lhs 14.0.1 → 14.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 726e88dd1603afc34575f3ca68bbf387a89b3530
-  data.tar.gz: 5f42ac2b71bc70c99551699fd76dc3b004e8f65d
+  metadata.gz: 7522953bf45a34511846a1b84fb66d60afb359ef
+  data.tar.gz: 1cc7f7f9efda635f6421370dce4f9701d2ff5bbf
 SHA512:
-  metadata.gz: a781414e59d524e1e84e75a3c0e11814fabf798f16386cbe97f61f6477bef81773db14d7803468fad704c3dde268fd233395255438addd662d779abb4b70dbd9
-  data.tar.gz: 604b34609d75eec04bfdd7c874f9e8139eb21ee74466fd0db108f5c131c8b17eb314325a5726a3d26b3662301559a80472250bd2b3844d0fcf0e7c61ebffae34
+  metadata.gz: 85a6f023c1e558947992ba04f93a37dac7fb9d7465cf4aafa1c5d92d4b950205cf227c56af63cd20f7545cdf2ce20c7a15d1ee51ff5998e603a2d9f02626f7f8
+  data.tar.gz: 74dcce5b6bc450bb9d2791c91b4b3b15171db2226b89b8d7b296746eff53640c7c5e73da516d9fc8a4bd0f39a6cb4b7a964f7e71475746606bf221b4a0d637a3

data/.rubocop.yml

@@ -29,3 +29,6 @@ Rails/DynamicFindBy:
   
 Metrics/BlockLength:
   Enabled: false
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false

data/lhs.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.requirements << 'Ruby >= 2.3.0'
   s.required_ruby_version = '>= 2.3.0'
 
-  s.add_dependency 'lhc', '>= 6.3.1'
+  s.add_dependency 'lhc', '>= 6.4.0'
   s.add_dependency 'activesupport', '> 4.2'
   s.add_dependency 'activemodel'
 

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

@@ -311,9 +311,9 @@ class LHS::Record
       end
 
       def resolve
-        @resolved ||= @record_class.new(
-          @record_class.request(resolved_options)
-        )
+        return @resolved if defined?(@resolved)
+        response_data = @record_class.request(resolved_options)
+        @resolved = response_data ? @record_class.new(response_data) : nil
       end
 
       def resolved_options

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

@@ -17,8 +17,8 @@ class LHS::Record
           else
             find_by_id(args, options)
           end
-        return data if data.is_a?(Array) || !data._record
-        data._record.new(data)
+        return data if data && (data.is_a?(Array) || !data._record)
+        data ? data._record.new(data) : nil
       end
 
       private

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

@@ -24,9 +24,9 @@ class LHS::Record
         options ||= {}
         params = params.dup.merge(limit: 1).merge(options.fetch(:params, {}))
         data = request(options.merge(params: params))
-        if data._proxy.is_a?(LHS::Collection)
+        if data && data._proxy.is_a?(LHS::Collection)
           data.first || raise(LHC::NotFound.new('No item was found.', data._request.response))
-        else
+        elsif data
           data._record.new(data)
         end
       end

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

@@ -495,6 +495,7 @@ class LHS::Record
         endpoint = find_endpoint(options[:params], options.fetch(:url, nil))
         apply_limit!(options) if options[:all]
         response = LHC.request(process_options(options, endpoint))
+        return nil if response.error_ignored?
         data = LHS::Data.new(response.body, nil, self, response.request, endpoint)
         single_request_load_and_merge_remaining_objects!(data, options, endpoint)
         expand_items(data, options[:expanded]) if data.collection? && options[:expanded]

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "14.0.1"
+  VERSION = "14.0.2"
 end

data/spec/record/ignore_errors_spec.rb

@@ -78,4 +78,34 @@ describe LHS::Record do
       .fetch
     expect(record).to eq nil
   end
+
+  context 'response body' do
+
+    let(:body) { { error_message: 'you are not worthy' }.to_json }
+
+    it 'returns nil also when ignoring errors on find' do
+      stub_request(:get, "http://local.ch/v2/records/1").to_return(status: 500, body: body)
+      record = Record
+        .ignore(LHC::Error)
+        .find(1)
+      expect(record).to eq nil
+    end
+
+    it 'returns nil also when ignoring errors on find' do
+      stub_request(:get, "http://local.ch/v2/records?color=blue").to_return(status: 500, body: body)
+      record = Record
+        .ignore(LHC::Error)
+        .where(color: 'blue')
+        .fetch
+      expect(record).to eq nil
+    end
+
+    it 'returns nil also when ignoring errors on find' do
+      stub_request(:get, "http://local.ch/v2/records?color=blue&limit=1").to_return(status: 500, body: body)
+      record = Record
+        .ignore(LHC::Error)
+        .find_by(color: 'blue')
+      expect(record).to eq nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 14.0.1
+  version: 14.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.3.1
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement