lhs 15.2.4 → 15.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 065d4f6623803cb198313fad6600902190ee982a
-  data.tar.gz: f93e91649e7f464da69cdddb63e2ddd11f9ca204
+  metadata.gz: 74a7df6c84bd30e35e9a0d4fe14bd0d4023c71e0
+  data.tar.gz: 899c8e3029fbee1bc9f42b68022eb0fd38d4fc5a
 SHA512:
-  metadata.gz: b3f6b6026982ef4b1582395758e536e2c01b0e7e987063ce1872a493466999d341bbe664717c41fea6c5de031c6731c29ce6c57b4f0cd68fce7ea2e0bdfc013d
-  data.tar.gz: 22c1b2e5d8b62fa1b570143ee8e532b523e38f7e425a0aca5dd5d14a3a2e5c61b207bab261d376ff0b0b75f6b82ec3b43bb63ff89c6e4b17f67088d191d30f0a
+  metadata.gz: 2dba61e4adcd12cd589c585bdf3d4fc96647b015c331d3b8ff55a681089019fe3f19f4f68860fb2b4a224332a3af447b701c1f05de7b59ead1f4459cc8cc60a5
+  data.tar.gz: 94e90e2cb651d2518b138cf76691f6dbc8c544ab14e619cb23c1dd1fc67e29680d3b93ac16e8471ce019ff4457de5fd1e4d60b2fa29fd2fa0fe392bec20f1bee

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

@@ -105,10 +105,19 @@ class LHS::Record
           .each_with_index do |item, index|
             item_addition = addition[index]
             next if item_addition.nil? || item.nil?
-            item.merge! item_addition._raw
+            if item_addition._raw.is_a?(Array)
+              extend_base_collection_with_array!(item, item_addition._raw)
+            else
+              item.merge! item_addition._raw
+            end
           end
       end
 
+      def extend_base_collection_with_array!(item, addition)
+        item[items_key] ||= []
+        item[items_key].concat(addition)
+      end
+
       def extend_base_array!(data, addition, key)
         data[key].zip(addition) do |item, additional_item|
           item._raw.merge!(additional_item._raw) if additional_item.present?
@@ -190,7 +199,14 @@ class LHS::Record
         if addition.item?
           (addition._raw.keys - [:href]).empty?
         elsif addition.collection?
-          addition.all? { |item| item && (item._raw.keys - [:href]).empty? }
+          addition.all? do |item|
+            next if item.blank?
+            if item._raw.is_a?(Hash)
+              (item._raw.keys - [:href]).empty?
+            elsif item._raw.is_a?(Array)
+              item.any? { |item| (item._raw.keys - [:href]).empty? }
+            end
+          end
         end
       end
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '15.2.4'
+  VERSION = '15.2.5'
 end

data/spec/record/includes_spec.rb

@@ -560,4 +560,48 @@ describe LHS::Record do
       expect(places[1].category_relations[0].name).to eq 'Drinks'
     end
   end
+
+  context 'single href with array response' do
+    it 'extends base items with arrays' do
+      class Sector < LHS::Record
+        endpoint '{+datastore}/sectors'
+        endpoint '{+datastore}/sectors/{id}'
+      end
+
+      stub_request(:get, "#{datastore}/sectors")
+        .with(query: hash_including(key: 'my_service'))
+        .to_return(body: [
+          {
+            href: "#{datastore}/sectors/1",
+            services: {
+              href: "#{datastore}/sectors/1/services"
+            },
+            keys: [
+              {
+                key: 'my_service',
+                language: 'de'
+              }
+            ]
+          }
+        ].to_json)
+
+      stub_request(:get, "#{datastore}/sectors/1/services")
+        .to_return(body: [
+          {
+            href: "#{datastore}/services/s1",
+            price_in_cents: 9900,
+            key: 'my_service_service_1'
+          },
+          {
+            href: "#{datastore}/services/s2",
+            price_in_cents: 19900,
+            key: 'my_service_service_2'
+          }
+        ].to_json)
+
+      sector = Sector.includes(:services).find_by(key: 'my_service')
+      expect(sector.services.length).to eq 2
+      expect(sector.services.first.key).to eq 'my_service_service_1'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 15.2.4
+  version: 15.2.5
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.3.0
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services