lhs 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e11e78d3dd76e163a20dd38f8873322ff71ff81
-  data.tar.gz: 763cb822c37ca6e938cfd8f9a7f7014a1f47dc7f
+  metadata.gz: a6ef5524ff9e948847824a817645866f6c19e19c
+  data.tar.gz: 8fa5c95d922cac9de6adc95509410b475d293693
 SHA512:
-  metadata.gz: 970ba3f98020e099502f5dcf768d0efc0e40bb147be2f334cd5429dbec35543fd0b6157459f45a7c293e7ecd08a2ffae951e06aba758eabae61d15baf2fe220a
-  data.tar.gz: 00d4680483a466f6ae84487c3ed1d6c014e493ee2c120f47cef1a35c4a1e8ad5a5ea6c2d0f58a741715db146ee14d141771ef0688234e9395ac2fd88f12bd283
+  metadata.gz: 65195f7a18c36afbdebe4c8441559de59dc7252c3471ec27bf060f7b0dd880327b81cd319c46e19e8aaa6466ff5810441f788a6a148fa35e6eeabc15a6464a9d
+  data.tar.gz: 36fadb3d46b9531e8d8b1b46e49b12c66544f47ae5c49a203650ae80a01e53ee48bb6497845cc23dae5c159e5c77ba0f445be93bcd5c6e3c3bf3eedf6b2218fe

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

@@ -256,7 +256,7 @@ class LHS::Record
 
       def resolved_options
         options = chain_options
-        options = options.merge(params: chain_parameters.merge(chain_pagination))
+        options = options.deep_merge(params: chain_parameters.merge(chain_pagination))
         options = options.merge(error_handler: chain_error_handler) if chain_error_handler.present?
         options = options.merge(including: chain_includes) if chain_includes.present?
         options = options.merge(referencing: chain_references) if chain_references.present?

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

@@ -22,7 +22,7 @@ class LHS::Record
 
       def _find_by(params, options = {})
         options ||= {}
-        params = params.dup.merge(limit: 1)
+        params = params.dup.merge(limit: 1).merge(options.fetch(:params, {}))
         data = request(options.merge(params: params))
         if data._proxy.is_a?(LHS::Collection)
           data.first || raise(LHC::NotFound.new('No item was found.', data._request.response))

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

@@ -109,7 +109,7 @@ class LHS::Record
         return if data.blank? || skip_loading_includes?(data, included)
         options = options_for_data(data, included)
         options = extend_with_references(options, references)
-        addition = load_include(options, data, sub_includes)
+        addition = load_include(options, data, sub_includes, references)
         extend_raw_data!(data, addition, included)
         expand_addition!(data, included) if no_expanded_data?(addition)
       end
@@ -162,14 +162,14 @@ class LHS::Record
       end
 
       # Load additional resources that are requested with include
-      def load_include(options, data, sub_includes)
+      def load_include(options, data, sub_includes, references)
         record = record_for_options(options) || self
         options = convert_options_to_endpoints(options) if record_for_options(options)
         begin
           if options.is_a?(Array)
-            options.each { |options| options.merge!(including: sub_includes) if sub_includes.present? }
+            options.each { |options| options.merge!(including: sub_includes, referencing: references) if sub_includes.present? }
           elsif sub_includes.present?
-            options.merge!(including: sub_includes)
+            options.merge!(including: sub_includes, referencing: references)
           end
           record.request(options)
         rescue LHC::NotFound

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "7.0.1"
+  VERSION = "7.0.2"
 end

data/spec/record/find_by_chains_spec.rb

@@ -5,7 +5,7 @@ describe LHS::Record do
     class Record < LHS::Record
       endpoint 'http://datastore/records/'
     end
-    stub_request(:get, "http://datastore/records/?limit=1&name=Steve")
+    stub_request(:get, "http://datastore/records/?limit=1&name=Steve&color=blue")
       .to_return(body: [{ name: 'Steve', color: 'blue' }].to_json)
   end
 

data/spec/record/includes_spec.rb

@@ -407,4 +407,46 @@ describe LHS::Record do
       expect(customers.first.places.first.id).to eq 1
     end
   end
+
+  context 'more complex examples' do
+    before(:each) do
+      class Place < LHS::Record
+        endpoint 'http://datastore/places/:id'
+      end
+    end
+
+    it 'forwards complex references' do
+      stub_request(:get, "http://datastore/places/123?limit=1&forwarded_params=for_place")
+        .to_return(body: {
+          'contracts' => {
+            'href' => "http://datastore/places/123/contracts"
+          }
+        }.to_json)
+      stub_request(:get, "http://datastore/places/123/contracts?forwarded_params=for_contracts")
+        .to_return(body: {
+          href: "http://datastore/places/123/contracts?forwarded_params=for_contracts",
+          items: [
+            { product: { 'href' => "http://datastore/products/llo" } }
+          ]
+        }.to_json)
+      stub_request(:get, "http://datastore/products/llo?forwarded_params=for_product")
+        .to_return(body: {
+          'href' => "http://datastore/products/llo",
+          'name' => 'Local Logo'
+        }.to_json)
+      place = Place
+        .options(params: { forwarded_params: 'for_place' })
+        .includes(contracts: :product)
+        .references(
+          contracts: {
+            params: { forwarded_params: 'for_contracts' },
+            product: { params: { forwarded_params: 'for_product' } }
+          }
+        )
+        .find_by(id: '123')
+      expect(
+        place.contracts.first.product.name
+      ).to eq 'Local Logo'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc