harvested 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f9194a4556d2e4f55bd7ed336a18393b3b75ba
-  data.tar.gz: b63cbb54de97e276cbaa9f4829f0756d8ceb74aa
+  metadata.gz: 716eb0ff1c8bf452bcc5c27141b506434879091e
+  data.tar.gz: 678f0a9979ebf26642b99394b1758bbf6e3fa003
 SHA512:
-  metadata.gz: dc40190d2ee5dde42dc4f7815306dc341edc5e0b503e828ed63f333739113f2b6c1087b50990978717979e9780d0a5bec24dd9a52062d9887177be2b1b316b11
-  data.tar.gz: f43828a1bbde4e7ca2443d97d741d7eb307f0c21521e80d24ac2e0a37b36a6df40c6878347e14a58165c22d8d7643445cd7b01973ac80d7e1a3bbb51fe3137c3
+  metadata.gz: 2ef6acffd66daf6656bba1596be6da0432b7fd66cda63ee40dd41f41ec08473c760bd339d1f3afe928ebdde7e76cb3920a36d99a8ec83ca6e7ba068466f863ed
+  data.tar.gz: a1924f4e508eab2b6780d08b5f775fbedc34dcfb2aa1cc90d30d1656a7d1ff40a670682fa221dd587241a8886f36755646439bfe2dc25ddaf943d27416d7810c

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.3.4

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 group :development, :test do
   gem 'bundler', '>= 1.6.2'
-  gem 'rake'
+  gem 'rake', '< 11'
 
   gem 'rspec', '~> 2'
   gem 'jruby-openssl', :platform => [:jruby], :require => false

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 4.0.0 - Apr 21, 2017
+  * Invoices need to be told explicitly to send line items to the server with a new attribute: `update_line_items`.
+  * Task/UserAssignment endpoints can now be passed query params. (Thanks Brendan Loudermilk - @bloudermilk and Nick Giancola @patbenatar)
+  * Expense Attachments work again. (Thanks Peter - @toothfairy)
+  * Company information is now included when retreiving info from `who_am_i`. (Thanks André Arko - @indirect)
+
 ## 3.1.0 - Aug 29, 2014
   * Allows Invoice Messages to be created (Thanks Thomas Balthazar - @tbalthazar)
 

data/README.md

