webmock 1.8.6 → 1.8.7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.8.7
+
+* Compatibility with RSpec >= 2.10
+
+    Thanks to [erwanlr](https://github.com/erwanlr) for reporting this issue.
+
+* Add missing required rack environment variable SCRIPT_NAME
+
+    Thanks to [Eric Oestrich](https://github.com/oestrich)
+
+* Fixed warnings due to @query_params not being initialized
+
+    Thanks to [Ben Bleything](https://github.com/bleything)
+
 ## 1.8.6
 
 * Pass through SERVER_PORT when stubbing to rack

data/README.md

@@ -705,6 +705,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * jugyo
 * aindustries
 * Eric Oestrich
+* erwanlr
+* Ben Bleything
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/rack_response.rb

@@ -36,7 +36,8 @@ module WebMock
         'PATH_INFO'      => uri.path,
         'QUERY_STRING'   => uri.query || '',
         'SERVER_NAME'    => uri.host,
-        'SERVER_PORT'    => uri.port
+        'SERVER_PORT'    => uri.port,
+        'SCRIPT_NAME'    => ""
       }
 
       env['HTTP_AUTHORIZATION'] = 'Basic ' + [uri.userinfo].pack('m').delete("\r\n") if uri.userinfo

data/lib/webmock/request_pattern.rb

@@ -83,6 +83,7 @@ module WebMock
 
     def initialize(pattern)
       @pattern = pattern.is_a?(Addressable::URI) ? pattern : WebMock::Util::URI.normalize_uri(pattern)
+      @query_params = nil
     end
 
     def add_query_params(query_params)
@@ -105,11 +106,6 @@ module WebMock
   end
 
   class URIRegexpPattern  < URIPattern
-    def initialize *args, &block
-      @query_params = nil
-      super
-    end
-
     def matches?(uri)
       WebMock::Util::URI.variations_of_uri_as_strings(uri).any? { |u| u.match(@pattern) } &&
         (@query_params.nil? || @query_params == uri.query_values)

data/lib/webmock/rspec.rb

@@ -1,7 +1,7 @@
 require 'webmock'
 
 # RSpec 1.x and 2.x compatibility
-if defined?(RSpec) && defined?(RSpec::Expectations)
+if defined?(RSpec::Expectations::ExpectationNotMetError)
   RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
 elsif defined?(Spec) && defined?(Spec.configure)
   RSPEC_NAMESPACE = Spec

data/lib/webmock/version.rb

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

data/spec/support/my_rack_app.rb

@@ -27,7 +27,7 @@ class MyRackApp
         name = env["rack.input"].read[/name=([^&]*)/, 1] || "World"
         [200, {}, ["Good to meet you, #{name}!"]]
       when ['GET', '/compute']
-        if env['SERVER_PORT'] == 80
+        if env['SERVER_PORT'] == 80 && env["SCRIPT_NAME"] == ""
           [200, {}, [""]]
         else
           [401, {}, [""]]

data/webmock.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '>= 2.2.7'
   s.add_dependency 'crack', '>=0.1.7'
 
-  s.add_development_dependency 'rspec',           '~> 2.8'
+  s.add_development_dependency 'rspec',           '~> 2.10'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
   s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'em-http-request', '>= 1.0.2'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 1
   - 8
-  - 6
-  version: 1.8.6
+  - 7
+  version: 1.8.7
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,11 +32,11 @@ dependencies:
         - 7
         version: 2.2.7
   type: :runtime
-  prerelease: false
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: crack
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,26 +48,26 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 2
-        - 8
-        version: "2.8"
+        - 10
+        version: "2.10"
   type: :development
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -78,11 +79,11 @@ dependencies:
         - 4
         version: 2.2.4
   type: :development
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: patron
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,11 +95,11 @@ dependencies:
         - 18
         version: 0.4.18
   type: :development
-  prerelease: false
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: em-http-request
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +111,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :development
-  prerelease: false
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: curb
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +127,11 @@ dependencies:
         - 0
         version: 0.8.0
   type: :development
-  prerelease: false
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: typhoeus
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,11 +143,11 @@ dependencies:
         - 3
         version: 0.3.3
   type: :development
-  prerelease: false
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: excon
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,11 +159,11 @@ dependencies:
         - 0
         version: 0.11.0
   type: :development
-  prerelease: false
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: minitest
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,11 +175,11 @@ dependencies:
         - 2
         version: 2.2.2
   type: :development
-  prerelease: false
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -190,8 +191,7 @@ dependencies:
         - 0
         version: 3.5.0
   type: :development
-  prerelease: false
-  requirement: *id011
+  version_requirements: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com