Merge pull request #138 from moteus/url_api

Support URL API

Author: moteus

lakefile

@@ -35,6 +35,7 @@ target('test', install, function()
   run_test('test_mime.lua')
   run_test('test_multi_callback.lua')
   run_test('test_multi_nested_callback.lua')
+  run_test('test_urlapi.lua')
 
   if not test_summary() then
     quit("test fail")

rockspecs/lua-curl-scm-0.rockspec

@@ -61,9 +61,10 @@ build = {
 
     lcurl = {
       sources = {
-        "src/l52util.c",    "src/lceasy.c", "src/lcerror.c",
-        "src/lchttppost.c", "src/lcurl.c",  "src/lcutils.c",
-        "src/lcmulti.c",    "src/lcshare.c","src/lcmime.c",
+        "src/l52util.c",    "src/lceasy.c",  "src/lcerror.c",
+        "src/lchttppost.c", "src/lcurl.c",   "src/lcutils.c",
+        "src/lcmulti.c",    "src/lcshare.c", "src/lcmime.c",
+        "src/lcurlapi.c",
       },
       incdirs   = { "$(CURL_INCDIR)" },
       libdirs   = { "$(CURL_LIBDIR)" }

src/lcerr_url.h

@@ -0,0 +1,20 @@
+#if LCURL_CURL_VER_GE(7,61,0)
+ERR_ENTRY ( BAD_HANDLE        )
+ERR_ENTRY ( BAD_PARTPOINTER   )
+ERR_ENTRY ( BAD_PORT_NUMBER   )
+ERR_ENTRY ( MALFORMED_INPUT   )
+ERR_ENTRY ( NO_FRAGMENT       )
+ERR_ENTRY ( NO_HOST           )
+ERR_ENTRY ( NO_OPTIONS        )
+ERR_ENTRY ( NO_PASSWORD       )
+ERR_ENTRY ( NO_PORT           )
+ERR_ENTRY ( NO_QUERY          )
+ERR_ENTRY ( NO_SCHEME         )
+ERR_ENTRY ( NO_USER           )
+ERR_ENTRY ( OK                )
+ERR_ENTRY ( OUT_OF_MEMORY     )
+ERR_ENTRY ( UNKNOWN_PART      )
+ERR_ENTRY ( UNSUPPORTED_SCHEME)
+ERR_ENTRY ( URLDECODE         )
+ERR_ENTRY ( USER_NOT_ALLOWED  )
+#endif

src/lcerror.c

@@ -20,6 +20,7 @@ static const char *LCURL_ERROR = LCURL_ERROR_NAME;
 #define LCURL_ERROR_MULTI_NAME "CURL-MULTI"
 #define LCURL_ERROR_SHARE_NAME "CURL-SHARE"
 #define LCURL_ERROR_FORM_NAME  "CURL-FORM"
+#define LCURL_ERROR_URL_NAME   "CURL-URL"
 
 typedef struct lcurl_error_tag{
   int tp;
@@ -72,12 +73,24 @@ static const char* lcurl_err_form_mnemo(int err){
 #undef ERR_ENTRY
 }
 
+static const char* lcurl_err_url_mnemo(int err){
+#define ERR_ENTRY(E) case CURLUE_##E: return #E;
+
+  switch (err){
+    #include "lcerr_url.h"
+  }
+  return "UNKNOWN";
+
+#undef ERR_ENTRY
+}
+
 static const char* _lcurl_err_mnemo(int tp, int err){
   switch(tp){
     case LCURL_ERROR_EASY : return lcurl_err_easy_mnemo (err);
     case LCURL_ERROR_MULTI: return lcurl_err_multi_mnemo(err);
     case LCURL_ERROR_SHARE: return lcurl_err_share_mnemo(err);
     case LCURL_ERROR_FORM : return lcurl_err_form_mnemo (err);
+    case LCURL_ERROR_URL  : return lcurl_err_url_mnemo  (err);
   }
   assert(0);
   return "<UNSUPPORTED ERROR TYPE>";
@@ -89,6 +102,7 @@ static const char* _lcurl_err_msg(int tp, int err){
     case LCURL_ERROR_MULTI: return curl_multi_strerror(err);
     case LCURL_ERROR_SHARE: return curl_share_strerror(err);
     case LCURL_ERROR_FORM : return lcurl_err_form_mnemo(err);
+    case LCURL_ERROR_URL  : return lcurl_err_url_mnemo(err);
   }
   assert(0);
   return "<UNSUPPORTED ERROR TYPE>";
@@ -100,6 +114,7 @@ static const char* _lcurl_err_category_name(int tp){
     (tp == LCURL_ERROR_MULTI) ||
     (tp == LCURL_ERROR_SHARE) ||
     (tp == LCURL_ERROR_FORM ) ||
+    (tp == LCURL_ERROR_URL  ) ||
     0
   );
 
@@ -120,6 +135,10 @@ static const char* _lcurl_err_category_name(int tp){
       static const char *name = LCURL_ERROR_FORM_NAME;
       return name;
     }
+    case LCURL_ERROR_URL: {
+      static const char *name = LCURL_ERROR_URL_NAME;
+      return name;
+    }
   }
 
   assert(0);
@@ -147,6 +166,7 @@ int lcurl_error_create(lua_State *L, int error_type, int no){
     (error_type == LCURL_ERROR_MULTI) ||
     (error_type == LCURL_ERROR_SHARE) ||
     (error_type == LCURL_ERROR_FORM ) ||
+    (error_type == LCURL_ERROR_URL  ) ||
     0
   );
 
@@ -233,13 +253,15 @@ static const int ERROR_CATEGORIES[] = {
   LCURL_ERROR_MULTI,
   LCURL_ERROR_SHARE,
   LCURL_ERROR_FORM,
+  LCURL_ERROR_URL,
 };
 
 static const char* ERROR_CATEGORIES_NAME[] = {
   LCURL_ERROR_EASY_NAME,
   LCURL_ERROR_MULTI_NAME,
   LCURL_ERROR_SHARE_NAME,
   LCURL_ERROR_FORM_NAME,
+  LCURL_ERROR_URL_NAME,
   NULL
 };
 
@@ -297,6 +319,10 @@ static const lcurl_const_t lcurl_error_codes[] = {
 
 #define ERR_ENTRY(N) { "E_FORM_"#N, CURL_FORMADD_##N },
 #include "lcerr_form.h"
+#undef ERR_ENTRY
+
+#define ERR_ENTRY(N) { "E_URL_"#N, CURLUE_##N },
+#include "lcerr_url.h"
 #undef ERR_ENTRY
 
   {NULL, 0}

src/lcerror.h

@@ -18,6 +18,7 @@
 #define LCURL_ERROR_MULTI 2
 #define LCURL_ERROR_SHARE 3
 #define LCURL_ERROR_FORM  4
+#define LCURL_ERROR_URL   5
 
 #define LCURL_ERROR_RETURN 1
 #define LCURL_ERROR_RAISE  2

src/lcopturl.h

@@ -0,0 +1,21 @@
+ENTRY_PART(fragment,      UPART_FRAGMENT , CURLUE_NO_FRAGMENT     )
+ENTRY_PART(host,          UPART_HOST     , CURLUE_NO_HOST         )
+ENTRY_PART(options,       UPART_OPTIONS  , CURLUE_NO_OPTIONS      )
+ENTRY_PART(password,      UPART_PASSWORD , CURLUE_NO_PASSWORD     )
+ENTRY_PART(path,          UPART_PATH     , CURLUE_OK              )
+ENTRY_PART(port,          UPART_PORT     , CURLUE_NO_PORT         )
+ENTRY_PART(query,         UPART_QUERY    , CURLUE_NO_QUERY        )
+ENTRY_PART(scheme,        UPART_SCHEME   , CURLUE_NO_SCHEME       )
+ENTRY_PART(url,           UPART_URL      , CURLUE_OK              )
+ENTRY_PART(user,          UPART_USER     , CURLUE_NO_USER         )
+
+ENTRY_FLAG(DEFAULT_PORT        )
+ENTRY_FLAG(NO_DEFAULT_PORT     )
+ENTRY_FLAG(DEFAULT_SCHEME      )
+ENTRY_FLAG(NON_SUPPORT_SCHEME  )
+ENTRY_FLAG(PATH_AS_IS          )
+ENTRY_FLAG(DISALLOW_USER       )
+ENTRY_FLAG(URLDECODE           )
+ENTRY_FLAG(URLENCODE           )
+ENTRY_FLAG(APPENDQUERY         )
+ENTRY_FLAG(GUESS_SCHEME        )

src/lcurl.c

@@ -15,6 +15,7 @@
 #include "lcerror.h"
 #include "lchttppost.h"
 #include "lcmime.h"
+#include "lcurlapi.h"
 #include "lcutils.h"
 
 /*export*/
@@ -36,10 +37,18 @@ static int lcurl_share_new_safe(lua_State *L){
   return lcurl_share_create(L, LCURL_ERROR_RETURN);
 }
 
-static int lcurl_hpost_new_safe(lua_State *L){
+static int lcurl_hpost_new_safe(lua_State *L) {
   return lcurl_hpost_create(L, LCURL_ERROR_RETURN);
 }
 
+#if LCURL_CURL_VER_GE(7,62,0)
+
+static int lcurl_url_new_safe(lua_State *L) {
+  return lcurl_url_create(L, LCURL_ERROR_RETURN);
+}
+
+#endif
+
 static int lcurl_easy_new(lua_State *L){
   return lcurl_easy_create(L, LCURL_ERROR_RAISE);
 }
@@ -56,6 +65,14 @@ static int lcurl_hpost_new(lua_State *L){
   return lcurl_hpost_create(L, LCURL_ERROR_RAISE);
 }
 
+#if LCURL_CURL_VER_GE(7,62,0)
+
+static int lcurl_url_new(lua_State *L) {
+  return lcurl_url_create(L, LCURL_ERROR_RAISE);
+}
+
+#endif
+
 static int lcurl_version(lua_State *L){
   lua_pushstring(L, curl_version());
   return 1;
@@ -170,6 +187,9 @@ static const struct luaL_Reg lcurl_functions[] = {
   {"easy",            lcurl_easy_new         },
   {"multi",           lcurl_multi_new        },
   {"share",           lcurl_share_new        },
+#if LCURL_CURL_VER_GE(7,62,0)
+  {"url",             lcurl_url_new          },
+#endif
   {"version",         lcurl_version          },
   {"version_info",    lcurl_version_info     },
 
@@ -182,6 +202,9 @@ static const struct luaL_Reg lcurl_functions_safe[] = {
   {"easy",            lcurl_easy_new_safe         },
   {"multi",           lcurl_multi_new_safe        },
   {"share",           lcurl_share_new_safe        },
+#if LCURL_CURL_VER_GE(7,62,0)
+  {"url",             lcurl_url_new_safe          },
+#endif
   {"version",         lcurl_version               },
   {"version_info",    lcurl_version_info          },
 
@@ -258,6 +281,7 @@ static int luaopen_lcurl_(lua_State *L, const struct luaL_Reg *func){
   LCURL_PUSH_NUP(L); lcurl_mime_initlib (L, NUP);
   LCURL_PUSH_NUP(L); lcurl_multi_initlib(L, NUP);
   LCURL_PUSH_NUP(L); lcurl_share_initlib(L, NUP);
+  LCURL_PUSH_NUP(L); lcurl_url_initlib  (L, NUP);
 
   LCURL_PUSH_NUP(L);