curb 0.8.6 → 0.8.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 727f8b8d733787a36d4e67e7b43aa03abd638426
+  data.tar.gz: 7d601d20ffc26f68d4ba0db85eca1216e1bf48f8
+SHA512:
+  metadata.gz: 45860ecb1398dcebe4df6787aef55cd81b364eb930d4bde85769e7132abeac81fdea83278c038b092f38b17f672f7f4dd1ab8f40cc76beac8c8ee857090f7827
+  data.tar.gz: 487fa8b068663ca3e8e2cdf5f6ccbf9efea4b91fb90dc6f52c9768d37b45333f6bfddb08e6ebbb24ff07804a5104dc7e7704793f57dc3ff87f043efa84cb34ed

data/README.markdown

@@ -26,7 +26,13 @@ Ruby license. See the LICENSE file for the gory details.
 ... will usually be as simple as:
 
     $ gem install curb
-  
+
+On Windows, make sure you're using the [DevKit](http://rubyinstaller.org/downloads/) and
+the [development version of libcurl](http://curl.haxx.se/gknw.net/7.39.0/dist-w32/curl-7.39.0-devel-mingw32.zip). Unzip, then run this in your command
+line (alter paths to your curl location, but remember to use forward slashes):
+
+    gem install curb --platform=ruby -- --with-curl-lib=C:/curl-7.39.0-devel-mingw32/bin --with-curl-include=C:/curl-7.39.0-devel-mingw32/include
+
 Or, if you downloaded the archive:  
 
     $ rake install 
@@ -44,6 +50,10 @@ On Ubuntu, the dependencies can be satisfied by installing the following package
 
     $ sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev
 
+On RedHat:
+
+    $ sudo yum install ruby-devel libcurl-devel openssl-devel
+    
 Curb has fairly extensive RDoc comments in the source. You can build the
 documentation with:
 

data/Rakefile

@@ -68,11 +68,6 @@ end
 desc "Compile the shared object"
 task :compile => [CURB_SO]
 
-desc "Create the markdown file"
-task :markdown do
-  cp "README", "README.markdown"
-end
-
 desc "Install to your site_ruby directory"
 task :install => :alltests do
   m = make 'install' 
@@ -171,13 +166,13 @@ else
 
   desc 'Build gem'
   task :package => :gemspec do
-    require 'rubygems/specification'
+    require 'rubygems/package'
     spec_source = File.read File.join(File.dirname(__FILE__),'curb.gemspec')
     spec = nil
     # see: http://gist.github.com/16215
     Thread.new { spec = eval("$SAFE = 3\n#{spec_source}") }.join
     spec.validate
-    Gem::Builder.new(spec).build
+    Gem::Package.build(spec)
   end
 
   task :static do

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.6"
-#define CURB_VER_NUM   806
+#define CURB_VERSION   "0.8.7"
+#define CURB_VER_NUM   807
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   8
-#define CURB_VER_MIC   6
+#define CURB_VER_MIC   7
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -791,9 +791,13 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)read_data_handler);
+#if HAVE_CURLOPT_SEEKFUNCTION
   curl_easy_setopt(curl, CURLOPT_SEEKFUNCTION, (curl_seek_callback)seek_data_handler);
+#endif
   curl_easy_setopt(curl, CURLOPT_READDATA, rbce);
+#if HAVE_CURLOPT_SEEKDATA
   curl_easy_setopt(curl, CURLOPT_SEEKDATA, rbce);
+#endif
 
   /* 
    * we need to set specific headers for the PUT to work... so
@@ -3121,6 +3125,12 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_NOPROGRESS:
   case CURLOPT_NOSIGNAL:
   case CURLOPT_HTTPGET:
+  case CURLOPT_POST: {
+    curl_easy_setopt(rbce->curl, CURLOPT_POST, rb_type(val) == T_TRUE);
+  } break;
+  case CURLOPT_POSTFIELDS: {
+    curl_easy_setopt(rbce->curl, CURLOPT_POSTFIELDS, NIL_P(val) ? NULL : StringValueCStr(val));
+  } break;
   case CURLOPT_NOBODY: {
     int type = rb_type(val);
     VALUE value;
@@ -3162,6 +3172,9 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
   case CURLOPT_FAILONERROR: {
     curl_easy_setopt(rbce->curl, CURLOPT_FAILONERROR, FIX2LONG(val));
     } break;
+  case CURLOPT_SSL_CIPHER_LIST: {
+    curl_easy_setopt(rbce->curl, CURLOPT_SSL_CIPHER_LIST, StringValueCStr(val));
+    } break;
 #if HAVE_CURLOPT_GSSAPI_DELEGATION
   case CURLOPT_GSSAPI_DELEGATION: {
     curl_easy_setopt(rbce->curl, CURLOPT_GSSAPI_DELEGATION, FIX2LONG(val));

data/ext/curb_multi.c

@@ -581,6 +581,8 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       rc = (int)(VALUE) rb_thread_call_without_gvl((void *(*)(void *))curb_select, &fdset_args, RUBY_UBF_IO, 0);
 #elif HAVE_RB_THREAD_BLOCKING_REGION
       rc = rb_thread_blocking_region(curb_select, &fdset_args, RUBY_UBF_IO, 0);
+#elif HAVE_RB_THREAD_FD_SELECT
+      rc = rb_thread_fd_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
 #else
       rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
 #endif

data/lib/curl.rb

@@ -61,4 +61,8 @@ module Curl
     params.respond_to?(:map) ? URI.encode_www_form(params) : (params.respond_to?(:to_s) ? params.to_s : params)
   end
 
+  def self.reset
+    Thread.current[:curb_curl] = Curl::Easy.new
+  end
+
 end

data/tests/tc_curl_easy.rb

@@ -4,6 +4,12 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_global_reset
+    c = Curl.get($TEST_URL)
+    # in a Timeout block you should reset the thread current handle 
+    Curl.reset
+  end
+
   def test_threads
     t = []
     5.times do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.6
-  prerelease: 
+  version: 0.8.7
 platform: ruby
 authors:
 - Ross Bamford
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2015-03-22 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
@@ -27,24 +26,24 @@ files:
 - README.markdown
 - Rakefile
 - doc.rb
-- ext/extconf.rb
-- lib/curb.rb
-- lib/curl/easy.rb
-- lib/curl/multi.rb
-- lib/curl.rb
 - ext/curb.c
-- ext/curb_easy.c
-- ext/curb_errors.c
-- ext/curb_multi.c
-- ext/curb_postfield.c
-- ext/curb_upload.c
 - ext/curb.h
+- ext/curb_easy.c
 - ext/curb_easy.h
+- ext/curb_errors.c
 - ext/curb_errors.h
 - ext/curb_macros.h
+- ext/curb_multi.c
 - ext/curb_multi.h
+- ext/curb_postfield.c
 - ext/curb_postfield.h
+- ext/curb_upload.c
 - ext/curb_upload.h
+- ext/extconf.rb
+- lib/curb.rb
+- lib/curl.rb
+- lib/curl/easy.rb
+- lib/curl/multi.rb
 - tests/alltests.rb
 - tests/bug_crash_on_debug.rb
 - tests/bug_crash_on_progress.rb
@@ -72,30 +71,29 @@ files:
 - tests/unittests.rb
 homepage: http://curb.rubyforge.org/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.markdown
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: curb
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
 - tests/alltests.rb
@@ -123,4 +121,3 @@ test_files:
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
-has_rdoc: true