webmock 1.8.5 → 1.8.6

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.8.6
+
+* Pass through SERVER_PORT when stubbing to rack
+
+    Thanks to [Eric Oestrich](https://github.com/oestrich)
+
+* Fixed problem with missing parenthesis in `WebMock#net_connect_allowed?` conditions.
+
+    Thanks to [aindustries](https://github.com/aindustries)
+
 ## 1.8.5
 
 * WebMock::RackResponse supports basic auth

data/README.md

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

data/lib/webmock/rack_response.rb

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

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -57,12 +57,20 @@ module WebMock
     if uri.is_a?(String)
       uri = WebMock::Util::URI.normalize_uri(uri)
     end
+
     Config.instance.allow_net_connect ||
-      (Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
-      Config.instance.allow && (
-        (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
-        (Config.instance.allow.respond_to?(:include?) &&
-         Config.instance.allow.include?(uri.host) || Config.instance.allow.include?("#{uri.host}:#{uri.port}")))
+    (
+    Config.instance.allow_localhost && WebMock::Util::URI.is_uri_localhost?(uri)) ||
+    Config.instance.allow && (
+      (Config.instance.allow.kind_of?(Regexp) && uri.to_s =~ Config.instance.allow) ||
+      (
+        Config.instance.allow.respond_to?(:include?) &&
+        (
+          Config.instance.allow.include?(uri.host) ||
+          Config.instance.allow.include?("#{uri.host}:#{uri.port}")
+        )
+      )
+    )
   end
 
   def self.reset!
@@ -105,10 +113,10 @@ module WebMock
     registered_request?
   ).each do |method|
     self.class_eval(%Q(
-      def #{method}(*args, &block)
-        WebMock::Deprecation.warning("WebMock##{method} instance method is deprecated. Please use WebMock.#{method} class method instead")
-        WebMock.#{method}(*args, &block)
-      end
+                      def #{method}(*args, &block)
+                        WebMock::Deprecation.warning("WebMock##{method} instance method is deprecated. Please use WebMock.#{method} class method instead")
+                        WebMock.#{method}(*args, &block)
+                          end
     ))
   end
 

data/spec/acceptance/shared/returning_declared_responses.rb

@@ -238,12 +238,14 @@ shared_context "declared responses" do |*adapter_info|
     end
 
     describe "when response is declared as an Rack app" do
-      before(:each) do
+      it "should return response returned by the rack app" do
         stub_request(:any, "http://www.example.com/greet").to_rack(MyRackApp)
+        http_request(:post, 'http://www.example.com/greet', :body => 'name=Jimmy').body.should == 'Good to meet you, Jimmy!'
       end
 
-      it "should return response returned by the rack app" do
-        http_request(:post, 'http://www.example.com/greet', :body => 'name=Jimmy').body.should == 'Good to meet you, Jimmy!'
+      it "should pass along the port number to the rack app" do
+        stub_request(:get, "http://www.example.com/compute").to_rack(MyRackApp)
+        http_request(:get, "http://www.example.com/compute").status.should == "200"
       end
     end
 

data/spec/support/my_rack_app.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 1
   - 8
-  - 5
-  version: 1.8.5
+  - 6
+  version: 1.8.6
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable