dhs 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02b8006074cd3482fac996fcf904ed9e904d6ab8f8b504afcd9c27318dd5724
-  data.tar.gz: 2ce157d1fd6f0333d9638516e650f2ef040b6f08145664e4f3e8b041f908ca66
+  metadata.gz: 79388bf9da2d5952b1df95513287bbd412dcb5196c99889ea91e28f302cbc64d
+  data.tar.gz: e18e9e03e4130cbc2e4dadddb63603170ffee5c2791eb2e64418f39b33f664c8
 SHA512:
-  metadata.gz: 8975d2399f0a7a63066fdf8e23b96dbf2b9809bd9e75efc73a85779b1a32e97eae997dce4573222ed5d7b1556ca9dc2276d12eee5dddfa911d71698ae26b10d0
-  data.tar.gz: 9d00278274df289db27965f24a6bc2a106d46e64ea09814b8129d5aeae15f6e0e2d7e7cde37a7f7b49447142ecc52a960ea458bef1cb9f46396ec9457c2acd97
+  metadata.gz: 3ccb5289a230ea385574091368925d293106fae4fb5874ead856fb85a68bfa726a531a7adf9ad5b9499c82f24a8a355cf9ac5eb8741b1eb30c862762b3ed6b08
+  data.tar.gz: 42edbdaadbf8adc52e7a8a05a979d7b498aa0c8aa084718e29e0237282164482d37cb4b5d499e19633245f8a72e81a67f0fc167a9e8ce87bdf0efad20899932d

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/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

@@ -9,7 +9,7 @@ class DHS::Pagination::NextParameter < DHS::Pagination::Base
   end
   alias count total
 
-  def self.next_offset(offset, limit)
+  def self.next_offset(_offset, _limit)
     nil
   end
 
@@ -24,7 +24,7 @@ class DHS::Pagination::NextParameter < DHS::Pagination::Base
 
   def next(current)
     next_value = current.dig(*_record.pagination_key(:body))
-    return if next_value.blank? || next_value.blank?
+    return if next_value.blank?
     {
       _record.pagination_key(:parameter) => current.dig(*_record.pagination_key(:body))
     }

data/lib/dhs/version.rb

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

data/spec/pagination/next_parameter_spec.rb

@@ -4,9 +4,8 @@ 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('&'))
+      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
 
@@ -31,9 +30,8 @@ describe DHS::Record do
   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('&'))
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhs
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - https://github.com/DePayFi/dhs/graphs/contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-14 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
@@ -582,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