harvest-ruby-v2 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd54649aabcba944c8e02a7ea5ae6a972b9b87f2bd7ad455ba2da0ab164ae87
-  data.tar.gz: 55357327dba37d0e8e50d5b7474d5a5b59f97e083849db987cf5fb38d5596418
+  metadata.gz: f341c06dfb732eeb0ab69f8a03d2d3a1d183c3afa1e200c14dba0cfe9e4bc81c
+  data.tar.gz: b10cb0684fb74ebb9a8e0dc87875b617a7b3c77af99ca5ed2dd75978c6fa7cf2
 SHA512:
-  metadata.gz: 4cb412255cdeed5d49b080c9168bc6f01e8f6ca05c953069428fed942f49a092127c5fc428ca9eac001f34f5b27a9b76d185de414b9daba6c622a4c2977c9d96
-  data.tar.gz: 5a08ac7e1e6025d43dc1b9e71f56bcf0964199c0c49a10cfb2247346e8a9c78301058b1181e7055b67212c63391d6614334b9431bd4de0517f3fe30c4812ba65
+  metadata.gz: bddbbd22c42beb25c7877adc7241b4d2feb61961c0f3ba61c5b774f34c9caf69a87239703a2e3eca0d7906a2b90e648b598492cc149c8d0752804d7f0bc58dd6
+  data.tar.gz: 8bdd8d98251fa443f0fbaf0b6665de237f64131aab1cc6d207c1305912f6891831bdd5eb8bf706e6d22696737209e9fccf158e8a9c3ba5625924254d5f8de086

data/CHANGELOG.rst

@@ -0,0 +1,8 @@
+##########################
+Changelog for harvest-ruby
+##########################
+
+0.5.0
+^^^^^
+
+* Fixed bug with ApiCall which caused query params to not be passed to the underlying call.

data/Gemfile

@@ -8,6 +8,7 @@ gemspec
 gem 'activesupport', '~> 6.0'
 gem 'configparser', '~> 0.1.7', group: :development
 gem 'pry', '~> 0.13.1', group: :development
+gem 'pry-stack_explorer', '~> 0.5.1', group: :development
 gem 'rake', '~> 12.0', group: :development
 gem 'redcarpet', '~> 3.5', group: :development
 gem 'reek', '~> 6.0', group: :development

data/Rakefile

@@ -9,6 +9,8 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:spec) do |rubocop|
   rubocop.options << '--auto-correct'
   rubocop.options << '--display-cop-names'
+  rubocop.options << '--extra-details'
+  rubocop.options << '--display-style-guide'
 end
 
 YARD::Rake::YardocTask.new do |t|

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'pry'
+require 'pry-stack_explorer'
 require 'configparser'
 require 'date'
 require "bundler/setup"

data/lib/harvest.rb

@@ -39,14 +39,17 @@ module Harvest
       @client = Harvest::HTTP::Api.new(**@config)
       @factory = Harvest::ResourceFactory.new
       @state = state
-      @active_user = @factory.user(@client.api_call(@client.api_caller('/users/me')))
-      @admin_api = if @active_user.is_admin
+      @admin_api = if active_user.is_admin
                      config.admin_api
                    else
                      false
                    end
     end
 
+    def active_user
+      @state[:active_user] ||= @factory.user(@client.api_call(@client.api_caller('/users/me')))
+    end
+
     def allowed?(meth)
       %i[
         projects
@@ -93,7 +96,7 @@ module Harvest
 
     # Find single instance of resource
     def change(**kwargs)
-      @state[@state[:active]].map do |_obj|
+      @state[@state[:active]].map do |obj|
         Harvest::Changers.const_get(to_class_name(@state[:active])).new.change(
           @factory, @client, active_user, @state, kwargs
         )

data/lib/harvest/discovers.rb

@@ -43,6 +43,9 @@ module Harvest
         paginator.path = 'time_entries'
         paginator.data_key = 'time_entries'
         paginator.param = params
+
+        # require 'pry'; binding.pry
+
         client.pagination(paginator).map do |time_entry|
           factory.time_entry(time_entry)
         end

data/lib/harvest/httpclient.rb

@@ -71,7 +71,7 @@ module Harvest
 
       # Make a api call to an endpoint.
       # @api public
-      # @param struct [Struct::ApiCall]
+      # @param struct [ApiCall]
       def api_call(struct)
         JSON.parse(
           send(struct.http_method.to_sym, struct).tap do
@@ -85,7 +85,9 @@ module Harvest
       # @param struct [Struct::Pagination]
       def pagination(struct)
         struct.param[:page] = struct.page_count
-        page = api_call(struct.to_api_call)
+        page = api_call(struct.to_api_call).tap do
+          # require 'pry'; binding.pry
+        end
         struct.rows.concat(page[struct.data_key])
 
         return struct.rows if struct.page_count >= page['total_pages']
@@ -108,11 +110,11 @@ module Harvest
       end
 
       def api_caller(path, http_method: 'get', param: {}, payload: nil, headers: {})
-        Struct::ApiCall.new(
+        ApiCall.new(
           {
             path: path,
             http_method: http_method.to_sym,
-            param: param,
+            params: param,
             payload: payload,
             headers: headers
           }
@@ -138,17 +140,30 @@ module Harvest
       end
     end
 
-    Struct.new(
-      'ApiCall',
-      :path,
-      :http_method,
-      :param,
-      :payload,
-      :headers,
-      keyword_init: true
-    ) do
-      def param(params)
-        headers['params'] = params
+    class NoOptionProvided; end
+
+    class ApiCall
+      attr_accessor :path, :http_method, :payload, :headers
+
+      def initialize(path:, payload: {}, http_method: 'get', headers: {}, params: {})
+        @path = path
+        @http_method = http_method
+        @payload = payload
+        @headers = headers
+        param(params)
+      end
+
+      def param(params = NoOptionProvided)
+        if params == NoOptionProvided
+          @headers['params']
+        else
+          @headers['params'] = params
+        end
+      end
+
+      def param=(params)
+        param(params)
+        self
       end
     end
 
@@ -165,11 +180,11 @@ module Harvest
       keyword_init: true
     ) do
       def to_api_call
-        Struct::ApiCall.new(
-          {
+        ApiCall.new(
+          **{
             path: path,
             http_method: http_method,
-            param: param,
+            params: param,
             payload: payload,
             headers: headers
           }

data/lib/harvest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harvest
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harvest-ruby-v2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Craig Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport