flexirest 1.3.16 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05916ea9c0a9dff55d6d260df70ab263b4cb51f
-  data.tar.gz: b8f74642b6c7ee86a8819f6ca2077cfc153be34c
+  metadata.gz: d3f5b7fd58fca9e5b1af0e80cd566a98404033d4
+  data.tar.gz: 66f2a9a29930347f6e72452b12d2adff5ab18145
 SHA512:
-  metadata.gz: 9e92347d9e7654e6296827a40ace68a536f39204b6fec78ece3955efba329768c5522e65715dc8ea3f7fb6bff739f639892fec26e06627a2b67a356375cf3bf9
-  data.tar.gz: d9582c21066db41a975ffe5f4c76ffcff27c85ea11af012f38acc267d71a7791ebc83dfc6b6951c6857527f7fc2b5c9e3d2e1ec163f577225c89bdb31e10d94a
+  metadata.gz: c2f55e90d6c57f50cb85b90f3acdd1981d8ff0bb206591ecf26f1d002c286cf71c4bc76d1b3d671c9f5a459d92ba3b12e6627e0c0fc2692a12c8b3e6e52ece67
+  data.tar.gz: 989344a2cece5f68cb99df45b2a4a0bb9372839be88c3853acf20d9b8710b813cfa26a7ed976176c450e6090dd204541ba5451f16319bbd09fa33fa49ba1b948

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.17
+
+Bugfix:
+
+- Authentication credentials weren't being passed through proxied classes (thanks to Lukasz Modlinski for the contribution).
+
 ## 1.3.16
 
 Feature:

data/lib/flexirest/request.rb

@@ -315,7 +315,7 @@ module Flexirest
             _, @base_url, @url = parts
           end
           base_url.gsub!(%r{//(.)}, "//#{username}:#{password}@\\1") if username && !base_url[%r{//[^/]*:[^/]*@}]
-          connection = Flexirest::ConnectionManager.get_connection(@base_url)
+          connection = Flexirest::ConnectionManager.get_connection(base_url)
         end
       else
         parts = @url.match(%r{^(https?://[a-z\d\.:-]+?)(/.*)}).to_a

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.3.16"
+  VERSION = "1.3.17"
 end

data/spec/lib/connection_spec.rb

@@ -147,7 +147,7 @@ describe Flexirest::Connection do
       expect(auth_header == "APIAuth id123:TQiQIW6vVaDC5jvh99uTNkxIg6Q=" || auth_header == "APIAuth id123:PMWBThkB8vKbvUccHvoqu9G3eVk=").to be_truthy
     end
 
-    if Gem.loaded_specs["api-auth"].version.to_s >= "2.0.0"
+    if  Gem.loaded_specs["api-auth"].present? && Gem.loaded_specs["api-auth"].version.to_s >= "2.0.0"
       it 'should have an Authorization header with a custom digest method' do
         puts Gem.loaded_specs["api-auth"].version
         @options[:api_auth][:api_auth_options] = {

data/spec/lib/proxy_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'active_support/core_ext/hash'
+require 'base64'
 
 class ProxyExample < Flexirest::ProxyBase
   get "/all" do
@@ -30,7 +31,7 @@ class ProxyExample < Flexirest::ProxyBase
     body "MY-BODY-CONTENT"
     passthrough
   end
-  
+
   patch "/partial_update" do
     body "MY-BODY-CONTENT"
     passthrough
@@ -93,6 +94,8 @@ class ProxyClientExample < Flexirest::Base
 end
 
 describe Flexirest::Base do
+  before(:each) { ProxyClientExample.base_url 'http://www.example.com' }
+
   it "allows the URL to be changed" do
     expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/getAll?id=1", instance_of(Hash)).and_return(OpenStruct.new(body:"{\"result\":true}", status:200, headers:{}))
     ProxyClientExample.all(id:1)
@@ -112,7 +115,7 @@ describe Flexirest::Base do
     expect_any_instance_of(Flexirest::Connection).to receive(:post).with("/create", {age:12, first_name:"John"}.to_query, instance_of(Hash)).and_return(OpenStruct.new(body:"{\"result\":true}", status:200, headers:{}))
     ProxyClientExample.create(fname:"John", lname:"Smith")
   end
-  
+
   it "has access to raw body content for PATCH requests" do
     expect_any_instance_of(Flexirest::Connection).to receive(:patch).with("/partial_update", "MY-BODY-CONTENT", instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"result\":true}", status:200, response_headers:{})))
     ProxyClientExample.partial_update(fname:"John", lname:"Smith")
@@ -197,4 +200,13 @@ describe Flexirest::Base do
     expect(ProxyClientExample.hal_test(id:1).test.result).to eq(true)
   end
 
+  it "properly passes basic HTTP auth credentials" do
+    host, credentials, url_path = 'www.example.com', 'user:pass', '/getAll?id=1'
+    ProxyClientExample.base_url "http://#{credentials}@#{host}"
+    stub_request(:get, "#{host}#{url_path}")
+    ProxyClientExample.all(id:1)
+    expect(a_request(:get, "#{host}#{url_path}").with(headers: {
+      'Authorization'=>"Basic #{Base64.strict_encode64(credentials)}"
+    })).to have_been_made
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.3.16
+  version: 1.3.17
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler