webmock 1.8.2 → 1.8.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.8.3
+
+* Fixed compatibility with latest em-http-request
+
+    Thanks to [Paul Cortens](https://github.com/thoughtless)
+
 ## 1.8.2
 
 * Prevent Webmock `hash_including` from overriding RSpec version 1 `hash_including` method.

data/README.md

@@ -700,6 +700,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Nick Recobra
 * Jordan Elver
 * Joe Karayusuf
+* Paul Cortens
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

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

@@ -154,7 +154,7 @@ if defined?(EventMachine::HttpClient)
 
         method = @req.method
         uri = @req.uri
-        auth = @req.proxy[:authorization]
+        auth = @req.proxy[:authorization] if @req.proxy
         query = @req.query
 
         if auth

data/lib/webmock/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 1
   - 8
-  - 2
-  version: 1.8.2
+  - 3
+  version: 1.8.3
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable