webmock 1.8.0 → 1.8.1

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.8.1
+
+* Ensured WebMock doesn't interfere with `em-synchrony`, when `em-synchrony/em-http` is not included.
+
+    Thanks to [Nick Recobra](https://github.com/oruen)
+
+* Improved README
+
+    Thanks to [Jordan Elver](https://github.com/jordelver)
+
+
 ## 1.8.0
 
 * Matching request body against partial hash.

data/README.md

@@ -71,6 +71,8 @@ Add the following code to `features/support/env.rb`
 
     require 'webmock/cucumber'
 
+### Outside a test framework
+
 You can also use WebMock outside a test framework:
 
     require 'webmock'
@@ -701,7 +703,7 @@ For a full list of contributors you can visit the
 
 ## Background
 
-Thank you Fakeweb! This library was inspired by [FakeWeb](fakeweb.rubyforge.org).
+Thank you Fakeweb! This library was inspired by [FakeWeb](http://fakeweb.rubyforge.org).
 I imported some solutions from that project to WebMock. I also copied some code i.e Net:HTTP adapter.
 Fakeweb architecture unfortunately didn't allow me to extend it easily with the features I needed.
 I also preferred some things to work differently i.e request stub precedence.

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -27,7 +27,7 @@ if defined?(EventMachine::HttpClient)
 
   module EventMachine
 
-    if defined?(Synchrony)
+    if defined?(Synchrony) && HTTPMethods.instance_methods.include?(:aget)
       # have to make the callbacks fire on the next tick in order
       # to avoid the dreaded "double resume" exception
       module HTTPMethods

data/lib/webmock/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 8
-  - 0
-  version: 1.8.0
+  - 1
+  version: 1.8.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-20 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: addressable
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +31,12 @@ dependencies:
         - 2
         - 7
         version: 2.2.7
-  prerelease: false
-  requirement: *id001
   type: :runtime
-  name: addressable
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: crack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +47,12 @@ dependencies:
         - 1
         - 7
         version: 0.1.7
-  prerelease: false
-  requirement: *id002
   type: :runtime
-  name: crack
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +62,12 @@ dependencies:
         - 2
         - 8
         version: "2.8"
-  prerelease: false
-  requirement: *id003
   type: :development
-  name: rspec
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: httpclient
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +78,12 @@ dependencies:
         - 2
         - 4
         version: 2.2.4
-  prerelease: false
-  requirement: *id004
   type: :development
-  name: httpclient
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: patron
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,12 +94,12 @@ dependencies:
         - 4
         - 17
         version: 0.4.17
-  prerelease: false
-  requirement: *id005
   type: :development
-  name: patron
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: em-http-request
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,12 +110,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  requirement: *id006
   type: :development
-  name: em-http-request
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: curb
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -124,12 +126,12 @@ dependencies:
         - 8
         - 0
         version: 0.8.0
-  prerelease: false
-  requirement: *id007
   type: :development
-  name: curb
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: typhoeus
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,12 +142,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  prerelease: false
-  requirement: *id008
   type: :development
-  name: typhoeus
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: excon
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,12 +158,12 @@ dependencies:
         - 9
         - 5
         version: 0.9.5
-  prerelease: false
-  requirement: *id009
   type: :development
-  name: excon
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  name: minitest
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,12 +174,12 @@ dependencies:
         - 2
         - 2
         version: 2.2.2
-  prerelease: false
-  requirement: *id010
   type: :development
-  name: minitest
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -188,10 +190,8 @@ dependencies:
         - 5
         - 0
         version: 3.5.0
-  prerelease: false
-  requirement: *id011
   type: :development
-  name: rdoc
+  version_requirements: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com