lhs 11.0.1 → 11.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b33b5484ee3a16c6d834c1520bb907c5c84cc3e
-  data.tar.gz: 4f179bf4a46b0e109bcd079353186e61ec08c5d4
+  metadata.gz: 43edcbb95ff9fac3487269d82e907074ebd34c77
+  data.tar.gz: 4c0b1606d84502bcbf2868cf0bacef57d6d189d3
 SHA512:
-  metadata.gz: 56558afe98484a87c27bd99d379172f6166ba9d27c32662f35e0d88cb1d010223858a60fac2ae3714d6860ee24f03c665f0388a53878193874d4120939d66b70
-  data.tar.gz: ce2b1ba748bd7feb39858457d36dd8e3a8f6c3dcc9db11d156279e599f83e082315e8a008127e8b7285ea393c0e8a1029271e917e77f295cae85cdc56d539fb9
+  metadata.gz: c2a9cd34ef7a3cb2967590b19e950e9925c71d1d9f9208d72a9a032bc2cdca061ce787ca2ab8447bfe5f3ea31fc971eed87f91fa24e1880b486b0016e897a57e
+  data.tar.gz: c1b547a13121304b67706163dbb5124cee91d9e4107e16e1dd1bf57abe55fc05c1a35e243b8fd0c9c401d3d92ae34f5baeb57c01e0a3bfac10676a1637ff1c3b

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.2'
+  s.add_dependency 'lhc', '>= 5.0.3'
   s.add_dependency 'activesupport', '> 4.2'
 
   s.add_development_dependency 'rspec-rails', '>= 3.0.0'

data/lib/lhs/concerns/proxy/accessors.rb

@@ -23,9 +23,24 @@ class LHS::Proxy
         value = _data._raw[name.to_s.classify.to_sym] if value.nil?
       end
 
-      return access_item(value) if value.is_a?(Hash)
-      return access_collection(value) if value.is_a?(Array)
-      convert(value)
+      record = LHS::Record.for_url(value[:href]) if value.is_a?(Hash) && value[:href]
+
+      access_item(value, record) ||
+        access_collection(value, record) ||
+        convert(value)
+    end
+
+    def accessing_item?(value, record)
+      return false unless value.is_a?(Hash)
+      return false if record && value[record.items_key].present?
+      return false if !record && value[LHS::Record::Configuration::DEFAULT_ITEMS_KEY].present?
+      true
+    end
+
+    def accessing_collection?(value, record)
+      return true if value.is_a?(Array)
+      return true if value.is_a?(Hash) && record && value[record.items_key].present?
+      return true if value.is_a?(Hash) && !record && value[LHS::Record::Configuration::DEFAULT_ITEMS_KEY].present?
     end
 
     def convert(value)
@@ -39,20 +54,22 @@ class LHS::Proxy
       end
     end
 
-    def access_item(value)
-      record = LHS::Record.for_url(value[:href]) if value[:href]
-      data = LHS::Data.new(value, _data)
-      if record
-        record.new(data)
-      else
-        data
-      end
+    def access_item(value, record)
+      return unless accessing_item?(value, record)
+      wrap_return(value, record)
+    end
+
+    def access_collection(value, record)
+      return unless accessing_collection?(value, record)
+      collection_data = LHS::Data.new(value, _data)
+      collection = LHS::Collection.new(collection_data)
+      wrap_return(collection, record)
     end
 
-    def access_collection(value)
+    def wrap_return(value, record)
       data = LHS::Data.new(value, _data)
-      collection = LHS::Collection.new(data)
-      LHS::Data.new(collection, _data)
+      return record.new(data) if record
+      data
     end
 
     def date?(value)

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

@@ -7,6 +7,8 @@ class LHS::Record
   module Configuration
     extend ActiveSupport::Concern
 
+    DEFAULT_ITEMS_KEY = :items
+
     mattr_accessor :configuration
 
     module ClassMethods
@@ -15,7 +17,7 @@ class LHS::Record
       end
 
       def items_key
-        (@configuration.try(:[], :items_key) || :items).to_sym
+        (@configuration.try(:[], :items_key) || DEFAULT_ITEMS_KEY).to_sym
       end
 
       def limit_key

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

@@ -49,11 +49,22 @@ class LHS::Record
         endpoint = LHS::Endpoint.for_url(url)
         return unless endpoint
         template = endpoint.url
-        new_options = options.deep_merge(params: LHC::Endpoint.values_as_params(template, url))
+        new_options = options.deep_merge(
+          params: LHC::Endpoint.values_as_params(template, url).merge(values_from_get_params(url))
+        )
         new_options[:url] = template
         new_options
       end
 
+      # Extracts values from url's get parameters
+      # and return them as a ruby hash
+      def values_from_get_params(url)
+        uri = URI.parse(url)
+        return {} unless uri.query.present?
+        params = Rack::Utils.parse_nested_query(uri.query)
+        params
+      end
+
       # Extends existing raw data with additionaly fetched data
       def extend_raw_data!(data, addition, key)
         if data.collection?

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "11.0.1"
+  VERSION = "11.0.2"
 end

data/spec/proxy/record_identification_spec.rb

@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe LHS::Proxy do
+  before(:each) do
+    class Search < LHS::Record
+      endpoint 'http://search/results', items_key: :docs
+    end
+
+    class Feedback < LHS::Record
+      endpoint 'http://datastore/places/:place_id/feedbacks'
+    end
+  end
+
+  context 'identifying records' do
+    it 'identifies records correctly even if parent record has another configuration set' do
+      stub_request(:get, "http://search/results?what=Blumen")
+        .to_return(body: {
+          place: { href: 'http://datastore/places/1' }
+        }.to_json)
+      stub_request(:get, "http://datastore/places/1")
+        .to_return(body: {
+          feedbacks: { href: 'http://datastore/places/1/feedbacks?limit=10&offset=0' }
+        }.to_json)
+      stub_request(:get, "http://datastore/places/1/feedbacks?limit=10&offset=0")
+        .to_return(body: {
+          items: [{ review: 'Nice restaurant' }]
+        }.to_json)
+      result = Search.where(what: 'Blumen').includes(place: :feedbacks)
+      expect(result.place.feedbacks).to be_kind_of Feedback
+      expect(result.place.feedbacks.first.review).to eq 'Nice restaurant'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 11.0.1
+  version: 11.0.2
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-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.2
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,7 @@ files:
 - spec/pagination/pages_left_spec.rb
 - spec/proxy/create_sub_resource_spec.rb
 - spec/proxy/load_spec.rb
+- spec/proxy/record_identification_spec.rb
 - spec/rails_helper.rb
 - spec/record/all_spec.rb
 - spec/record/build_spec.rb
@@ -469,6 +470,7 @@ test_files:
 - spec/pagination/pages_left_spec.rb
 - spec/proxy/create_sub_resource_spec.rb
 - spec/proxy/load_spec.rb
+- spec/proxy/record_identification_spec.rb
 - spec/rails_helper.rb
 - spec/record/all_spec.rb
 - spec/record/build_spec.rb