harvest-ruby-v2 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63f7fe5a1b38cbabc2a53858a64a02096a6f3e40b386dd5b92e317294b89133
-  data.tar.gz: 5cc8d701ce1de2ae80fa091bce77ea52927e188d880fccfa99e798ed6a9c24f3
+  metadata.gz: 657bfe3e49665ad68a2d7498b8b775b6d7704701a807cbce5739d52e677e405b
+  data.tar.gz: 9ced52a03ca53b10967c20e87ad156259c457d957a134196f89c403b6e97fc01
 SHA512:
-  metadata.gz: 96b23ddc9d7f6348dbef4ce181532d1ed270fd7340acffb5de0fa003f4f252d01723b1c6e531c60fb444b3b5a062739c01af4032df792a40599a1f77b4dd9296
-  data.tar.gz: 9e41e01d8bf4d0f99bd06b0ed7f31b2aa5d5c9e47e316d4ad487cb36c9ac247f01e901441c5157823cfb018bd2ee5d4e516c0a8a3ec22f64bfe7d37d22f98ad1
+  metadata.gz: 257341d20fd30a3e582784368020e32a903d9a87e9b6487aa6f6d1e85a57d170ccaf8082b9818da285d93c079bfad65925780e779430039e194fc85ffde426da
+  data.tar.gz: 40a10bf4c46b6d48db61e4a4a8eeef8afd1db7e5a37c1018279967a1e02b6ace9314e12759d72080ba55fce393f8271a8b5874c83d8724d39de7f97f85a8146d

data/Gemfile

@@ -5,35 +5,20 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in harvest.gemspec
 gemspec
 
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
-
-gem 'rest-client', '~> 2.1'
-
-gem 'pry', '~> 0.13.1'
-
-gem 'configparser', '~> 0.1.7'
-
-gem 'rubocop', '~> 0.89.1'
-
 gem 'activesupport', '~> 6.0'
-
-gem 'reek', '~> 6.0'
-
-gem 'webmock', '~> 3.8'
-
-gem 'rubocop-rspec', '~> 1.43'
-
-gem 'rubocop-rake', '~> 0.5.1'
-
-gem 'yard', '~> 0.9.25'
-
-gem 'rubocop-performance', '~> 1.7'
-gem 'ruby-prof', '~> 1.4'
-gem 'simplecov', '~> 0.19.0'
-
-# gem 'pry-byebug', '~> 3.9'
-
-gem 'redcarpet', '~> 3.5'
-
-gem 'yard-struct', '~> 1.1'
+gem 'configparser', '~> 0.1.7', group: :development
+gem 'pry', '~> 0.13.1', group: :development
+gem 'rake', '~> 12.0', group: :development
+gem 'redcarpet', '~> 3.5', group: :development
+gem 'reek', '~> 6.0', group: :development
+gem 'rest-client', '~> 2.1'
+gem 'rspec', '~> 3.0', group: :development
+gem 'rubocop', '~> 0.89.1', group: :development
+gem 'rubocop-performance', '~> 1.7', group: :development
+gem 'rubocop-rake', '~> 0.5.1', group: :development
+gem 'rubocop-rspec', '~> 1.43', group: :development
+gem 'ruby-prof', '~> 1.4', group: :development
+gem 'simplecov', '~> 0.19.0', group: :development
+gem 'webmock', '~> 3.8', group: :development
+gem 'yard', '~> 0.9.25', group: :development
+gem 'yard-struct', '~> 1.1', group: :development

data/Makefile

@@ -7,3 +7,8 @@ setup:
 yard:
 	bundle exec rake yard
 	bundle exec rake yard-server
+
+push:
+	find . -maxdepth 1 -name '*.gem' -exec rm {} \;
+	gem build *.gemspec
+	gem push *.gem

data/harvest-ruby-v2.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   # spec.bindir        = 'exe'
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.add_dependency 'activesupport', '~> 6.0'
+  spec.add_dependency 'rest-client', '~> 2.1'
 end

data/lib/harvest.rb

@@ -55,6 +55,10 @@ module Harvest
       ].include?(meth)
     end
 
+    def clone
+      Harvest::Client.new(@config, state: @state.clone)
+    end
+
     # @param meth [Symbol]
     # @return [Boolean]
     def respond_to_missing?(meth)
@@ -74,7 +78,7 @@ module Harvest
         super
       end
     rescue NoMethodError
-      # binding.pry
+      # require 'pry'; binding.pry
       raise Harvest::Exceptions::BadState, "#{meth} is an invalid state change."
     end
 
@@ -88,27 +92,29 @@ module Harvest
 
     # Discover resources
     def discover(**params)
-      @state[@state[:active]] = Harvest::Discovers.const_get(
-        to_class_name(@state[:active])
-      ).new.discover(
-        @admin_api, @client, @factory, active_user, @state, params
-      )
+      @state[@state[:active]] = Harvest::Discovers
+                                .const_get(to_class_name(@state[:active]))
+                                .new
+                                .discover(
+                                  @admin_api, @client, @factory, active_user, @state, params
+                                )
       self
     end
 
     # Select a subset of all items depending on state
     def select(&block)
-      @state[:filtered][@state[:active]] = @state[@state[:active]].select(&block)
+      @state[@state[:active]] = @state[@state[:active]].select(&block)
       self
     end
 
     # Map block of filtered items
     def map(&block)
-      if @state[:filtered].key?(@state[:active])
-        @state[:filtered][@state[:active]].map(&block)
-      else
-        @state[@state[:active]].map(&block)
-      end
+      @state[@state[:active]].map(&block)
+    end
+
+    # Return data from the active state in the base state or filtered.
+    def data
+      @state[@state[:active]]
     end
 
     # Create an instance of object based on state

data/lib/harvest/creates.rb

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

data/lib/harvest/discovers.rb

@@ -51,7 +51,7 @@ module Harvest
 
     class ProjectTasks
       def discover(_admin_api, _client, _factory, _active_user, state, _params)
-        state[:filtered][:projects][0].task_assignments
+        state[:projects][0].task_assignments
       end
     end
   end

data/lib/harvest/httpclient.rb

@@ -75,8 +75,7 @@ module Harvest
       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

data/lib/harvest/resourcefactory.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
 require 'harvest/resources'
 
 module Harvest
@@ -214,6 +213,11 @@ module Harvest
           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.2.1'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: harvest-ruby-v2
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Craig Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
-dependencies: []
+date: 2020-10-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: Harvest API for v2  written in Fluent API style
 email:
 - craig.davis@rackspace.com