httpclient 2.2.0.1 → 2.2.0.2

data/lib/httpclient.rb

@@ -229,7 +229,7 @@ require 'httpclient/cookie'
 #   ruby -rhttpclient -e 'p HTTPClient.head(ARGV.shift).header["last-modified"]' http://dev.ctor.org/
 #
 class HTTPClient
-  VERSION = '2.2.0.1'
+  VERSION = '2.2.0.2'
   RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   /: (\S+) (\S+)/ =~ %q$Id$
   LIB_NAME = "(#{$1}/#{$2}, #{RUBY_VERSION_STRING})"
@@ -389,6 +389,22 @@ class HTTPClient
     @follow_redirect_count = 10
     load_environment
     self.proxy = proxy if proxy
+    keep_webmock_compat
+  end
+
+  # webmock 1.6.2 depends on HTTP::Message#body.content to work.
+  # let's keep it work iif webmock is loaded for a while.
+  def keep_webmock_compat
+    if respond_to?(:do_get_block_with_webmock)
+      ::HTTP::Message.module_eval do
+        def body
+          def (o = self.content).content
+            self
+          end
+          o
+        end
+      end
+    end
   end
 
   # Returns debug device if exists.  See debug_dev=.

data/lib/httpclient/cacert.p7s

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----21BACCEB0386628A2D68B26976B22018"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----FD1775D1D9127483D5635511E610AF67"
 
 This is an S/MIME signed message
 
-------21BACCEB0386628A2D68B26976B22018
+------FD1775D1D9127483D5635511E610AF67
 -----BEGIN CERTIFICATE-----
 MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
 MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
@@ -1813,7 +1813,7 @@ lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
 7M2CYfE45k+XmCpajQ==
 -----END CERTIFICATE-----
 
-------21BACCEB0386628A2D68B26976B22018
+------FD1775D1D9127483D5635511E610AF67
 Content-Type: application/pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -1843,16 +1843,16 @@ BO7mpwMLMIdsjTvnkx2b/WEokIPiXr2Hcnc6FEgRQ8l8ec+8znC2LILZ1wT2K3AT
 o3whsSOELB++JcWKxWsM3/6llkYx/rtlpjGCAiswggInAgEBMFAwSzELMAkGA1UE
 BhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9wbWVudDET
 MBEGA1UEAwwKaHR0cGNsaWVudAIBATAJBgUrDgMCGgUAoIGxMBgGCSqGSIb3DQEJ
-AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEwMTIxMzEzNTI1MlowIwYJ
+AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxOTEzMTk1MFowIwYJ
 KoZIhvcNAQkEMRYEFB6px2QzZcvvEHTjt2rAmZJQzfDEMFIGCSqGSIb3DQEJDzFF
 MEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcG
-BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAECC6IqXybf+
-fWzYjqKoIWvoNSjsvIddbRh8D46naHzBGPC6CjYf1FG/Spsv2NMKdxnZsR/P888D
-xJvHgVkUqa+Q1KXS0nRk6K1/YlvNS2D3N9rPC827WgxYP+EB0nNDsBS+7tUJl2YV
-k/7bBn8jJsUP34PqXfLHFhpcz2+9Djji6bWRSpFtPvDDmLF90/qZc6ESNmtOTv4G
-N5guqomPy3Ayo92dS80MMWIyWLm2P/xkpjlDt9Kaekc1TiODNozHyQbaA7jMH5hJ
-3Xnp1DtzIRkvONW2tu/VnWlfnuk4MOabNrwjo713Bs6wEbEs8BFfIoToP1gybeBf
-87QK8ziDw8g=
+BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAD4EMqXaqm6w
+loVOMuk2Etbhp9jBFykE3fOB5WUTTkEH9sgI04Ajoc6CBjud97ngG+WVfK9JK1zG
+D5uEI+8IV5l4N38kzV/CJ3oomMtXlwPvzXYXcHeN3FAPcNwHxKSswMEOyCmn1Xh7
+3UBvJBiMuqZfCuM63n0ozj5fiYCBUUnhX3fb2pcmswhO8PDEuA2XoYS5sLAmqA20
+4mklFS4ejN1dmWcJY+cHaS45+pYfzFXtZDaOR7WU+vYIydMoTxBOgVbrjnlciZc0
+eomLCA65FMf8adnS658gfqzstjp7Sq81G7uniUQdipK4BA6uU+Qeg0LRbMSaV4VG
+8ML4DnOTXME=
 
-------21BACCEB0386628A2D68B26976B22018--
+------FD1775D1D9127483D5635511E610AF67--
 

data/lib/httpclient/cacert_sha1.p7s

@@ -1,9 +1,9 @@
 MIME-Version: 1.0
-Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----9D03D47FAA98363CD7978AFC0454F513"
+Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg="sha1"; boundary="----A7A3ED9F71494B934F978FF49CCFDAA8"
 
 This is an S/MIME signed message
 
