lhs 23.0.2 → 24.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4598d2f5041bf799a481dd7fb9ddbe6767acfdc799de851a7592228023d70f96
-  data.tar.gz: 3688dabba7d80461e187b93107ba785d081bedb8be8b008eadebe00c43513e72
+  metadata.gz: e31a9b37f1bc0f12b3a6c87933b145781ed3054e08ea4ea347d5b27d00a069ea
+  data.tar.gz: d67f414e70fdcae5567dcf5c81c2e2dec93237026e829c9dc9522df5eb778480
 SHA512:
-  metadata.gz: 73d23712b3ee30c3e55fb11f95be384144ff521580ddb1afd7c3e70694aa3c57778f6a5bf751576e9a633e53720419147aadb249c4d076b0428caa0d30617829
-  data.tar.gz: 95f2eb1975d019b0f5ea57e20225552c459c6784a9584f5a79d6c45a0e92d3fd42eebfdbd010d6f00350ab750bb447ae6b50133537cec002d3aa9f6ff3d8ac73
+  metadata.gz: f39832a96aa989660bfbaf051c53bd53c647d4e75f7b9fa3ca81ab1243ec94bd17828da931207f80fd57a9f98f38188cca659143912a01a4ffc5e197090f6b3a
+  data.tar.gz: 19ea228303da96f4f4e831825c19c98ea9a81c15b76ad645b3ecbe23532f0a7336eb87d815f432f2d25ee5d6f0c07d98963ed0ba5388022cd79521cd0ae04424

data/README.md

@@ -979,7 +979,7 @@ If you need to render some different view in Rails based on an LHS error raised
 
 def show
   @records = Record
-    .handle(LHC::Error, ->(error){ handle_error(error) })
+    .rescue(LHC::Error, ->(error){ rescue_from(error) })
     .where(color: 'blue')
   render 'show'
   render_error if @error
@@ -987,7 +987,7 @@ end
 
 private
 
-def handle_error(error)
+def rescue_from(error)
   @error = error
   nil
 end
@@ -1012,7 +1012,7 @@ If you want to inject values for the failing records, that might not have been f
 # app/controllers/some_controller.rb
 
 data = Record
-  .handle(LHC::Unauthorized, ->(response) { Record.new(name: 'unknown') })
+  .rescue(LHC::Unauthorized, ->(response) { Record.new(name: 'unknown') })
   .find(1, 2, 3)
 
 data[1].name # 'unknown'
@@ -2286,7 +2286,7 @@ Here is another example, if you want to ignore errors, that occure while you fet
 
 feedback = Feedback
   .includes(campaign: :entry)
-  .references(campaign: { ignored_errors: [LHC::NotFound] })
+  .references(campaign: { ignore: LHC::NotFound })
   .find(12345)
 ```
 

data/lhs.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemodel'
   s.add_dependency 'activesupport', '>= 4.2.11'
-  s.add_dependency 'lhc', '>= 11.2.0', '< 12'
+  s.add_dependency 'lhc', '>= 12.1.1', '< 13'
   s.add_dependency 'local_uri'
 
   s.add_development_dependency 'capybara'

data/lib/lhs/concerns/record/chainable.rb

@@ -52,7 +52,7 @@ class LHS::Record
         Chain.new(self, Pagination.new(per: argument))
       end
 
-      def handle(error_class, handler)
+      def rescue(error_class, handler)
         Chain.new(self, ErrorHandling.new(error_class => handler))
       end
 
@@ -255,7 +255,7 @@ class LHS::Record
         push(Pagination.new(per: argument))
       end
 
-      def handle(error_class, handler)
+      def rescue(error_class, handler)
         push(ErrorHandling.new(error_class => handler))
       end
 
@@ -348,8 +348,8 @@ class LHS::Record
       def resolved_options
         options = chain_options
         options = options.deep_merge(params: chain_parameters.merge(chain_pagination))
-        options = options.merge(error_handler: chain_error_handler) if chain_error_handler.present?
-        options = options.merge(ignored_errors: chain_ignored_errors) if chain_ignored_errors.present?
+        options = options.merge(rescue: chain_error_handler) if chain_error_handler.present?
+        options = options.merge(ignore: chain_ignored_errors) if chain_ignored_errors.present?
         options = options.merge(including: chain_includes) if chain_includes.present?
         options = options.merge(referencing: chain_references) if chain_references.present?
         options

data/lib/lhs/concerns/record/request.rb

@@ -504,7 +504,7 @@ class LHS::Record
         options = options.deep_dup
         options[:ignored_errors] = ignored_errors if ignored_errors.present?
         options[:params]&.deep_symbolize_keys!
-        options[:error_handler] = merge_error_handlers(options[:error_handler]) if options[:error_handler]
+        options[:rescue] = merge_error_handlers(options[:rescue]) if options[:rescue]
         options = (provider_options || {})
           .deep_merge(endpoint.options || {})
           .deep_merge(options)

data/lib/lhs/version.rb

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

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

@@ -6,7 +6,7 @@ class ErrorHandlingWithChainsController < ApplicationController
   # in the view (during render 'show')
   def fetch_in_view
     @records = DummyRecord
-      .handle(LHC::Error, ->(error) { handle_error(error) })
+      .rescue(LHC::Error, ->(error) { handle_error(error) })
       .where(color: 'blue')
     render 'show'
     render_error if @error
@@ -16,7 +16,7 @@ class ErrorHandlingWithChainsController < ApplicationController
   # before the view is rendered
   def fetch_in_controller
     @records = DummyRecord
-      .handle(LHC::Error, ->(error) { handle_error(error) })
+      .rescue(LHC::Error, ->(error) { handle_error(error) })
       .where(color: 'blue').fetch
     render 'show'
     render_error if @error

data/spec/record/error_handling_spec.rb

@@ -15,14 +15,14 @@ describe LHS::Record do
 
   it 'allows to chain error handling' do
     expect {
-      Record.where(color: 'blue').handle(LHC::Error, ->(_error) { handler.handle }).first
+      Record.where(color: 'blue').rescue(LHC::Error, ->(_error) { handler.handle }).first
     }.not_to raise_error
     expect(handler).to have_received(:handle)
   end
 
   it 'reraises in case chained error is not matched' do
     expect {
-      Record.where(color: 'blue').handle(LHC::Conflict, ->(_error) { handler.handle }).first
+      Record.where(color: 'blue').rescue(LHC::Conflict, ->(_error) { handler.handle }).first
     }.to raise_error(LHC::Error)
     expect(handler).not_to have_received(:handle)
   end
@@ -30,8 +30,8 @@ describe LHS::Record do
   it 'calls all the handlers' do
     expect {
       Record.where(color: 'blue')
-        .handle(LHC::Error, ->(_error) { handler.handle_1 })
-        .handle(LHC::Error, ->(_error) { handler.handle_2 })
+        .rescue(LHC::Error, ->(_error) { handler.handle_1 })
+        .rescue(LHC::Error, ->(_error) { handler.handle_2 })
         .first
     }.not_to raise_error
     expect(handler).to have_received(:handle_1)

data/spec/record/find_in_parallel_spec.rb

@@ -33,7 +33,7 @@ describe LHS::Record do
     it 'applies error handlers from the chain and returns whatever the error handler returns' do
       stub_request(:get, "http://datastore/records/2").to_return(status: 401)
       data = Record
-        .handle(LHC::Unauthorized, ->(_response) { Record.new(name: 'unknown') })
+        .rescue(LHC::Unauthorized, ->(_response) { Record.new(name: 'unknown') })
         .find(1, 2, 3)
       expect(data[1].name).to eq 'unknown'
     end

data/spec/record/handle_includes_errors_spec.rb

@@ -25,7 +25,7 @@ describe LHS::Record do
 
   it 'allows to pass error_handling for includes to LHC' do
     handler = ->(_) { return { deleted: true } }
-    record = Record.includes_first_page(:other).references(other: { error_handler: { LHC::NotFound => handler } }).find(id: 1)
+    record = Record.includes_first_page(:other).references(other: { rescue: { LHC::NotFound => handler } }).find(id: 1)
 
     expect(record.other.deleted).to be(true)
   end

data/spec/record/includes_first_page_spec.rb

@@ -249,7 +249,7 @@ describe LHS::Record do
     it 'ignores LHC::NotFound for links that cannot be included if configured so with reference options' do
       feedback = Feedback
         .includes_first_page(campaign: :entry)
-        .references(campaign: { ignored_errors: [LHC::NotFound] })
+        .references(campaign: { ignore: [LHC::NotFound] })
         .find(123)
       expect(feedback.campaign._raw.keys.length).to eq 1
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 23.0.2
+  version: 24.0.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 12.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.2.0
+        version: 12.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '12'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: local_uri
   requirement: !ruby/object:Gem::Requirement