lhs 9.0.2 → 9.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0073ba2cc1f6367f97cd507e4437aebb252f5f5b
-  data.tar.gz: 52687195c84cf5a5f5f122d41d8fb52389ff3b54
+  metadata.gz: a94202476f1970242cdb7215def030000b3ee3b9
+  data.tar.gz: 074bb140334dcd7e09f1fdb93896edea6935c72c
 SHA512:
-  metadata.gz: 29226d8c8a1504a986321f5a25e0ff84358b50545404d5dfbb423af85dce4abeaeb9eaf0e68b19e64c1ce11e0b69df8b70e7fb45389bc051a9632520c5043747
-  data.tar.gz: 86a699cc56dad77686ed4e2b0428fd4ee56acb074d6dddde697001a61737b293242fdadb317f39662cd7b2e98d63e0ee59a92ebf825e7b770494a9fe34bce40f
+  metadata.gz: 3d300ee0903b0c74999cb3b8cccc46bda9efdc2005ac18e9bddb01ec64e274063f7d12782b36578fca4ef97f38cbbf06640bc46f92a95326e3c421ba553c9634
+  data.tar.gz: 0556539c40153065c023cb49638d4f799391e814abd8d3150fdebad5a952df3a1c6ad7d1f9f174db159f489288840a07286ad86c1a815f3f2ba6a44f9e53c80b

data/lib/lhs/complex.rb

@@ -30,7 +30,7 @@ class LHS::Complex
       merge_into_array!(other)
     elsif data.is_a?(Hash)
       merge_into_hash!(other)
-    else
+    elsif unwrap != other.unwrap
       raise ArgumentError, "Cannot merge #{unwrap} with #{other.unwrap}"
     end
 

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

@@ -9,7 +9,8 @@ class LHS::Record
       def request(options)
         options ||= {}
         options = options.deep_dup
-        if options.is_a? Array
+        if options.is_a?(Array)
+          filter_request_options!(options)
           multiple_requests(options)
         else
           single_request(options)
@@ -18,6 +19,13 @@ class LHS::Record
 
       private
 
+      def filter_request_options!(options)
+        options.each_with_index do |option, index|
+          next if !option || !option.key?(:url) || !option[:url].nil?
+          options[index] = nil
+        end
+      end
+
       # Applies limit to the first request of an all request chain
       # Tries to apply an high value for limit and reacts on the limit
       # returned by the endpoint to make further requests
@@ -72,7 +80,7 @@ class LHS::Record
 
       def extend_base_array!(data, addition, key)
         data[key].zip(addition) do |item, additional_item|
-          item._raw.merge!(additional_item._raw)
+          item._raw.merge!(additional_item._raw) if additional_item.present?
         end
       end
 
@@ -159,8 +167,8 @@ class LHS::Record
         return options unless references
         options ||= {}
         if options.is_a?(Array)
-          options.map { |request_options| request_options.merge(references) }
-        else
+          options.map { |request_options| request_options.merge(references) if request_options.present? }
+        elsif options.present?
           options.merge(references)
         end
       end
@@ -216,20 +224,28 @@ class LHS::Record
         begin
           prepare_options_for_include_request!(options, sub_includes, references)
           if references && references[:all] # include all linked resources
-            prepare_options_for_include_all_request!(options)
-            data = load_all_included!(record, options)
-            references.delete(:all) # for this all remote objects have been fetched
-            continue_including(data, sub_includes, references)
+            load_include_all!(options, record, sub_includes, references)
           else # simply request first page/batch
-            data = record.request(options)
-            warn "[WARNING] You included `#{options[:url]}`, but this endpoint is paginated. You might want to use `includes_all` instead of `includes` (https://github.com/local-ch/lhs#includes_all-for-paginated-endpoints)." if paginated?(data._raw)
-            data
+            load_include_simple!(options, record)
           end
         rescue LHC::NotFound
           LHS::Data.new({}, data, record)
         end
       end
 
