webmock 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c62cee53bf447bb19145917ce3ce566167e2c73c
-  data.tar.gz: a88c14886f10f7951ce3683bdd92c7420cad1d5a
+  metadata.gz: 050c61fa8c7558b2c5fc52862600577199f286c7
+  data.tar.gz: 9745a14b5c7b2428dcd8720efc132c0b1573b43c
 SHA512:
-  metadata.gz: e23e4392312fbfbac76d8f29e44eb6711753a8c3a6010d5553587f583ec9fd6da45f06f37f58cdfbd1e48d7adb63034a0a68de52cfe4c1c77bff718a46966b38
-  data.tar.gz: 850b7aa2808bfb7ebccb8875cfc9f05a35d110bcf754a519c37ae59c0675a390f4294f6b97b17c49555271df8b8f1c67287bd7319cf01f84ac32114c72da63d1
+  metadata.gz: b698fda2494837e51abd90df2eaef0a651d87b6968a3c541af5630f951b60e2b7dd09d50a12f1a8fb0f3adc5583d079d0805067ecfdce6168cd56d0e6119c833
+  data.tar.gz: 33d11e2e5d09870aaf44ef1522c4381b83c37d4dd0e9b88d75be9b3c7321a82e7f008d3c8da831ee0957a61c8a6226f9adbe211f88e5de5e4fa36888d115c4af

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.0.2
+
+  * Using `Base64.strict_encode64` instead of `Base64.encode64` to handle long user:pass basic auth credentials
+
+    Thanks to [Jonathan Schatz](https://github.com/modosc)
+
+  * Fixed handling of Authorisation header provided as string instead of array when using em-http-request.
+
+    Thanks to [Michael Richardson](https://github.com/TTransmit) for reporing the issue.
+
+  * Ensured `WebMock.net_connect_explicit_allowed?` always returns boolean.
+
+    Thanks tp [Jose Luis Honorato](https://github.com/jlhonora)
+
 ## 2.0.1
 
   * Added code responsible for loading em-http-request if available, which has been removed by mistake.
@@ -40,7 +54,7 @@
   or
 
         stub_request(:get, "www.example.com").
-          with(headers: 'Authorization' => "Basic #{ Base64.encode64('user:pass').chomp}")
+          with(headers: 'Authorization' => "Basic #{ Base64.strict_encode64('user:pass').chomp}")
 
   In order to stub a request with basic authentication credentials provided in the url, please use the following code:
 

data/README.md

@@ -209,7 +209,7 @@ RestClient.post('www.example.com', 'abc')    # ===> Success
 stub_request(:get, "www.example.com").with(basic_auth: ['user', 'pass'])
 # or
 # stub_request(:get, "www.example.com").
-#   with(headers: 'Authorization' => "Basic #{ Base64.encode64('user:pass').chomp}")
+#   with(headers: {'Authorization' => "Basic #{ Base64.strict_encode64('user:pass').chomp}"})
 
 Net::HTTP.start('www.example.com') do |http|
   req = Net::HTTP::Get.new('/')
@@ -1017,6 +1017,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Gabriel Chaney
 * Chris Griego
 * Taiki Ono
+* Jonathan Schatz
+* Jose Luis Honorato
 
 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

@@ -180,7 +180,7 @@ if defined?(EventMachine::HttpClient)
 
         headers = @req.headers
 
-        if headers['authorization']
+        if headers['authorization'] && headers['authorization'].is_a?(Array)
           headers['Authorization'] = WebMock::Util::Headers.basic_auth_header(headers.delete('authorization'))
         end
 

data/lib/webmock/util/headers.rb

@@ -39,7 +39,7 @@ module WebMock
       end
 
       def self.basic_auth_header(*credentials)
-        "Basic #{Base64.encode64(credentials.join(':')).chomp}"
+        "Basic #{Base64.strict_encode64(credentials.join(':')).chomp}"
       end
 
     end

data/lib/webmock/version.rb

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

data/lib/webmock/webmock.rb

@@ -68,8 +68,8 @@ module WebMock
     when Array
       allowed.any? { |allowed_item| net_connect_explicit_allowed?(allowed_item, uri) }
     when Regexp
-      uri.to_s =~ allowed ||
-      uri.omit(:port).to_s =~ allowed && uri.port == uri.default_port
+      (uri.to_s =~ allowed) != nil ||
+      (uri.omit(:port).to_s =~ allowed) != nil && uri.port == uri.default_port
     when String
       allowed == uri.to_s ||
       allowed == uri.host ||

data/spec/acceptance/shared/stubbing_requests.rb

@@ -403,6 +403,11 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         expect(http_request(:get, "http://www.example.com/", basic_auth: ['user', 'pass']).status).to eq("200")
       end
 
+      it "should match if credentials are the same and encode to more than one line" do
+        stub_request(:get, "www.example.com").with(basic_auth: ['user' * 5, 'pass' * 5])
+        expect(http_request(:get, "http://www.example.com/", basic_auth: ['user' * 5, 'pass' * 5]).status).to eq("200")
+      end
+
       it "should match if credentials are the same and were provided directly as authentication headers in request" do
         stub_request(:get, "www.example.com").with(basic_auth: ['user', 'pass'])
         expect(http_request(:get, "http://www.example.com/", headers: {'Authorization'=>'Basic dXNlcjpwYXNz'}).status).to eq("200")

metadata

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