dhs 1.4.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef9be83e5148eedcda73523574e4d53684aecbf906e9034b12f52c9b8881a7b
-  data.tar.gz: c8195c1668a305f9e9fcc723ba2464de9b87f17d2eaaa57ec3d4787ec36d8e45
+  metadata.gz: 79388bf9da2d5952b1df95513287bbd412dcb5196c99889ea91e28f302cbc64d
+  data.tar.gz: e18e9e03e4130cbc2e4dadddb63603170ffee5c2791eb2e64418f39b33f664c8
 SHA512:
-  metadata.gz: be55a13a577be249b76b1eaeb7baec3a307b94f4a7c2c4643ea1fcf66edb3f8df3927386886babe211b687821229180d33f0cf5e5af04f1af9534ccd67c20ffd
-  data.tar.gz: 5ab39a51ac32085b8cb71e183c34edd64a7c5e78c86e6e08faabdd03d196a5aadbbfeba8e7b2ac8dc571d59b2ad7281cda2a20c5d8c131e3fbafdf061c6a0adc
+  metadata.gz: 3ccb5289a230ea385574091368925d293106fae4fb5874ead856fb85a68bfa726a531a7adf9ad5b9499c82f24a8a355cf9ac5eb8741b1eb30c862762b3ed6b08
+  data.tar.gz: 42edbdaadbf8adc52e7a8a05a979d7b498aa0c8aa084718e29e0237282164482d37cb4b5d499e19633245f8a72e81a67f0fc167a9e8ce87bdf0efad20899932d

data/README.md

@@ -1431,6 +1431,50 @@ GET https://service.example.com/assets?offset=39
 }
 ```
 
+##### Pagination strategy: next_parameter
+
+The `next_parameter` strategy continuously follows in-response offset parameter information to following pages until the last page is reached (indicated by next parameter being empty or unset).
+
+*WARNING*
+
+Loading all pages from a resource paginated with next_parameter only can result in very poor performance, as pages can only be loaded sequentially!
+
+```ruby
+# app/models/record.rb
+
+class Search < DHS::Record
+  configuration pagination_strategy: 'next_parameter'
+
+  endpoint '{+service}/assets'
+end
+```
+
+```ruby
+# app/controllers/some_controller.rb
+
+Record.all
+
+```
+```
+GET https://service.example.com/assets?limit=100
+{
+  items: [{...}, ...],
+  limit: 10,
+  next: "LXBrPTIzMzE4NDE0"
+}
+GET https://service.example.com/assets?next=LXBrPTIzMzE4NDE0
+{
+  items: [{...}, ...],
+  limit: 10,
+  next: "ASDASdads9123"
+}
+GET https://service.example.com/assets?next=ASDASdads9123
+{
+  items: [{...}, ...],
+  limit: 10
+}
+```
+
 #### Pagination keys
 
 ##### limit_key

data/dhs.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activemodel'
   s.add_dependency 'activesupport', '>= 6'
+  s.add_dependency 'nio4r', '>= 2.7.1'
   s.add_dependency 'dhc', '>= 2'
   s.add_dependency 'local_uri'
 

data/lib/dhs/concerns/option_blocks.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/per_thread_registry'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module DHS
   module OptionBlocks
     extend ActiveSupport::Concern
 
     class CurrentOptionBlock
-      # Using ActiveSupports PerThreadRegistry to be able to support Active Support v4.
-      # Will switch to thread_mattr_accessor (which comes with Activesupport) when we dropping support for Active Support v4.
-      extend ActiveSupport::PerThreadRegistry
-      attr_accessor :options
+      thread_mattr_accessor :options
     end
 
     module ClassMethods

data/lib/dhs/concerns/record/pagination.rb

@@ -32,6 +32,8 @@ class DHS::Record
           DHS::Pagination::Link
         when :next_offset
           DHS::Pagination::NextOffset
+        when :next_parameter
+          DHS::Pagination::NextParameter
         else
           DHS::Pagination::Offset
         end

data/lib/dhs/interceptors/auto_oauth/thread_registry.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/per_thread_registry'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module DHS
   module Interceptors
     module AutoOauth
       extend ActiveSupport::Concern
       class ThreadRegistry
-        # Using ActiveSupports PerThreadRegistry to be able to support Active Support v4.
-        # Will switch to thread_mattr_accessor (which comes with Activesupport) when we dropping support for Active Support v4.
-        extend ActiveSupport::PerThreadRegistry
-        attr_accessor :access_token
+        thread_mattr_accessor :access_token
       end
     end
   end

data/lib/dhs/interceptors/extended_rollbar/thread_registry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/per_thread_registry'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module DHS
   module Interceptors
@@ -9,10 +9,7 @@ module DHS
       extend ActiveSupport::Concern
 
       class ThreadRegistry
-        # Using ActiveSupports PerThreadRegistry to be able to support Active Support v4.
-        # Will switch to thread_mattr_accessor (which comes with Activesupport) when we dropping support for Active Support v4.
-        extend ActiveSupport::PerThreadRegistry
-        attr_accessor :log
+        thread_mattr_accessor :log
       end
     end
   end

data/lib/dhs/interceptors/request_cycle_cache/thread_registry.rb

@@ -1,17 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/per_thread_registry'
-
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 module DHS
   module Interceptors
     module RequestCycleCache
       extend ActiveSupport::Concern
       class ThreadRegistry
-        # Using ActiveSupports PerThreadRegistry to be able to support Active Support v4.
-        # Will switch to thread_mattr_accessor (which comes with Activesupport) when we dropping support for Active Support v4.
-        extend ActiveSupport::PerThreadRegistry
-        attr_accessor :request_id
+        thread_mattr_accessor :request_id
       end
     end
   end

data/lib/dhs/pagination/next_parameter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class DHS::Pagination::NextParameter < DHS::Pagination::Base
+
+  DEFAULT_OFFSET = nil
+
+  def total
+    data._raw.dig(*_record.items_key).count || 0
+  end
+  alias count total
+
+  def self.next_offset(_offset, _limit)
+    nil
+  end
+
+  def parallel?
+    false
+  end
+
+  def pages_left?
+    next_offset = data._raw.dig(*_record.pagination_key(:body))
+    next_offset.present? && !next_offset.blank?
+  end
+
+  def next(current)
+    next_value = current.dig(*_record.pagination_key(:body))
+    return if next_value.blank?
+    {
+      _record.pagination_key(:parameter) => current.dig(*_record.pagination_key(:body))
+    }
+  end
+end

data/lib/dhs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHS
-  VERSION = '1.4.2'
+  VERSION = '1.6.0'
 end

data/lib/dhs.rb

@@ -40,6 +40,7 @@ module DHS
     autoload :TotalPages, 'dhs/pagination/total_pages'
     autoload :OffsetPage, 'dhs/pagination/offset_page'
     autoload :NextOffset, 'dhs/pagination/next_offset'
+    autoload :NextParameter, 'dhs/pagination/next_parameter'
     autoload :Start, 'dhs/pagination/start'
     autoload :Link, 'dhs/pagination/link'
   end

data/spec/pagination/next_parameter_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe DHS::Record do
+  context 'next parameter pagination' do
+    def stub_api_request(this_parameter:, next_parameter:, items: [])
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', this_parameter ? "next=#{this_parameter}" : nil].compact.join('&'))
+        .to_return(body: { items: items, next: next_parameter }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, this_parameter: nil, next_parameter: 'NEXT1')
+      stub_api_request(items: (100...200).to_a, this_parameter: 'NEXT1', next_parameter: 'NEXT2')
+      stub_api_request(items: nil, this_parameter: 'NEXT2', next_parameter: nil)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration pagination_strategy: :next_parameter, pagination_key: { body: :next, parameter: :next }
+
+        endpoint 'http://depay.fi/v2/transactions'
+      end
+    end
+
+    it 'fetches all the pages' do
+      transactions = Transaction.all.fetch
+      expect(transactions.to_a).to eq (0...200).to_a
+    end
+  end
+
+  context 'next parameter pagination with items configuration and nil response' do
+    def stub_api_request(this_parameter:, next_parameter:, items: [])
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', this_parameter ? "next=#{this_parameter}" : nil].compact.join('&'))
+        .to_return(body: { assets: items, next: next_parameter }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, this_parameter: nil, next_parameter: 'NEXT1')
+      stub_api_request(items: (100...200).to_a, this_parameter: 'NEXT1', next_parameter: 'NEXT2')
+      stub_api_request(items: nil, this_parameter: 'NEXT2', next_parameter: nil)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration items_key: :assets, pagination_strategy: :next_parameter, pagination_key: { body: :next, parameter: :next }
+
+        endpoint 'http://depay.fi/v2/transactions'
+      end
+    end
+
+    it 'fetches and merges all the assets/items' do
+      transactions = Transaction.all.fetch
+      expect(transactions.to_a).to eq (0...200).to_a
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhs
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.6.0
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhs/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: dhc
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +342,7 @@ files:
 - lib/dhs/pagination/base.rb
 - lib/dhs/pagination/link.rb
 - lib/dhs/pagination/next_offset.rb
+- lib/dhs/pagination/next_parameter.rb
 - lib/dhs/pagination/offset.rb
 - lib/dhs/pagination/offset_page.rb
 - lib/dhs/pagination/page.rb
@@ -468,6 +483,7 @@ files:
 - spec/pagination/link/parallel_spec.rb
 - spec/pagination/link/total_spec.rb
 - spec/pagination/next_offset_spec.rb
+- spec/pagination/next_parameter_spec.rb
 - spec/pagination/offset/pages_left_spec.rb
 - spec/pagination/offset_page_spec.rb
 - spec/pagination/parameters_spec.rb
@@ -580,7 +596,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.7.2
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like
@@ -706,6 +722,7 @@ test_files:
 - spec/pagination/link/parallel_spec.rb
 - spec/pagination/link/total_spec.rb
 - spec/pagination/next_offset_spec.rb
+- spec/pagination/next_parameter_spec.rb
 - spec/pagination/offset/pages_left_spec.rb
 - spec/pagination/offset_page_spec.rb
 - spec/pagination/parameters_spec.rb