@@ -1,3 +1,7 @@
+# Harvested needs maintainers!! If you are interested in maintaining Harvested, create an issue! Until someone volunteers to help, development and bugfixes will lag. #
+
+Current project status: abandoned
+
 # Harvested: A Ruby Harvest API
 
 This is a Ruby wrapper for the [Harvest API](http://www.getharvest.com/api).

data/lib/harvest/api/account.rb

@@ -15,8 +15,11 @@ module Harvest
       # @return [Harvest::User]
       def who_am_i
         response = request(:get, credentials, '/account/who_am_i')
-        Harvest::User.parse(response.body).first
+        parsed = JSON.parse(response.body)
+        Harvest::User.parse(parsed).first.tap do |user|
+          user.company = parsed["company"]
+        end
       end
     end
   end
-end
+end

data/lib/harvest/api/expenses.rb

@@ -2,26 +2,32 @@ module Harvest
   module API
     class Expenses < Base
       api_model Harvest::Expense
-      
+
       include Harvest::Behavior::Crud
-      
+
       def all(date = ::Time.now, user = nil)
         date = ::Time.parse(date) if String === date
         response = request(:get, credentials, "#{api_model.api_path}/#{date.yday}/#{date.year}", :query => of_user_query(user))
         api_model.parse(response.parsed_response)
       end
-      
-      # This is currently broken, but will come back to it
+
       def attach(expense, filename, receipt)
         body = ""
-        body << "------------------------------b7edea381b46\r\n"
+        body << "--__X_ATTACH_BOUNDARY__\r\n"
         body << %Q{Content-Disposition: form-data; name="expense[receipt]"; filename="#{filename}"\r\n}
-        body << "Content-Type: image/png\r\n"
-        body << "\r\n#{receipt.read}\r\n"
-        body << "------------------------------b7edea381b46\r\n"
-        
-        request(:post, credentials, "#{api_model.api_path}/#{expense.to_i}/receipt", :headers => {'Content-Type' => 'multipart/form-data; boundary=------------------------------b7edea381b46'}, :body => body)
+        body << "\r\n#{receipt.read}"
+        body << "\r\n--__X_ATTACH_BOUNDARY__--\r\n\r\n"
+
+        request(
+          :post,
+          credentials,
+          "#{api_model.api_path}/#{expense.to_i}/receipt",
+          :headers => {
+            'Content-Type' => 'multipart/form-data; charset=utf-8; boundary=__X_ATTACH_BOUNDARY__',
+            'Content-Length' => body.length.to_s,
+          },
+          :body => body)
       end
     end
   end
-end
+end

data/lib/harvest/api/task_assignments.rb

@@ -2,8 +2,8 @@ module Harvest
   module API
     class TaskAssignments < Base
       
-      def all(project)
-        response = request(:get, credentials, "/projects/#{project.to_i}/task_assignments")
+      def all(project, query = {})
+        response = request(:get, credentials, "/projects/#{project.to_i}/task_assignments", {query: query})
         Harvest::TaskAssignment.parse(response.parsed_response)
       end
       
@@ -31,4 +31,4 @@ module Harvest
       end
     end
   end
-end
+end

data/lib/harvest/api/user_assignments.rb

@@ -1,9 +1,9 @@
 module Harvest
   module API
     class UserAssignments < Base
-      
-      def all(project)
-        response = request(:get, credentials, "/projects/#{project.to_i}/user_assignments")
+
+      def all(project, query = {})
+        response = request(:get, credentials, "/projects/#{project.to_i}/user_assignments", {query: query})
         Harvest::UserAssignment.parse(response.parsed_response)
       end
       

data/lib/harvest/invoice.rb

@@ -42,6 +42,7 @@ module Harvest
     api_path '/invoices'
 
     attr_reader :line_items
+    attr_accessor :update_line_items
 
     def self.parse(json)
       parsed   = String === json ? JSON.parse(json) : json
@@ -60,6 +61,7 @@ module Harvest
         self.line_items = args.delete("csv_line_items")
         self.line_items = args.delete("line_items")
         self.line_items = [] if self.line_items.nil?
+        self.update_line_items = args.delete("update_line_items")
       end
       super
     end
@@ -77,7 +79,7 @@ module Harvest
 
     def as_json(*options)
       json = super(*options)
-      json[json_root]["csv_line_items"] = encode_csv(@line_items)
+      json[json_root]["csv_line_items"] = encode_csv(@line_items) if update_line_items
       json
     end
 

data/lib/harvest/invoice_category.rb

@@ -3,7 +3,13 @@ module Harvest
     include Harvest::Model
 
     api_path '/invoice_item_categories'
-    def self.json_root; "category"; end
+    def self.json_root; "invoice_item_category"; end
 
+    class << self
+      def parse(json)
+        parsed = String === json ? JSON.parse(json) : json
+        Array.wrap(parsed).map {|attrs| new(attrs["invoice_category"])}
+      end
+    end
   end
 end

data/lib/harvest/version.rb

@@ -1,3 +1,3 @@
 module Harvest
-  VERSION = "3.1.1"
+  VERSION = "4.0.0"
 end

data/spec/functional/invoice_payments_spec.rb

@@ -18,7 +18,7 @@ describe 'harvest invoice payments' do
   it 'allows adding, and removing invoice payments' do
     cassette('invoice_payment2') do
       client  = harvest.clients.create(FactoryGirl.attributes_for(:client))
-      invoice = harvest.invoices.create(FactoryGirl.attributes_for(:invoice, :client_id => client.id))
+      invoice = harvest.invoices.create(FactoryGirl.attributes_for(:invoice, :client_id => client.id, update_line_items: true))
 
       half_amount = (invoice.amount.to_f / 2)
 
@@ -26,7 +26,7 @@ describe 'harvest invoice payments' do
       payment1 = harvest.invoice_payments.create(payment1)
 
       invoice = harvest.invoices.find(invoice.id)
-      invoice.state.should == 'partial'
+      invoice.state.should == 'draft'
 
       payment2 = Harvest::InvoicePayment.new(FactoryGirl.attributes_for(:invoice_payment, :invoice_id => invoice.id, :amount => half_amount))
       payment2 = harvest.invoice_payments.create(payment2)
@@ -38,7 +38,7 @@ describe 'harvest invoice payments' do
       harvest.invoice_payments.all(invoice).should be_empty
 
       invoice = harvest.invoices.find(invoice.id)
-      invoice.state.should == 'open'
+      invoice.state.should == 'draft'
     end
   end
 end

data/spec/functional/invoice_spec.rb

@@ -19,7 +19,7 @@ describe 'harvest invoices' do
     cassette('invoice2') do
       client  = harvest.clients.create(FactoryGirl.attributes_for(:client))
 
-      invoice = Harvest::Invoice.new(FactoryGirl.attributes_for(:invoice, :client_id => client.id))
+      invoice = Harvest::Invoice.new(FactoryGirl.attributes_for(:invoice, :client_id => client.id, update_line_items: true))
       invoice = harvest.invoices.create(invoice)
 
       invoice.subject.should == "Invoice for Joe's Stream Cleaning"
@@ -28,6 +28,7 @@ describe 'harvest invoices' do
 
       invoice.subject    = "Updated Invoice for Joe"
       invoice.line_items << FactoryGirl.build(:line_item)
+      invoice.update_line_items = true
 
       invoice = harvest.invoices.update(invoice)
       invoice.subject.should == "Updated Invoice for Joe"
@@ -70,7 +71,8 @@ describe 'harvest invoices' do
         "kind"                 => "free_form",
         "import_hours"         => "no",
         "import_expenses"      => "no",
-        "line_items"           => [Harvest::LineItem.new("kind" => "Service", "description" => "One item", "quantity" => 200, "unit_price" => "12.00")]
+        "line_items"           => [Harvest::LineItem.new("kind" => "Service", "description" => "One item", "quantity" => 200, "unit_price" => "12.00")],
+        "update_line_items"   => true
       )
       invoice = harvest.invoices.create(invoice)
 
@@ -96,7 +98,7 @@ describe 'harvest invoices' do
       invoices = harvest.invoices.all(:status => 'draft', :page => 1)
       invoices.count.should == 1
 
-      invoices = harvest.invoices.all(:timeframe => {:from => Date.today, :to => Date.today})
+      invoices = harvest.invoices.all(:timeframe => {:from => '2014-01-01', :to => '2014-01-01'})
       invoices.count.should == 1
 
       invoices = harvest.invoices.all(:timeframe => {:from => '19690101', :to => '19690101'})

data/spec/functional/reporting_spec.rb

@@ -46,7 +46,7 @@ describe 'harvest reporting' do
 
       entry3_time = Time.now.utc
       entry3  = harvest.time.create(notes: "test entry for checking updated_since", hours: 5, spent_at: "2009/12/15", task_id: task1.id, project_id: project1.id, of_user: user.id)
-      entries = harvest.reports.time_by_user(user, Time.utc(2009, 12, 10), Time.utc(2009,12,30), {project: project1, updated_since: entry3_time})
+      entries = harvest.reports.time_by_user(user, Time.utc(2009, 12, 10), Time.utc(2009,12,30), {project: project1, updated_since: Time.parse(entry3.updated_at) - 1})
       entries.first.should == entry3
       entries.size.should  == 1
 

data/spec/functional/time_tracking_spec.rb

@@ -76,7 +76,7 @@ describe 'harvest time tracking' do
 
       trackable_projects = harvest.time.trackable_projects
       trackable_project = trackable_projects.find {|p| p.name == "Bobby's Trackable Project" }
-      trackable_projects.first.client.should == "Bobbys Coffee Shop"
+      trackable_projects.first.client.should == "Bobby's Coffee Shop"
       trackable_projects.first.tasks.first.name.should == "A billable task for Bobby"
     end
   end

data/spec/harvest/invoice_spec.rb

@@ -36,10 +36,13 @@ describe Harvest::Invoice do
   end
 
   context "as_json" do
-    it 'encodes line items csv' do
+    it 'only updates line items remotely if it the invoice is told to' do
       invoice = Harvest::Invoice.new(:line_items => "kind,description,quantity,unit_price,amount,taxed,taxed2,project_id\nService,Abc,200,12.00,2400.0,false,false,\nService,def,1.00,20.00,20.0,false,false,\n")
       invoice.line_items.count.should == 2
       invoice.line_items.first.kind.should == "Service"
+      invoice.as_json["invoice"].keys.should_not include("csv_line_items")
+
+      invoice.update_line_items = true
       invoice.as_json["invoice"]["csv_line_items"].should == "kind,description,quantity,unit_price,amount,taxed,taxed2,project_id\nService,Abc,200,12.00,2400.0,false,false,\nService,def,1.00,20.00,20.0,false,false,\n"
     end
   end

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ VCR.configure do |c|
     # force cassettes to re_record when we pass VCR_REFRESH=true
     re_record_interval: ENV['VCR_REFRESH'] == 'true' ? 0 : nil
   }
+  c.allow_http_connections_when_no_cassette = true
 end
 
 FactoryGirl.find_definitions
@@ -33,7 +34,11 @@ RSpec.configure do |config|
   end
 
   def cassette(*args)
-    VCR.use_cassette(*args) do
+    if ENV['USE_VCR']
+      VCR.use_cassette(*args) do
+        yield
+      end
+    else
       yield
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harvested
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Zach Moazeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Ruby Wrapper for the Harvest API http://www.getharvest.com/
@@ -215,4 +215,3 @@ test_files:
 - spec/support/harvest_credentials.example.yml
 - spec/support/harvested_helpers.rb
 - spec/support/json_examples.rb
-has_rdoc: