lhs 25.2.0 → 26.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ba3545c4f37d2becb37fbe7efb328a942af240d6a4d03e64fea4890e766969
-  data.tar.gz: 9cd64f9e1222e7f0f4cb041bdf967c257a2f0fd3ef1564618a65650e23a07ec1
+  metadata.gz: abbbaed93b7775580684622aaf8a8dcf7d70825e2105b5ed06f2745f37342d55
+  data.tar.gz: 5770ea1e8b270c46e9839b49098515ef36eb396a9ed4fe96af6ce0bfa81d5139
 SHA512:
-  metadata.gz: a9c87bfbc21370b89591c0b7a58bf30a24d8123ccbd41280f418afd69a5ebae47d05e0367fabdc7b7a0441a3cdf9729da8fee97b1c2fd5c39fbc757a7c1a0e6e
-  data.tar.gz: 4ef0c1857ba4983df1c567ea3ffee56ef5348e195e000beed34b4d91d7d372effc9c7fcbeb0d59419aebad7477926ece0e8938b9dfab936827603a8488f051a8
+  metadata.gz: '018e106cccf4b3d509472294e6764a1fa8f4c2a966d73884a5291f4c64aa7517fb43891e47a2b7726ec4a80142658987e77514154df08bfca63a80e457657456'
+  data.tar.gz: 20ce99451144a5c6de593a325a8b99fb962889c48c27dd682ba70814d196bd26fe73851b4ba9c5137e677186b6bce444f901648a3585a27659afd845874e2e60

data/lhs.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemodel'
   s.add_dependency 'activesupport', '>= 4.2.11'
-  s.add_dependency 'lhc', '>= 12.1.1', '< 14'
+  s.add_dependency 'lhc', '>= 12.1.1', '< 16'
   s.add_dependency 'local_uri'
 
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'json', '>=  1.8.2'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-byebug'
-  s.add_development_dependency 'rails', '>= 4.2.11'
+  s.add_development_dependency 'rails', '>= 4.2.11', '< 7'
   s.add_development_dependency 'rollbar', '<= 2.24.0'
   s.add_development_dependency 'rspec-rails', '>= 3.7.0'
   s.add_development_dependency 'rubocop', '~> 0.57.1'

data/lib/lhs/concerns/item/save.rb

@@ -34,7 +34,7 @@ class LHS::Item < LHS::Proxy
     private
 
     def apply_default_creation_options(options, url, data)
-      options = options.merge(method: :post, url: url, body: data)
+      options = options.merge(method: options.fetch(:method, :post), url: url, body: data)
       options[:headers] ||= {}
       options
     end

data/lib/lhs/interceptors/auto_oauth/interceptor.rb

@@ -10,7 +10,7 @@ module LHS
       class Interceptor < LHC::Interceptor
 
         def before_request
-          request.options[:auth] = { bearer: token }
+          request.options[:auth] ||= { bearer: token }
         end
 
         def tokens

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '25.2.0'
+  VERSION = '26.1.0'
 end

data/spec/auto_oauth_spec.rb

@@ -165,5 +165,46 @@ describe 'Auto OAuth Authentication', type: :request, dummy_models: true do
         expect(records_request).to have_been_requested
       end
     end
+
+    context 'overriding auth options with provider enabled for auto oauth' do
+
+      let(:token) { ApplicationController::ACCESS_TOKEN }
+      let(:overridden_token) { 'ACCESS_TOKEN' }
+
+      let(:record_request) do
+        stub_request(:get, "http://internalservice/v2/records/1")
+          .with(
+            headers: { 'Authorization' => "Bearer #{overridden_token}" }
+          ).to_return(status: 200, body: { name: 'Record' }.to_json)
+      end
+
+      let(:records_request) do
+        stub_request(:get, "http://internalservice/v2/records?color=blue")
+          .with(
+            headers: { 'Authorization' => "Bearer #{overridden_token}" }
+          ).to_return(status: 200, body: { items: [{ name: 'Record' }] }.to_json)
+      end
+
+      before do
+        LHS.configure do |config|
+          config.auto_oauth = -> { access_token }
+        end
+        LHC.configure do |config|
+          config.interceptors = [LHC::Auth]
+        end
+        record_request
+        records_request
+      end
+
+      after do
+        LHC.config.reset
+      end
+
+      it 'applies OAuth credentials for the individual request automatically' do
+        get '/automatic_authentication/oauth_with_provider_override', params: { access_token: overridden_token }
+        expect(record_request).to have_been_requested
+        expect(records_request).to have_been_requested
+      end
+    end
   end
 end

data/spec/dummy/app/controllers/automatic_authentication_controller.rb

@@ -26,4 +26,11 @@ class AutomaticAuthenticationController < ApplicationController
       records: DummyRecordWithAutoOauthProvider.where(color: 'blue').as_json
     }
   end
+
+  def o_auth_with_provider_override
+    render json: {
+      record: DummyRecordWithAutoOauthProvider.options(auth: { bearer: params[:access_token] }).find(1).as_json,
+      records: DummyRecordWithAutoOauthProvider.options(auth: { bearer: params[:access_token] }).where(color: 'blue').as_json
+    }
+  end
 end

data/spec/dummy/config/routes.rb

@@ -7,6 +7,7 @@ Rails.application.routes.draw do
   get 'automatic_authentication/oauth' => 'automatic_authentication#o_auth'
   get 'automatic_authentication/oauth_with_multiple_providers' => 'automatic_authentication#o_auth_with_multiple_providers'
   get 'automatic_authentication/oauth_with_provider' => 'automatic_authentication#o_auth_with_provider'
+  get 'automatic_authentication/oauth_with_provider_override' => 'automatic_authentication#o_auth_with_provider_override'
 
   # Request Cycle Cache
   get 'request_cycle_cache/simple' => 'request_cycle_cache#simple'

data/spec/item/save_spec.rb

@@ -112,4 +112,14 @@ describe LHS::Item do
       expect(request).to have_been_requested
     end
   end
+
+  context 'chainable' do
+    it 'allows to chain save with options' do
+      stub_request(:put, item.href).with(body: item._raw.merge(name: 'Steve').to_json)
+      item.name = 'Steve'
+      result = item.options(method: :put).save
+
+      expect(result).to eq true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 25.2.0
+  version: 26.1.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -47,7 +47,7 @@ dependencies:
         version: 12.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: 12.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '14'
+        version: '16'
 - !ruby/object:Gem::Dependency
   name: local_uri
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,6 +145,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.11
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rollbar
   requirement: !ruby/object:Gem::Requirement