webmock 1.7.8 → 1.7.10

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.7.10
+
+* Yanked 1.7.9 and rebuilt gem on 1.8.7 to deal with syck/psych incompatibilties in gemspec.
+
+## 1.7.9
+
+* Fixed support for native Typhoeus timeouts.
+
+    Thanks to [Albert Llop](https://github.com/mrsimo)
+
+* Fixed problem with WebMock and RSpec compatibility on TeamCity servers. See [this article](http://www.coding4streetcred.com/blog/post/Issue-RubyMine-31-Webmock-162-and-%E2%80%9CSpecconfigure%E2%80%9D-curse.aspx) for more details.
+
+    Thanks to [Christopher Pickslay](https://github.com/chrispix) from [Two Bit Labs](https://github.com/twobitlabs)
+
+
 ## 1.7.8
 
 * Fix each adapter so that it calls a `stub.with` block only once per

data/README.md

@@ -652,6 +652,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Chris McGrath
 * Stephen Celis
 * Eugene Pimenov
+* Albert Llop
+* Christopher Pickslay
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -56,3 +56,10 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/webmock/webmock.rb')
 end
+
+
+task :require_ruby_18 do
+  raise "This must be run on Ruby 1.8" unless RUBY_VERSION =~ /^1\.8/
+end
+
+task :release => [:require_ruby_18]

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -49,15 +49,28 @@ if defined?(Typhoeus)
             uri.password = req.password
           end
 
+          body = req.body
+
+          if req.params && req.method == :post
+            body = request_body_for_post_request_with_params(req)
+          end
+
           request_signature = WebMock::RequestSignature.new(
             req.method,
             uri.to_s,
-            :body => req.body,
+            :body => body,
             :headers => req.headers
           )
           request_signature
         end
 
+        def self.request_body_for_post_request_with_params(req)
+          params = req.params
+          form = Typhoeus::Form.new(params)
+          form.process!
+          form.to_s
+        end
+
         def self.build_webmock_response(typhoeus_response)
           webmock_response = WebMock::Response.new
           webmock_response.status = [typhoeus_response.code, typhoeus_response.status_message]
@@ -72,7 +85,8 @@ if defined?(Typhoeus)
               :code         => 0,
               :status_message => "",
               :body         => "",
-              :headers_hash => {}
+              :headers_hash => {},
+              :curl_return_code => 28
             )
           else
             ::Typhoeus::Response.new(

data/lib/webmock/rspec.rb

@@ -3,7 +3,7 @@ require 'webmock'
 # RSpec 1.x and 2.x compatibility
 if defined?(RSpec) && defined?(RSpec::Expectations)
   RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
-elsif defined?(Spec)
+elsif defined?(Spec) && defined?(Spec.configure)
   RSPEC_NAMESPACE = Spec
   RSPEC_CONFIGURER = Spec::Runner
 else

data/lib/webmock/version.rb

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

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -15,6 +15,28 @@ unless RUBY_PLATFORM =~ /java/
         WebMock.reset!
       end
 
+      describe "when params are used" do
+        it "should take into account params for POST request" do
+          stub_request(:post, "www.example.com").with(:body => {:hello => 'world'})
+          Typhoeus::Request.post("www.example.com", :params => {:hello => 'world'})
+        end
+
+        it "should take into account params for GET request" do
+          stub_request(:get, "http://www.example.com/?hello=world")
+          Typhoeus::Request.get("www.example.com", :params => {:hello => 'world'})
+        end
+      end
+
+      describe "timeouts" do
+        it "should support native typhoeus timeouts" do
+          stub_request(:any, "example.com").to_timeout
+
+          response = Typhoeus::Request.get("http://example.com")
+
+          response.should be_timed_out
+        end
+      end
+
       describe "callbacks" do
         before(:each) do
           @hydra = Typhoeus::Hydra.new
@@ -46,7 +68,6 @@ unless RUBY_PLATFORM =~ /java/
           @hydra.run
           test.should == response_code
         end
-
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 7
-  - 8
-  version: 1.7.8
+  - 10
+  version: 1.7.10
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 Z
+date: 2012-01-04 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: addressable
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -39,12 +38,12 @@ dependencies:
         - 2
         - 5
         version: 2.2.5
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
+  name: addressable
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: crack
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,12 +54,12 @@ dependencies:
         - 1
         - 7
         version: 0.1.7
-  requirement: *id002
+  type: :runtime
+  name: crack
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +70,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: rspec
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: httpclient
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +87,12 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: httpclient
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: patron
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,12 +103,12 @@ dependencies:
         - 4
         - 15
         version: 0.4.15
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: patron
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: em-http-request
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,12 +119,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: em-http-request
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: curb
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -136,12 +135,12 @@ dependencies:
         - 7
         - 15
         version: 0.7.15
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: curb
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: typhoeus
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,12 +151,12 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: typhoeus
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: minitest
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +167,12 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   type: :development
+  name: minitest
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rdoc
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -184,7 +183,9 @@ dependencies:
         - 5
         - 0
         version: 3.5.0
-  requirement: *id010
+  type: :development
+  name: rdoc
+  version_requirements: *id010
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -302,6 +303,7 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
+has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
 
@@ -331,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.