productive 0.6.58 → 0.6.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a95c1e1546277fd6ad210fd73a25436f2c07a313dae7f1049b3b7ef234c9e7b
-  data.tar.gz: 34126a9c2491a4cb3325aa29029cfe9824e879337bd6e73401cb1db47ab26527
+  metadata.gz: 7b0581cbf5e2dd654905d5cbfb67e5cceca461b3db48757e0e1cae3a569e9a17
+  data.tar.gz: 1771d2708b58d47c891bbc63cd6ab59a17109d6cfbc476b97c8d63928f2ded18
 SHA512:
-  metadata.gz: 4e5ff80c334e01dc85ba636ad29b17289498b6cbfc686b398c511ac072ae09aa10dd08009b20120ca4c7ae0069d5991c90936400535cda9677feb15d79079da4
-  data.tar.gz: 819a6352d792ccb8a3e95da050b5a1249022f006431e639275f0f67f99f40a2c60f1d77f9ffe71debf89b2bb3d8378df2848a09295515c59ba8fe15501713554
+  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/resources/role.rb

@@ -0,0 +1,4 @@
+module Productive
+  class Role < BaseAccount
+  end
+end

data/lib/productive/version.rb

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

data/lib/productive.rb

@@ -72,6 +72,7 @@ require 'productive/resources/reports/project_report'
 require 'productive/resources/reports/service_report'
 require 'productive/resources/reports/task_report'
 require 'productive/resources/reports/time_entry_report'
+require 'productive/resources/role'
 require 'productive/resources/salary'
 require 'productive/resources/salary_report'
 require 'productive/resources/sales_report'

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.58
+  version: 0.6.60
 platform: ruby
 authors:
 - Josip Bišćan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 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
@@ -139,6 +131,7 @@ files:
 - lib/productive/resources/reports/service_report.rb
 - lib/productive/resources/reports/task_report.rb
 - lib/productive/resources/reports/time_entry_report.rb
+- lib/productive/resources/role.rb
 - lib/productive/resources/salary.rb
 - lib/productive/resources/salary_report.rb
 - lib/productive/resources/sales_report.rb
@@ -165,7 +158,7 @@ homepage: https://github.com/productiveio/api_client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A JSONAPI-based client to consume Productive API
 test_files: []