webmock 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 #Changelog
 
+## 1.2.0 
+
+* RSpec 2 compatibility. Thanks to Sam Phillips!
+
+* :allow_localhost => true' now permits 127.0.0.1 as well as 'localhost'. Thanks to Mack Earnhardt
+
+* Request URI matching in now 2x faster!
+
+
 ## 1.1.0
 
-* [VCR](http://github.com/myronmarston/vcr/) compatibility. Many thanks to Myron Masteron for all suggestions.
+* [VCR](http://github.com/myronmarston/vcr/) compatibility. Many thanks to Myron Marston for all suggestions.
 	
 * Support for stubbing requests and returning responses with multiple headers with the same name. i.e multiple Accept headers.	
 

data/README.md

@@ -429,7 +429,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Tekin Suleyman
 * Tom Ward
 * Nadim Bitar
-* Myron Masteron
+* Myron Marston
 
 ## Background
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/webmock/adapters/rspec.rb

@@ -1,10 +1,20 @@
 require 'webmock'
-require 'spec'
+
+# RSpec 1.x and 2.x compatibility
+begin
+  require 'rspec'
+  RSPEC_NAMESPACE = RSPEC_CONFIGURER = Rspec
+rescue LoadError
+  require 'spec'
+  RSPEC_NAMESPACE = Spec
+  RSPEC_CONFIGURER = Spec::Runner
+end
+
 require 'webmock/adapters/rspec/request_pattern_matcher'
 require 'webmock/adapters/rspec/webmock_matcher'
 require 'webmock/adapters/rspec/matchers'
-
-Spec::Runner.configure { |config|
+  
+RSPEC_CONFIGURER.configure { |config|
 
   config.include WebMock::Matchers
 
@@ -15,6 +25,6 @@ Spec::Runner.configure { |config|
 
 module WebMock
   def assertion_failure(message)
-    raise Spec::Expectations::ExpectationNotMetError.new(message)
+    raise RSPEC_NAMESPACE::Expectations::ExpectationNotMetError.new(message)
   end
-end
+end

data/lib/webmock/request_pattern.rb

@@ -64,7 +64,7 @@ module WebMock
     def matches?(uri)
       if @pattern.is_a?(Addressable::URI)
         ##TODO : do I need to normalize again??
-        WebMock::Util::URI.normalize_uri(uri) === WebMock::Util::URI.normalize_uri(@pattern)
+        uri === @pattern
       elsif @pattern.is_a?(Regexp)
         WebMock::Util::URI.variations_of_uri_as_strings(uri).any? { |u| u.match(@pattern) }
       else

data/lib/webmock/util/uri.rb

@@ -17,7 +17,7 @@ module WebMock
         uri = 'http://' + uri unless uri.match('^https?://') if uri.is_a?(String)
         normalized_uri = Addressable::URI.heuristic_parse(uri)
         normalized_uri.query_values = Hash[*normalized_uri.query_values.sort.flatten] if normalized_uri.query_values
-        normalized_uri.normalize!
+        normalized_uri = normalized_uri.normalize #normalize! is slower 
         normalized_uri.port = normalized_uri.inferred_port unless normalized_uri.port
         normalized_uri
       end
@@ -26,20 +26,20 @@ module WebMock
         normalized_uri = normalize_uri(uri_object.dup).freeze
         uris = [ normalized_uri ]
 
+        if normalized_uri.path == '/'
+          uris = uris_with_trailing_slash_and_without(uris)
+        end
+
+        uris = uris_encoded_and_unencoded(uris)
+
         if normalized_uri.port == Addressable::URI.port_mapping[normalized_uri.scheme]
           uris = uris_with_inferred_port_and_without(uris)
         end
-
+        
         if normalized_uri.scheme == "http"
           uris = uris_with_scheme_and_without(uris)
         end
 
-        if normalized_uri.path == '/'
-          uris = uris_with_trailing_slash_and_without(uris)
-        end
-
-        uris = uris_encoded_and_unencoded(uris)
-
         uris.map {|uri| uri.to_s.gsub(/^\/\//,'') }.uniq
       end
 
@@ -58,17 +58,17 @@ module WebMock
       private
 
       def self.uris_with_inferred_port_and_without(uris)
-        uris.map { |uri| [ uri, uri.omit(:port).freeze ] }.flatten
+        uris.map { |uri| [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ] }.flatten
       end
 
       def self.uris_encoded_and_unencoded(uris)
         uris.map do |uri|
-          [ uri, Addressable::URI.heuristic_parse(Addressable::URI.unencode(uri)).freeze ]
+          [ uri.to_s, Addressable::URI.unencode(uri, String).freeze ]
         end.flatten
       end
 
       def self.uris_with_scheme_and_without(uris)
-        uris.map { |uri| [ uri, uri.omit(:scheme).freeze ] }.flatten
+        uris.map { |uri| [ uri, uri.gsub(%r{^https?://},"").freeze ] }.flatten
       end
 
       def self.uris_with_trailing_slash_and_without(uris)

data/lib/webmock/webmock.rb

@@ -44,7 +44,7 @@ module WebMock
       uri = WebMock::Util::URI.normalize_uri(uri)
     end
     Config.instance.allow_net_connect || 
-      (Config.instance.allow_localhost && uri.is_a?(Addressable::URI) && uri.host == 'localhost')
+      (Config.instance.allow_localhost && uri.is_a?(Addressable::URI) && (uri.host == 'localhost' || uri.host == '127.0.0.1'))
   end
 
   def registered_request?(request_signature)

data/spec/benchmark.rb

@@ -0,0 +1,63 @@
+require 'rubygems'
+require 'benchmark'
+require 'net/http'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+def http_request
+  res = Net::HTTP.get_response(URI.parse('http://example.com'))
+  raise "Body should be 'Hello'" unless res.body == 'Hello'
+end
+
+# def fakeweb
+#   FakeWeb.register_uri(:get, 'http://example.com', :body => 'Hello')
+#   yield
+# ensure
+#   FakeWeb.clean_registry
+# end
+
+def webmock
+  WebMock.stub_request(:get, %r{http://example.com}).to_return(:body => 'Hello')
+  yield
+ensure
+  WebMock.reset_webmock
+end
+
+def perform_benchmark(name)
+  puts "\n\nBenchmarking #{name}:"
+  Benchmark.benchmark do |b|
+    %w(webmock).each do |type|
+      b.report(type) do
+        # this is a bit convoluted, but we want to ensure that each benchmark runs without the other library loaded,
+        # so we fork off a sub-process before requiring the libraries.
+        Process.fork do
+          require type
+          yield type
+        end
+        Process.wait
+      end
+    end
+  end
+end
+
+n = 5000 #*2*2
+# uri = Addressable::URI.heuristic_parse("http://www.example.com")
+perform_benchmark("Single setup/teardown") do |type|
+  send(type) { n.times { http_request } }
+  # (2*n).times { WebMock::Util::URI.normalize_uri("http://www.example.com") }
+end
+
+perform_benchmark("Setup/teardown for each http request") do |type|
+  n.times { send(type) { http_request } }
+   # WebMock::Util::URI.normalize_uri("http://www.example.com")
+end
+
+# Output on my machine:
+#
+# Benchmarking Single setup/teardown:
+# webmock  0.000000   0.000000  18.830000 ( 19.350281)
+# fakeweb  0.000000   0.000000   1.930000 (  2.049569)
+# 
+# 
+# Benchmarking Setup/teardown for each http request:
+# webmock  0.000000   0.000000  21.350000 ( 21.795557)
+# fakeweb  0.000000   0.000000   2.490000 (  2.707574)

data/spec/webmock_spec.rb

@@ -84,11 +84,17 @@ describe "WebMock", :shared => true do
         }.should raise_error(WebMock::NetConnectNotAllowedError, client_specific_request_string("Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/"))
       end
 
-      it "should allow a real request localhost" do
+      it "should allow a real request to localhost" do
         lambda {
           http_request(:get, "http://localhost:12345/")
         }.should raise_error(connection_refused_exception_class)
       end
+
+      it "should allow a real request to 127.0.0.1" do
+        lambda {
+          http_request(:get, "http://127.0.0.1:12345/")
+        }.should raise_error(connection_refused_exception_class)
+      end
     end
   end
 

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-05-14}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [
@@ -83,10 +83,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/bblimke/webmock}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Library for stubbing HTTP requests in Ruby.}
   s.test_files = [
-    "spec/httpclient_spec.rb",
+    "spec/benchmark.rb",
+     "spec/httpclient_spec.rb",
      "spec/httpclient_spec_helper.rb",
      "spec/net_http_spec.rb",
      "spec/net_http_spec_helper.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -9,49 +14,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +01:00
+date: 2010-05-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 5
+        - 2
         version: 2.1.5.2
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: patron
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
-    version: 
+  type: :development
+  version_requirements: *id004
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: bartosz.blimke@gmail.com
 executables: []
@@ -137,22 +159,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
 test_files: 
+- spec/benchmark.rb
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb