lhs 11.2.1 → 11.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ef3cf453e687b887eecf083b9db24027367077
-  data.tar.gz: 813cf6662e7e1b84fc88f7bbea58e9ede0bd78f9
+  metadata.gz: 3dfd9e57f04eb43210b4178efe52fd0fddcbe7de
+  data.tar.gz: 41c60bc23a3c4ad5ad4e215c62ea96d969e4f479
 SHA512:
-  metadata.gz: bbab32a774d4fc31d35cec8a4a58d4ab9727f8605073ff4887b01fe6714248d77140987767e2d7c58a086869784d322114daebe637387440feb0286a26935163
-  data.tar.gz: e8e4c55d6c74e2286d0adc4cb77295d95df5bf902a8984e552ee5e719eee7db55222c604356e79a63296f0b94c9dcea91c343bc78931744433d478e1b5cb13c6
+  metadata.gz: 971b794d749267d8c055ce020828632f5575bff89d0005052e8600babec47d6ae64121a86ab2d2d34ae85eb570ef739938662b60e9d2dc5760a744d55be104d7
+  data.tar.gz: f9ae285b2f0aa39aae2a4dc547f384e3890ca2cde1359c29d535bcac3bdaf3542c8cba8b6860b5d60a487a6f439fcdd3370ced438b08c6cf56337182aed6d5c1

data/lhs.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.requirements << 'Ruby >= 2.0.0'
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'lhc', '>= 5.0.3'
+  s.add_dependency 'lhc', '>= 5.1.1'
   s.add_dependency 'activesupport', '> 4.2'
 
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'

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

@@ -56,7 +56,6 @@ class LHS::Record
 
       # Computes the url from params
       # by identifiying endpoint and compiles it if necessary.
-      # Id in params is threaded in a special way.
       def compute_url!(params)
         endpoint = find_endpoint(params)
         url = endpoint.compile(params)
@@ -64,6 +63,11 @@ class LHS::Record
         url
       end
 
+      def compute_url(params)
+        find_endpoint(params)
+          .compile(params)
+      end
+
       private
 
       def validates_deprecation_check!(options)

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

@@ -50,7 +50,7 @@ class LHS::Record
         return unless endpoint
         template = endpoint.url
         new_options = options.deep_merge(
-          params: LHC::Endpoint.values_as_params(template, url).merge(values_from_get_params(url))
+          params: LHC::Endpoint.values_as_params(template, url).merge(values_from_get_params(url, options))
         )
         new_options[:url] = template
         new_options
@@ -58,13 +58,23 @@ class LHS::Record
 
       # Extracts values from url's get parameters
       # and return them as a ruby hash
-      def values_from_get_params(url)
-        uri = URI.parse(url)
+      def values_from_get_params(url, options)
+        uri = parse_uri(url, options)
         return {} unless uri.query.present?
         params = Rack::Utils.parse_nested_query(uri.query)
         params
       end
 
+      def parse_uri(url, options)
+        URI.parse(
+          if url.match(LHC::Endpoint::PLACEHOLDER)
+            compute_url(options[:params])
+          else
+            url
+          end
+        )
+      end
+
       # Extends existing raw data with additionaly fetched data
       def extend_raw_data!(data, addition, key)
         if data.collection?
@@ -292,7 +302,7 @@ class LHS::Record
       # as we have to fetch all resources on this level first, before we continue_including
       def prepare_option_for_include_all_request!(option)
         return option if option.empty? || option[:url].nil?
-        uri = URI.parse(option[:url])
+        uri = parse_uri(option[:url], option)
         get_params = Rack::Utils.parse_nested_query(uri.query)
           .symbolize_keys
           .except(limit_key, pagination_key)

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "11.2.1"
+  VERSION = "11.2.2"
 end

data/spec/record/includes_all_spec.rb

@@ -211,5 +211,54 @@ describe LHS::Record do
         end
       end
     end
+
+    context 'include a known/identifiable record' do
+      before(:each) do
+        class Contract < LHS::Record
+          endpoint 'http://datastore/contracts/:id'
+        end
+
+        class Entry < LHS::Record
+          endpoint ':datastore/entry/v1/:id.json'
+        end
+
+        LHC.config.placeholder(:datastore, 'http://datastore')
+      end
+
+      let!(:customer_request) do
+        stub_request(:get, %r{http://datastore/customers/\d+})
+          .to_return(
+            body: {
+              contracts: [{ href: 'http://datastore/contracts/1' }, { href: 'http://datastore/contracts/2' }]
+            }.to_json
+          )
+      end
+
+      let!(:contracts_request) do
+        stub_request(:get, %r{http://datastore/contracts/\d+})
+          .to_return(
+            body: {
+              type: 'contract',
+              entry: { href: 'http://datastore/entry/v1/1.json' }
+            }.to_json
+          )
+      end
+
+      let!(:entry_request) do
+        stub_request(:get, %r{http://datastore/entry/v1/\d+.json})
+          .to_return(
+            body: {
+              name: 'Casa Ferlin'
+            }.to_json
+          )
+      end
+
+      it 'loads included identifiable records without raising exceptions' do
+        customer = Customer.includes_all(contracts: :entry).find(1, 2).first
+        expect(customer.contracts.first.href).to eq 'http://datastore/contracts/1'
+        expect(customer.contracts.first.type).to eq 'contract'
+        expect(customer.contracts.first.entry.name).to eq 'Casa Ferlin'
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 11.2.1
+  version: 11.2.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement