lhs 5.4.2 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8355a11dabd2c8cd1e889120f20e7c6eaa133d25
-  data.tar.gz: 9c576f20dbda1dec490ad144760f30c61ff51050
+  metadata.gz: 3f470a5aba78054aa70cc3479afb69bc0dd92814
+  data.tar.gz: b1b7436c1998cb1280d6a3c2f11f59e9a99e91d1
 SHA512:
-  metadata.gz: 36258e2eff638180df2066b889bc4c861c9dca3f89839d96c9d82d366a369de6b4be64cffd8e0ba2e53de5a499344d93e28437070001bceeebf0efe8063d5d44
-  data.tar.gz: 54a33e04d23850e597ab94e9b21592725fa0748b10577852a57c5f22fc1c2c3e530d2094977fde57f5f672de7db50fd309efdfa249e8c4a166e150d182375466
+  metadata.gz: 8385de082cb82e468583343d4d5ad78db3f7ac6d4265c7d8faeb399ad26cfa4a4d61cde15243ca9782fca0079f79d73c6952a675cc3cc9d94feced5de2cde1b9
+  data.tar.gz: 04b937fe66115b2fa3020993fb40b230a01fdb2f60a98ade93ef6715881a0133e7a3b136a6b902083a4ebc8d94ebd3299d0b6e7cf80782266a771746bb37d990

data/README.md

@@ -302,8 +302,40 @@ The implementation is heavily influenced by [http://guides.rubyonrails.org/activ
   claims = Claims.includes(:localch_account).where(place_id: 'huU90mB_6vAfUdVz_uDoyA')
   claims.first.localch_account.email # 'test@email.com'
 ```
-* [see the JSON without include](docs/examples/claim_no_include.json)
-* [see the JSON with include](docs/examples/claim_with_include.json)
+
+Before include:
+```json
+{
+  "href" : "http://datastore/v2/places/huU90mB_6vAfUdVz_uDoyA/claims",
+  "items" : [
+    {
+      "href" : "http://datastore/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims/huU90mB_6vAfUdVz_uDoyA",
+      "localch_account" : {
+        "href" : "http://datastore/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg"
+      }
+    }
+  ]
+}
+```
+
+After include:
+```json
+{
+  "href" : "http://datastore/v2/places/huU90mB_6vAfUdVz_uDoyA/claims",
+  "items" : [
+    {
+      "href" : "http://datastore/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims/huU90mB_6vAfUdVz_uDoyA",
+      "localch_account" : {
+        "href" : "http://datastore/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg",
+        "id" : "6bSss0y93lK0MrVsgdNNdg",
+        "name" : "Myriam",
+        "phone" : "12345678",
+        "email" : "email@gmail.com"
+      }
+    }
+  ]
+}
+```
 
 ### Two-Level `includes`
 

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

@@ -46,6 +46,10 @@ class LHS::Record
             link = item[key.to_sym]
             link.merge_raw!(addition[i]) if link.present?
           end
+        elsif data[key]._raw.is_a? Array
+          data[key].zip(addition) do |item, additional_item|
+            item._raw.merge!(additional_item._raw)
+          end
         elsif data._proxy.is_a? LHS::Item
           data._raw[key.to_sym].merge!(addition._raw)
         end
@@ -66,6 +70,8 @@ class LHS::Record
         options =
           if data.collection?
             options_for_multiple(data, included)
+          elsif data[included]._raw.is_a?(Array)
+            options_for_nested_items(data, included)
           else
             url_option_for(data, included)
           end
@@ -132,6 +138,12 @@ class LHS::Record
         end
       end
 
+      def options_for_nested_items(data, key)
+        data[key].map do |item|
+          url_option_for(item)
+        end
+      end
+
       # Merge explicit params and take configured endpoints options as base
       def process_options(options, endpoint)
         options[:params].deep_symbolize_keys! if options[:params]
@@ -167,8 +179,8 @@ class LHS::Record
         data
       end
 
-      def url_option_for(item, key)
-        link = item[key]
+      def url_option_for(item, key = nil)
+        link = key ? item[key] : item
         return { url: link.href } if link.present? && link.href.present?
       end
     end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "5.4.2"
+  VERSION = "5.5.0"
 end

data/spec/record/includes_spec.rb

@@ -266,4 +266,30 @@ describe LHS::Record do
       Services::Feedback.includes(campaign: :entry).find(123)
     end
   end
+
+  context 'arrays' do
+    it 'includes items of arrays' do
+      class Place < LHS::Record
+        endpoint ':datastore/place'
+        endpoint ':datastore/place/:id'
+      end
+
+      stub_request(:get, "#{datastore}/place/1")
+        .to_return(body: {
+          'relations' => [
+            { 'href' => "#{datastore}/place/relations/2" },
+            { 'href' => "#{datastore}/place/relations/3" }
+          ]
+        }.to_json)
+
+      stub_request(:get, "#{datastore}/place/relations/2")
+        .to_return(body: { name: 'Category' }.to_json)
+      stub_request(:get, "#{datastore}/place/relations/3")
+        .to_return(body: { name: 'ZeFrank' }.to_json)
+
+      place = Place.includes(:relations).find(1)
+      expect(place.relations.first.name).to eq 'Category'
+      expect(place.relations[1].name).to eq 'ZeFrank'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 5.5.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -173,8 +173,6 @@ files:
 - cider-ci/scripts/rubocop.yml
 - cider-ci/scripts/ruby-version.yml
 - cider-ci/scripts/tmp-cache.yml
-- docs/examples/claim_no_include.json
-- docs/examples/claim_with_include.json
 - lhs.gemspec
 - lib/lhs.rb
 - lib/lhs/collection.rb

data/docs/examples/claim_no_include.json

@@ -1,16 +0,0 @@
-{
-  "href" : "http://silo2:8082/v2/places/huU90mB_6vAfUdVz_uDoyA/claims",
-  "items" : [
-    {
-      "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims/huU90mB_6vAfUdVz_uDoyA",
-      "localch_account" : {
-        "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg"
-      },
-      "place" : {
-        "href" : "http://silo2:8082/v2/places/huU90mB_6vAfUdVz_uDoyA"
-      },
-      "created_date" : "2014-05-06T14:15:59.115+02:00",
-      "method" : "MBA"
-    }
-  ]
-}

data/docs/examples/claim_with_include.json

@@ -1,47 +0,0 @@
-{
-  "href" : "http://silo2:8082/v2/places/huU90mB_6vAfUdVz_uDoyA/claims",
-  "items" : [
-    {
-      "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims/huU90mB_6vAfUdVz_uDoyA",
-      "localch_account" : {
-        "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg",
-        "id" : "6bSss0y93lK0MrVsgdNNdg",
-        "name" : "Myriam",
-        "phone" : "0791994817",
-        "email" : "myriam.salm@gmail.com",
-        "language" : "en",
-        "created_date" : "2014-05-06T14:15:58.809+02:00",
-        "claims" : {
-          "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims",
-          "items" : [
-            {
-              "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/claims/huU90mB_6vAfUdVz_uDoyA",
-              "localch_account" : {
-                "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg"
-              },
-              "place" : {
-                "href" : "http://silo2:8082/v2/places/huU90mB_6vAfUdVz_uDoyA"
-              },
-              "created_date" : "2014-05-06T14:15:59.115+02:00",
-              "method" : "MBA"
-            }
-          ],
-          "total" : 1
-        },
-        "password_hash" : "$2a$10$LFb8IhUSK/0GBZoXRQE/2euRkIdQpTqI8Cw4OFkStPf5XvItvlhJK",
-        "accepted_agbs" : {
-          "href" : "http://silo2:8082/v2/localch-accounts/6bSss0y93lK0MrVsgdNNdg/accepted-agbs",
-          "items" : [],
-          "total" : 0
-        },
-        "enabled" : true,
-        "non_locked" : true
-      },
-      "place" : {
-        "href" : "http://silo2:8082/v2/places/huU90mB_6vAfUdVz_uDoyA"
-      },
-      "created_date" : "2014-05-06T14:15:59.115+02:00",
-      "method" : "MBA"
-    }
-  ]
-}