webmock 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07a138a8c64902f36eca871bd732a1f16c1a775a
-  data.tar.gz: 34f5d60511d7fc5b2dd8a91ea840b455fdc01eaf
+  metadata.gz: c62cee53bf447bb19145917ce3ce566167e2c73c
+  data.tar.gz: a88c14886f10f7951ce3683bdd92c7420cad1d5a
 SHA512:
-  metadata.gz: 4704d249edaed69a8c672a4f8b14c2d925cae989baaae04868e6e369b3d55fe8e119ccfc1ad8dfc588fbb3b34076ed3ac6f40c32cc77821f1cad93c7ae3fb0e7
-  data.tar.gz: fa6e166b79d79018f3f86abd3f97fdf7ef045d7b4145b2e5e206ec5c744fcf504693a7d401118191f24bb7e4e461125f97cd7b5c3093f8b6fb25b5b0d7b368bb
+  metadata.gz: e23e4392312fbfbac76d8f29e44eb6711753a8c3a6010d5553587f583ec9fd6da45f06f37f58cdfbd1e48d7adb63034a0a68de52cfe4c1c77bff718a46966b38
+  data.tar.gz: 850b7aa2808bfb7ebccb8875cfc9f05a35d110bcf754a519c37ae59c0675a390f4294f6b97b17c49555271df8b8f1c67287bd7319cf01f84ac32114c72da63d1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.0.1
+
+  * Added code responsible for loading em-http-request if available, which has been removed by mistake.
+
+    Thanks to [Vasiliy](https://github.com/304)
+
+  * WebMock loads "base64" if it's not yet loaded.
+
+    Thanks to [Taiki Ono](https://github.com/taiki45).
+
 ## 2.0.0
 
   * `require 'webmock'` does not enable WebMock anymore. `gem 'webmock'` can now be safely added to a Gemfile and no http client libs will be modified when it's loaded. Call `WebMock.enable!` to enable WebMock.

data/README.md

@@ -1016,6 +1016,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Tim Diggins
 * Gabriel Chaney
 * Chris Griego
+* Taiki Ono
 
 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_adapter.rb

@@ -1,3 +1,9 @@
+begin
+  require 'em-http-request'
+rescue LoadError
+  # em-http-request not found
+end
+
 if defined?(EventMachine::HttpClient)
   module WebMock
     module HttpLibAdapters

data/lib/webmock/util/headers.rb

@@ -1,3 +1,5 @@
+require 'base64'
+
 module WebMock
 
   module Util

data/lib/webmock/version.rb

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

data/spec/acceptance/net_http/net_http_spec.rb

@@ -137,9 +137,10 @@ describe "Net:HTTP" do
         http.request(request)
       end.to raise_error ArgumentError, "Net:HTTP does not accept headers as symbols"
     else
+      stub_http_request(:get, "google.com").with(headers: { InvalidHeaderSinceItsASymbol: "this will not be valid" })
       expect do
         http.request(request)
-      end.to_not raise_error ArgumentError, "Net:HTTP does not accept headers as symbols"
+      end.not_to raise_error
     end
   end
 

data/spec/support/network_connection.rb

@@ -3,7 +3,7 @@ require 'socket'
 
 module NetworkConnection
   def self.connect_to(host, port, timeout=10)
-    timeout(timeout) do
+    Timeout.timeout(timeout) do
       TCPSocket.new(host, port)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable