lhs 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583ea8a5785e4d78e732150986bcb5a05f5f8397
-  data.tar.gz: a488798e7c906e0806d8d0d78ea3e4b5be8c87e1
+  metadata.gz: bf11afeed9a8a7a43f2c594ad95dd909e1a12f0d
+  data.tar.gz: 885dacb37539493c398957242a4fba4c20e13a4f
 SHA512:
-  metadata.gz: a0251caac24d2fd88395ac78af1a0e044b6f887f3750ff84fe1ccc9aa43ca42bf4dd80cbc11c450a793b9ee902bfdc621b7e3dba84fc938de38495c24de37282
-  data.tar.gz: d7ca3bcc747f89051c5ad59294dc8046b5a2553ad50a6243110ecebf44d9e65ddb551a5a782da5025cda4cd16fec520a0258c0b70da82d07261e81b65361546c
+  metadata.gz: e854348297280962ce9553f22112b0f014462263f94eef3d18f870e4602524ac658679427927827230977c1052234d7dda39e6350b54bd1676599a1af83163c1
+  data.tar.gz: 760777a4f2e23e6a31509aa436417ce5abcff5a60805b5ec56a81fbe75594ac7b5562738179c16418b6c4203ae3563127e3729de94763924b392be4dcdd28506

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

@@ -45,39 +45,33 @@ class LHS::Service
       end
     end
 
-    def handle_includes(data)
+    def handle_includes(includes, data)
       if includes.is_a? Hash
-        includes.keys.each { |key| handle_include(data, key) }
+        includes.each { |_include, sub_includes| handle_include(_include, data, sub_includes) }
       elsif includes.is_a? Array
-        includes.each { |key| handle_include(data, key) }
+        includes.each { |_include| handle_includes(_include, data) }
       else
-        handle_include(data, includes)
+        handle_include(includes, data)
       end
     end
 
-    def handle_include(data, key)
+    def handle_include(_include, data, sub_includes = nil)
       return unless data.present?
       options = if data._proxy.is_a? LHS::Collection
-        options_for_multiple(data, key)
+        options_for_multiple(data, _include)
       else
-        url_option_for(data, key)
+        url_option_for(data, _include)
       end
-      addition = load_include(includes, options, key, data)
-      extend(data, addition, key)
+      addition = load_include(options, data, sub_includes)
+      extend(data, addition, _include)
     end
 
     # Load additional resources that are requested with include
-    def load_include(includes, options, key, data)
+    def load_include(options, data, sub_includes)
       service = service_for_options(options) || self
       options = convert_options_to_endpoints(options) if service_for_options(options)
-      further_keys = includes.fetch(key, nil) if includes.is_a? Hash
-      service_class = if further_keys
-        service.class.includes(further_keys)
-      else
-        service.class.includes(nil)
-      end
       begin
-        service_class.instance.request(options)
+        service.class.includes(sub_includes).instance.request(options)
       rescue LHC::NotFound
         LHS::Data.new({}, data, service)
       end
@@ -96,7 +90,7 @@ class LHS::Service
       responses = LHC.request(options)
       data = responses.map{ |response| LHS::Data.new(response.body, nil, self.class, response.request) }
       data = LHS::Data.new(data, nil, self.class)
-      handle_includes(data) if includes
+      handle_includes(includes, data) if includes
       data
     end
 
@@ -136,7 +130,7 @@ class LHS::Service
     def single_request(options)
       response = LHC.request(process_options(options))
       data = LHS::Data.new(response.body, nil, self.class, response.request)
-      handle_includes(data) if includes
+      handle_includes(includes, data) if includes
       data
     end
 

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/service/includes_spec.rb

@@ -120,6 +120,21 @@ describe LHS::Service do
       expect(feedbacks.campaign.user.name).to eq 'Mario'
     end
 
+    it 'includes list of linked resources while fetching a single resource from one service' do
+
+      stub_request(:get, "#{datastore}/feedbacks/123")
+        .to_return(status: 200, body: {
+          'href' => "#{datastore}/feedbacks/-Sc4_pYNpqfsudzhtivfkA",
+          'campaign' => { 'href' => "#{datastore}/content-ads/51dfc5690cf271c375c5a12d" },
+          'user' => { 'href' => "#{datastore}/users/lakj35asdflkj1203va" }
+        }.to_json)
+
+      feedbacks = Feedback.includes(:user, campaign: [:entry, :user]).find(123)
+      expect(feedbacks.campaign.entry.name).to eq 'Casa Ferlin'
+      expect(feedbacks.campaign.user.name).to eq 'Mario'
+      expect(feedbacks.user.name).to eq 'Mario'
+    end
+
     context 'include objects from known services' do
 
       let(:stub_feedback_request) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - local.ch