restful_resource 2.2.8 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec111ab5ac7ec4d10d07eaaff544481e7267280d
-  data.tar.gz: 97286bf61d3fce595bec163ecdacbb0fddaf2f54
+SHA256:
+  metadata.gz: eecf67a6ba417dae5f868966a577a527eaf35560ddf9ec17af5aa7070e9935bb
+  data.tar.gz: 4ddd23ce149cd8f4f9db30af2cdef923654771608108ed44ff8891199bb1643c
 SHA512:
-  metadata.gz: e82565fc5a04369d88a211c702e49f7bf95998a16fa00b39a64bcd97f598c4ccc2f68a6b4f0a90a82f85f98c59adb1205aa39c69fc17659311904e9b2a4f1ac6
-  data.tar.gz: 2b3c6af8446db0154e62f4b4809b020d8f30f1503f14d65bf989ae749feef95d0388c63a88ee36c55b08fe1b43bd478fcb43e6f990f2ae7947ab5552a2f36ab7
+  metadata.gz: 6893e6298085c0e14e28f5d08ca7ab9144eafea210d18eabeb865df3dfa9b670af1a9f0052db5a0c2ad84ed6f6b9061cb0e101b7724514385e9b14509ab138e4
+  data.tar.gz: 0f2c0c895a4ae9a77d17b6816a15cbd0cd17f0bdbb6e46417aebfd471f1c2e33e0f3c8c997016e7bb2213d25058c6b9525106bd870145a5e8efee0da15325d9a

data/Rakefile

@@ -9,12 +9,12 @@ desc "Upload to rubygems"
 task :upload => :build do
   # Check if tag with v#{ResearchSiteApiClient::VERSION} version exists, if so, return with error
 
-  if tag_exists?(current_tag_name)
-    puts "Tag exists, did you run rake increase_revision_number after merging with master?"
-    exit 1
-  end
+  # if tag_exists?(current_tag_name)
+  #   puts "Tag exists, did you run rake increase_revision_number after merging with master?"
+  #   exit 1
+  # end
 
-  create_tag(current_tag_name)
+  # create_tag(current_tag_name)
   Rake::Task[:release].invoke
 end
 

data/lib/restful_resource/base.rb

@@ -5,6 +5,7 @@ module RestfulResource
     def self.configure(base_url: nil,
                        username: nil,
                        password: nil,
+                       auth_token: nil,
                        logger: nil,
                        cache_store: nil,
                        instrumentation: {},
@@ -14,6 +15,7 @@ module RestfulResource
 
       @http = RestfulResource::HttpClient.new(username: username,
                                               password: password,
+                                              auth_token: auth_token,
                                               logger: logger,
                                               cache_store: cache_store,
                                               instrumentation: instrumentation,

data/lib/restful_resource/http_client.rb

@@ -70,6 +70,7 @@ module RestfulResource
 
     def initialize(username: nil,
                    password: nil,
+                   auth_token: nil,
                    logger: nil,
                    cache_store: nil,
                    connection: nil,
@@ -101,7 +102,12 @@ module RestfulResource
                                                         server_cache_instrument_name: instrumentation.fetch(:server_cache_instrument_name, nil),
                                                         faraday_config: faraday_config)
 
-      @connection.basic_auth(username, password) if username && password
+      if auth_token
+        @connection.headers[:authorization] = "Bearer #{auth_token}"
+      elsif username && password
+        @connection.basic_auth(username, password)
+      end
+
       @connection.headers[:user_agent] = build_user_agent(instrumentation[:app_name])
       @default_open_timeout = open_timeout
       @default_timeout = timeout

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = '2.2.8'
+  VERSION = '2.3.0'
 end

data/spec/restful_resource/base_spec.rb

@@ -313,6 +313,7 @@ RSpec.describe RestfulResource::Base do
   describe ".configure" do
      let(:username) { double }
      let(:password) { double }
+     let(:auth_token) { double }
      let(:logger) { double }
      let(:cache_store) { double }
      let(:instrumentation) { double }
@@ -321,6 +322,7 @@ RSpec.describe RestfulResource::Base do
     it "passes arguments to HttpClient" do
       expect(RestfulResource::HttpClient).to receive(:new).with(username: username,
                                                                 password: password,
+                                                                auth_token: auth_token,
                                                                 logger: logger,
                                                                 cache_store: cache_store,
                                                                 instrumentation: instrumentation,
@@ -329,6 +331,7 @@ RSpec.describe RestfulResource::Base do
       RestfulResource::Base.configure(base_url: 'http://foo.bar',
                                       username: username,
                                       password: password,
+                                      auth_token: auth_token,
                                       logger: logger,
                                       cache_store: cache_store,
                                       instrumentation: instrumentation,

data/spec/restful_resource/http_client_spec.rb

@@ -169,18 +169,36 @@ RSpec.describe RestfulResource::HttpClient do
   end
 
   describe 'Authentication' do
-    def http_client(connection)
-      described_class.new(connection: connection, username: 'user', password: 'passwd')
+    describe 'Basic auth' do
+      def http_client(connection)
+        described_class.new(connection: connection, username: 'user', password: 'passwd')
+      end
+
+      it 'should execute authenticated get' do
+        connection = faraday_connection do |stubs|
+          stubs.get('http://httpbin.org/basic-auth/user/passwd') { |env| [200, {}, nil] }
+        end
+
+        response = http_client(connection).get('http://httpbin.org/basic-auth/user/passwd', headers: {"Authorization"=>"Basic dXNlcjpwYXNzd2Q="})
+
+        expect(response.status).to eq 200
+      end
     end
 
-    it 'should execute authenticated get' do
-      connection = faraday_connection do |stubs|
-        stubs.get('http://httpbin.org/basic-auth/user/passwd') { |env| [200, {}, nil] }
+    describe 'Token auth' do
+      def http_client(connection)
+        described_class.new(connection: connection, auth_token: 'abc123')
       end
 
-      response = http_client(connection).get('http://httpbin.org/basic-auth/user/passwd', headers: {"Authorization"=>"Basic dXNlcjpwYXNzd2Q="})
+      it 'should execute authenticated get' do
+        connection = faraday_connection do |stubs|
+          stubs.get('http://httpbin.org/bearer', { 'Authorization' => 'Bearer abc123'} ) { |env| [200, {}, nil] }
+        end
 
-      expect(response.status).to eq 200
+        response = http_client(connection).get('http://httpbin.org/bearer', headers: { 'Authorization' => 'Bearer abc123'})
+
+        expect(response.status).to eq 200
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.3.0
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A simple activerecord inspired rest resource base class implemented using