curb 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53aeed05cc43efb7e736097fd212e43a8b25e21b
-  data.tar.gz: 129c6741252ba30006df855fb7543eba7e706fca
+  metadata.gz: 074fa1f2330b83e471e524dcbef1f5ef869fd352
+  data.tar.gz: 52abfef2028f532f2070406117f66dc779913ccc
 SHA512:
-  metadata.gz: e2f6065c80853bdc3d17d69316e202b7f7f73d5ab4925171fa50847e370978b67f4419144559305beb002a7e91dc5cf6b359b1d643237cb17699c37ba07d936f
-  data.tar.gz: b76fd1724733c9566e4150c4467370ca63a40838f59e8b6ab1412d8b893eca1ebfe12cca6bb8ac59f607292498daa4e97d06fd9239ac7d651b5441b4e2f2abfa
+  metadata.gz: 1eee7cc31175d70a6720c9f0f86958644e7fd9f179e82cc0b3a90e70dc3e5c4caa2cd0db06a3e1350ae88ef7c030e14e8d2c6e6d2dfba9e8c9b8872fe56fa421
+  data.tar.gz: 3191554e99e528b7e59801ad5322661fe95ebcfe83ced7f6658f1eda2ee6a2546b990b4c6ff9182a4242f15556443422dcc9be4f4005dfe0c72cb13da517d1b6

data/README.markdown

@@ -16,7 +16,7 @@ Ruby license. See the LICENSE file for the gory details.
 
 ## You will need
 
-* A working Ruby installation (1.8+, tested with 1.8.6, 1.8.7, 1.9.1, and 1.9.2)
+* A working Ruby installation (2.1+)
 * A working (lib)curl installation, with development stuff (7.5+, tested with 7.19.x)
 * A sane build environment (e.g. gcc, make)
 
@@ -30,7 +30,7 @@ On Windows, make sure you're using the [DevKit](http://rubyinstaller.org/downloa
 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
+    gem install curb --platform=ruby -- --with-curl-lib=C:/curl-7.39.0-devel-mingw32/lib --with-curl-include=C:/curl-7.39.0-devel-mingw32/include
 
 Or, if you downloaded the archive:
 
@@ -134,9 +134,9 @@ c.perform
 ### HTTP "insecure" SSL connections (like curl -k, --insecure) to avoid Curl::Err::SSLCACertificateError:
 
 ```ruby
-    c = Curl::Easy.new("https://github.com/")
-    c.ssl_verify_peer = false
-    c.perform
+c = Curl::Easy.new("https://github.com/")
+c.ssl_verify_peer = false
+c.perform
 ```
 
 ### Supplying custom handlers:

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.9.6"
-#define CURB_VER_NUM   906
+#define CURB_VERSION   "0.9.7"
+#define CURB_VER_NUM   907
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   6
-#define CURB_VER_MIC   0
+#define CURB_VER_MIN   9
+#define CURB_VER_MIC   7
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -2346,6 +2346,7 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
     }
   }
 
+#if HAVE_CURLOPT_RESOLVE
   /* Setup resolve list if necessary */
   if (!rb_easy_nil("resolve")) {
     if (rb_easy_type_check("resolve", T_ARRAY)) {
@@ -2357,6 +2358,7 @@ VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
       curl_easy_setopt(curl, CURLOPT_RESOLVE, *rslv);
     }
   }
+#endif
 
   return Qnil;
 }

data/ext/curb_errors.c

@@ -307,9 +307,11 @@ VALUE rb_curl_easy_error(CURLcode code) {
       exclz = eCurlErrObsolete;
       break;
 #endif
+#if LIBCURL_VERSION_NUM < 0x073e00
     case CURLE_SSL_PEER_CERTIFICATE:    /* 51 - peer's certificate wasn't ok */
       exclz = eCurlErrSSLPeerCertificate;
       break;
+#endif
     case CURLE_GOT_NOTHING:             /* 52 - when this is a specific error */
       exclz = eCurlErrGotNothing;
       break;
@@ -334,8 +336,13 @@ VALUE rb_curl_easy_error(CURLcode code) {
     case CURLE_SSL_CIPHER:              /* 59 - couldn't use specified cipher */
       exclz = eCurlErrSSLCipher;
       break;
+#if LIBCURL_VERSION_NUM >= 0x073e00
+    case CURLE_PEER_FAILED_VERIFICATION:              /* 60 - problem with the CA cert (path?) */
+      exclz = eCurlErrSSLPeerCertificate;
+#else
     case CURLE_SSL_CACERT:              /* 60 - problem with the CA cert (path?) */
       exclz = eCurlErrSSLCACertificate;
+#endif
       break;
     case CURLE_BAD_CONTENT_ENCODING:    /* 61 - Unrecognized transfer encoding */
       exclz = eCurlErrBadContentEncoding;

data/ext/extconf.rb

@@ -102,6 +102,9 @@ have_constant "curle_send_fail_rewind"
 have_constant "curle_ssl_engine_initfailed"
 have_constant "curle_login_denied"
 
+# older than 7.10.0
+have_constant "curlopt_nosignal"
+
 # older than 7.16.0
 have_constant "curlmopt_pipelining"
 

data/lib/curl.rb

@@ -48,13 +48,11 @@ module Curl
 
   def self.urlalize(url, params={})
     uri = URI(url)
+    # early return if we didn't specify any extra params
+    return uri.to_s if (params || {}).empty?
+
     params_query = URI.encode_www_form(params || {})
-    # both uri.query and params_query not blank
-    if !(uri.query.nil? || uri.query.empty?) && !params_query.empty?
-      uri.query = "#{uri.query}&#{params_query}"
-    else
-      uri.query = "#{uri.query}#{params_query}"
-    end
+    uri.query = [uri.query.to_s, params_query].reject(&:empty?).join('&')
     uri.to_s
   end
 

data/tests/helper.rb

@@ -97,7 +97,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
       if params and params['s'] == '500'
         res.status = 500
       elsif params and params['c']
-        cookie = URI.decode_www_form(params['c'])[0][0].split('=')
+        cookie = URI.decode_www_form_component(params['c']).split('=')
         res.cookies << WEBrick::Cookie.new(*cookie)
       else
         respond_with("POST\n#{req.body}",req,res)

data/tests/tc_curl.rb

@@ -31,6 +31,36 @@ class TestCurl < Test::Unit::TestCase
     assert_equal "OPTIONSfoo=bar", curl.body_str
   end
 
+  def test_urlalize_without_extra_params
+    url_no_params = 'http://localhost/test'
+    url_with_params = 'http://localhost/test?a=1'
+
+    assert_equal(url_no_params, Curl.urlalize(url_no_params))
+    assert_equal(url_with_params, Curl.urlalize(url_with_params))
+  end
+
+  def test_urlalize_with_nil_as_params
+    url = 'http://localhost/test'
+    assert_equal(url, Curl.urlalize(url, nil))
+  end
+
+  def test_urlalize_with_extra_params
+    url_no_params = 'http://localhost/test'
+    url_with_params = 'http://localhost/test?a=1'
+    extra_params = { :b => 2 }
+
+    expected_url_no_params = 'http://localhost/test?b=2'
+    expected_url_with_params = 'http://localhost/test?a=1&b=2'
+
+    assert_equal(expected_url_no_params, Curl.urlalize(url_no_params, extra_params))
+    assert_equal(expected_url_with_params, Curl.urlalize(url_with_params, extra_params))
+  end
+
+  def test_urlalize_does_not_strip_trailing_?
+    url_empty_params = 'http://localhost/test?'
+    assert_equal(url_empty_params, Curl.urlalize(url_empty_params))
+  end
+
   include TestServerMethods
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ross Bamford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2018-11-26 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