harvest-ruby-v2 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11eefb4a95c2afe45777912d11df1af797579b171d93b5a1c6398b75749cd28a
-  data.tar.gz: 6943ae64910c643dc5ef55da6507271d0c5e8899a993d88556fce8de67b135ec
+  metadata.gz: f341c06dfb732eeb0ab69f8a03d2d3a1d183c3afa1e200c14dba0cfe9e4bc81c
+  data.tar.gz: b10cb0684fb74ebb9a8e0dc87875b617a7b3c77af99ca5ed2dd75978c6fa7cf2
 SHA512:
-  metadata.gz: 5d8fec631281d689903d475cc9c45d02e264c69906a86f6b42d23603031a879785f768d6a2e4e1df0fedac5a5b49e1a50d3dd0a3e72697a4a856657b9d39b166
-  data.tar.gz: 26a5b2067684d9e3b7bf93ce0439417d3c8415d1a5e4b17813d98fecde178c66fa55810a1d346e9b4a95c82b3c0dcf50cfea21c7394bac62879e73e9368f0856
+  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

@@ -11,6 +11,7 @@ require 'harvest/exceptions'
 require 'harvest/finders'
 require 'harvest/discovers'
 require 'harvest/creates'
+require 'harvest/changers'
 
 # Conform to naming pattern of Finder, Discover, Creators.
 # @param key [Symbol] symbol of state
@@ -38,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
@@ -78,7 +82,7 @@ module Harvest
         super
       end
     rescue NoMethodError
-      # binding.pry
+      # require 'pry'; binding.pry
       raise Harvest::Exceptions::BadState, "#{meth} is an invalid state change."
     end
 
@@ -90,6 +94,16 @@ module Harvest
       self
     end
 
+    # Find single instance of resource
+    def change(**kwargs)
+      @state[@state[:active]].map do |obj|
+        Harvest::Changers.const_get(to_class_name(@state[:active])).new.change(
+          @factory, @client, active_user, @state, kwargs
+        )
+      end
+      self
+    end
+
     # Discover resources
     def discover(**params)
       @state[@state[:active]] = Harvest::Discovers
@@ -101,6 +115,16 @@ module Harvest
       self
     end
 
+    # Create an instance of object based on state
+    def create(**kwargs)
+      @state[@state[:active]] = Harvest::Create.const_get(
+        to_class_name(@state[:active])
+      ).new.create(
+        @factory, @client, active_user, @state, kwargs
+      )
+      self
+    end
+
     # Select a subset of all items depending on state
     def select(&block)
       @state[@state[:active]] = @state[@state[:active]].select(&block)
@@ -116,15 +140,5 @@ module Harvest
     def data
       @state[@state[:active]]
     end
-
-    # Create an instance of object based on state
-    def create(**kwargs)
-      @state[@state[:active]] = Harvest::Create.const_get(
-        to_class_name(@state[:active])
-      ).new.create(
-        @factory, @client, active_user, @state, kwargs
-      )
-      self
-    end
   end
 end

data/lib/harvest/changers.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Harvest
+  module Changers
+    class TimeEntry
+      def change(factory, client, _active_user, state, kwargs)
+        # binding.pry
+        state[state[:active]].map do |te|
+          send(kwargs[:action].to_sym, factory, client, te)
+        end
+      end
+
+      private
+
+      def restart(factory, client, te)
+        # PATCH /v2/time_entries/{TIME_ENTRY_ID}/restart
+        # binding.pry
+        [factory.time_entry(client.api_call(client.api_caller("time_entries/#{te.id}/restart", http_method: 'patch')))]
+      end
+
+      def stop(factory, client, te)
+        # PATCH /v2/time_entries/{TIME_ENTRY_ID}/stop
+        [factory.time_entry(client.api_call(client.api_caller("time_entries/#{te.id}/stop", http_method: 'patch')))]
+      end
+    end
+  end
+end

data/lib/harvest/creates.rb

@@ -34,8 +34,8 @@ module Harvest
 
       # @api private
       def time_entry_payload(kwargs)
-        possible_keys = %i[spent_date notes external_reference user_id]
-        payload = kwargs.map { |k, v| [k, v] if possible_keys.include?(k) }.to_h
+        possible_keys = %i[spent_date notes external_reference user_id project_id task_id]
+        payload = kwargs.each { |k, v| [k, v] if possible_keys.include?(k) }.to_h
         payload[:user_id] ||= @active_user.id
         payload[:task_id] = @state[:project_tasks][0].task.id
         payload[:project_id] = true_project(@state[:projects][0]).id

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/finders.rb

@@ -10,7 +10,7 @@ module Harvest
 
     class TimeEntry
       def find(factory, client, id)
-        [factory.time_entry(client.api_call(client.api_caller("time_entry/#{id}")))]
+        [factory.time_entry(client.api_call(client.api_caller("time_entries/#{id}")))]
       end
     end
   end

data/lib/harvest/httpclient.rb

@@ -71,12 +71,11 @@ 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
-            require 'pry'
-            # binding.pry
+            # require 'pry'; binding.pry
           end
         )
       end
@@ -86,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']
@@ -109,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
           }
@@ -126,22 +127,43 @@ module Harvest
         client[struct.path].get(struct.headers)
       end
 
+      def delete(struct)
+        client[struct.path].delete(struct.headers)
+      end
+
       def post(struct)
         client[struct.path].post(struct.payload, struct.headers)
       end
+
+      def patch(struct)
+        client[struct.path].patch(struct.payload, struct.headers)
+      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
 
@@ -158,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/resourcefactory.rb

@@ -208,11 +208,16 @@ module Harvest
     end
 
     def convert_dates(data)
-      %i[created_at updated_at sent_at accepted_at declined_at spent_date].each do |key|
+      %i[created_at updated_at sent_at accepted_at declined_at].each do |key|
         if data.members.include?(key) && !data.method(key).call.nil?
           data.method("#{key}=").call(DateTime.strptime(data.method(key).call))
         end
       end
+      %i[spent_date].each do |key|
+        if data.members.include?(key) && !data.method(key).call.nil?
+          data.method("#{key}=").call(Date.strptime(data.method(key).call))
+        end
+      end
       data
     end
   end

data/lib/harvest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Harvest
-  VERSION = '0.3.1'
+  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.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Craig Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -61,6 +61,7 @@ files:
 - bin/setup
 - harvest-ruby-v2.gemspec
 - lib/harvest.rb
+- lib/harvest/changers.rb
 - lib/harvest/client.rb
 - lib/harvest/config.rb
 - lib/harvest/creates.rb