dhs 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31dbca2778853f9bafb3a74e2c7ef830d3897c0caa78b66e5bb58203fc8bb11
-  data.tar.gz: 8e5968134c395c0b4e6196506ef5502f5941f68754423bc885bc536a44c2ba33
+  metadata.gz: 8ef9be83e5148eedcda73523574e4d53684aecbf906e9034b12f52c9b8881a7b
+  data.tar.gz: c8195c1668a305f9e9fcc723ba2464de9b87f17d2eaaa57ec3d4787ec36d8e45
 SHA512:
-  metadata.gz: 54e1c9ec3c0b71566a8b6831690250d0eecc00f00155617dc39873c20d49a26ef57051ae04d7d3a1bbb3733f75fc3ccc0024b96c3b4bd086dafe48a1634cb8cf
-  data.tar.gz: 1bea7f70ccd0cba8dc488604d5f4a668d1bc602a2cb30d19058b195a17b2d9f1aaa5d72e21286e910570a89be0e78c25adac4bb45186a6f3f11ffcc81128b39c
+  metadata.gz: be55a13a577be249b76b1eaeb7baec3a307b94f4a7c2c4643ea1fcf66edb3f8df3927386886babe211b687821229180d33f0cf5e5af04f1af9534ccd67c20ffd
+  data.tar.gz: 5ab39a51ac32085b8cb71e183c34edd64a7c5e78c86e6e08faabdd03d196a5aadbbfeba8e7b2ac8dc571d59b2ad7281cda2a20c5d8c131e3fbafdf061c6a0adc

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

@@ -204,7 +204,7 @@ class DHS::Record
       end
 
       def load_and_merge_not_paginated_collection!(data, options)
-        return if data.length.zero?
+        return if data.empty?
         options = options.is_a?(Hash) ? options : {}
         limit = options.dig(:params, limit_key(:parameter)) || pagination_class::DEFAULT_LIMIT
         offset = options.dig(:params, pagination_key(:parameter)) || pagination_class::DEFAULT_OFFSET
@@ -230,7 +230,7 @@ class DHS::Record
       end
 
       def load_and_merge_paginated_collection!(data, options)
-        set_nested_data(data._raw, limit_key(:body), data.length) if data._raw.dig(*limit_key(:body)).blank? && !data.length.zero?
+        set_nested_data(data._raw, limit_key(:body), data.length) if data._raw.dig(*limit_key(:body)).blank? && !data.empty?
         pagination = data._record.pagination(data)
         return data unless pagination.pages_left?
         record = data._record
@@ -256,7 +256,7 @@ class DHS::Record
           page_data = if next_value.is_a?(String) && next_value.match(/^http/)
              record.request(options.except(:all).merge(url: next_value))
           else
-            record.request(options.except(:all).merge(params: (options.dig(:params) || {}).merge(next_value) ))
+            record.request(options.except(:all).merge(params: (options.dig(:params) || {}).merge(next_value)))
           end
           next_value = pagination.next(page_data._raw)
           merge_batch_data_with_parent!(page_data, data, pagination)
@@ -387,6 +387,7 @@ class DHS::Record
       end
 
       def merge_batch_data_with_parent!(batch_data, parent_data, pagination = nil)
+        return if batch_data.raw_items.blank?
         parent_data.concat(input: parent_data._raw, items: batch_data.raw_items, record: self)
         return if pagination.present? && pagination.is_a?(DHS::Pagination::Link)
         [limit_key(:body), total_key, pagination_key(:body)].each do |pagination_attribute|

data/lib/dhs/pagination/next_offset.rb

@@ -3,7 +3,7 @@
 class DHS::Pagination::NextOffset < DHS::Pagination::Base
 
   DEFAULT_OFFSET = 0
-  
+
   def total
     data._raw.dig(*_record.items_key).count || 0
   end

data/lib/dhs/problems/errors.rb

@@ -54,7 +54,7 @@ module DHS::Problems
     end
 
     def messages_from_response(response = nil)
-      return {} if !response || !response.body.is_a?(String) || response.body.length.zero?
+      return {} if !response || !response.body.is_a?(String) || response.body.empty?
       json = JSON.parse(response.body)
       parse_messages(json)
     end

data/lib/dhs/version.rb

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

data/spec/concerns/record/request_spec.rb

@@ -19,15 +19,15 @@ describe DHS::Record::Request do
 
     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')
+        .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 (collection)' do
       expect(subject).to receive(:prepare_option_for_include_all_request!)
-        .with(abc: 'def').and_return('ignore')
+        .with({ abc: 'def' }).and_return('ignore')
       expect(subject).to receive(:prepare_option_for_include_all_request!)
-        .with(hij: 'kel').and_return('ignore')
+        .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

data/spec/pagination/next_offset_spec.rb

@@ -3,11 +3,9 @@
 require 'rails_helper'
 
 describe DHS::Record do
-
-  context 'pagination' do
-
-    def stub_api_request(items: [], offset: nil, next_offset:)
-      stub_request(:get, ["http://depay.fi/v2/transactions?limit=100", offset ? "offset=#{offset}" : nil].compact.join('&'))
+  context 'next offset pagination' do
+    def stub_api_request(next_offset:, items: [], offset: nil)
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
         .to_return(body: { items: items, next_offset: next_offset }.to_json)
     end
 
@@ -30,4 +28,56 @@ describe DHS::Record do
       expect(transactions.to_a).to eq (0...300).to_a
     end
   end
+
+  context 'next offset pagination with items configuration' do
+    def stub_api_request(next_offset:, items: [], offset: nil)
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
+        .to_return(body: { assets: items, next_offset: next_offset }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, next_offset: 99)
+      stub_api_request(items: (100...200).to_a, offset: 99, next_offset: 199)
+      stub_api_request(items: (200...300).to_a, offset: 199, next_offset: 0)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration items_key: :assets, pagination_strategy: :next_offset, pagination_key: { body: :next_offset, parameter: :offset }
+
+        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...300).to_a
+    end
+  end
+
+  context 'next offset pagination with items configuration and nil response' do
+    def stub_api_request(next_offset:, items: [], offset: nil)
+      stub_request(:get, ['http://depay.fi/v2/transactions?limit=100', offset ? "offset=#{offset}" : nil].compact.join('&'))
+        .to_return(body: { assets: items, next_offset: next_offset }.to_json)
+    end
+
+    let!(:requests) do
+      stub_api_request(items: (0...100).to_a, next_offset: 99)
+      stub_api_request(items: (100...200).to_a, offset: 99, next_offset: 199)
+      stub_api_request(items: nil, offset: 199, next_offset: 0)
+    end
+
+    before do
+      class Transaction < DHS::Record
+        configuration items_key: :assets, pagination_strategy: :next_offset, pagination_key: { body: :next_offset, parameter: :offset }
+
+        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

data/spec/record/endpoint_options_spec.rb

@@ -16,12 +16,12 @@ describe DHS::Record do
 
     it 'uses the options that are configured for an endpoint' do
       expect(DHC).to receive(:request)
-        .with(
-          cache_expires_in: 1.day,
-          retry: 2,
-          cache: true,
-          url: 'backend/v2/feedbacks/1'
-        ).and_call_original
+        .with({
+                cache_expires_in: 1.day,
+                retry: 2,
+                cache: true,
+                url: 'backend/v2/feedbacks/1'
+              }).and_call_original
 
       stub_request(:get, 'http://backend/v2/feedbacks/1').to_return(status: 200)
       Record.find(1)

data/spec/record/includes_spec.rb

@@ -214,12 +214,12 @@ describe DHS::Record do
 
       it 'overwrites existing pagination paramters if they are already contained in a string' do
         expect(DHC).to receive(:request)
-          .with(url: 'http://datastore/customers/1').and_call_original
+          .with({ url: 'http://datastore/customers/1' }).and_call_original
 
         expect(DHC).to receive(:request)
-          .with(url: 'http://datastore/customers/1/contracts',
-                all: true,
-                params: { limit: 100 }).and_call_original
+          .with({ url: 'http://datastore/customers/1/contracts',
+                  all: true,
+                  params: { limit: 100 } }).and_call_original
 
         expect(DHC).to receive(:request)
           .with([{ url: 'http://datastore/customers/1/contracts',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhs
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhs/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -580,7 +580,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.7.2
-rubygems_version: 3.2.33
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'REST services accelerator: Rails gem providing an easy, active-record-like