-------9D03D47FAA98363CD7978AFC0454F513
+------A7A3ED9F71494B934F978FF49CCFDAA8
 -----BEGIN CERTIFICATE-----
 MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
 MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
@@ -1813,7 +1813,7 @@ lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
 7M2CYfE45k+XmCpajQ==
 -----END CERTIFICATE-----
 
-------9D03D47FAA98363CD7978AFC0454F513
+------A7A3ED9F71494B934F978FF49CCFDAA8
 Content-Type: application/pkcs7-signature; name="smime.p7s"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="smime.p7s"
@@ -1843,16 +1843,16 @@ YMEtiMT3acFCZEjamCfXIcfLu6Jr7dYc6bvZqLd8tKkKFy01dOSEXIgHtDsthHbv
 t9v4ZZy8AJlYcuqOLLbIs9nL0lnCcKLjITGCAiswggInAgEBMFAwSzELMAkGA1UE
 BhMCSlAxETAPBgNVBAoMCGN0b3Iub3JnMRQwEgYDVQQLDAtEZXZlbG9wbWVudDET
 MBEGA1UEAwwKaHR0cGNsaWVudAIBAjAJBgUrDgMCGgUAoIGxMBgGCSqGSIb3DQEJ
-AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEwMTIxMzEzNTY0NlowIwYJ
+AzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTExMDQxOTEzMjAwNFowIwYJ
 KoZIhvcNAQkEMRYEFB6px2QzZcvvEHTjt2rAmZJQzfDEMFIGCSqGSIb3DQEJDzFF
 MEMwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcG
-BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBAE8dkUXL11pJ
-KAFjLByBhcS+NcyeTqoVB5NSCydznZxHHBmFptQQn2lq85mjvxtpkVe2xJfEKMZY
-yIJ148K7piwMY0pu79RIGDc6Ssk1ehS2TJBigsShx6mT56EdQALVrPfLofCUh0v2
-3DysNYHkbTmY+cMeEJP2uynNpXercCUrqoff5Sf5MjHfSNmJ7M8bJdjrnOOXKN2Z
-9eJJuibvV8CX+vx5TO9O9r8AezTw7ZVzdnM61qnVGpJWYZUJEQ6kA2qA2CDkQjDP
-Y3GRu0DW0MMytVRG5fCdIE52Yh5hmwo54hW0WAY9TtjbiApvlOGTn9LgpW/Z7mvu
-f8g+y6bwGnk=
+BSsOAwIHMA0GCCqGSIb3DQMCAgEoMA0GCSqGSIb3DQEBAQUABIIBACVjHueimi/s
+rHZxaiZMz45S2uXLynpAco67tGw/iguWTk3hKHQ3Dwp2iFmqIYaAPjNeYt/eV7qr
+A+3DVL64tTxSvnNU/lgFOTmq1p8jITrKwdVYBvwWaSNURvTy3bpt3W962hdfmqAL
+CXOdo7h7nXL5haHLFPPw4Hca9Z9mFpM6x1fIjSk/zSRo2W1RgXxva/4F2LKHREcD
+OPfDbTN517z7u+mQ/J7D+4JU8zLQZA8khM0JF/PhuKzy2PxPqrEREZcx+EFy3JHA
+Q6Fdof6LYHrDEZppOrEtJB7UVhoQ1Ksw25T9dMjB2PqLK3hafUtC10iOAQxIfEDH
+ANx4tC98GH8=
 
-------9D03D47FAA98363CD7978AFC0454F513--
+------A7A3ED9F71494B934F978FF49CCFDAA8--
 

data/lib/httpclient/util.rb

@@ -42,10 +42,10 @@ class HTTPClient
     #   end
     #
     def keyword_argument(args, *field)
-      if args.size == 1 and args[0].is_a?(Hash)
-        r = args[0].values_at(*field)
-        unless r.compact.empty?
-          return r
+      if args.size == 1 and Hash === args[0]
+        h = args[0]
+        if field.any? { |f| h.key?(f) }
+          return h.values_at(*field)
         end
       end
       args
@@ -60,10 +60,10 @@ class HTTPClient
     # includes defined keys.
     def argument_to_hash(args, *field)
       return nil if args.empty?
-      if args.size == 1 and args[0].is_a?(Hash)
-        r = args[0].values_at(*field)
-        unless r.compact.empty?
-          return args[0]
+      if args.size == 1 and Hash === args[0]
+        h = args[0]
+        if field.any? { |f| h.key?(f) }
+          return h
         end
       end
       h = {}

metadata

@@ -2,7 +2,7 @@
 name: httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.0.1
+  version: 2.2.0.2
 platform: ruby
 authors: 
 - NAKAMURA, Hiroshi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-04-25 00:00:00 Z
 dependencies: []
 
 description: