lhs 20.1.3.pre.paginationfix.3 → 20.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9284aed364b9d0b32bd9341399c4c8309aa3438c4d6e073b89a7d4f3fcaab21
-  data.tar.gz: d3c50128acf732d233b61d2930f22a38d48102dca92fb13ab2f2f88a03108767
+  metadata.gz: 90bb5680db8b584ee9597cf6e3029014f05a56704de09cecb8f4b9788ff0bbdf
+  data.tar.gz: 1403e9844367ef3cc13c2987368d219b12db90700178b26bfacba1f3690346f7
 SHA512:
-  metadata.gz: f75419036051feb2e65f155a59dfedf1364f2fb23f2f97bab4615fce6152ae8158f249a20f97308a4e8284c70180de920d5dc97ab13fbfd8f8876d2888aee7aa
-  data.tar.gz: 248054e48c2a757db5575c982f17356038d9d63d475f24fbd320c2bb1732481d7ff9ccc3c70b4baa50bef5c21701bec1ac2d0916ed917fdab30f58737d7472cf
+  metadata.gz: 5c8c37a17da7d96fb7f397425dcf74440e3a3d3a562eecf142992546b58c07cefa7527166b8ba26131e3e025ca823b3d78c3f98a1d8cb0c974394e9887b623c6
+  data.tar.gz: 187cf1be11baf4d8c32cb9521e4eeb283152b5b026b06e67d2e548deb649c36957fc6fa91b2d5d577e45de90382faf4fed80dd999cdfad161ae647753df28a94

data/Gemfile

@@ -1,13 +1,4 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org/'
-
-# Declare your gem's dependencies in lhs.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
 gemspec
-
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.

data/lhs.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemodel'
   s.add_dependency 'activesupport', '>= 4.2.11'
   s.add_dependency 'lhc', '~> 10.2'
+  s.add_dependency 'local_uri'
 
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'json', '>=  1.8.2'
-  s.add_development_dependency 'local_uri'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'rails', '>= 4.2.11'
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails', '>= 3.7.0'
   s.add_development_dependency 'rubocop', '~> 0.57.1'
   s.add_development_dependency 'rubocop-rspec', '~> 1.26.0'
+  s.add_development_dependency 'sprockets', '< 4'
   s.add_development_dependency 'webmock'
 
   s.license = 'GPL-3'

data/lib/lhs/pagination/base.rb

@@ -23,13 +23,7 @@ module LHS::Pagination
     alias count total
 
     def limit
-      response_limit = data._raw.dig(*_record.limit_key(:body))
-      requested_limit = data._request.params.dig(*_record.limit_key(:params)).to_i if data&._request&.params.present?
-      if  requested_limit && response_limit && last_page?(response_limit, requested_limit) && response_limit < requested_limit
-        requested_limit
-      else
-        response_limit || DEFAULT_LIMIT
-      end
+      data._raw.dig(*_record.limit_key(:body)) || DEFAULT_LIMIT
     end
 
     def offset
@@ -53,10 +47,6 @@ module LHS::Pagination
       # should be implemented in subclass (optional)
     end
 
-    def last_page?
-      raise 'to be implemented in subclass'
-    end
-
     def first_page
       1
     end

data/lib/lhs/pagination/offset.rb

@@ -12,10 +12,6 @@ class LHS::Pagination::Offset < LHS::Pagination::Base
     self.class.next_offset(offset, limit, step)
   end
 
-  def last_page?(response_limit, requested_limit)
-    offset + response_limit >= total
-  end
-
   def self.page_to_offset(page, limit = DEFAULT_LIMIT)
     (page.to_i - 1) * limit.to_i
   end

data/lib/lhs/pagination/page.rb

@@ -8,10 +8,6 @@ class LHS::Pagination::Page < LHS::Pagination::Base
     offset
   end
 
-  def last_page?(response_limit, requested_limit)
-    (offset-1 * requested_limit) + response_limit >= total
-  end
-
   def next_offset(step = 1)
     self.class.next_offset(current_page, limit, step)
   end

data/lib/lhs/pagination/start.rb

@@ -12,10 +12,6 @@ class LHS::Pagination::Start < LHS::Pagination::Base
     self.class.next_offset(offset, limit, step)
   end
 
-  def last_page?(response_limit, requested_limit)
-    offset + response_limit > total
-  end
-  
   def self.page_to_offset(page, limit = DEFAULT_LIMIT)
     (page.to_i - 1) * limit.to_i + 1
   end

data/lib/lhs/test/stub.rb

@@ -13,15 +13,15 @@ module LHS
           uri = LocalUri::URI.new(url)
           uri.query.merge!(limit: DEFAULT_LIMIT)
           uri.query.merge!(offset: DEFAULT_LIMIT * index) unless index.zero?
-          stub_request(:get, uri.to_s)
-            .with(options)
-            .to_return(
-              body: {
-                items: batch,
-                offset: index * DEFAULT_LIMIT,
-                total: items.length
-              }.to_json
-            )
+          request_stub = stub_request(:get, uri.to_s)
+          request_stub.with(options) if options.present?
+          request_stub.to_return(
+            body: {
+              items: batch,
+              offset: index * DEFAULT_LIMIT,
+              total: items.length
+            }.to_json
+          )
         end
       end
     end

data/lib/lhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHS
-  VERSION = '20.1.3.pre.paginationfix.3'
+  VERSION = '20.1.4'
 end

data/spec/record/pagination_spec.rb

@@ -67,27 +67,5 @@ describe LHS::Record do
         expect(record.total_pages).to eq(28)
       end
     end
-
-    context 'total_pages calculation for last page' do
-      before do
-        class Search < LHS::Record
-          configuration pagination_strategy: :start, total_key: :totalResult, pagination_key: :start, limit_key: { body: :size, parameter: :limit }
-          endpoint 'https://search'
-        end
-      end
-
-      it 'provides the correct number of total pages for the last page' do
-        stub_request(:get, "https://search/?limit=10&start=11")
-          .to_return(body: {
-            size: 4,
-            totalResult: 14,
-            start: 11,
-            items: [11,12,13,14]
-          }.to_json)
-
-        results = Search.page(2).limit(10).fetch
-        expect(results.total_pages).to eq 2
-      end
-    end
   end
 end

data/spec/stubs/all_spec.rb

@@ -25,4 +25,25 @@ describe LHS do
     expect(records.length).to eq 200
     expect(records.first.name).to eq 'Item 0'
   end
+
+  context 'without conditions' do
+
+    before do
+      class Record < LHS::Record
+        endpoint 'https://records'
+      end
+
+      LHS.stub.all(
+        'https://records',
+        200.times.map { |index| { name: "Item #{index}" } }
+      )
+    end
+
+    it 'stubs all requests without a webmock "with"' do
+      records = Record.all.fetch
+      expect(records.count).to eq 200
+      expect(records.length).to eq 200
+      expect(records.first.name).to eq 'Item 0'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 20.1.3.pre.paginationfix.3
+  version: 20.1.4
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: local_uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: local_uri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.26.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -525,13 +539,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - Ruby >= 2.3.0
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like