lhs 25.0.2 → 25.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '030995aefe88b5d0494d0e7ccaa760eb2a67d8ebf728ce4aaaa8646ca5b130ef'
-  data.tar.gz: af0e530a38ff5c816a797613506b40c996f58aea8c391ca59099d1ee6152ce00
+  metadata.gz: 7aa5e0e072a78d7029c968c255ac6c41e5425504b7e121fc5c205a672c59d4a7
+  data.tar.gz: 59a90ded930e12b7cc54842db415d5d0f2c09ade777eaccc44d9703d4bc1f46a
 SHA512:
-  metadata.gz: 70859dbf4582c03d84edeb5aa6b750ee76a4908e2bd43e9c324b4ab8ca318da457087f2b95d3c433e570f48d2ee4a6cc691dd821830c82f86acc44f7e8ff4652
-  data.tar.gz: ab20d6595519d82cf47a9b203f0e246062ce6d611c9997c4ae50cc3fb33c0b1378c911415df845ddbc2f714c98bc05d63c562e5364227a7ccba1a573af9f1954
+  metadata.gz: e953b0d8278c209f1a398298d6bbf85b91469cf285bc7c0470b401cacfce2db7b692822e7d13488c4b36c823cef1c093bc8ffb4a5d2d53ab5782765589711b07
+  data.tar.gz: d7124e16eca63583fb58922354253c902bbd86e0079c22e3d8b864a7a80b8acd098128a67c2e32cfe45c6ed28d19158def5a063fec174bdba364435b11054d92

data/lib/lhs/collection.rb

@@ -14,7 +14,7 @@ class LHS::Collection < LHS::Proxy
 
   METHOD_NAMES_EXLCUDED_FROM_WRAPPING = %w(to_a to_ary map).freeze
 
-  delegate :select, :length, :size, to: :_collection
+  delegate :select, :length, :size, :insert, to: :_collection
   delegate :_record, :_raw, to: :_data
   delegate :limit, :count, :total, :offset, :current_page, :start,
            :next?, :previous?, to: :_pagination

data/lib/lhs/concerns/collection/internal_collection.rb

@@ -14,7 +14,7 @@ class LHS::Collection < LHS::Proxy
 
       attr_accessor :raw
       delegate :length, :size, :first, :last, :sample, :[], :present?, :blank?, :empty?,
-               :<<, :push, to: :raw
+               :<<, :push, :insert, to: :raw
 
       def initialize(raw, parent, record)
         self.raw = raw

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

@@ -29,7 +29,10 @@ class LHS::Record
         if options.is_a?(Hash)
           options.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options)
         elsif options.is_a?(Array)
-          options.map { |option| option.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options) }
+          options.map do |option|
+            return LHS::OptionBlocks::CurrentOptionBlock.options unless option
+            option.deep_merge(LHS::OptionBlocks::CurrentOptionBlock.options)
+          end
         end
       end
 
@@ -118,7 +121,7 @@ class LHS::Record
         else
           options = options_for_data(data, included)
           options = extend_with_reference(options, reference)
-          addition = load_include(options, data, sub_includes, reference)
+          addition = load_existing_includes(options, data, sub_includes, reference)
           data.extend!(addition, included)
           expand_addition!(data, included, reference) unless expanded_data?(addition)
         end
@@ -277,6 +280,21 @@ class LHS::Record
         end
       end
 
+      def load_existing_includes(options, data, sub_includes, references)
+        if data.collection? && data.any?(&:blank?)
+          # filter only existing items
+          loaded_includes = load_include(options.compact, data.compact, sub_includes, references)
+          # fill up skipped items before returning
+          data.each_with_index do |item, index|
+            next if item.present?
+            loaded_includes.insert(index, {})
+          end
+          loaded_includes
+        else
+          load_include(options, data, sub_includes, references)
+        end
+      end
+
       # Load additional resources that are requested with include
       def load_include(options, _data, sub_includes, references)
         record = record_for_options(options) || self

data/lib/lhs/version.rb

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

data/spec/record/includes_missing_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHS::Record do
+
+  context 'merge request options ' do
+    before do
+      class Record < LHS::Record
+        endpoint 'http://records/{id}'
+      end
+
+      stub_request(:get, 'http://records/1')
+        .to_return(body: {
+          place_attributes: [
+            { href: 'https://attributes/bar' },
+            { href: 'https://attributes/restaurant' },
+            { href: 'https://attributes/cafe' }
+          ]
+        }.to_json)
+
+      stub_request(:get, "https://attributes/restaurant?limit=100")
+        .to_return(body: {}.to_json)
+      stub_request(:get, "https://attributes/restaurant")
+        .to_return(body: {}.to_json)
+      stub_request(:get, "https://attributes/bar?limit=100")
+        .to_return(body: {
+          group: {
+            href: 'https://group/general'
+          }
+        }.to_json)
+      stub_request(:get, "https://attributes/cafe?limit=100")
+        .to_return(body: {
+          group: {
+            href: 'https://group/general'
+          }
+        }.to_json)
+      stub_request(:get, "https://group/general?limit=100&status=active")
+        .to_return(body: {
+          name: 'General'
+        }.to_json)
+    end
+
+    context 'missing referenced options due to none existance of include' do
+
+      it 'does not raise when trying to merge options with the options block' do
+        LHS.options(throttle: { break: '80%' }) do
+          record = Record
+            .references(place_attributes: { group: { params: { status: 'active' } } })
+            .includes([{ place_attributes: :group }])
+            .find(1)
+          expect(record.place_attributes[0].group.name).to eq 'General'
+          expect(record.place_attributes[1].group).to eq nil
+          expect(record.place_attributes[2].group.name).to eq 'General'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 25.0.2
+  version: 25.0.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -507,6 +507,7 @@ files:
 - spec/record/immutable_chains_spec.rb
 - spec/record/includes_expanded_spec.rb
 - spec/record/includes_first_page_spec.rb
+- spec/record/includes_missing_spec.rb
 - spec/record/includes_spec.rb
 - spec/record/includes_warning_spec.rb
 - spec/record/item_key_spec.rb
@@ -738,6 +739,7 @@ test_files:
 - spec/record/immutable_chains_spec.rb
 - spec/record/includes_expanded_spec.rb
 - spec/record/includes_first_page_spec.rb
+- spec/record/includes_missing_spec.rb
 - spec/record/includes_spec.rb
 - spec/record/includes_warning_spec.rb
 - spec/record/item_key_spec.rb