webmock 1.14.0 → 1.15.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.15.0
+
+* Excon >= 0.27.5 compatibility.
+
+  Thanks to [Brian D. Burns](https://github.com/burns)
+
 ## 1.14.0
 
 * Handling non UTF-8 characters in query params.

data/Gemfile

@@ -8,8 +8,6 @@ end
 
 group :development do
   gem 'rake'
-  gem 'guard-rspec'
-  gem 'rb-fsevent'
 end
 
 group :test do

data/README.md

@@ -136,7 +136,7 @@ end    # ===> Success
 ### Matching request body against a hash. Body can be URL-Encoded, JSON or XML.
 
 ```ruby
-stub_http_request(:post, "www.example.com").
+stub_request(:post, "www.example.com").
   with(:body => {:data => {:a => '1', :b => 'five'}})
 
 RestClient.post('www.example.com', "data[a]=1&data[b]=five",
@@ -152,7 +152,7 @@ RestClient.post('www.example.com', '<data a="1" b="five" />',
 ### Matching request body against partial hash.
 
 ```ruby
-stub_http_request(:post, "www.example.com").
+stub_request(:post, "www.example.com").
   with(:body => hash_including({:data => {:a => '1', :b => 'five'}}))
 
 RestClient.post('www.example.com', "data[a]=1&data[b]=five&x=1",
@@ -176,7 +176,7 @@ end    # ===> Success
 ### Matching multiple headers with the same name
 
 ```ruby
-stub_http_request(:get, 'www.example.com').with(:headers => {'Accept' => ['image/jpeg', 'image/png'] })
+stub_request(:get, 'www.example.com').with(:headers => {'Accept' => ['image/jpeg', 'image/png'] })
 
 req = Net::HTTP::Get.new("/")
 req['Accept'] = ['image/png']
@@ -214,7 +214,7 @@ Net::HTTP.get('www.example.com', '/')    # ===> Success
 ### Matching query params using hash
 
 ```ruby
-stub_http_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
+stub_request(:get, "www.example.com").with(:query => {"a" => ["b", "c"]})
 
 RestClient.get("http://www.example.com/?a[]=b&a[]=c")    # ===> Success
 ```
@@ -222,7 +222,7 @@ RestClient.get("http://www.example.com/?a[]=b&a[]=c")    # ===> Success
 ### Matching partial query params using hash
 
 ```ruby
-stub_http_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
+stub_request(:get, "www.example.com").with(:query => hash_including({"a" => ["b", "c"]}))
 
 RestClient.get("http://www.example.com/?a[]=b&a[]=c&x=1")    # ===> Success
 ```
@@ -860,6 +860,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Matthew Horan
 * Dmitry Gutov
 * Florian Dütsch
+* Manuel Meurer
+* Brian D. Burns
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -5,7 +5,7 @@ rescue LoadError
 end
 
 if defined?(Excon)
-  WebMock::VersionChecker.new('Excon', Excon::VERSION, '0.22.0').check_version!
+  WebMock::VersionChecker.new('Excon', Excon::VERSION, '0.27.5').check_version!
 
   module WebMock
     module HttpLibAdapters
@@ -54,7 +54,7 @@ if defined?(Excon)
             response
           elsif WebMock.net_connect_allowed?(mock_request.uri)
             conn = new_excon_connection(params)
-            real_response = conn.request(scrub_params_from(params.merge(:mock => false)))
+            real_response = conn.request(request_params_from(params.merge(:mock => false)))
 
             ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response), :real_request => true)
 
@@ -68,15 +68,25 @@ if defined?(Excon)
           # Ensure the connection is constructed with the exact same args
           # that the orginal connection was constructed with.
           args = params.fetch(:__construction_args)
-          ::Excon::Connection.new(scrub_params_from args.merge(:mock => false))
+          ::Excon::Connection.new(connection_params_from args.merge(:mock => false))
         end
 
-        def self.scrub_params_from(hash)
+        def self.connection_params_from(hash)
           hash = hash.dup
           PARAMS_TO_DELETE.each { |key| hash.delete(key) }
           hash
         end
 
+        def self.request_params_from(hash)
+          hash = hash.dup
+          if Excon::VERSION >= '0.27.5'
+            request_keys = Excon::Utils.valid_request_keys(hash)
+            hash.reject! {|key,_| !request_keys.include?(key) }
+          end
+          PARAMS_TO_DELETE.each { |key| hash.delete(key) }
+          hash
+        end
+
         def self.to_query(hash)
           string = ""
           for key, values in hash

data/lib/webmock/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 1
-  - 14
+  - 15
   - 0
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-03 00:00:00 Z
+date: 2013-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -208,7 +208,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Guardfile
 - LICENSE
 - README.md
 - Rakefile

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# rubies = %w[
-#   1.8.6
-#   1.8.7
-#   1.9.2
-#   ree
-#   jruby
-# ].map { |ruby| "#{ruby}@webmock" }
-
-rspec_options = {
-  # :rvm          => rubies,
-  :all_on_start => false,
-  :notification => false,
-  :cli          => '--color',
-  :version      => 2
-}
-
-guard 'rspec', rspec_options do
-  watch(%r{^spec/.+_spec\.rb})
-  watch(%r{^lib/(.+)\.rb})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { "spec" }
-end