lhs 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a67846d69ae33c0fc39973108dcad1e2b996fd60
-  data.tar.gz: 231e57735eeb0ce6a71a567d311148a69257178a
+  metadata.gz: f5c5dde69a8e71e9f37d3b769c04b865ec6d97cf
+  data.tar.gz: ceaf6a4a5c87d83448c317522d06b475aaf411ff
 SHA512:
-  metadata.gz: 91193cb240275698ce0e2571ff24588cc411f4111260663fce90258c20f2cf9c37b346abcefc40ca91661aeb6b46fff39c6ee4339dcb86e8677c81c605a6db3e
-  data.tar.gz: c13f28d8bea1e6e73dcb0595851195b0c3168eb002268b48b646a636cc52baaf14c0adb8e77708b1b9c6cf1d9416ebd238f4b0b8d71c92d0019ebe39bd672936
+  metadata.gz: 0d2adc8b42d6f832313537ae26e2c5228a77dbfa9f917b338e365f972e21a198c5b79f703ac0c7c14bc0282aa59d73499d322f4100861c31461c8dc8e0aae151
+  data.tar.gz: 32a78f36ab5f8903386631cd84f005231f90453a0045f1d90045cb7a81e941cb2e49fbd8dbb85c14475582ac3db85998ff7854d2faf4d1116e5ce4832d9979c5

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

@@ -36,8 +36,10 @@ class LHS::Record
       # Find an endpoint based on the provided parameters.
       # If no parameters are provided it finds the base endpoint
       # otherwise it finds the endpoint that matches the parameters best.
-      def find_endpoint(params = {})
+      def find_endpoint(params = {}, url = nil)
         endpoint = find_best_endpoint(params) if params && params.keys.count > 0
+        endpoint ||= find_endpoint_by_url(url) if url.present?
+        endpoint ||= LHC::Endpoint.new(url) if url.present?
         endpoint ||= find_base_endpoint
         endpoint
       end
@@ -80,6 +82,13 @@ class LHS::Record
         end
       end
 
+      # Find endpoint by given URL
+      def find_endpoint_by_url(url)
+        sorted_endpoints.find do |endpoint|
+          LHC::Endpoint.match?(url, endpoint.url)
+        end
+      end
+
       # Sort endpoints by number of placeholders, heighest first
       def sorted_endpoints
         endpoints.sort { |a, b| b.placeholders.count <=> a.placeholders.count }

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

@@ -292,7 +292,7 @@ class LHS::Record
       def multiple_requests(options)
         options = options.map do |option|
           next unless option.present?
-          process_options(option, find_endpoint(option[:params]))
+          process_options(option, find_endpoint(option[:params], option.fetch(:url, nil)))
         end
         data = LHC.request(options.compact).map do |response|
           LHS::Data.new(response.body, nil, self, response.request)
@@ -395,7 +395,7 @@ class LHS::Record
         options = options.dup
         including = options.delete(:including)
         referencing = options.delete(:referencing)
-        endpoint = find_endpoint(options[:params])
+        endpoint = find_endpoint(options[:params], options.fetch(:url, nil))
         apply_limit!(options) if options[:all]
         response = LHC.request(process_options(options, endpoint))
         data = LHS::Data.new(response.body, nil, self, response.request, endpoint)

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "9.0.0"
+  VERSION = "9.0.1"
 end

data/spec/record/endpoints_spec.rb

@@ -69,5 +69,24 @@ describe LHS::Record do
         AnotherRecord.where(campaign_id: 123, entry_id: 123)
       end
     end
+
+    context 'includes data without considering base endpoint of parent record if url is present' do
+      before(:each) do
+        class Contract < LHS::Record
+          endpoint ':datastore/contracts/:id'
+          endpoint ':datastore/entry/:entry_id/contracts'
+        end
+      end
+
+      it 'uses urls instead of trying to find base endpoint of parent class' do
+        stub_request(:get, "#{datastore}/entry/123/contracts?limit=100")
+          .to_return(body: [{ product: { href: "#{datastore}/products/LBC" } }].to_json)
+        stub_request(:get, "#{datastore}/products/LBC")
+          .to_return(body: { name: 'Local Business Card' }.to_json)
+        expect(lambda {
+          Contract.includes(:product).where(entry_id: '123').all.first
+        }).not_to raise_error # Multiple base endpoints found
+      end
+    end
   end
 end

metadata

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