Merge pull request #13 from moteus/master

Rename module name in rockspec and update readme

Author: moteus

.travis.yml

@@ -22,7 +22,7 @@ before_install:
   - sudo luarocks install lua-path
 
 install:
-  - sudo luarocks make rockspecs/lcurl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
+  - sudo luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
 
 script: 
   - cd test

README.md

@@ -1,23 +1,38 @@
 # Lua binding to [libcurl](http://curl.haxx.se/libcurl)
-[![Build Status](https://travis-ci.org/Lua-cURL/lua-lcurl.png?branch=master)](https://travis-ci.org/Lua-cURL/lua-lcurl)
-[![Coverage Status](https://coveralls.io/repos/Lua-cURL/lua-lcurl/badge.png?branch=master)](https://coveralls.io/r/Lua-cURL/lua-lcurl?branch=master)
+[![Build Status](https://travis-ci.org/Lua-cURL/Lua-cURLv3.svg?branch=master)](https://travis-ci.org/Lua-cURL/Lua-cURLv3)
+[![Coverage Status](https://coveralls.io/repos/Lua-cURL/Lua-cURLv3/badge.png?branch=master)](https://coveralls.io/r/Lua-cURL/Lua-cURLv3?branch=master)
 [![Licence](http://img.shields.io/badge/Licence-MIT-brightgreen.svg)](LICENSE)
 
+##Status
+
+This module include three layer
+
+1. `lcurl` module provide low level pure C binding to libcurl.<br/>
+Almost ready and needs tests. I have no plans to change this API.
+
+2. `cURL` module provide compatibility for Lua-cURLv2 API.<br/>
+Almost ready and needs tests.
+
+3. `cURL` module provide new high level API.<br/>
+In fact for now it provide `lcurl` API directly and needed to redesign.<br/>
+
+
 ## Documentation
-[API](http://moteus.github.com/lcurl)<br/>
-Also library provide `lcurl.cURL` compatibility module for [Lua-cURL](http://lua-curl.github.io/Lua-cURL) binding.
+[lcurl API](http://moteus.github.com/lcurl)<br/>
+[Lua-cURLv2 API](http://lua-curl.github.io/Lua-cURL)<br/>
+Lua-cURLv3 API - TODO
 
-## Why one more curl binding
+## 
 
-Existing [Lua-cURL](http://lua-curl.github.io/Lua-cURL) binding has several problems:
+Lua-cURLv2 binding has several problems:
 
 * it can not return error codes but just raise Lua errors
 * it raise Lua error from callback that may result resource leak in libcurl
 * it does not provide building multipart/formdata explicitly
 * it has memory leak when send multipart/formdata
 * it does not save string for curl options that may result crush in libcurl
 * there no way to get result for operations in multi interface (e.g. if one of easy operation fail you can not get result code/error message)
-* you can not use multi interface for upload operation
+* you can not use multi interface for upload operation (?)
 * you can not use your own callback function to perform operation with multi interface
 * you can not pass your context to callback functions
 

rockspecs/lcurl-scm-0.rockspec rockspecs/lua-curl-scm-0.rockspecrockspecs/lcurl-scm-0.rockspec renamed to rockspecs/lua-curl-scm-0.rockspec

@@ -1,20 +1,20 @@
-package = "lcurl"
+package = "Lua-cURL"
 version = "scm-0"
 source = {
-  url = "https://github.com/moteus/lua-lcurl/archive/master.zip",
-  dir = "lua-lcurl-master",
+  url = "https://github.com/Lua-cURL/Lua-cURLv3/archive/master.zip",
+  dir = "Lua-cURLv3-master",
 }
 
 description = {
   summary = "Lua binding to libcurl",
   detailed = [[
   ]],
-  homepage = "https://github.com/moteus/lua-lcurl",
-  license = "MIT/X11"
+  homepage = "https://github.com/Lua-cURL",
+  license  = "MIT/X11"
 }
 
 dependencies = {
-  "lua >= 5.1"
+  "lua >= 5.1, < 5.3"
 }
 
 external_dependencies = {
@@ -57,15 +57,15 @@ build = {
   },
 
   modules = {
+    cURL  = "src/lua/cURL.lua",
     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/lcmulti.c",    "src/lcshare.c",
       },
       incdirs   = { "$(CURL_INCDIR)" },
       libdirs   = { "$(CURL_LIBDIR)" }
     },
-    ["lcurl.cURL"] = "src/lua/cURL.lua",
   }
 }

test/test_safe.lua

@@ -242,4 +242,37 @@ end
 
 end
 
+local _ENV = TEST_CASE'objects_have_same_metatables' do
+
+local scurl = require "lcurl.safe"
+local curl  = require "lcurl"
+local e1, e2, m
+
+function teardown()
+  if m  then m:close()  end
+  if e1 then e1:close() end
+  if e2 then e2:close() end
+  e1, e2, m = nil
+end
+
+function test_1()
+  e1 = assert(scurl.easy())
+  e2 = assert(curl.easy())
+  m  = assert(scurl.multi())
+
+  assert_equal(m, m:add_handle(e1))
+  assert_equal(m, m:add_handle(e2))
+end
+
+function test_2()
+  e1 = assert(scurl.easy())
+  e2 = assert(curl.easy())
+  m  = assert(curl.multi())
+
+  assert_equal(m, m:add_handle(e1))
+  assert_equal(m, m:add_handle(e2))
+end
+
+end
+
 if not HAS_RUNNER then lunit.run() end