webmock 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050c61fa8c7558b2c5fc52862600577199f286c7
-  data.tar.gz: 9745a14b5c7b2428dcd8720efc132c0b1573b43c
+  metadata.gz: 20d5a309586539a993335a28d74d8fc43495ec27
+  data.tar.gz: abfbec11bc296d461282f8698d18171b02a6c752
 SHA512:
-  metadata.gz: b698fda2494837e51abd90df2eaef0a651d87b6968a3c541af5630f951b60e2b7dd09d50a12f1a8fb0f3adc5583d079d0805067ecfdce6168cd56d0e6119c833
-  data.tar.gz: 33d11e2e5d09870aaf44ef1522c4381b83c37d4dd0e9b88d75be9b3c7321a82e7f008d3c8da831ee0957a61c8a6226f9adbe211f88e5de5e4fa36888d115c4af
+  metadata.gz: a76bd8f96fd204ec2cae1784cfedafebe96b261010d15531518bbbd81ebe2ddae765652c5c72a0f0d8cc7f9b423f4936751a4d738d0115417de116f819a45e93
+  data.tar.gz: 3d1fc2113f0225f774e16406bb1fcd9ce1ee1067b26c8209737a761c7bb91737f083f721629e8ef37f8779653773ac879eec31155e05bfbde50bdf2a7b63374f

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.0.3
+
+  * Handling headers passed as an Array to Curl::Easy
+
+    Thanks to [Chelsea](https://github.com/grosscr) for reporting the issue.
+
+  * Removed Ruby warnings.
+
+    Thanks to [Aaron Kromer](https://github.com/cupakromer)
+
 ## 2.0.2
 
   * Using `Base64.strict_encode64` instead of `Base64.encode64` to handle long user:pass basic auth credentials

data/README.md

@@ -1019,6 +1019,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Taiki Ono
 * Jonathan Schatz
 * Jose Luis Honorato
+* Aaron Kromer
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -98,11 +98,23 @@ if defined?(Curl)
           method,
           uri.to_s,
           :body => request_body,
-          :headers => self.headers.merge(basic_auth_headers)
+          :headers => headers_as_hash(self.headers).merge(basic_auth_headers)
         )
         request_signature
       end
 
+      def headers_as_hash(headers)
+        if headers.is_a?(Array)
+          headers.inject({}) {|hash, header|
+            name, value = header.split(":").map(&:strip)
+            hash[name] = value
+            hash
+          }
+        else
+          headers
+        end
+      end
+
       def basic_auth_headers
         if self.username
           {'Authorization' => WebMock::Util::Headers.basic_auth_header(self.username, self.password)}

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -19,6 +19,11 @@ if defined?(Excon)
 
         adapter_for :excon
 
+        instance_exec do
+          @original_excon_mock_default = nil
+          @stub = nil
+        end
+
         def self.enable!
           self.add_excon_stub
         end

data/lib/webmock/request_body_diff.rb

@@ -15,9 +15,10 @@ module WebMock
       HashDiff.diff(request_signature_body_hash, request_stub_body_hash)
     end
 
-    private
-
     attr_reader :request_signature, :request_stub
+    private :request_signature, :request_stub
+
+    private
 
     def request_signature_diffable?
       request_signature.json_headers? && request_signature_parseable_json?

data/lib/webmock/util/version_checker.rb

@@ -31,7 +31,11 @@ module WebMock
 
       @major,     @minor,     @patch     = parse_version(library_version)
       @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
-      @max_major, @max_minor             = parse_version(max_minor_version) if max_minor_version
+      if max_minor_version
+        @max_major, @max_minor           = parse_version(max_minor_version)
+      else
+        @max_major, @max_minor           = nil, nil
+      end
 
       @comparison_result = compare_version
     end

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '2.0.2' unless defined?(::WebMock::VERSION)
+  VERSION = '2.0.3' unless defined?(::WebMock::VERSION)
 end

data/spec/acceptance/curb/curb_spec.rb

@@ -355,6 +355,16 @@ unless RUBY_PLATFORM =~ /java/
         c.http(:GET)
         expect(c.body).to eq("abc")
       end
+
+      it "supports array headers passed to Curl::Easy" do
+        stub_request(:get, "www.example.com").with(headers: {'X-One' => '1'}).to_return(:body => "abc")
+
+        c = Curl::Easy.new
+        c.url = "http://www.example.com"
+        c.headers = ["X-One: 1"]
+        c.http(:GET)
+        expect(c.body).to eq("abc")
+      end
     end
 
     describe "using #http_* methods for requests" do

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -274,12 +274,12 @@ unless RUBY_PLATFORM =~ /java/
           err = :success_from_timeout
           EM.stop
         end.errback do |resp|
-          conn.get(:path => "/foo").callback do |resp|
-            expect(resp.response_header.status).to eq(200)
-            body = resp.response
+          conn.get(:path => "/foo").callback do |retry_resp|
+            expect(retry_resp.response_header.status).to eq(200)
+            body = retry_resp.response
             EM.stop
-          end.errback do |resp|
-            err = resp.error
+          end.errback do |retry_resp|
+            err = retry_resp.error
             EM.stop
           end
         end

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -188,7 +188,7 @@ describe "HTTPClient" do
 
     it 'sets the full body on the webmock response' do
       body = ''
-      result = HTTPClient.new.request(:get, 'http://www.example.com/') do |http_res, chunk|
+      HTTPClient.new.request(:get, 'http://www.example.com/') do |http_res, chunk|
         body += chunk
       end
       expect(@response.body).to eq body

data/spec/acceptance/httpclient/httpclient_spec_helper.rb

@@ -20,14 +20,7 @@ module HTTPClientSpecHelper
     else
       response = c.request(*params, &block)
     end
-    headers = response.header.all.inject({}) do |headers, header|
-      if !headers.has_key?(header[0])
-        headers[header[0]] = header[1]
-      else
-        headers[header[0]] = [headers[header[0]], header[1]].join(', ')
-      end
-      headers
-    end
+    headers = merge_headers(response)
     OpenStruct.new({
       :body => HTTPClientSpecHelper.async_mode ? response.content.read : response.content,
       :headers => headers,
@@ -48,4 +41,16 @@ module HTTPClientSpecHelper
     :httpclient
   end
 
+private
+
+  def merge_headers(response)
+    response.header.all.inject({}) do |headers, header|
+      if !headers.has_key?(header[0])
+        headers[header[0]] = header[1]
+      else
+        headers[header[0]] = [headers[header[0]], header[1]].join(', ')
+      end
+      headers
+    end
+  end
 end

data/spec/acceptance/net_http/net_http_spec_helper.rb

@@ -10,8 +10,8 @@ module NetHTTPSpecHelper
     req = clazz.new("#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", nil)
     options[:headers].each do |k,v|
       if v.is_a?(Array)
-        v.each_with_index do |v,i|
-          i == 0 ? (req[k] = v) : req.add_field(k, v)
+        v.each_with_index do |e,i|
+          i == 0 ? (req[k] = e) : req.add_field(k, e)
         end
       else
         req[k] = v
@@ -31,8 +31,8 @@ module NetHTTPSpecHelper
       http.read_timeout = 60
     end
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    response = http.start {|http|
-      http.request(req, options[:body], &block)
+    response = http.start {|open_http|
+      open_http.request(req, options[:body], &block)
     }
     headers = {}
     response.each_header {|name, value| headers[name] = value}

data/spec/acceptance/shared/returning_declared_responses.rb

@@ -1,5 +1,11 @@
 class MyException < StandardError; end;
 
+class Responder
+  def call(request)
+    {:body => request.body}
+  end
+end
+
 shared_context "declared responses" do |*adapter_info|
   describe "when request stub declares that request should raise exception" do
     it "should raise exception" do
@@ -128,12 +134,6 @@ shared_context "declared responses" do |*adapter_info|
     end
 
     describe "when response was declared as lambda" do
-      class Responder
-        def call(request)
-          {:body => request.body}
-        end
-      end
-
       it "should return evaluated response body" do
         stub_request(:post, "www.example.com").to_return(lambda {|request|
                                                                 {:body => request.body}

data/spec/acceptance/shared/stubbing_requests.rb

@@ -34,8 +34,8 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         begin
           http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}")
         rescue WebMock::NetConnectNotAllowedError => e
-          expect(e.message).to match /Unregistered request: GET http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m/m
-          expect(e.message).to match /stub_request\(:get, "http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m"\)/m
+          expect(e.message).to match(/Unregistered request: GET http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m/m)
+          expect(e.message).to match(/stub_request\(:get, "http:\/\/www\.example\.com\/hello\+\/\?x=ab%20c&z='Stop!'%20said%20Fred%20m"\)/m)
         end
 
         stub_request(:get, "http://www.example.com/hello+/?x=ab%20c&z='Stop!'%20said%20Fred%20m")

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -104,8 +104,8 @@ unless RUBY_PLATFORM =~ /java/
           test_body = nil
           test_complete = nil
           skip("This test requires a newer version of Typhoeus") unless @request.respond_to?(:on_body)
-          @request.on_body do |body, response|
-            test_body = body
+          @request.on_body do |body_chunk, response|
+            test_body = body_chunk
           end
           @request.on_complete do |response|
             test_complete = response.body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable