lhs 21.2.0 → 21.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6225eb173a7f2586b2a7bbeceb9a9d5c0a06c435708b9dd673a288e9e362745d
-  data.tar.gz: 75473dc1a4fd69c7ab8392c965e9ef932a19b30e1aae2505fa902b9e713540c9
+  metadata.gz: cdee54df382d303ac6c2df71e4dfb3ce6816d098578fc1919262b2daa937763c
+  data.tar.gz: '0340809599cfa8cb547c85dd031f8e767a644885637e77bcdc09ad011e2be617'
 SHA512:
-  metadata.gz: 897f78093924c54e3d8dce53655f075e8919c09d124cf71e676dd8b20dc3f429c623671f4697006c06d4babb07b8a18c65cd5e4c219cdc5a81955bd2d39b8fa4
-  data.tar.gz: 7f677d03fe47a75f3ac9e87ed9a4fc7f0cf51d30402b79b100fac79f3a6cdff8e85ef902d0615d35db84ea247a9207d08c9e96badd41ea4ff01bf504d9652e60
+  metadata.gz: e01af57617fc98df8e61a053bb4b69a527701a29aa1cfd3b842ec1b08ca47e925702ffeedf31b019997a1693409fc00637da0dba4cc205b0cfafba0f1b2769c2
+  data.tar.gz: 0f7418cee11af1966be59ad017f13469aaa94a96e4214045c05434312690b5d9fad08d4193b8705844e0d5f3411a1988498b50a966cf7324c167f9062493aa8a

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

@@ -180,12 +180,20 @@ class LHS::Record
       end
 
       def handle_include(included, data, sub_includes = nil, reference = nil)
-        return if data.blank? || skip_loading_includes?(data, included)
-        options = options_for_data(data, included)
-        options = extend_with_reference(options, reference)
-        addition = load_include(options, data, sub_includes, reference)
-        extend_raw_data!(data, addition, included)
-        expand_addition!(data, included, options) if no_expanded_data?(addition)
+        if data.blank? || skip_loading_includes?(data, included)
+          handle_skip_include(included, data, sub_includes, reference)
+        else
+          options = options_for_data(data, included)
+          options = extend_with_reference(options, reference)
+          addition = load_include(options, data, sub_includes, reference)
+          extend_raw_data!(data, addition, included)
+          expand_addition!(data, included, options) if no_expanded_data?(addition)
+        end
+      end
+
+      def handle_skip_include(included, data, sub_includes = nil, reference = nil)
+        return if sub_includes.blank?
+        handle_includes(sub_includes, data[included], reference)
       end
 
       def options_for_data(data, included = nil)
@@ -238,6 +246,8 @@ class LHS::Record
       def skip_loading_includes?(data, included)
         if data.collection?
           data.to_a.none? { |item| item[included].present? }
+        elsif data[included].present? && data[included].item? && data[included].href.blank?
+          true
         else
           !data._raw.key?(included)
         end

data/lib/lhs/version.rb

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

data/spec/record/includes_spec.rb

@@ -606,4 +606,63 @@ describe LHS::Record do
       expect(sector.services.first.key).to eq 'my_service_service_1'
     end
   end
+
+  context 'include for POST/create' do
+
+    before do
+      class Record < LHS::Record
+        endpoint 'https://records'
+      end
+      stub_request(:post, 'https://records/')
+        .with(body: { color: 'blue' }.to_json)
+        .to_return(
+          body: {
+            color: 'blue',
+            alternative_categories: [
+              { href: 'https://categories/blue' }
+            ]
+          }.to_json
+        )
+      stub_request(:get, 'https://categories/blue')
+        .to_return(
+          body: {
+            name: 'blue'
+          }.to_json
+        )
+    end
+
+    it 'includes the resources from the post response' do
+      records = Record.includes(:alternative_categories).create(color: 'blue')
+      expect(records.alternative_categories.first.name).to eq 'blue'
+    end
+  end
+
+  context 'nested within another structure' do
+    before do
+      class Place < LHS::Record
+        endpoint 'https://places/{id}'
+      end
+      stub_request(:get, "https://places/1")
+        .to_return(body: {
+          customer: {
+            salesforce: {
+              href: 'https://salesforce/customers/1'
+            }
+          }
+        }.to_json)
+    end
+
+    let!(:nested_request) do
+      stub_request(:get, "https://salesforce/customers/1")
+        .to_return(body: {
+          name: 'Steve'
+        }.to_json)
+    end
+
+    it 'includes data that has been nested in an additional structure' do
+      place = Place.includes(customer: :salesforce).find(1)
+      expect(nested_request).to have_been_requested
+      expect(place.customer.salesforce.name).to eq 'Steve'
+    end
+  end
 end

metadata

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