lhs 12.0.0 → 12.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fc72f0094042042734fdecaec1df8b9c07194a2
-  data.tar.gz: 33bc6824ba84ac62a79a7c2cc324f61681789847
+  metadata.gz: f6dd72496ffd697f998423f63eb040d12da20c75
+  data.tar.gz: 087da614313aa4626e2b0671a0071cdbc7c82922
 SHA512:
-  metadata.gz: 4f90bef44098ed8a70f00285c48c7627774a1cc00d3a04b5f2030855c7ee5807597cc9e920ea91f9307aca1980fd77927345e70f8826a11b787590e2caba4761
-  data.tar.gz: 7488e69922acb478161effd760e6ae5224c0d192ed1f4bd7fd78a4bdd578fd945e057af4e058a9183bdc88dc58e81beeaa563b2c50334535c9796886ca37c832
+  metadata.gz: 75374cd617e5b67ba372bdefc710e2f305b27e8639a5df27d4f21cd44cd93df14a13ab79d11ae2a333069a3686f16739e0b15298346d0cb860c8944d7a0cd8b5
+  data.tar.gz: 566ebd60a00e7e7a68486bd77bc6431678bd42df5abcd680e1e4d775c7b321d88ac33d097576330195ecb97705aa74a68224547c3663051c40717c2fa695459e

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

@@ -63,8 +63,8 @@ class LHS::Record
         url
       end
 
-      def compute_url(params)
-        find_endpoint(params)
+      def compute_url(params, url = nil)
+        find_endpoint(params, url)
           .compile(params)
       end
 

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

@@ -68,7 +68,7 @@ class LHS::Record
       def parse_uri(url, options)
         URI.parse(
           if url.match(LHC::Endpoint::PLACEHOLDER)
-            compute_url(options[:params])
+            compute_url(options[:params], url)
           else
             url
           end

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "12.0.0"
+  VERSION = "12.0.1"
 end

data/spec/record/includes_all_spec.rb

@@ -339,4 +339,43 @@ describe LHS::Record do
       end
     end
   end
+
+  context 'Linked resources' do
+    before(:each) do
+      stub_request(:get, 'http://datastore/places/1/contracts?offset=0&limit=10')
+        .to_return(
+          body: {
+            href:  "http://datastore/v2/places/1/contracts?offset=0&limit=10",
+            items: [{ href: "http://datastore/v2/contracts/1" }]
+          }.to_json
+        )
+
+      stub_request(:get, "http://datastore/v2/contracts/1")
+        .to_return(
+          body: {
+            customer: { name: 'Swisscom Directories AG' }
+          }.to_json
+        )
+
+      stub_request(:get, 'http://datastore/places/1?limit=1')
+        .to_return(
+          body: { href: 'http://datastore/places/1', contracts: { href: 'http://datastore/places/1/contracts?offset=0&limit=10' } }.to_json
+        )
+
+      class Place < LHS::Record
+        endpoint 'http://datastore/places/:id'
+      end
+
+      class Contract < LHS::Record
+        endpoint 'http://datastore/places/:place_id/contracts'
+      end
+    end
+
+    it 'does not use the root record endpoints when including nested records' do
+      place = Place
+        .includes_all(:contracts)
+        .find_by(id: 1)
+      expect(place.contracts.first.customer.name).to eq 'Swisscom Directories AG'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.0.1
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc