webmock 1.6.2 → 1.6.4

data/spec/patron_spec_helper.rb

@@ -10,6 +10,7 @@ module PatronSpecHelper
 
     sess.connect_timeout = 10
     sess.timeout = 10
+    sess.max_redirects = 0
    
     response = sess.request(method, "#{uri.path}#{uri.query ? '?' : ''}#{uri.query}", options[:headers] || {}, {
       :data => options[:body]

data/spec/request_pattern_spec.rb

@@ -145,7 +145,7 @@ describe WebMock::RequestPattern do
        WebMock::RequestPattern.new(:get, "www.example.com", :query => {"a" => ["b", "c"]}).
           should_not match(WebMock::RequestSignature.new(:get, "www.example.com?x[]=b&a[]=c"))
       end
-
+      
       it "should match for query params are the same as declared as string" do
        WebMock::RequestPattern.new(:get, "www.example.com", :query => "a[]=b&a[]=c").
           should match(WebMock::RequestSignature.new(:get, "www.example.com?a[]=b&a[]=c"))
@@ -224,6 +224,15 @@ describe WebMock::RequestPattern do
               should_not match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'foo bar'))
           end
 
+          it "should match when hash contains regex values" do
+           WebMock::RequestPattern.new(:post, "www.example.com", :body => {:a => /^\w{5}$/, :b => {:c => /^\d{3}$/}}).
+              should match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'a=abcde&b[c]=123'))
+          end
+
+          it "should not match when hash does not contains regex values" do
+           WebMock::RequestPattern.new(:post, "www.example.com", :body => {:a => /^\d+$/, :b => {:c => /^\d{3}$/}}).
+              should_not match(WebMock::RequestSignature.new(:post, "www.example.com", :body => 'a=abcde&b[c]=123'))
+          end
         end
 
         describe "for request with json body and content type is set to json" do

data/spec/spec_helper.rb

@@ -23,6 +23,9 @@ RSpec.configure do |config|
   if ENV["NO_CONNECTION"] || no_network_connection
     config.filter_run_excluding :net_connect => true
   end
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end
 
 def fail()
@@ -42,8 +45,8 @@ end
 def setup_expectations_for_real_example_com_request(options = {})
   defaults = { :host => "www.example.com", :port => 80, :method => "GET",
     :path => "/",
-    :response_code => 200, :response_message => "OK",
-    :response_body => "<title>example</title>" }
+    :response_code => 302, :response_message => "Found",
+    :response_body => "" }
   setup_expectations_for_real_request(defaults.merge(options))
 end
 

data/spec/webmock_shared.rb

@@ -4,20 +4,17 @@ unless defined? SAMPLE_HEADERS
   SAMPLE_HEADERS = { "Content-Length" => "8888", "Accept" => "application/json" }
   ESCAPED_PARAMS = "x=ab%20c&z=%27Stop%21%27%20said%20Fred"
   NOT_ESCAPED_PARAMS = "z='Stop!' said Fred&x=ab c"
-  WWW_EXAMPLE_COM_CONTENT_LENGTH = 596
+  WWW_EXAMPLE_COM_CONTENT_LENGTH = 0
 end
 
 class MyException < StandardError; end;
 
 describe "WebMock version" do
-  
   it "should report version" do
-    WebMock.version.should == open(File.join(File.dirname(__FILE__), "..", "VERSION")).read.strip
+    WebMock.version.should == WebMock::VERSION
   end
-  
 end
 
-
 shared_examples_for "WebMock" do
   before(:each) do
     WebMock.disable_net_connect!
@@ -33,8 +30,7 @@ shared_examples_for "WebMock" do
 
       it "should make a real web request if request is not stubbed" do
         setup_expectations_for_real_example_com_request
-        http_request(:get, "http://www.example.com/").
-          body.should =~ /.*example.*/
+        http_request(:get, "http://www.example.com/").status.should == "302"
       end
 
       it "should make a real https request if request is not stubbed" do
@@ -42,6 +38,8 @@ shared_examples_for "WebMock" do
          :host => "www.paypal.com",
          :port => 443,
          :path => "/uk/cgi-bin/webscr",
+         :response_code => 200,
+         :response_message => "OK",
          :response_body => "hello paypal"
         )
         http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
@@ -128,7 +126,7 @@ shared_examples_for "WebMock" do
       end
 
       it "should allow a real request to allowed host", :net_connect => true do
-        http_request(:get, "http://www.example.org/").status.should == "200"
+        http_request(:get, "http://www.example.org/").status.should == "302"
       end
     end
   end
@@ -1493,8 +1491,8 @@ shared_examples_for "WebMock" do
           end
 
           it "should pass response with status and message" do
-            @response.status[0].should == 200
-            @response.status[1].should == "OK"
+            @response.status[0].should == 302
+            @response.status[1].should == "Found"
           end
         
           it "should pass response with headers" do

data/webmock.gemspec

@@ -1,175 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'webmock/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{webmock}
-  s.version = "1.6.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Bartosz Blimke"]
-  s.date = %q{2011-01-12}
+  s.name        = 'webmock'
+  s.version     = WebMock::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Bartosz Blimke']
+  s.email       = ['bartosz.blimke@gmail.com']
+  s.homepage    = 'http://github.com/bblimke/webmock'
+  s.summary     = %q{Library for stubbing HTTP requests in Ruby.}
   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 = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.md",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/webmock.rb",
-     "lib/webmock/api.rb",
-     "lib/webmock/assertion_failure.rb",
-     "lib/webmock/callback_registry.rb",
-     "lib/webmock/config.rb",
-     "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/net_http.rb",
-     "lib/webmock/http_lib_adapters/net_http_response.rb",
-     "lib/webmock/http_lib_adapters/patron.rb",
-     "lib/webmock/request_execution_verifier.rb",
-     "lib/webmock/request_pattern.rb",
-     "lib/webmock/request_registry.rb",
-     "lib/webmock/request_signature.rb",
-     "lib/webmock/request_stub.rb",
-     "lib/webmock/response.rb",
-     "lib/webmock/responses_sequence.rb",
-     "lib/webmock/rspec.rb",
-     "lib/webmock/rspec/matchers.rb",
-     "lib/webmock/rspec/matchers/request_pattern_matcher.rb",
-     "lib/webmock/rspec/matchers/webmock_matcher.rb",
-     "lib/webmock/stub_registry.rb",
-     "lib/webmock/stub_request_snippet.rb",
-     "lib/webmock/test_unit.rb",
-     "lib/webmock/util/hash_counter.rb",
-     "lib/webmock/util/hash_keys_stringifier.rb",
-     "lib/webmock/util/headers.rb",
-     "lib/webmock/util/uri.rb",
-     "lib/webmock/webmock.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/httpclient_spec.rb",
-     "spec/httpclient_spec_helper.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/request_execution_verifier_spec.rb",
-     "spec/request_pattern_spec.rb",
-     "spec/request_registry_spec.rb",
-     "spec/request_signature_spec.rb",
-     "spec/request_stub_spec.rb",
-     "spec/response_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stub_registry_spec.rb",
-     "spec/stub_request_snippet_spec.rb",
-     "spec/util/hash_counter_spec.rb",
-     "spec/util/hash_keys_stringifier_spec.rb",
-     "spec/util/headers_spec.rb",
-     "spec/util/uri_spec.rb",
-     "spec/vendor/addressable/lib/addressable/uri.rb",
-     "spec/vendor/addressable/lib/uri.rb",
-     "spec/vendor/crack/lib/crack.rb",
-     "spec/vendor/right_http_connection-1.2.4/History.txt",
-     "spec/vendor/right_http_connection-1.2.4/Manifest.txt",
-     "spec/vendor/right_http_connection-1.2.4/README.txt",
-     "spec/vendor/right_http_connection-1.2.4/Rakefile",
-     "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
-     "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",
-     "test/test_helper.rb",
-     "test/test_webmock.rb",
-     "webmock.gemspec"
-  ]
-  s.homepage = %q{http://github.com/bblimke/webmock}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Library for stubbing HTTP requests in Ruby.}
-  s.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/httpclient_spec.rb",
-     "spec/httpclient_spec_helper.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/request_execution_verifier_spec.rb",
-     "spec/request_pattern_spec.rb",
-     "spec/request_registry_spec.rb",
-     "spec/request_signature_spec.rb",
-     "spec/request_stub_spec.rb",
-     "spec/response_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stub_registry_spec.rb",
-     "spec/stub_request_snippet_spec.rb",
-     "spec/util/hash_counter_spec.rb",
-     "spec/util/hash_keys_stringifier_spec.rb",
-     "spec/util/headers_spec.rb",
-     "spec/util/uri_spec.rb",
-     "spec/vendor/addressable/lib/addressable/uri.rb",
-     "spec/vendor/addressable/lib/uri.rb",
-     "spec/vendor/crack/lib/crack.rb",
-     "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
-     "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",
-     "test/test_helper.rb",
-     "test/test_webmock.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = 'webmock'
+
+  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'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<httpclient>, [">= 2.1.5.2"])
-      s.add_development_dependency(%q<patron>, [">= 0.4.9"])
-      s.add_development_dependency(%q<em-http-request>, [">= 0.2.14"])
-      s.add_development_dependency(%q<curb>, [">= 0.7.8"])
-    else
-      s.add_dependency(%q<addressable>, [">= 2.2.2"])
-      s.add_dependency(%q<crack>, [">= 0.1.7"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
-      s.add_dependency(%q<patron>, [">= 0.4.9"])
-      s.add_dependency(%q<em-http-request>, [">= 0.2.14"])
-      s.add_dependency(%q<curb>, [">= 0.7.8"])
-    end
-  else
-    s.add_dependency(%q<addressable>, [">= 2.2.2"])
-    s.add_dependency(%q<crack>, [">= 0.1.7"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<httpclient>, [">= 2.1.5.2"])
-    s.add_dependency(%q<patron>, [">= 0.4.9"])
-    s.add_dependency(%q<em-http-request>, [">= 0.2.14"])
-    s.add_dependency(%q<curb>, [">= 0.7.8"])
+  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
-end
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 2
-  version: 1.6.2
+  prerelease: 
+  version: 1.6.4
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +00:00
+date: 2011-05-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +19,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.2"
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+        version: 2.2.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,11 +35,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 1
-        - 7
         version: 0.1.7
   type: :runtime
   version_requirements: *id002
@@ -58,11 +46,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id003
@@ -74,12 +57,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 119
-        segments: 
-        - 2
-        - 1
-        - 5
-        - 2
         version: 2.1.5.2
   type: :development
   version_requirements: *id004
@@ -91,11 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 4
-        - 9
         version: 0.4.9
   type: :development
   version_requirements: *id005
@@ -107,11 +79,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 2
-        - 14
         version: 0.2.14
   type: :development
   version_requirements: *id006
@@ -123,30 +90,26 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
         version: 0.7.8
   type: :development
   version_requirements: *id007
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
-email: bartosz.blimke@gmail.com
+email: 
+- bartosz.blimke@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- .rvmrc
 - CHANGELOG.md
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/webmock.rb
 - lib/webmock/api.rb
 - lib/webmock/assertion_failure.rb
@@ -179,6 +142,7 @@ files:
 - lib/webmock/util/hash_keys_stringifier.rb
 - lib/webmock/util/headers.rb
 - lib/webmock/util/uri.rb
+- lib/webmock/version.rb
 - lib/webmock/webmock.rb
 - spec/curb_spec.rb
 - spec/curb_spec_helper.rb
@@ -226,8 +190,8 @@ homepage: http://github.com/bblimke/webmock
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -235,23 +199,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: webmock
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
@@ -261,6 +219,7 @@ test_files:
 - spec/em_http_request_spec.rb
 - spec/em_http_request_spec_helper.rb
 - spec/errors_spec.rb
+- spec/example_curl_output.txt
 - spec/httpclient_spec.rb
 - spec/httpclient_spec_helper.rb
 - spec/net_http_spec.rb
@@ -285,6 +244,10 @@ test_files:
 - spec/vendor/addressable/lib/addressable/uri.rb
 - spec/vendor/addressable/lib/uri.rb
 - spec/vendor/crack/lib/crack.rb
+- spec/vendor/right_http_connection-1.2.4/History.txt
+- spec/vendor/right_http_connection-1.2.4/Manifest.txt
+- spec/vendor/right_http_connection-1.2.4/README.txt
+- spec/vendor/right_http_connection-1.2.4/Rakefile
 - spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb
 - spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb
 - spec/vendor/right_http_connection-1.2.4/setup.rb