curb 0.8.3 → 0.8.4

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.8.3"
-#define CURB_VER_NUM   803
+#define CURB_VERSION   "0.8.4"
+#define CURB_VER_NUM   804
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   8
-#define CURB_VER_MIC   3
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -703,8 +703,8 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   curl = rbce->curl;
   
   if ( post_body == Qnil ) {
-    //rbce->postdata_buffer = Qnil;
     rb_easy_del("postdata_buffer");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
     
   } else {  
     if (rb_type(post_body) == T_STRING) {

data/lib/curb.rb

@@ -1,4 +1 @@
-require 'curb_core'
 require 'curl'
-require 'curl/easy'
-require 'curl/multi'

data/lib/curl.rb

@@ -1,11 +1,14 @@
-require 'curb'
+require 'curb_core'
+require 'curl/easy'
+require 'curl/multi'
 require 'uri'
 
 # expose shortcut methods
 module Curl
   
   def self.http(verb, url, post_body=nil, put_data=nil, &block)
-    handle = Curl::Easy.new(url)
+    handle = Thread.current[:curb_curl] ||= Curl::Easy.new
+    handle.url = url
     handle.post_body = post_body if post_body
     handle.put_data = put_data if put_data
     yield handle if block_given?
@@ -34,7 +37,7 @@ module Curl
   end
 
   def self.head(url, params={}, &block)
-    http :OPTIONS, urlalize(url, params), nil, nil, &block
+    http :HEAD, urlalize(url, params), nil, nil, &block
   end
 
   def self.options(url, params={}, &block)

data/lib/curl/easy.rb

@@ -310,7 +310,7 @@ module Curl
       # the +http_get+ call.
       #
       def perform(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.perform
         c
@@ -327,7 +327,7 @@ module Curl
       # the +http_get+ call.
       #
       def http_get(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_get
         c
@@ -344,7 +344,7 @@ module Curl
       # the +http_head+ call.
       #
       def http_head(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_head
         c
@@ -383,7 +383,7 @@ module Curl
         url = args.shift
         c = Curl::Easy.new url
         yield c if block_given?
-        c.http_post *args
+        c.http_post(*args)
         c
       end
 
@@ -398,7 +398,7 @@ module Curl
       # the +http_delete+ call.
       #
       def http_delete(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_delete
         c

data/tests/bug_require_last_or_segfault.rb

@@ -24,7 +24,7 @@
 require 'test/unit'
 require 'rbconfig'
 
-$rubycmd = Config::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
+$rubycmd = RbConfig::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
 
 class BugTestRequireLastOrSegfault < Test::Unit::TestCase
   def test_bug

data/tests/tc_curl_easy.rb

@@ -4,6 +4,21 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_threads
+    t = []
+    5.times do
+      t << Thread.new do
+        5.times do
+          c = Curl.get($TEST_URL)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_equal "", c.header_str
+        end
+      end
+    end
+
+    t.each {|t| t.join }
+  end
+
   def test_class_perform_01   
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2013-05-20 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
@@ -57,7 +57,6 @@ files:
 - tests/bug_postfields_crash2.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/bugtests.rb
-- tests/foo.rb
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
@@ -86,12 +85,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -243569426931689339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -243569426931689339
 requirements: []
 rubyforge_project: curb
 rubygems_version: 1.8.24
@@ -111,7 +116,6 @@ test_files:
 - tests/bug_postfields_crash2.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/bugtests.rb
-- tests/foo.rb
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb

data/tests/foo.rb

@@ -1,13 +0,0 @@
-require 'curb'
-
-SSL_CERT = '/path/to/my/cert'
-SSL_KEY = '/path/to/my/key'
-
-curl = Curl::Easy.new('98.129.21.125')
-curl.verbose = true
-curl.cert = SSL_CERT
-curl.cert_key = SSL_KEY
-curl.follow_location = true
-curl.ssl_verify_host = false
-curl.ssl_verify_peer = false
-curl.perform