productive 0.6.59 → 0.6.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c977425e19aa039f3141c9c9820e79bc9899bf7bee60672a7075360e5fe6fb31
-  data.tar.gz: 931e85b9bfec1e7ce396906043fc7b358afc2309a9494db7fae8bd268664cba1
+  metadata.gz: a1fa7dbc3f6b6b926bbd59707a36c45bcc6b59016f1bc5ce7eec6d71955fb344
+  data.tar.gz: 5be468ef591d98b86d7b4e6c5fde8c89e185b1cb50a6bf9b19fb86b6872db77c
 SHA512:
-  metadata.gz: 40950a5478f66abf477f960bd655ab2e4a62881fe6ff2bb5ed37d484bdd67d6abca4c476be40833f16ef92bef8a48b056e66c82a545c8fc26496f405b81b4af9
-  data.tar.gz: 4cc670d8b290a89721428db68ec1ca5b957dc3774b042153d214ef191f822964fe04b20d5bcb17631b8a65285f5651c802a4580fff9af5981f31e84b974940c8
+  metadata.gz: 1338b329648fa312f37e5cd7e62b479b863c4840ddaaaa2aadff72229bc890002674e61698dcd6d082ca2068c16cdd84b2c96ba4e04b7d7f0cf9dfdf4e335e21
+  data.tar.gz: 2319384f1ea30d0e0d4ce3885a1a27867d17946ffe531a638d83f1b489ba0187347b96883abb52aeb757a1e24c2e60ae528170a9b86f294bb74856667f8b6e24

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/reports/salary_report.rb

@@ -0,0 +1,9 @@
+module Productive
+  module Reports
+    class SalaryReport < BaseAccount
+      def self.table_name
+        "reports/salary_reports"
+      end
+    end
+  end
+end

data/lib/productive/resources/reports/time_report.rb

@@ -0,0 +1,9 @@
+module Productive
+  module Reports
+    class TimeReport < BaseAccount
+      def self.table_name
+        "reports/time_reports"
+      end
+    end
+  end
+end

data/lib/productive/version.rb

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

data/lib/productive.rb

@@ -26,7 +26,6 @@ require 'productive/resources/document_type'
 require 'productive/resources/email'
 require 'productive/resources/entitlement'
 require 'productive/resources/event'
-require 'productive/resources/event_report'
 require 'productive/resources/expense'
 require 'productive/resources/filter'
 require 'productive/resources/holiday_calendar'
@@ -46,7 +45,6 @@ require 'productive/resources/payment'
 require 'productive/resources/person'
 require 'productive/resources/pipeline'
 require 'productive/resources/price'
-require 'productive/resources/profitability_report'
 require 'productive/resources/project'
 require 'productive/resources/project_assignment'
 require 'productive/resources/pulse'
@@ -69,13 +67,13 @@ require 'productive/resources/reports/payroll_item_report'
 require 'productive/resources/reports/person_report'
 require 'productive/resources/reports/price_report'
 require 'productive/resources/reports/project_report'
+require 'productive/resources/reports/salary_report'
 require 'productive/resources/reports/service_report'
 require 'productive/resources/reports/task_report'
 require 'productive/resources/reports/time_entry_report'
+require 'productive/resources/reports/time_report'
 require 'productive/resources/role'
 require 'productive/resources/salary'
-require 'productive/resources/salary_report'
-require 'productive/resources/sales_report'
 require 'productive/resources/section'
 require 'productive/resources/service'
 require 'productive/resources/subsidiary'

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.61
 platform: ruby
 authors:
 - Josip Bišćan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2022-12-20 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
@@ -93,7 +85,6 @@ files:
 - lib/productive/resources/email.rb
 - lib/productive/resources/entitlement.rb
 - lib/productive/resources/event.rb
-- lib/productive/resources/event_report.rb
 - lib/productive/resources/expense.rb
 - lib/productive/resources/filter.rb
 - lib/productive/resources/holiday_calendar.rb
@@ -113,7 +104,6 @@ files:
 - lib/productive/resources/person.rb
 - lib/productive/resources/pipeline.rb
 - lib/productive/resources/price.rb
-- lib/productive/resources/profitability_report.rb
 - lib/productive/resources/project.rb
 - lib/productive/resources/project_assignment.rb
 - lib/productive/resources/pulse.rb
@@ -136,13 +126,13 @@ files:
 - lib/productive/resources/reports/person_report.rb
 - lib/productive/resources/reports/price_report.rb
 - lib/productive/resources/reports/project_report.rb
+- lib/productive/resources/reports/salary_report.rb
 - 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/reports/time_report.rb
 - lib/productive/resources/role.rb
 - lib/productive/resources/salary.rb
-- lib/productive/resources/salary_report.rb
-- lib/productive/resources/sales_report.rb
 - lib/productive/resources/section.rb
 - lib/productive/resources/service.rb
 - lib/productive/resources/service_assignment.rb

data/lib/productive/resources/event_report.rb

@@ -1,6 +0,0 @@
-module Productive
-  class EventReport < BaseAccount
-    has_one :person
-    has_one :event
-  end
-end

data/lib/productive/resources/profitability_report.rb

@@ -1,8 +0,0 @@
-module Productive
-  class ProfitabilityReport < BaseAccount
-    has_one :deal
-    has_one :company
-    has_one :project
-    has_one :manager, class_name: :person
-  end
-end

data/lib/productive/resources/salary_report.rb

@@ -1,5 +0,0 @@
-module Productive
-  class SalaryReport < BaseAccount
-    has_one :person
-  end
-end

data/lib/productive/resources/sales_report.rb

@@ -1,6 +0,0 @@
-module Productive
-  class SalesReport < BaseAccount
-    has_one :deal
-    has_one :manager, class_name: :person
-  end
-end