flexirest 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034246a4c82d512ced039ae0265091d40688183c762e1094c12f0dca31439a55
-  data.tar.gz: 65545b4903a74eae1140866589f97be1bf664b2df052bc515a243e29844ab543
+  metadata.gz: 8eeb42973b47925b75719642de9f2ad0ff58795453b0843ae2119ad32be87f89
+  data.tar.gz: fb6760cd9d4da6bbf4e3c653c7860790b3c259d7764f3ba4b2fc804461ff5d2b
 SHA512:
-  metadata.gz: fa7bd3620f69ec7ba0ba6493d86bae8aef4c889e5f3ed536d2bd801c6b62a8f9248bd80338901eff4b0435a2aa26589672ea03ddd6e81a4c1bc99cb66387651b
-  data.tar.gz: e73ba209c5dd7e98a370e8ac2fab285f98cb948b81f56a3cc23f63ad9f3035ba385de0292546943f1ca63d8eca30e9f0795f1ee3f60268b1b8a9bfe2c0a69deb
+  metadata.gz: 4ab9bd72452449e4e46332f44b100a7bace5e06334eb408f215956590b07c398e24a9a89144f6f6d99ae392730f91232ba5482e0d3075d45d7851fc67a2334aa
+  data.tar.gz: af37f9b843b3bdf129078907468ac77f00019a9d499eecf8412a2c44d544b3792c5d0394449ae5a391f9e43dc6d107e707070772aea4f14fba4a6a3a05fde73c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.8.9
+
+Feature:
+
+- Adds proc support to api_auth credentials (thanks to David Underwood for the PR).
+
 ## 1.8.8
 
 Fix:

data/lib/flexirest/request.rb

@@ -69,19 +69,27 @@ module Flexirest
     end
 
     def api_auth_access_id
+      ret = nil
       if object_is_class?
-        @object.api_auth_access_id
+        ret = @object.api_auth_access_id
+        ret = ret.call if ret.respond_to?(:call)
       else
-        @object.class.api_auth_access_id
+        ret = @object.class.api_auth_access_id
+        ret = ret.call(@object) if ret.respond_to?(:call)
       end
+      ret
     end
 
     def api_auth_secret_key
+      ret = nil
       if object_is_class?
-        @object.api_auth_secret_key
+        ret = @object.api_auth_secret_key
+        ret = ret.call if ret.respond_to?(:call)
       else
-        @object.class.api_auth_secret_key
+        ret = @object.class.api_auth_secret_key
+        ret = ret.call(@object) if ret.respond_to?(:call)
       end
+      ret
     end
 
     def api_auth_options

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.8.8"
+  VERSION = "1.8.9"
 end

data/spec/lib/request_spec.rb

@@ -83,6 +83,14 @@ describe Flexirest::Request do
       get :all, "/"
     end
 
+    class ApiAuthProcExampleClient < Flexirest::Base
+      base_url "http://www.example.com"
+      api_auth_credentials( Proc.new { |obj| obj ? "key-#{obj.id}" : "key" },
+                            Proc.new { |obj| obj ? "secret-#{obj.id}" : "secret" }
+                          )
+      get :all, "/"
+    end
+
     class ProcDefaultExampleClient < Flexirest::Base
       base_url "http://www.example.com"
       get :all, "/", defaults: (Proc.new do |params|
@@ -217,14 +225,14 @@ describe Flexirest::Request do
     AuthenticatedExampleClient.all
   end
 
-  it "should get an HTTP connection with authentication using procs when called in a class context" do
+  it "should get an HTTP connection with basic authentication using procs when called in a class context" do
     connection = double(Flexirest::Connection).as_null_object
     expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://bill:jones@www.example.com").and_return(connection)
     expect(connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     AuthenticatedProcExampleClient.all
   end
 
-  it "should get an HTTP connection with authentication using procs when called in an object context" do
+  it "should get an HTTP connection with basic authentication using procs when called in an object context" do
     connection = double(Flexirest::Connection).as_null_object
     expect(Flexirest::ConnectionManager).to receive(:get_connection).with("http://bill-1:jones-1@www.example.com").and_return(connection)
     expect(connection).to receive(:get).with("/?id=1", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
@@ -232,6 +240,19 @@ describe Flexirest::Request do
     obj.all
   end
 
+  it "should get an HTTP connection with API authentication using procs when called in a class context" do
+    header_expectation = {headers: {"Accept"=>"application/hal+json, application/json;q=0.5", "Content-Type"=>"application/x-www-form-urlencoded; charset=utf-8"}, api_auth: {api_auth_access_id: "key", api_auth_secret_key: "secret", api_auth_options: {}}}
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", header_expectation).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
+    ApiAuthProcExampleClient.all
+  end
+
+  it "should get an HTTP connection with API authentication using procs when called in an object context" do
+    header_expectation = {headers: {"Accept"=>"application/hal+json, application/json;q=0.5", "Content-Type"=>"application/x-www-form-urlencoded; charset=utf-8"}, api_auth: {api_auth_access_id: "key-1", api_auth_secret_key: "secret-1", api_auth_options: {}}}
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/?id=1", header_expectation).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
+    obj = ApiAuthProcExampleClient.new(id: 1)
+    obj.all
+  end
+
   it "should get an HTTP connection when called and call get on it" do
     expect_any_instance_of(Flexirest::Connection).to receive(:get).with("/", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:'{"result":true}', response_headers:{})))
     ExampleClient.all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler