lhs 19.0.0 → 19.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b527b1361f3271ef942872409972d6ad2b7e15110b46ef0ec4c538419d7356
-  data.tar.gz: a20166a8a53f5997fc78ca86198c51adb89485e9b406ffc040016ca060050e9a
+  metadata.gz: 3877f76874bcb34f2627b1c88810a610fae7cc7c5eaf3398d8a13825896c84a2
+  data.tar.gz: 6640dcf74957e4cb8a526f07ec6411b327fc52d29eb5da8207b0cfa60efbb743
 SHA512:
-  metadata.gz: 1685d5df2ad15049e2e9afb1977130782735b87f00fd3a3b4d586537aca791c9d0bbfb3dd914866b15aa2cbed4a0b94fc327174f6bd5e5bdb8bffe4e47769e0d
-  data.tar.gz: 6b1bc8d53d681a6da347c2f42046192f245b4fab9e934291ee7d63d1644e4c313347c70b9b37d07e8bcb684b628d862304e1978d38ea2e1e831b0e37005dce9d
+  metadata.gz: efcafa00c531b5f8b91b13168daa5f9502f9d6aca3ec52ede815246e32052fa75f064099460fb2db9102be644c7d3219b78b23d441374612adf7aad181c16c96
+  data.tar.gz: 8e30bb7d0e5ceee64a03978d89c14f608a35f4f728940ea51dcae7f571bee1bf51e90695b9b86b9c3ec90df8aaddd249cc40e6c45517402205654e300e80d4a1

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

@@ -147,7 +147,7 @@ class LHS::Record
       def extend_base_item_with_hash_of_items!(target, addition)
         LHS::Collection.nest(input: target._raw, value: [], record: self)
         if LHS::Collection.access(input: target._raw, record: self).empty?
-          LHS::Collection.nest(input: target._raw, value: addition.map(&:_raw), record: self)
+          LHS::Collection.nest(input: target._raw, value: addition.compact.map(&:_raw), record: self)
         else
           LHS::Collection.access(input: target._raw, record: self).each_with_index do |item, index|
             item.merge!(addition[index])
@@ -242,7 +242,7 @@ class LHS::Record
           load_and_merge_paginated_collection!(data, options)
         elsif data.collection? && paginated?(data.first.try(:_raw))
           load_and_merge_set_of_paginated_collections!(data, options)
-        elsif load_not_paginated_collection
+        elsif load_not_paginated_collection && data.collection?
           warn('[Warning] "all" has been requested, but endpoint does not provide pagination meta data. If you just want to fetch the first response, use "where" or "fetch".')
           load_and_merge_not_paginated_collection!(data, options)
         end

data/lib/lhs/version.rb

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

data/spec/record/includes_all_spec.rb

@@ -523,4 +523,45 @@ describe LHS::Record do
       end
     end
   end
+
+  context 'includes collection trough single item' do
+
+    before do
+      class Place < LHS::Record
+        endpoint 'https://places/{id}'
+      end
+
+      stub_request(:get, 'https://places/1')
+        .to_return(
+          body: {
+            customer: { href: 'https://customers/1' }
+          }.to_json
+        )
+
+      stub_request(:get, 'https://customers/1?limit=100')
+        .to_return(
+          body: {
+            addresses: { 'href': 'https://customer/1/addresses' }
+          }.to_json
+        )
+
+      stub_request(:get, 'https://customer/1/addresses?limit=100')
+        .to_return(
+          body: {
+            items: [
+              { city: 'Zurich', no: 1 },
+              { city: 'Zurich', no: 2 }
+            ],
+            total: 2
+          }.to_json
+        )
+    end
+
+    it 'includes a collection trough a single item without exceptions' do
+      place = Place
+        .includes_all(customer: :addresses)
+        .find(1)
+      expect(place.customer.addresses.map(&:no)).to eq [1, 2]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 19.0.0
+  version: 19.0.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -472,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like