webmock 1.6.4 → 1.7.0

data/spec/webmock_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "WebMock version" do
+  it "should report version" do
+    WebMock.version.should == WebMock::VERSION
+  end
+end

data/test/http_request.rb

@@ -0,0 +1,24 @@
+require 'ostruct'
+
+module HttpRequestTestHelper
+  def http_request(method, uri, options = {})
+    begin
+      uri = URI.parse(uri)
+    rescue
+      uri = Addressable::URI.heuristic_parse(uri)
+    end
+    response = nil
+    clazz = ::Net::HTTP.const_get("#{method.to_s.capitalize}")
+    req = clazz.new("#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers])
+    req.basic_auth uri.user, uri.password if uri.user
+    http = ::Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true if uri.scheme == "https"
+    response = http.start {|http|
+      http.request(req, options[:body])
+    }
+    OpenStruct.new({
+      :body => response.body,
+      :headers => response,
+      :status => response.code })
+  end
+end

data/test/shared_test.rb

@@ -0,0 +1,47 @@
+require File.expand_path(File.dirname(__FILE__) + '/http_request')
+
+module SharedTest
+  include HttpRequestTestHelper
+
+  def setup
+    super
+    stub_http_request(:any, "http://www.example.com")
+    stub_http_request(:any, "https://www.example.com")
+  end
+
+  def test_error_on_non_stubbed_request
+    default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
+    assert_raise_with_message(WebMock::NetConnectNotAllowedError, %r{Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers}) do
+      http_request(:get, "http://www.example.net/")
+    end
+  end
+
+  def test_verification_that_expected_request_occured
+    http_request(:get, "http://www.example.com/")
+    assert_requested(:get, "http://www.example.com", :times => 1)
+    assert_requested(:get, "http://www.example.com")
+  end
+
+  def test_verification_that_expected_request_didnt_occur
+    expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
+    expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
+    assert_fail(expected_message) do
+      assert_requested(:get, "http://www.example.com")
+    end
+  end
+
+  def test_verification_that_expected_request_occured_with_body_and_headers
+    http_request(:get, "http://www.example.com/",
+      :body => "abc", :headers => {'A' => 'a'})
+    assert_requested(:get, "http://www.example.com",
+      :body => "abc", :headers => {'A' => 'a'})
+  end
+
+  def test_verification_that_non_expected_request_didnt_occur
+    expected_message = %r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
+    assert_fail(expected_message) do
+      http_request(:get, "http://www.example.com/")
+      assert_not_requested(:get, "http://www.example.com")
+    end
+  end
+end

data/test/test_helper.rb

@@ -7,14 +7,17 @@ require 'webmock/test_unit'
 require 'test/unit'
 
 class Test::Unit::TestCase
-  include WebMock::API
   AssertionFailedError =  Test::Unit::AssertionFailedError rescue MiniTest::Assertion
-  def assert_fail(message, &block)
-    e = assert_raise(AssertionFailedError, &block)
+  def assert_raise_with_message(e, message, &block)
+    e = assert_raise(e, &block)
     if message.is_a?(Regexp)
       assert_match(message, e.message)
     else
       assert_equal(message, e.message)
     end
   end
+
+  def assert_fail(message, &block)
+    assert_raise_with_message(AssertionFailedError, message, &block)
+  end
 end

data/test/test_webmock.rb

@@ -1,71 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-require 'ostruct'
+require File.expand_path(File.dirname(__FILE__) + '/shared_test')
 
 class TestWebMock < Test::Unit::TestCase
-
-  def http_request(method, uri, options = {})
-    begin
-      uri = URI.parse(uri)
-    rescue
-      uri = Addressable::URI.heuristic_parse(uri)
-    end
-    response = nil
-    clazz = ::Net::HTTP.const_get("#{method.to_s.capitalize}")
-    req = clazz.new("#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers])
-    req.basic_auth uri.user, uri.password if uri.user
-    http = ::Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true if uri.scheme == "https"
-    response = http.start {|http|
-      http.request(req, options[:body])
-    }
-    OpenStruct.new({
-      :body => response.body,
-      :headers => response,
-      :status => response.code })
-  end
-
-
-  def setup
-    super
-    stub_http_request(:any, "http://www.example.com")
-    stub_http_request(:any, "https://www.example.com")
-  end
-
-  def test_error_on_non_stubbed_request
-    default_ruby_headers = (RUBY_VERSION >= "1.9.1") ? "{'Accept'=>'*/*', 'User-Agent'=>'Ruby'}" : "{'Accept'=>'*/*'}"
-    assert_raise(WebMock::NetConnectNotAllowedError, "Real HTTP connections are disabled. Unregistered request: GET http://www.example.net/ with headers #{default_ruby_headers}") do
-      http_request(:get, "http://www.example.net/")
-    end
-  end
-
-  def test_verification_that_expected_request_occured
-    http_request(:get, "http://www.example.com/")
-    assert_requested(:get, "http://www.example.com", :times => 1)
-    assert_requested(:get, "http://www.example.com")
-  end
-
-  def test_verification_that_expected_request_didnt_occur
-    expected_message = "The request GET http://www.example.com/ was expected to execute 1 time but it executed 0 times"
-    expected_message << "\n\nThe following requests were made:\n\nNo requests were made.\n============================================================"
-    assert_fail(expected_message) do
-      assert_requested(:get, "http://www.example.com")
-    end
-  end
-
-  def test_verification_that_expected_request_occured_with_body_and_headers
-    http_request(:get, "http://www.example.com/",
-      :body => "abc", :headers => {'A' => 'a'})
-    assert_requested(:get, "http://www.example.com",
-      :body => "abc", :headers => {'A' => 'a'})
-  end
-
-  def test_verification_that_non_expected_request_didnt_occur
-    expected_message = %r(The request GET http://www.example.com/ was expected to execute 0 times but it executed 1 time\n\nThe following requests were made:\n\nGET http://www.example.com/ with headers .+ was made 1 time\n\n============================================================)
-    assert_fail(expected_message) do
-      http_request(:get, "http://www.example.com/")
-      assert_not_requested(:get, "http://www.example.com")
-    end
-  end
-
+  include SharedTest
 end

data/webmock.gemspec

@@ -16,14 +16,15 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'addressable', '~> 2.2', '> 2.2.5'
   s.add_dependency 'crack', '>=0.1.7'
-  s.add_development_dependency 'rspec', '>= 2.0.0'
-  s.add_development_dependency 'httpclient', '>= 2.1.5.2'
 
-  unless RUBY_PLATFORM =~ /java/
-    s.add_development_dependency 'patron', '>= 0.4.9'
-    s.add_development_dependency 'em-http-request', '>= 0.2.14'
-    s.add_development_dependency 'curb', '>= 0.7.8'
-  end
+  s.add_development_dependency 'rspec',           '>= 2.0.0'
+  s.add_development_dependency 'httpclient',      '>= 2.1.5.2'
+  s.add_development_dependency 'patron',          '>= 0.4.9'
+  s.add_development_dependency 'em-http-request', '>= 0.2.14'
+  s.add_development_dependency 'curb',            '>= 0.7.8'
+  s.add_development_dependency 'typhoeus',        '>= 0.2.4'
+  s.add_development_dependency 'minitest',        '>= 2.2.2'
+  s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,112 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: webmock
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.0
   prerelease: 
-  version: 1.6.4
 platform: ruby
-authors: 
+authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-18 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153406180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.2"
-    - - ">"
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: crack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153406180
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &2153404320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153404320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153403860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153403860
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &2153403160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.5.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: patron
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153403160
+- !ruby/object:Gem::Dependency
+  name: patron
+  requirement: &2153402700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.9
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153402700
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2153402220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.14
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: curb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153402220
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: &2153401700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :development
-  version_requirements: *id007
-description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
-email: 
+  prerelease: false
+  version_requirements: *2153401700
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &2153401220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :development
+  prerelease: false
+  version_requirements: *2153401220
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2153400760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *2153400760
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2153400200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *2153400200
+description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
+  requests.
+email:
 - bartosz.blimke@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gemtest
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -118,12 +150,19 @@ files:
 - lib/webmock/cucumber.rb
 - lib/webmock/deprecation.rb
 - lib/webmock/errors.rb
-- lib/webmock/http_lib_adapters/curb.rb
-- lib/webmock/http_lib_adapters/em_http_request.rb
-- lib/webmock/http_lib_adapters/httpclient.rb
+- lib/webmock/http_lib_adapters/curb_adapter.rb
+- lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb
+- lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb
+- lib/webmock/http_lib_adapters/em_http_request_adapter.rb
+- lib/webmock/http_lib_adapters/http_lib_adapter.rb
+- lib/webmock/http_lib_adapters/http_lib_adapter_registry.rb
+- lib/webmock/http_lib_adapters/httpclient_adapter.rb
 - lib/webmock/http_lib_adapters/net_http.rb
 - lib/webmock/http_lib_adapters/net_http_response.rb
-- lib/webmock/http_lib_adapters/patron.rb
+- lib/webmock/http_lib_adapters/patron_adapter.rb
+- lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- lib/webmock/minitest.rb
+- lib/webmock/rack_response.rb
 - lib/webmock/request_execution_verifier.rb
 - lib/webmock/request_pattern.rb
 - lib/webmock/request_registry.rb
@@ -141,23 +180,33 @@ files:
 - lib/webmock/util/hash_counter.rb
 - lib/webmock/util/hash_keys_stringifier.rb
 - lib/webmock/util/headers.rb
+- lib/webmock/util/json.rb
 - lib/webmock/util/uri.rb
 - lib/webmock/version.rb
 - lib/webmock/webmock.rb
+- minitest/test_helper.rb
+- minitest/test_webmock.rb
+- minitest/webmock_spec.rb
 - spec/curb_spec.rb
 - spec/curb_spec_helper.rb
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/errors_spec.rb
 - spec/example_curl_output.txt
+- spec/http_lib_adapters/http_lib_adapter_registry_spec.rb
+- spec/http_lib_adapters/http_lib_adapter_spec.rb
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
+- spec/my_rack_app.rb
+- spec/net_http_shared.rb
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
 - spec/network_connection.rb
-- spec/other_net_http_libs_spec.rb
 - spec/patron_spec.rb
 - spec/patron_spec_helper.rb
+- spec/quality_spec.rb
+- spec/rack_response_spec.rb
+- spec/real_net_http_spec.rb
 - spec/request_execution_verifier_spec.rb
 - spec/request_pattern_spec.rb
 - spec/request_registry_spec.rb
@@ -167,9 +216,13 @@ files:
 - spec/spec_helper.rb
 - spec/stub_registry_spec.rb
 - spec/stub_request_snippet_spec.rb
+- spec/support/webmock_server.rb
+- spec/typhoeus_hydra_spec.rb
+- spec/typhoeus_hydra_spec_helper.rb
 - spec/util/hash_counter_spec.rb
 - spec/util/hash_keys_stringifier_spec.rb
 - spec/util/headers_spec.rb
+- spec/util/json_spec.rb
 - spec/util/uri_spec.rb
 - spec/vendor/addressable/lib/addressable/uri.rb
 - spec/vendor/addressable/lib/uri.rb
@@ -182,52 +235,57 @@ files:
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
 - spec/webmock_shared.rb
+- spec/webmock_spec.rb
+- test/http_request.rb
+- test/shared_test.rb
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
-has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: webmock
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
-test_files: 
+test_files:
 - spec/curb_spec.rb
 - spec/curb_spec_helper.rb
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/errors_spec.rb
 - spec/example_curl_output.txt
+- spec/http_lib_adapters/http_lib_adapter_registry_spec.rb
+- spec/http_lib_adapters/http_lib_adapter_spec.rb
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
+- spec/my_rack_app.rb
+- spec/net_http_shared.rb
 - spec/net_http_spec.rb
 - spec/net_http_spec_helper.rb
 - spec/network_connection.rb
-- spec/other_net_http_libs_spec.rb
 - spec/patron_spec.rb
 - spec/patron_spec_helper.rb
+- spec/quality_spec.rb
+- spec/rack_response_spec.rb
+- spec/real_net_http_spec.rb
 - spec/request_execution_verifier_spec.rb
 - spec/request_pattern_spec.rb
 - spec/request_registry_spec.rb
@@ -237,9 +295,13 @@ test_files:
 - spec/spec_helper.rb
 - spec/stub_registry_spec.rb
 - spec/stub_request_snippet_spec.rb
+- spec/support/webmock_server.rb
+- spec/typhoeus_hydra_spec.rb
+- spec/typhoeus_hydra_spec_helper.rb
 - spec/util/hash_counter_spec.rb
 - spec/util/hash_keys_stringifier_spec.rb
 - spec/util/headers_spec.rb
+- spec/util/json_spec.rb
 - spec/util/uri_spec.rb
 - spec/vendor/addressable/lib/addressable/uri.rb
 - spec/vendor/addressable/lib/uri.rb
@@ -252,5 +314,8 @@ test_files:
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb
 - spec/webmock_shared.rb
+- spec/webmock_spec.rb
+- test/http_request.rb
+- test/shared_test.rb
 - test/test_helper.rb
 - test/test_webmock.rb