lhs 11.0.2 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43edcbb95ff9fac3487269d82e907074ebd34c77
-  data.tar.gz: 4c0b1606d84502bcbf2868cf0bacef57d6d189d3
+  metadata.gz: dc9d93456e8c4ad57a3883f582dd868169272980
+  data.tar.gz: d741c6a54fcdbe5c7b72a8f226fd290485d5e218
 SHA512:
-  metadata.gz: c2a9cd34ef7a3cb2967590b19e950e9925c71d1d9f9208d72a9a032bc2cdca061ce787ca2ab8447bfe5f3ea31fc971eed87f91fa24e1880b486b0016e897a57e
-  data.tar.gz: c1b547a13121304b67706163dbb5124cee91d9e4107e16e1dd1bf57abe55fc05c1a35e243b8fd0c9c401d3d92ae34f5baeb57c01e0a3bfac10676a1637ff1c3b
+  metadata.gz: a1dbba4cf7b6d320d0a16ff0582159a50565d6f5e5ba037e0c0bbebc3c708d3e50403df9846a35b26879dc48f116349ec961cd4c418c3a97ac6302c916280c91
+  data.tar.gz: d6d14efc2d3558dd996aba3bcc9da903e8a19ca118dd8d2b760a3bab415b13807512740ae947524f0894984f1e373c7e9d96cfa49e0cb29de6d95c3fd30b2156

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

@@ -291,9 +291,15 @@ 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?
+        return option if option.empty? || option[:url].nil?
+        uri = URI.parse(option[:url])
+        get_params = Rack::Utils.parse_nested_query(uri.query)
+          .symbolize_keys
+          .except(limit_key, pagination_key)
         option[:params] ||= {}
-        option[:params].merge!(limit_key => option.fetch(:params, {}).fetch(limit_key, LHS::Pagination::Base::DEFAULT_LIMIT))
+        option[:params].reverse_merge!(get_params)
+        option[:params][limit_key] ||= LHS::Pagination::Base::DEFAULT_LIMIT
+        option[:url] = option[:url].gsub("?#{uri.query}", '')
         option.delete(:including)
         option.delete(:referencing)
         option

data/lib/lhs/version.rb

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

data/spec/concerns/record/request_spec.rb

@@ -0,0 +1,76 @@
+require 'rails_helper'
+
+describe LHS::Record::Request do
+  subject do
+    Class.new do
+      include LHS::Record::Configuration
+      include LHS::Record::Request
+    end
+  end
+
+  describe 'prepare_options_for_include_all_request' do
+    it 'calls correct prepare method for nil' do
+      expect(subject).to receive(:prepare_option_for_include_all_request!)
+        .with(nil).and_return('ignore')
+      expect(subject.send(:prepare_options_for_include_all_request!, nil)).to be_nil
+    end
+
+    it 'calls correct prepare method for a Hash' do
+      expect(subject).to receive(:prepare_option_for_include_all_request!)
+        .with(abc: 'def').and_return('ignore')
+      expect(subject.send(:prepare_options_for_include_all_request!, abc: 'def')).to eq(abc: 'def')
+    end
+
+    it 'calls correct prepare method for a Hash' do
+      expect(subject).to receive(:prepare_option_for_include_all_request!)
+        .with(abc: 'def').and_return('ignore')
+      expect(subject).to receive(:prepare_option_for_include_all_request!)
+        .with(hij: 'kel').and_return('ignore')
+      expect(subject.send(:prepare_options_for_include_all_request!, [{ abc: 'def' }, { hij: 'kel' }]))
+        .to eq([{ abc: 'def' }, { hij: 'kel' }])
+    end
+  end
+
+  describe 'prepare_option_for_incldue_all_request' do
+    it 'removes all limit and offset parameters' do
+      option = { url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=2' }
+      expect(subject.send(:prepare_option_for_include_all_request!, option))
+        .to eq(option)
+      expect(option).to eq(url: 'http://localhost:3000/test/resource',
+                           params: { limit: 100, abc: 'def', test: '2' })
+    end
+
+    it 'do nothing without url' do
+      option = { param: { abc: 'def' } }
+      expect(subject.send(:prepare_option_for_include_all_request!, option))
+        .to eq(option)
+      expect(option).to eq(param: { abc: 'def' })
+    end
+
+    it 'raises an exception when url invalid' do
+      option = { param: { abc: 'def' }, url: 'http://ab de.com/resource' }
+      expect { subject.send(:prepare_option_for_include_all_request!, option) }
+        .to raise_exception(URI::InvalidURIError)
+      expect(option).to eq(param: { abc: 'def' }, url: 'http://ab de.com/resource')
+    end
+
+    it 'keeps current params over url params' do
+      option = { url: 'http://localhost:3000/test/resource?abc=def&limit=1&offset=3&test=2',
+                 params: { abc: '123' } }
+      expect(subject.send(:prepare_option_for_include_all_request!, option))
+        .to eq(option)
+      expect(option).to eq(url: 'http://localhost:3000/test/resource',
+                           params: { limit: 100, abc: '123', test: '2' })
+    end
+
+    it 'removes including and referening options' do
+      option = { url: 'http://localhost:3000/test/resource',
+                 including: 'all',
+                 referencing: 'nothing' }
+      expect(subject.send(:prepare_option_for_include_all_request!, option))
+        .to eq(option)
+      expect(option).to eq(url: 'http://localhost:3000/test/resource',
+                           params: { limit: 100 })
+    end
+  end
+end

data/spec/record/includes_all_spec.rb

@@ -116,6 +116,59 @@ describe LHS::Record do
       expect(products_request_page_3).to have_been_requested.at_least_once
     end
 
+    context 'links already contain pagination parameters' do
+      let!(:customer_request) do
+        stub_request(:get, 'http://datastore/customers/1')
+          .to_return(
+            body: {
+              contracts: { href: 'http://datastore/customers/1/contracts?limit=5&offset=0' }
+            }.to_json
+          )
+      end
+
+      let!(:contracts_request) do
+        stub_request(:get, "http://datastore/customers/1/contracts?limit=100")
+          .to_return(
+            body: {
+              items: 10.times.map do
+                {
+                  products: { href: 'http://datastore/products' }
+                }
+              end,
+              limit: 10,
+              offset: 0,
+              total: amount_of_contracts
+            }.to_json
+          )
+      end
+
+      it 'overwrites existing pagination paramters if they are already contained in a string' do
+        expect(LHC).to receive(:request)
+          .with(url: "http://datastore/customers/1").and_call_original
+
+        expect(LHC).to receive(:request)
+          .with(url: "http://datastore/customers/1/contracts",
+                all: true,
+                params: { limit: 100 }).and_call_original
+
+        expect(LHC).to receive(:request)
+          .with([{ url: "http://datastore/customers/1/contracts",
+                   all: true,
+                   params: { limit: 10, offset: 10 } },
+                 { url: "http://datastore/customers/1/contracts",
+                   all: true,
+                   params: { limit: 10, offset: 20 } },
+                 { url: "http://datastore/customers/1/contracts",
+                   all: true,
+                   params: { limit: 10, offset: 30 } }]).and_call_original
+
+        customer = Customer
+          .includes_all(:contracts)
+          .find(1)
+        expect(customer.contracts.length).to eq amount_of_contracts
+      end
+    end
+
     context 'includes for an empty array' do
       before(:each) do
         class Contract < LHS::Record

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc
@@ -239,6 +239,7 @@ files:
 - spec/collection/respond_to_spec.rb
 - spec/collection/without_object_items_spec.rb
 - spec/complex/reduce_spec.rb
+- spec/concerns/record/request_spec.rb
 - spec/data/collection_spec.rb
 - spec/data/equality_spec.rb
 - spec/data/inspect_spec.rb
@@ -385,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Ruby >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails gem providing an easy, active-record-like interface for http json services
@@ -401,6 +402,7 @@ test_files:
 - spec/collection/respond_to_spec.rb
 - spec/collection/without_object_items_spec.rb
 - spec/complex/reduce_spec.rb
+- spec/concerns/record/request_spec.rb
 - spec/data/collection_spec.rb
 - spec/data/equality_spec.rb
 - spec/data/inspect_spec.rb