lhs 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1375879a321c15e499ad2871e21ab93cda9b386b
-  data.tar.gz: dfa739b88f8c0f26bd47ce4722a9d145fb479ecd
+  metadata.gz: 5d7653bf52ccc6c331969c2b7f153014c05e30f3
+  data.tar.gz: 99ac462ec3a706a538693846ae0f7af83a49ba38
 SHA512:
-  metadata.gz: b457566f62fc9aae5f60287eae881b2a5cf2cf46c2de118a283b301d20b6d98126d93f816d46a70ed4714bb485dd0a2d971f022846864e91eb58764802779232
-  data.tar.gz: da2266a749937a72f6fb2510c054024c1f2171493a7a05c4cdf7321b4e2af45aaf67229adc756d9e4f7da7aedd360d47638a6a2fc56e7dadac947959561018bc
+  metadata.gz: 49afc23aef8a94f6ebe4d3da147f2275ec7e615712d426b927c01d49fbcf81f8454714e1615b1bf7fbf038dd651c7aab28b89420a8479634217aeedd7dfdc730
+  data.tar.gz: 471d79108df5e5c4e6fed9f05fa2d1db3befbf6038e6d866187bc1e6e850627d37d20475ea141b597828c771c80e5f9a7e8cfb1fa23d6c1cb3f62700148efffb

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

@@ -22,6 +22,12 @@ class LHS::Record
         end
       end
 
+      def without_including
+        class_clone_factory(rand.to_s.gsub(/\D/, '')).tap do |class_clone|
+          class_clone.including = nil
+        end
+      end
+
       private
 
       def unfold_args(args)

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

@@ -75,7 +75,18 @@ class LHS::Record
         if target._raw.is_a? Array
           data[key] = addition.map(&:_raw)
         else # hash with items
+          extend_base_item_with_hash_of_items!(target, addition)
+        end
+      end
+
+      def extend_base_item_with_hash_of_items!(target, addition)
+        target._raw[items_key] ||= []
+        if target._raw[items_key].empty?
           target._raw[items_key] = addition.map(&:_raw)
+        else
+          target._raw[items_key].each_with_index do |item, index|
+            item.merge!(addition[index])
+          end
         end
       end
 
@@ -92,17 +103,39 @@ class LHS::Record
 
       def handle_include(included, data, sub_includes = nil, references = nil)
         return if data.blank? || skip_loading_includes?(data, included)
-        options =
-          if data.collection?
-            options_for_multiple(data, included)
-          elsif data[included].collection?
-            options_for_nested_items(data, included)
-          else
-            url_option_for(data, included)
-          end
+        options = options_for_data(data, included)
         options = extend_with_references(options, references)
         addition = load_include(options, data, sub_includes)
         extend_raw_data!(data, addition, included)
+        expand_addition!(data, included) if no_expanded_data?(addition)
+      end
+
+      def options_for_data(data, included = nil)
+        return options_for_multiple(data, included) if data.collection?
+        return options_for_nested_items(data, included) if included && data[included].collection?
+        url_option_for(data, included)
+      end
+
+      def expand_addition!(data, included)
+        addition = data[included]
+        options = options_for_data(addition)
+        record = record_for_options(options) || self
+        options = convert_options_to_endpoints(options) if record_for_options(options)
+        expanded_data = begin
+          record.without_including.request(options)
+        rescue LHC::NotFound
+          LHS::Data.new({}, data, record)
+        end
+        extend_raw_data!(data, expanded_data, included)
+      end
+
+      def no_expanded_data?(addition)
+        return false if addition.blank?
+        if addition.item?
+          (addition._raw.keys - [:href]).empty?
+        elsif addition.collection?
+          addition.all? { |item| item && (item._raw.keys - [:href]).empty? }
+        end
       end
 
       # Extends request options with options provided for this reference
@@ -169,13 +202,13 @@ class LHS::Record
         array
       end
 
-      def options_for_multiple(data, key)
+      def options_for_multiple(data, key = nil)
         data.map do |item|
           url_option_for(item, key)
         end
       end
 
-      def options_for_nested_items(data, key)
+      def options_for_nested_items(data, key = nil)
         data[key].map do |item|
           url_option_for(item)
         end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "6.0.0"
+  VERSION = "6.1.0"
 end

data/spec/record/includes_spec.rb

@@ -337,6 +337,35 @@ describe LHS::Record do
     end
   end
 
+  context 'unexpanded response when requesting the included collection' do
+    it 'loads the collection and the single items, if not already expanded' do
+      class Customer < LHS::Record
+        endpoint ':datastore/customer/:id'
+      end
+
+      stub_request(:get, "#{datastore}/customer/1")
+        .to_return(body: {
+          places: {
+            href: "#{datastore}/places"
+          }
+        }.to_json)
+
+      stub_request(:get, "#{datastore}/places")
+        .to_return(body: {
+          items: [{ href: "#{datastore}/places/1" }]
+        }.to_json)
+
+      item_request = stub_request(:get, "#{datastore}/places/1")
+        .to_return(body: {
+          name: 'Casa Ferlin'
+        }.to_json)
+
+      place = Customer.includes(:places).find(1).places.first
+      assert_requested(item_request)
+      expect(place.name).to eq 'Casa Ferlin'
+    end
+  end
+
   context 'includes with options' do
     before(:each) do
       class Customer < LHS::Record

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors