curb 0.7.17 → 0.7.18

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.17"
-#define CURB_VER_NUM   717
+#define CURB_VERSION   "0.7.18"
+#define CURB_VER_NUM   718
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
 #define CURB_VER_MIC   1
-#define CURB_VER_PATCH 7
+#define CURB_VER_PATCH 8
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -54,7 +54,7 @@ static size_t read_data_handler(void *ptr,
     /* copy read_bytes from stream into ptr */
     VALUE str = rb_funcall(stream, rb_intern("read"), 1, rb_int_new(read_bytes) );
     if( str != Qnil ) {
-      memcpy(ptr, StringValueCStr(str), RSTRING_LEN(str));
+      memcpy(ptr, RSTRING_PTR(str), RSTRING_LEN(str));
       return RSTRING_LEN(str);
     }
     else {
@@ -71,7 +71,7 @@ static size_t read_data_handler(void *ptr,
     str = rb_funcall(stream, rb_intern("to_s"), 0);
     len = RSTRING_LEN(str);
     remaining = len - rbcu->offset;
-    str_ptr = StringValueCStr(str);
+    str_ptr = RSTRING_PTR(str);
 
     if( remaining < read_bytes ) {
       if( remaining > 0 ) {

data/ext/curb_errors.c

@@ -286,9 +286,11 @@ VALUE rb_curl_easy_error(CURLcode code) {
     case CURLE_TELNET_OPTION_SYNTAX:    /* 49 - Malformed telnet option */
       exclz = eCurlErrTelnetBadOptionSyntax;
       break;
+#ifdef HAVE_CURLE_OBSOLETE
     case CURLE_OBSOLETE:                /* 50 - NOT USED */
       exclz = eCurlErrObsolete;
       break;
+#endif
     case CURLE_SSL_PEER_CERTIFICATE:    /* 51 - peer's certificate wasn't ok */
       exclz = eCurlErrSSLPeerCertificate;
       break;

data/ext/extconf.rb

@@ -346,6 +346,8 @@ have_constant "curlopt_telnetoptions"
 # was obsoleted in August 2007 for 7.17.0, reused in April 2011 for 7.21.5
 have_constant "curle_not_built_in"
 
+have_constant "curle_obsolete" # removed in 7.24 ?
+
 if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end

data/tests/tc_curl_download.rb

@@ -8,7 +8,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
   
   def test_download_url_to_file_via_string
-    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
+    dl_url = "http://localhost:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
@@ -19,7 +19,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_file_io
-    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
+    dl_url = "http://localhost:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     io = File.open(dl_path, 'wb')
 
@@ -32,7 +32,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_io
-    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
+    dl_url = "http://localhost:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     reader, writer = IO.pipe
 
@@ -62,7 +62,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_bad_url_gives_404
-    dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
+    dl_url = "http://localhost:9129/this_file_does_not_exist.html"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)

data/tests/tc_curl_easy.rb

@@ -510,11 +510,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_resolve_mode
     c = Curl::Easy.new
-    assert c.resolve_mode == :auto
+    assert_equal :auto, c.resolve_mode
     c.resolve_mode = :ipv4
-    assert c.resolve_mode == :ipv4
+    assert_equal :ipv4, c.resolve_mode 
     c.resolve_mode = :ipv6
-    assert c.resolve_mode == :ipv6
+    assert_equal :ipv6, c.resolve_mode 
 
     assert_raises(ArgumentError) { c.resolve_mode = :bad }
   end
@@ -683,6 +683,17 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match /message$/, curl.body_str
   end
 
+  # https://github.com/taf2/curb/issues/101
+  def test_put_data_null_bytes
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.put_data = "a\0b"
+ 
+    curl.perform
+    
+    assert_match /^PUT/, curl.body_str
+    assert_match "a\0b", curl.body_str
+  end
+
   def test_put_nil_data_no_crash
     curl = Curl::Easy.new(TestServlet.url)
     curl.put_data = nil

metadata

@@ -1,35 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: curb
-version: !ruby/object:Gem::Version 
-  hash: 33
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 17
-  version: 0.7.17
+version: !ruby/object:Gem::Version
+  version: 0.7.18
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ross Bamford
 - Todd A. Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 -05:00
-default_executable: 
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies: []
-
-description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the libcurl(3), a fully-featured client-side URL transfer library. cURL and libcurl live at http://curl.haxx.se/
+description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
+  for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
+  libcurl live at http://curl.haxx.se/
 email: todd.fisher@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
+files:
 - LICENSE
 - README
 - Rakefile
@@ -73,43 +66,34 @@ files:
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
-has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: curb
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
-test_files: 
+test_files:
 - tests/alltests.rb
 - tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb