productive 0.6.59 → 0.6.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c977425e19aa039f3141c9c9820e79bc9899bf7bee60672a7075360e5fe6fb31
-  data.tar.gz: 931e85b9bfec1e7ce396906043fc7b358afc2309a9494db7fae8bd268664cba1
+  metadata.gz: 7b0581cbf5e2dd654905d5cbfb67e5cceca461b3db48757e0e1cae3a569e9a17
+  data.tar.gz: 1771d2708b58d47c891bbc63cd6ab59a17109d6cfbc476b97c8d63928f2ded18
 SHA512:
-  metadata.gz: 40950a5478f66abf477f960bd655ab2e4a62881fe6ff2bb5ed37d484bdd67d6abca4c476be40833f16ef92bef8a48b056e66c82a545c8fc26496f405b81b4af9
-  data.tar.gz: 4cc670d8b290a89721428db68ec1ca5b957dc3774b042153d214ef191f822964fe04b20d5bcb17631b8a65285f5651c802a4580fff9af5981f31e84b974940c8
+  metadata.gz: 180bc3286195bac1465b0997353e104c88dbec6a2b98590b791f4799c70548d9236e4aba6509c92116bcfea74dbc7b0962919db03e5f07b4434641d0a1d5c580
+  data.tar.gz: 2969164942aa23e8e6e7b0cd6666a6a273045d0306b8b2e822ea67d711961951fb1db1bae7e1c1ba855cbc1a41d387948b56bdeab734d45b5095dd054dcfa534

data/lib/json_api_paginator.rb

@@ -1,67 +1,15 @@
-require 'rack'
+class JsonApiPaginator < JsonApiClient::Paginating::NestedParamPaginator
+  self.page_param = 'number'
+  self.per_page_param = 'size'
 
-class JsonApiPaginator
-  attr_reader :params, :result_set, :links, :meta
+  attr_reader :meta
 
   def initialize(result_set, data)
-    @params = params_for_uri(result_set.uri)
-    @result_set = result_set
-    @links = data['links'] || {}
+    super
     @meta = data['meta'] || {}
   end
 
-  def next
-    links['next'] ? result_set.links.fetch_link('next') : nil
-  end
-
-  def prev
-    links['prev'] ? result_set.links.fetch_link('prev') : nil
-  end
-
-  def first
-    links['first'] ? result_set.links.fetch_link('first') : nil
-  end
-
-  def last
-    links['last'] ? result_set.links.fetch_link('last') : nil
-  end
-
-  def total_pages
-    if links['last']
-      uri = result_set.links.link_url_for('last')
-      last_params = params_for_uri(uri)
-      last_params['page']['number'].to_i
-    else
-      current_page
-    end
-  end
-
   def total_entries
-    meta['total_count'].to_i || per_page * total_pages
-  end
-  alias_method :total_count, :total_entries
-
-  def per_page
-    params['page']['size'].to_i
-  end
-
-  def current_page
-    (params['page']['number'] || 1).to_i
-  end
-
-  def previous_page
-    current_page > 1 ? (current_page - 1) : nil
-  end
-
-  def next_page
-    current_page < total_pages ? (current_page + 1) : nil
-  end
-
-  private
-
-  def params_for_uri(uri)
-    return {} unless uri
-    uri = Addressable::URI.parse(uri)
-    Rack::Utils.parse_nested_query(uri.query || '')
+    meta['total_count'].to_i || super
   end
 end

data/lib/productive/version.rb

@@ -1,3 +1,3 @@
 module Productive
-  VERSION = '0.6.59'.freeze
+  VERSION = '0.6.60'.freeze
 end

data/productive.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.files = `git ls-files`.split("\n")
 
-  s.add_dependency 'rack'
-  s.add_dependency 'json_api_client', '>= 1.5.2'
+  s.add_dependency 'json_api_client', '>= 1.13.0', "<= 1.21.0"
   s.add_dependency 'request_store', '~> 1.3'
 end

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: productive
 version: !ruby/object:Gem::Version
-  version: 0.6.59
+  version: 0.6.60
 platform: ruby
 authors:
 - Josip Bišćan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2022-12-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.13.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.13.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement