lhs 7.2.4 → 7.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d99ceddb2ae5693268943054615f83012e7915
-  data.tar.gz: 237d0864cfd642b7ea652646c9694e11db6df6bc
+  metadata.gz: c375618ed280267c2a1dbf38604b1924c43fa6e4
+  data.tar.gz: 88d0a5d78565d170db988070b4968dfe7dc9adcc
 SHA512:
-  metadata.gz: 90e6b45e7b29f894773ff861bcd5ceae5cb28d4d223e099b360da9e729e6ef27746abb5f8c97d9ed679378f2ae58a97a6a953c14082f6addb00c82f2981831c4
-  data.tar.gz: 6f1404569a787ef49efbc533a2e61a43eef55315387d9d32c6351d844fdde9f90a3f6556fed649558129db06dc292908dabc03a45eaa002bb2d3dd0f81806a96
+  metadata.gz: ecf2eb96d8f92288659c89fa838567ac4125929268ff5bb63fe2a4fd46fb7723808687f0c6deefad86aa8cd128574118211f8e3e0730ef4fbae05b84014fcd95
+  data.tar.gz: bdb3fb946afc13ef8f726fbae6b1b32c2fb50be840c3fdd43bebca8812b954636ba6e150bd98b6b3c37bc94d5c9f418faa31aaa1c9bc8d57b0ebd8790d198c59

data/.rubocop.yml

@@ -27,3 +27,5 @@ Style/SignalException:
 Rails/DynamicFindBy:
   Enabled: false
   
+Metrics/BlockLength:
+  Enabled: false

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

@@ -92,12 +92,11 @@ class LHS::Record
 
       def handle_includes(includes, data, references = {})
         references ||= {}
-        references = [references] if includes.is_a?(Array) && !references.is_a?(Array)
         if includes.is_a? Hash
           includes.each { |included, sub_includes| handle_include(included, data, sub_includes, references[included]) }
         elsif includes.is_a? Array
-          includes.each_with_index do |included, index|
-            handle_includes(included, data, references[index])
+          includes.each do |included|
+            handle_includes(included, data, references)
           end
         else
           handle_include(includes, data, nil, references[includes])

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "7.2.4"
+  VERSION = "7.2.5"
 end

data/spec/record/references_spec.rb

@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+describe LHS::Record do
+  context 'references' do
+    before(:each) do
+      class Customer < LHS::Record
+        endpoint 'http://datastore/customers/:id'
+      end
+    end
+
+    let!(:customer_request) do
+      stub_request(:get, "http://datastore/customers/1")
+        .to_return(body: {
+          'electronic_addresses' => {
+            'href' => "http://datastore/electronic_addresses"
+          },
+          'contact_addresses' => {
+            'href' => "http://datastore/contact_addresses"
+          }
+        }.to_json)
+    end
+
+    let!(:electronic_addresses_request) do
+      stub_request(:get, "http://datastore/electronic_addresses")
+        .with(referencing_options)
+        .to_return(body: [].to_json)
+    end
+
+    let!(:contact_addresses_request) do
+      stub_request(:get, "http://datastore/contact_addresses")
+        .with(referencing_options)
+        .to_return(body: [].to_json)
+    end
+
+    let(:referencing_options) do
+      { headers: { 'Authentication' => 'Bearer 123' } }
+    end
+
+    it 'uses the "references" hash for all symbols of the "including" array' do
+      Customer
+        .includes(:electronic_addresses, :contact_addresses)
+        .references(
+          electronic_addresses: referencing_options,
+          contact_addresses: referencing_options
+        )
+        .find(1)
+      assert_requested(electronic_addresses_request)
+      assert_requested(contact_addresses_request)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 7.2.4
+  version: 7.2.5
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -337,6 +337,7 @@ files:
 - spec/record/pagination_chain_spec.rb
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
+- spec/record/references_spec.rb
 - spec/record/request_spec.rb
 - spec/record/save_spec.rb
 - spec/record/scope_chains_spec.rb
@@ -488,6 +489,7 @@ test_files:
 - spec/record/pagination_chain_spec.rb
 - spec/record/pagination_spec.rb
 - spec/record/persisted_spec.rb
+- spec/record/references_spec.rb
 - spec/record/request_spec.rb
 - spec/record/save_spec.rb
 - spec/record/scope_chains_spec.rb