+      def load_include_all!(options, record, sub_includes, references)
+        prepare_options_for_include_all_request!(options)
+        data = load_all_included!(record, options)
+        references.delete(:all) # for this reference all remote objects have been fetched
+        continue_including(data, sub_includes, references)
+      end
+
+      def load_include_simple!(options, record)
+        data = record.request(options)
+        warn "[WARNING] You included `#{options[:url]}`, but this endpoint is paginated. You might want to use `includes_all` instead of `includes` (https://github.com/local-ch/lhs#includes_all-for-paginated-endpoints)." if paginated?(data._raw)
+        data
+      end
+
       # Continues loading included resources after one complete batch/level has been fetched
       def continue_including(data, including, referencing)
         handle_includes(including, data, referencing) if including.present? && data.present?
@@ -263,6 +279,7 @@ class LHS::Record
       # When including all resources on one level, don't forward :includes & :references
       # 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 unless option.present?
         option[:params] ||= {}
         option[:params].merge!(limit_key => option.fetch(:params, {}).fetch(limit_key, LHS::Pagination::Base::DEFAULT_LIMIT))
         option.delete(:including)
@@ -302,8 +319,8 @@ class LHS::Record
         data = LHC.request(options.compact).map do |response|
           LHS::Data.new(response.body, nil, self, response.request)
         end
-        including = LHS::Complex.reduce options.compact.map { |options| options.delete(:including) }.compact
-        referencing = LHS::Complex.reduce options.compact.map { |options| options.delete(:referencing) }.compact
+        including = LHS::Complex.reduce(options.compact.map { |options| options.delete(:including) }.compact)
+        referencing = LHS::Complex.reduce(options.compact.map { |options| options.delete(:referencing) }.compact)
         data = restore_with_nils(data, locate_nils(options)) # nil objects in data provide location information for mapping
         data = LHS::Data.new(data, nil, self)
         handle_includes(including, data, referencing) if including.present? && data.present?

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = "9.0.2"
+  VERSION = "9.0.3"
 end

data/spec/complex/reduce_spec.rb

@@ -15,6 +15,12 @@ describe LHS::Complex do
     }.to raise_error(ArgumentError)
   end
 
+  it 'does not fail trying to merge primitive types when they are the same' do
+    expect {
+      LHS::Complex.reduce([{ entry: true }, { entry: true }])
+    }.not_to raise_error
+  end
+
   context 'first level' do
     context 'reduces symbols into/with X' do
       it 'reduces symbols into hash' do

data/spec/record/includes_all_spec.rb

@@ -121,19 +121,41 @@ describe LHS::Record do
         class Contract < LHS::Record
           endpoint 'http://datastore/contracts/:id'
         end
-        stub_request(:get, "http://datastore/contracts/1")
+        stub_request(:get, %r{http://datastore/contracts/\d})
           .to_return(body: {
-            options: []
+            options: nested_resources
           }.to_json)
       end
 
-      it 'includes_all in case of an empty array' do
-        expect(lambda do
-          Contract
-            .includes(:product)
-            .includes_all(:options)
-            .find(1)
-        end).not_to raise_error
+      context 'empty array' do
+        let(:nested_resources) { [] }
+
+        it 'includes_all in case of an empty array' do
+          expect(
+            -> { Contract.includes(:product).includes_all(:options).find(1) }
+          ).not_to raise_error
+          expect(
+            -> { Contract.includes(:product).includes_all(:options).find(1, 2) }
+          ).not_to raise_error
+        end
+      end
+
+      context 'weird array without hrefs' do
+        before(:each) do
+          stub_request(:get, "http://datastore/options/1?limit=100")
+            .to_return(body: { type: 'REACH_EXT' }.to_json)
+        end
+
+        let(:nested_resources) { [{ href: 'http://datastore/options/1' }, { type: 'E_COMMERCE' }] }
+
+        it 'includes_all in case of an unexpect objects within array' do
+          expect(
+            -> { Contract.includes(:product).includes_all(:options).find(1) }
+          ).not_to raise_error
+          expect(
+            -> { Contract.includes(:product).includes_all(:options).find(1, 2) }
+          ).not_to raise_error
+        end
       end
     end
   end

metadata

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