webmock 1.9.0 → 1.9.1

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree
   - jruby-19mode
   - jruby-18mode
@@ -9,6 +10,7 @@ rvm:
   - rbx-19mode
 matrix:
   allow_failures:
+    - rvm: 2.0.0
     - rvm: rbx-18mode
     - rvm: rbx-19mode
     - rvm: jruby-19mode

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## 1.9.1
+
+* Fix 'rack.errors' not being set for Rack apps
+
+  Thanks to [Alex Grant](https://github.com/grantovich)
+
+* Added support for minitest assertions count
+
+  Thanks to [Mokevnin Kirill](https://github.com/mokevnin)
+
+* Fixed issues with registering http requests in multi-threaded environments
+
+  Thanks to [Travis Beauvais](https://github.com/tbeauvais)
+
+* Bumped Crack version to >=0.3.2
+
+  Thanks to [Jake Benilov](https://github.com/benilovj)
+
+* Fixed issues in Typhoeus 0.6. Defaulted method to GET when no method specified.
+
+  Thanks to [Hans Hasselberg](https://github.com/i0rek)
+
+* Add license information to the gemspec
+
+  Thanks to [Jordi Massaguer Pla](https://github.com/jordimassaguerpla) and [Murahashi Sanemat Kenichi](https://github.com/sanemat)
+
+* Added support for :expects option in Excon adapter
+
+  Thanks to [Evgeniy Dolzhenko](https://github.com/dolzenko)
+
+* Fixed Faye compatibility by treating StringIO in Net::HTTP adapter properly
+
+  Thanks to [Pavel Forkert](https://github.com/fxposter)
+
+* Updated VCR link
+
+  Thanks to [Rex Feng](https://github.com/xta)
+
 ## 1.9.0
 
 * Added support for Typhoeus >= 0.5.0 and removed support for Typhoeus < 0.5.0.

data/README.md

@@ -565,7 +565,7 @@ i.e the following two sets of headers are equal:
 
 ## Recording real requests and responses and replaying them later
 
-To record your application's real HTTP interactions and replay them later in tests you can use [VCR](http://github.com/myronmarston/vcr) with WebMock.
+To record your application's real HTTP interactions and replay them later in tests you can use [VCR](https://github.com/vcr/vcr) with WebMock.
 
 ## Request callbacks
 
@@ -714,6 +714,13 @@ People who submitted patches and new features or suggested improvements. Many th
 * Hans Hasselberg
 * Andrew France
 * Jonathan Hyman
+* Rex Feng
+* Pavel Forkert
+* Jordi Massaguer Pla
+* Jake Benilov
+* Travis Beauvais
+* Mokevnin Kirill
+* Alex Grant
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -87,7 +87,14 @@ if defined?(Excon)
 
           if mock_response = WebMock::StubRegistry.instance.response_for_request(mock_request)
             ExconAdapter.perform_callbacks(mock_request, mock_response, :real_request => false)
-            ExconAdapter.real_response(mock_response)
+            response = ExconAdapter.real_response(mock_response)
+
+            if params.has_key?(:expects) && ![*params[:expects]].include?(response.status)
+              raise(Excon::Errors.status_error(params, response))
+            else
+              response
+            end
+
           elsif WebMock.net_connect_allowed?(mock_request.uri)
             real_response = super
             ExconAdapter.perform_callbacks(mock_request, ExconAdapter.mock_response(real_response), :real_request => true)

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -216,7 +216,7 @@ module Net  #:nodoc: all
       @debug_output = debug_output
 
       @io = case io
-      when Socket, OpenSSL::SSL::SSLSocket, IO
+      when Socket, OpenSSL::SSL::SSLSocket, IO, StringIO
         io
       when String
         StringIO.new(io)

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -60,7 +60,7 @@ if defined?(Typhoeus)
           body = req.options[:body]
 
           request_signature = WebMock::RequestSignature.new(
-            req.options[:method],
+            req.options[:method] || :get,
             uri.to_s,
             :body => body,
             :headers => req.options[:headers]

data/lib/webmock/minitest.rb

@@ -10,6 +10,15 @@ MiniTest::Unit::TestCase.class_eval do
     WebMock.reset!
   end
   alias_method :teardown, :teardown_with_webmock
+
+  [:assert_request_requested, :assert_request_not_requested].each do |name|
+    alias_method :"#{name}_without_assertions_count", name
+    define_method :"#{name}_with_assertions_count" do |*args|
+      self._assertions += 1
+      send :"#{name}_without_assertions_count", *args
+    end
+    alias_method name, :"#{name}_with_assertions_count"
+  end
 end
 
 WebMock::AssertionFailure.error_class = MiniTest::Assertion

data/lib/webmock/rack_response.rb

@@ -44,6 +44,7 @@ module WebMock
 
       # Rack-specific variables
       env['rack.input']      = StringIO.new(body)
+      env['rack.errors']     = $stderr
       env['rack.version']    = Rack::VERSION
       env['rack.url_scheme'] = uri.scheme
       env['rack.run_once']   = true

data/lib/webmock/util/hash_counter.rb

@@ -6,13 +6,18 @@ module WebMock
         self.hash = {}
         @order = {}
         @max = 0
+        @lock = Mutex.new
       end
       def put key, num=1
-        hash[key] = (hash[key] || 0) + num
-        @order[key] = @max = @max + 1
+        @lock.synchronize do
+          hash[key] = (hash[key] || 0) + num
+          @order[key] = @max = @max + 1
+        end
       end
       def get key
-        hash[key] || 0
+        @lock.synchronize do
+          hash[key] || 0
+        end
       end
 
       def each(&block)

data/lib/webmock/version.rb

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

data/minitest/test_webmock.rb

@@ -3,4 +3,5 @@ require File.expand_path(File.dirname(__FILE__) + '/../test/shared_test')
 
 class MiniTestWebMock < MiniTest::Unit::TestCase
   include SharedTest
+
 end

data/minitest/webmock_spec.rb

@@ -8,6 +8,17 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
       @stub_https = stub_http_request(:any, "https://www.example.com")
     end
 
+    it "should update assertions count" do
+      assert_equal 0, _assertions
+      http_request(:get, "http://www.example.com/")
+
+      assert_requested(@stub_http)
+      assert_equal 2, _assertions
+
+      assert_not_requested(:post, "http://www.example.com")
+      assert_equal 4, _assertions
+    end
+
     it "should raise error on non stubbed request" do
       lambda { http_request(:get, "http://www.example.net/") }.must_raise(WebMock::NetConnectNotAllowedError)
     end

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -13,7 +13,7 @@ unless RUBY_PLATFORM =~ /java/
 
     #functionality only supported for em-http-request 1.x
     if defined?(EventMachine::HttpConnection)
-      context 'when a real request is made and redirects are followed' do
+      context 'when a real request is made and redirects are followed', :net_connect => true do
         before { WebMock.allow_net_connect! }
 
         # This url redirects to the https URL.
@@ -116,7 +116,7 @@ unless RUBY_PLATFORM =~ /java/
           end
         end
 
-        context 'making a real request' do
+        context 'making a real request', :net_connect => true do
           before { WebMock.allow_net_connect! }
           include_examples "em-http-request middleware/after_request hook integration"
         end

data/spec/acceptance/excon/excon_spec.rb

@@ -11,6 +11,11 @@ describe "Excon" do
     Excon.get('http://example.com', :path => "resource/", :query => {:a => 1, :b => 2}).body.should == "abc"
   end
 
+  it 'should support Excon :expects options' do
+    stub_request(:get, "http://example.com/").to_return(:body => 'a')
+    lambda { Excon.get('http://example.com', :expects => 204) }.should raise_error(Excon::Errors::OK)
+  end
+
   let(:file) { File.new(__FILE__) }
   let(:file_contents) { File.new(__FILE__).read }
 
@@ -27,4 +32,3 @@ describe "Excon" do
     yielded_request_body.should eq(file_contents)
   end
 end
-

data/spec/acceptance/shared/callbacks.rb

@@ -68,7 +68,7 @@ shared_context "callbacks" do |*adapter_info|
         before(:each) do
           stub_request(:get, "http://www.example.com").
           to_return(
-            :status => ["200", "hello"],
+            :status => [200, "hello"],
             :headers => {'Content-Length' => '666', 'Hello' => 'World'},
             :body => "foo bar"
           )
@@ -79,7 +79,7 @@ shared_context "callbacks" do |*adapter_info|
         end
 
         it "should pass response to callback with the status and message" do
-          @response.status.should == ["200", "hello"]
+          @response.status.should == [200, "hello"]
         end
 
         it "should pass response to callback with headers" do

data/spec/acceptance/shared/complex_cross_concern_behaviors.rb

@@ -20,7 +20,7 @@ shared_context "complex cross-concern behaviors" do |*adapter_info|
 
   let(:no_content_url) { 'http://httpstat.us/204' }
   [nil, ''].each do |stub_val|
-    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has" do
+    it "returns the same value (nil or "") for a request stubbed as #{stub_val.inspect} that a real empty response has", :net_connect => true do
       unless http_library == :curb
         WebMock.allow_net_connect!
 

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -22,7 +22,7 @@ unless RUBY_PLATFORM =~ /java/
 
       describe "when params are used" do
         it "should take into account params for POST request" do
-          stub_request(:post, "www.example.com").with(:params => {:hello => 'world'})
+          stub_request(:post, "www.example.com/?hello=world").with(:params => {:hello => 'world'})
           request = Typhoeus::Request.new("http://www.example.com", :method => :post, :params => {:hello => 'world'})
           hydra.queue(request)
           hydra.run

data/spec/support/my_rack_app.rb

@@ -2,7 +2,7 @@ require 'rack'
 
 class MyRackApp
   class NonArrayResponse
-    # The rack response body need not implement #join, 
+    # The rack response body need not implement #join,
     # but it must implement #each.  It need not be an Array.
     # ActionDispatch::Response, for example, exercises that fact.
     # See: http://rack.rubyforge.org/doc/SPEC.html
@@ -32,6 +32,9 @@ class MyRackApp
         else
           [401, {}, [""]]
         end
+      when ['GET', '/error']
+        env['rack.errors'].puts('Error!')
+        [500, {}, ['']]
       else
         [404, {}, ['']]
     end

data/spec/unit/rack_response_spec.rb

@@ -49,6 +49,24 @@ describe WebMock::RackResponse do
     response.body.should include('Good to meet you, Jimmy!')
   end
 
+  describe 'rack error output' do
+    before :each do
+      @original_stderr = $stderr
+      $stderr = StringIO.new
+    end
+
+    after :each do
+      $stderr = @original_stderr
+    end
+
+    it 'should behave correctly when an app uses rack.errors' do
+      request = WebMock::RequestSignature.new(:get, 'www.example.com/error')
+
+      expect { @rack_response.evaluate(request) }.to_not raise_error
+      expect($stderr.length).to_not eq 0
+    end
+  end
+
   describe 'basic auth request' do
     before :each do
       @rack_response_with_basic_auth = WebMock::RackResponse.new(

data/test/shared_test.rb

@@ -73,4 +73,4 @@ module SharedTest
       assert_not_requested(@stub_http)
     end
   end
-end
+end

data/webmock.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |s|
   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.license     = "MIT"
 
   s.rubyforge_project = 'webmock'
 
   s.add_dependency 'addressable', '>= 2.2.7'
-  s.add_dependency 'crack', '>=0.1.7'
+  s.add_dependency 'crack', '>=0.3.2'
 
   s.add_development_dependency 'rspec',           '~> 2.10'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-07 00:00:00 Z
+date: 2013-02-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 7
-        version: 0.1.7
+        - 3
+        - 2
+        version: 0.3.2
   type: :runtime
   prerelease: false
   requirement: *id002
@@ -318,8 +318,8 @@ files:
 - test/test_webmock.rb
 - webmock.gemspec
 homepage: http://github.com/bblimke/webmock
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []