lhs 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b80422557549f4c6187df6ec6068be2d4186317
-  data.tar.gz: ed4841db53bf4da2636c33167eea5171f6064199
+  metadata.gz: 583ea8a5785e4d78e732150986bcb5a05f5f8397
+  data.tar.gz: a488798e7c906e0806d8d0d78ea3e4b5be8c87e1
 SHA512:
-  metadata.gz: 475b1f2ba9d9082f086e3e2777b28cd19eea593ca2678484c72121e5b128667f1f324c85b1b869ba032084076a4c994565f60c0c403e6b9737fc55133a8ef17b
-  data.tar.gz: ee009de8735ccd8ae997b6c97530a6dee5243a34c2498fc54c7c35b6421f0831845007ae8b32ededc02a41b2db7737c6bd1ee5eb1a224d2f0f52e4ca6259e3c5
+  metadata.gz: a0251caac24d2fd88395ac78af1a0e044b6f887f3750ff84fe1ccc9aa43ca42bf4dd80cbc11c450a793b9ee902bfdc621b7e3dba84fc938de38495c24de37282
+  data.tar.gz: d7ca3bcc747f89051c5ad59294dc8046b5a2553ad50a6243110ecebf44d9e65ddb551a5a782da5025cda4cd16fec520a0258c0b70da82d07261e81b65361546c

data/docs/services.md

@@ -183,6 +183,19 @@ and you should read it to understand this feature in all its glory.
   feedbacks.first.campaign.entry.name # 'Casa Ferlin'
 ```
 
+### Multiple `includes`
+
+```ruby
+  # list of includes
+  claims = Claims.includes(:localch_account, :entry).where(place_id: 'huU90mB_6vAfUdVz_uDoyA')
+  
+  # array of includes
+  claims = Claims.includes([:localch_account, :entry]).where(place_id: 'huU90mB_6vAfUdVz_uDoyA')
+  
+  # Two-level with array of includes
+  feedbacks = Feedback.includes(campaign: [:entry, :user]).where(has_reviews: true)
+```
+
 ### Known services are used to request linked resources
 
 When including linked resources with `includes`, known/defined services and endpoints are used to make those requests. 
@@ -244,4 +257,4 @@ favorite.place.name # local.ch AG
 
 ## Validation
 
-See: [Item Validation](../item.md).
+See: [Item Validation](../item.md).

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

@@ -9,11 +9,11 @@ class LHS::Service
 
     module ClassMethods
 
-      def includes(args)
+      def includes(*args)
         class_clone = clone
         class_clone.instance.endpoints = instance.endpoints
         class_clone.instance.mapping = instance.mapping
-        class_clone.instance.includes = args
+        class_clone.instance.includes = args.size == 1 ? args[0] : args
         class_clone
       end
     end

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

@@ -48,6 +48,8 @@ class LHS::Service
     def handle_includes(data)
       if includes.is_a? Hash
         includes.keys.each { |key| handle_include(data, key) }
+      elsif includes.is_a? Array
+        includes.each { |key| handle_include(data, key) }
       else
         handle_include(data, includes)
       end
@@ -60,12 +62,12 @@ class LHS::Service
       else
         url_option_for(data, key)
       end
-      addition = load_includes(includes, options, key, data)
+      addition = load_include(includes, options, key, data)
       extend(data, addition, key)
     end
 
     # Load additional resources that are requested with include
-    def load_includes(includes, options, key, data)
+    def load_include(includes, options, key, data)
       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

data/lib/lhs/version.rb

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

data/spec/service/includes_spec.rb

@@ -9,7 +9,8 @@ describe LHS::Service do
     stub_request(:get, "#{datastore}/content-ads/51dfc5690cf271c375c5a12d")
       .to_return(body: {
         'href' => "#{datastore}/content-ads/51dfc5690cf271c375c5a12d",
-        'entry' => { 'href' => "#{datastore}/local-entries/lakj35asdflkj1203va" }
+        'entry' => { 'href' => "#{datastore}/local-entries/lakj35asdflkj1203va" },
+        'user' => { 'href' => "#{datastore}/users/lakj35asdflkj1203va" }
       }.to_json)
   end
 
@@ -18,26 +19,52 @@ describe LHS::Service do
       .to_return(body: { 'name' => 'Casa Ferlin' }.to_json)
   end
 
+  let(:stub_user_request) do
+    stub_request(:get, "#{datastore}/users/lakj35asdflkj1203va")
+      .to_return(body: { 'name' => 'Mario' }.to_json)
+  end
+
   context 'singlelevel includes' do
     before(:each) do
-     class LocalEntry < LHS::Service
+      class LocalEntry < LHS::Service
         endpoint ':datastore/local-entries'
         endpoint ':datastore/local-entries/:id'
       end
+      class User < LHS::Service
+        endpoint ':datastore/users'
+        endpoint ':datastore/users/:id'
+      end
       class Favorite < LHS::Service
         endpoint ':datastore/favorites'
         endpoint ':datastore/favorites/:id'
       end
       stub_request(:get, "#{datastore}/local-entries/1")
         .to_return(body: {company_name: 'local.ch'}.to_json)
+      stub_request(:get, "#{datastore}/users/1")
+        .to_return(body: {name: 'Mario'}.to_json)
       stub_request(:get, "#{datastore}/favorites/1")
-        .to_return(body: {local_entry: {href: "#{datastore}/local-entries/1"}}.to_json)
+        .to_return(body: {
+          local_entry: {href: "#{datastore}/local-entries/1"},
+          user: {href: "#{datastore}/users/1"}
+          }.to_json)
     end
 
-    it 'does single level includes' do
+    it 'includes a resource' do
       favorite = Favorite.includes(:local_entry).find(1)
       expect(favorite.local_entry.company_name).to eq 'local.ch'
     end
+
+    it 'includes a list of resources' do
+      favorite = Favorite.includes(:local_entry, :user).find(1)
+      expect(favorite.local_entry.company_name).to eq 'local.ch'
+      expect(favorite.user.name).to eq 'Mario'
+    end
+
+    it 'includes an array of resources' do
+      favorite = Favorite.includes([:local_entry, :user]).find(1)
+      expect(favorite.local_entry.company_name).to eq 'local.ch'
+      expect(favorite.user.name).to eq 'Mario'
+    end
   end
 
   context 'multilevel includes' do
@@ -49,6 +76,7 @@ describe LHS::Service do
       end
       stub_campaign_request
       stub_entry_request
+      stub_user_request
     end
 
     it 'includes linked resources while fetching multiple resources from one service' do
@@ -79,6 +107,19 @@ describe LHS::Service do
       expect(feedbacks.campaign.entry.name).to eq 'Casa Ferlin'
     end
 
+    it 'includes linked resources with array 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" }
+        }.to_json)
+
+      feedbacks = Feedback.includes(campaign: [:entry, :user]).find(123)
+      expect(feedbacks.campaign.entry.name).to eq 'Casa Ferlin'
+      expect(feedbacks.campaign.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.3
+  version: 2.0.4
 platform: ruby
 authors:
 - local.ch