harvested 2.0.0 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2bbcab0b8d5c473899f541789533afac807bc1d
-  data.tar.gz: 2271ae74a87f8108722d0019afb636661728fbad
+  metadata.gz: d40d1bfd28ea226ff25aa4e6f6b78d6ce3df6d37
+  data.tar.gz: c3ebf97344f99de79afc0eae59dd6b0a6de43f7d
 SHA512:
-  metadata.gz: edfa9ad33c17a0f759b725788a1c0fe4412609097e6c06a4b16cd553fd49c8429cdc495e23f0313197f555c298eb024fd0f157fbb395aa7c06bd839bf3d4cf61
-  data.tar.gz: 7d37d6f6f261c930e1030ddee9c82557823fcb9795303081f48ecbcd743413709a40841edaf15736b39c0842ba2a1a48fcf3a4cc504b2ab726efff1604a52451
+  metadata.gz: 2bc9034c02ad6d9ce05a8a2c70b545db1c8b5924085c674ec07093092c2d95c18f3af451240278e858398b6c445805615fa263f2d6892de82842e7bbe35d6ee3
+  data.tar.gz: bcea2bb7c21a00dba42ba7f666d79fe343b618f75a855b60f0c9cada27b39a4eed577c96181b843ba3cb50fdaef0acab99b8c73763a5879ddd009e85d2587848

data/.gitignore

@@ -31,3 +31,5 @@ spec/support/harvest_credentials.yml
 Gemfile.lock
 .bundle
 vendor/bundle
+
+tmp

data/{HISTORY → HISTORY.md}

@@ -1,38 +1,58 @@
-2.0.0 - April 23, 2014
+## 3.0.0.rc1 - May 30, 2014
+  * Require Ruby 2.0+
+  * Allow OAuth authentication (Thanks Brendan Loudermilk - @bloudermilk)
+  * Allow expenses_by_project to be retrieved (Thanks Jordan Yeo - @jordanyeo)
+  * Reports now pass through any remaining options (Thanks Philip Arndt - @parndt)
+
+## 2.0.0 - April 23, 2014
   * Every connection must be SSL
-1.2.0 - February 21, 2014
+
+## 1.2.0 - February 21, 2014
   * Adds time.trackable_projects: projects that the current user can create entries for
   * Show hint on error for projects.all as unprivileged user
-1.1.0 - December 13, 2013
+
+## 1.1.0 - December 13, 2013
   * Adds ability to toggle timers (thanks Eli Fatsi - @efatsi)
-1.0.1 - June 21, 2013
+
+## 1.0.1 - June 21, 2013
   * Adds ability to pass updated_since paramter to report methods (thanks Pete McWilliams)
   * Adds ability to create time entries for a given user
-1.0.0 - April 26, 2013
+
+## 1.0.0 - April 26, 2013
   * Same as 0.6.4 - This should have been v1.0 long ago.
-0.6.4 - October 24, 2012
+
+## 0.6.4 - October 24, 2012
   * Removes yard and redcarpet dependencies (added on accident)
-0.6.3 - October 24, 2012
+
+## 0.6.3 - October 24, 2012
   * Adds task activation (Thanks Mark Rickert - @markrickert)
   * Adds basic invoice support (Thanks Jeffrey Lee - @jlee42)
   * Adds basic invoice payment support (Thanks Adam Doeler - @releod)
-0.6.2 - August 25, 2012
+
+## 0.6.2 - August 25, 2012
   * Fixes Mash constructor errors
-0.6.1 - August 22, 2012
+
+## 0.6.1 - August 22, 2012
   * Adds options to "all" finder (thanks Mikel Lindsaar)
   * Adds Unauthorized error type (thanks @bcobb)
-0.6.0 - August 22, 2012
+
+## 0.6.0 - August 22, 2012
   * Replaces Dash with Mash
-0.5.3 - August 21, 2012
+
+## 0.5.3 - August 21, 2012
   * Adds new fields has_timesheet_2012_beta and timesheet_2012_beta_control_group to Users (thanks Aldric Giacomoni)
-0.5.2 - August 17, 2012
+
+## 0.5.2 - August 17, 2012
   * Adds new field password_change_required to Users
-0.5.1 - June 27, 2012
+
+## 0.5.1 - June 27, 2012
   * Updates README and harvested_credentials.example.yml with warnings about normal accounts
-0.5.0 - June 18, 2012
+
+## 0.5.0 - June 18, 2012
   * Bugfixes on User: https://github.com/zmoazeni/harvested/pull/26
   * Bugfixes on TimeEntry: https://github.com/zmoazeni/harvested/pull/25
-0.4.0 - August 4, 2011
+
+## 0.4.0 - August 4, 2011
   * Large rewrite of codebase
   * Rewrite of library to use JSON instead of XML
   * Rewrite of tests to use rspec instead of cucumber
@@ -41,14 +61,18 @@
   * Implements most of the invoice functionality. Creating/Editing/Updating is disabled due to Harvest API issue
   * Consolidates various forks (thanks Chris Ritterdorf, bricooke, Michelle Moon Lee, tkwong, Steve McKinney, and others that helped but aren't in the git log!)
   * Tests passing against MRI 1.8, 1.9, JRuby, and Rubinius
-0.3.3 - January 27, 2010
+
+## 0.3.3 - January 27, 2010
   * Adds fields to TaskAssignment (Quilted)
-0.3.2 - January 27, 2010
+
+## 0.3.2 - January 27, 2010
   * Adds of_user support to Time Entry (Benjamin Wong - tkwong)
-0.3.1 - October 14, 2010
+
+## 0.3.1 - October 14, 2010
   * Updates docs removing :ssl => false since Harvest released SSL to everyone
   * Adds department to the User model (Steve McKinney - )
-0.3.0 - April 11, 2010
+
+## 0.3.0 - April 11, 2010
   * Adds users
   * Adds clients
   * Adds contacts

data/harvested.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0'
+
   spec.add_runtime_dependency('httparty')
   spec.add_runtime_dependency('hashie', '~> 1')
   spec.add_runtime_dependency('json')

data/lib/harvest/api/base.rb

@@ -19,23 +19,25 @@ module Harvest
 
       protected
         def request(method, credentials, path, options = {})
-          params = {}
-          params[:path] = path
-          params[:options] = options
-          params[:method] = method
+          params = {
+            path:    path,
+            options: options,
+            method:  method
+          }
 
-          response = HTTParty.send(method, "#{credentials.host}#{path}",
-            :query => options[:query],
-            :body => options[:body],
-            :format => :plain,
-            :headers => {
-              "Accept" => "application/json",
+          httparty_options = {
+            query:  options[:query],
+            body:   options[:body],
+            format: :plain,
+            headers: {
+              "Accept"       => "application/json",
               "Content-Type" => "application/json; charset=utf-8",
-              "Authorization" => "Basic #{credentials.basic_auth}",
-              "User-Agent" => "Harvestable/#{Harvest::VERSION}",
+              "User-Agent"   => "Harvested/#{Harvest::VERSION}"
             }.update(options[:headers] || {})
-          )
+          }
 
+          credentials.set_authentication(httparty_options)
+          response = HTTParty.send(method, "#{credentials.host}#{path}", httparty_options)
           params[:response] = response.inspect.to_s
 
           case response.code

data/lib/harvest/api/reports.rb

@@ -2,31 +2,45 @@ module Harvest
   module API
     class Reports < Base
 
+      TIME_FORMAT = '%Y%m%d'
+
       def time_by_project(project, start_date, end_date, options = {})
-        query = {:from => start_date.strftime("%Y%m%d"), :to => end_date.strftime("%Y%m%d")}
-        query[:user_id]       = options[:user].to_i if options[:user]
-        query[:billable]      = (options[:billable] ? "yes" : "no") unless options[:billable].nil?
-        query[:updated_since] = options[:updated_since].to_s if options[:updated_since]
+        query = { from: start_date.strftime(TIME_FORMAT), to: end_date.strftime(TIME_FORMAT) }
+        query[:user_id]       = options.delete(:user).to_i if options[:user]
+        query[:billable]      = (options.delete(:billable) ? "yes" : "no") unless options[:billable].nil?
+        query[:updated_since] = options.delete(:updated_since).to_s if options[:updated_since]
+        query.update(options)
 
-        response = request(:get, credentials, "/projects/#{project.to_i}/entries", :query => query)
+        response = request(:get, credentials, "/projects/#{project.to_i}/entries", query: query)
         Harvest::TimeEntry.parse(JSON.parse(response.body).map {|h| h["day_entry"]})
       end
 
       def time_by_user(user, start_date, end_date, options = {})
-        query = {:from => start_date.strftime("%Y%m%d"), :to => end_date.strftime("%Y%m%d")}
-        query[:project_id]    = options[:project].to_i if options[:project]
-        query[:billable]      = (options[:billable] ? "yes" : "no") unless options[:billable].nil?
-        query[:updated_since] = options[:updated_since].to_s if options[:updated_since]
+        query = { from: start_date.strftime(TIME_FORMAT), to: end_date.strftime(TIME_FORMAT) }
+        query[:project_id]    = options.delete(:project).to_i if options[:project]
+        query[:billable]      = (options.delete(:billable) ? "yes" : "no") unless options[:billable].nil?
+        query[:updated_since] = options.delete(:updated_since).to_s if options[:updated_since]
+        query.update(options)
 
-        response = request(:get, credentials, "/people/#{user.to_i}/entries", :query => query)
+        response = request(:get, credentials, "/people/#{user.to_i}/entries", query: query)
         Harvest::TimeEntry.parse(JSON.parse(response.body).map {|h| h["day_entry"]})
       end
 
       def expenses_by_user(user, start_date, end_date, options = {})
-        query = {:from => start_date.strftime("%Y%m%d"), :to => end_date.strftime("%Y%m%d")}
-        query[:updated_since] = options[:updated_since].to_s if options[:updated_since]
+        query = { from: start_date.strftime(TIME_FORMAT), to: end_date.strftime(TIME_FORMAT) }
+        query[:updated_since] = options.delete(:updated_since).to_s if options[:updated_since]
+        query.update(options)
+
+        response = request(:get, credentials, "/people/#{user.to_i}/expenses", query: query)
+        Harvest::Expense.parse(response.parsed_response)
+      end
+
+      def expenses_by_project(project, start_date, end_date, options = {})
+        query = { from: start_date.strftime(TIME_FORMAT), to: end_date.strftime(TIME_FORMAT) }
+        query[:updated_since] = options.delete(:updated_since).to_s if options[:updated_since]
+        query.update(options)
 
-        response = request(:get, credentials, "/people/#{user.to_i}/expenses", :query => query)
+        response = request(:get, credentials, "/projects/#{project.to_i}/expenses", query: query)
         Harvest::Expense.parse(response.parsed_response)
       end
 

data/lib/harvest/base.rb

@@ -4,9 +4,14 @@ module Harvest
 
     # @see Harvest.client
     # @see Harvest.hardy_client
-    def initialize(subdomain, username, password)
-      @credentials = Credentials.new(subdomain, username, password)
-      raise InvalidCredentials unless credentials.valid?
+    def initialize(subdomain: nil, username: nil, password: nil, access_token: nil)
+      @credentials = if subdomain && username && password
+        BasicAuthCredentials.new(subdomain: subdomain, username: username, password: password)
+      elsif access_token
+        OAuthCredentials.new(access_token)
+      else
+        fail 'You must provide either :subdomain, :username, and :password or an oauth :access_token'
+      end
     end
 
     # All API actions surrounding accounts

data/lib/harvest/credentials.rb

@@ -1,21 +1,37 @@
 module Harvest
-  class Credentials
-    attr_accessor :subdomain, :username, :password
-
-    def initialize(subdomain, username, password)
+  class BasicAuthCredentials
+    def initialize(subdomain: nil, username: nil, password: nil)
       @subdomain, @username, @password = subdomain, username, password
     end
 
-    def valid?
-      !subdomain.nil? && !username.nil? && !password.nil?
+    def set_authentication(request_options)
+      request_options[:headers] ||= {}
+      request_options[:headers]["Authorization"] = "Basic #{basic_auth}"
     end
 
+    def host
+      "https://#{@subdomain}.harvestapp.com"
+    end
+
+    private
+
     def basic_auth
-      Base64.encode64("#{username}:#{password}").delete("\r\n")
+      Base64.encode64("#{@username}:#{@password}").delete("\r\n")
+    end
+  end
+
+  class OAuthCredentials
+    def initialize(access_token)
+      @access_token = access_token
+    end
+
+    def set_authentication(request_options)
+      request_options[:query] ||= {}
+      request_options[:query]["access_token"] = @access_token
     end
 
     def host
-      "https://#{subdomain}.harvestapp.com"
+      "https://api.harvestapp.com"
     end
   end
 end

data/lib/harvest/errors.rb

@@ -1,6 +1,4 @@
 module Harvest
-  class InvalidCredentials < StandardError; end
-  
   class HTTPError < StandardError
     attr_reader :response
     attr_reader :params
@@ -12,12 +10,12 @@ module Harvest
       @hint = hint
       super(response)
     end
-    
+
     def to_s
       "#{self.class.to_s} : #{response.code} #{response.body}" + (hint ? "\n#{hint}" : "")
     end
   end
-  
+
   class RateLimited < HTTPError; end
   class NotFound < HTTPError; end
   class Unavailable < HTTPError; end

data/lib/harvest/version.rb

@@ -1,3 +1,3 @@
 module Harvest
-  VERSION = "2.0.0"
+  VERSION = "3.0.0.rc1"
 end

data/lib/harvested.rb

@@ -29,23 +29,38 @@ module Harvest
     # Creates a standard client that will raise all errors it encounters
     #
     # == Options
-    # * +:ssl+ - Whether or not to use SSL when connecting to Harvest. This is dependent on whether your account supports it. Set to +true+ by default
+    # * Basic Authentication
+    #   * +:subdomain+ - Your Harvest subdomain
+    #   * +:username+ - Your Harvest username
+    #   * +:password+ - Your Harvest password
+    # * OAuth
+    #   * +:access_token+ - An OAuth 2.0 access token
+    #
     # == Examples
-    #   Harvest.client('mysubdomain', 'myusername', 'mypassword', :ssl => false)
+    #   Harvest.client(subdomain: 'mysubdomain', username: 'myusername', password: 'mypassword')
+    #   Harvest.client(access_token: 'myaccesstoken')
     #
     # @return [Harvest::Base]
-    def client(subdomain, username, password, options = {})
-      Harvest::Base.new(subdomain, username, password)
+    def client(subdomain: nil, username: nil, password: nil, access_token: nil)
+      Harvest::Base.new(subdomain: subdomain, username: username, password: password, access_token: access_token)
     end
 
     # Creates a hardy client that will retry common HTTP errors it encounters and sleep() if it determines it is over your rate limit
     #
     # == Options
-    # * +:ssl+ - Whether or not to use SSL when connecting to Harvest. This is dependent on whether your account supports it. Set to +true+ by default
+    # * Basic Authentication
+    #   * +:subdomain+ - Your Harvest subdomain
+    #   * +:username+ - Your Harvest username
+    #   * +:password+ - Your Harvest password
+    # * OAuth
+    #   * +:access_token+ - An OAuth 2.0 access token
+    #
     # * +:retry+ - How many times the hardy client should retry errors. Set to +5+ by default.
     #
     # == Examples
-    #   Harvest.hardy_client('mysubdomain', 'myusername', 'mypassword', :ssl => true, :retry => 3)
+    #   Harvest.hardy_client(subdomain: 'mysubdomain', username: 'myusername', password: 'mypassword', retry: 3)
+    #
+    #   Harvest.hardy_client(access_token: 'myaccesstoken', retries: 3)
     #
     # == Errors
     # The hardy client will retry the following errors
@@ -60,9 +75,8 @@ module Harvest
     #
     # @return [Harvest::HardyClient] a Harvest::Base wrapped in a Harvest::HardyClient
     # @see Harvest::Base
-    def hardy_client(subdomain, username, password, options = {})
-      retries = options.delete(:retry)
-      Harvest::HardyClient.new(client(subdomain, username, password), (retries || 5))
+    def hardy_client(subdomain: nil, username: nil, password: nil, access_token: nil, retries: 5)
+      Harvest::HardyClient.new(client(subdomain: subdomain, username: username, password: password, access_token: access_token), retries)
     end
   end
 end

data/spec/functional/reporting_spec.rb

@@ -4,52 +4,52 @@ describe 'harvest reporting' do
   it 'allows project and people entry reporting' do
     cassette("reports1") do
       user = harvest.users.create(
-        "email"      => "jane@example.com",
-        "first_name" => "Jane",
-        "last_name"  => "Doe",
-        "password"   => "secure"
+        email:      "jane@example.com",
+        first_name: "Jane",
+        last_name:  "Doe",
+        password:   "secure"
       )
-      client   = harvest.clients.create("name" => "Tim's Dry Cleaning")
-      project1 = harvest.projects.create("name" => "Reporting Project1", "client_id" => client.id)
-      project2 = harvest.projects.create("name" => "Reporting Project2", "client_id" => client.id)
-      task1     = harvest.tasks.create("name" => "A billable task", "default_hourly_rate" => 120, "billable_by_default" => true)
-      task2     = harvest.tasks.create("name" => "A non billable task", "billable_by_default" => false)
+      client   = harvest.clients.create(name: "Tim's Dry Cleaning")
+      project1 = harvest.projects.create(name: "Reporting Project1", client_id: client.id)
+      project2 = harvest.projects.create(name: "Reporting Project2", client_id: client.id)
+      task1     = harvest.tasks.create(name: "A billable task", "default_hourly_rate" => 120, "billable_by_default" => true)
+      task2     = harvest.tasks.create(name: "A non billable task", "billable_by_default" => false)
 
-      harvest.task_assignments.create("project" => project1, "task" => task1)
-      harvest.task_assignments.create("project" => project2, "task" => task2)
-      harvest.user_assignments.create("project" => project1, "user" => user)
-      harvest.user_assignments.create("project" => project2, "user" => user)
+      harvest.task_assignments.create(project: project1, task: task1)
+      harvest.task_assignments.create(project: project2, task: task2)
+      harvest.user_assignments.create(project: project1, user: user)
+      harvest.user_assignments.create(project: project2, user: user)
 
-      entry1 = harvest.time.create("notes" => "billable entry1", "hours" => 3, "spent_at" => "2009/12/28", "task_id" => task1.id, "project_id" => project1.id, "of_user" => user.id)
-      entry2 = harvest.time.create("notes" => "non billable entry2", "hours" => 6, "spent_at" => "2009/12/28", "task_id" => task2.id, "project_id" => project2.id, "of_user" => user.id)
+      entry1 = harvest.time.create(notes: "billable entry1", hours: 3, spent_at: "2009/12/28", task_id: task1.id, project_id: project1.id, of_user: user.id)
+      entry2 = harvest.time.create(notes: "non billable entry2", hours: 6, spent_at: "2009/12/28", task_id: task2.id, project_id: project2.id, of_user: user.id)
 
       harvest.reports.time_by_project(project1, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).first.should == entry1
 
-      harvest.reports.time_by_project(project1, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :user => user).first.should == entry1
+      harvest.reports.time_by_project(project1, Time.utc(2009, 12, 20), Time.utc(2009,12,30), user: user).first.should == entry1
 
-      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :user => user).first.should == entry2
+      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), user: user).first.should == entry2
 
-      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :billable => true).should == []
-      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :billable => false).first.should == entry2
+      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), billable: true).should == []
+      harvest.reports.time_by_project(project2, Time.utc(2009, 12, 20), Time.utc(2009,12,30), billable: false).first.should == entry2
 
-      harvest.reports.time_by_project(project1, Time.utc(2009, 12, 10), Time.utc(2009,12,30), {:updated_since => Time.now.utc}).should == []
+      harvest.reports.time_by_project(project1, Time.utc(2009, 12, 10), Time.utc(2009,12,30), {updated_since: Time.now.utc}).should == []
 
       harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).map(&:id).should == [entry1, entry2].map(&:id)
 
-      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :project => project1).first.should == entry1
+      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), project: project1).first.should == entry1
 
-      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :project => project2).first.should == entry2
+      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), project: project2).first.should == entry2
 
-      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :billable => true).first.should == entry1
-      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), :billable => false).first.should == entry2
+      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), billable: true).first.should == entry1
+      harvest.reports.time_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), billable: false).first.should == entry2
 
       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})
+      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.first.should == entry3
       entries.size.should  == 1
 
-      client2 = harvest.clients.create("name" => "Phil's Sandwich Shop")
+      client2 = harvest.clients.create(name: "Phil's Sandwich Shop")
       harvest.reports.projects_by_client(client).map(&:id).to_set.should == [project1, project2].map(&:id).to_set
       harvest.reports.projects_by_client(client2).should == []
     end
@@ -58,32 +58,36 @@ describe 'harvest reporting' do
   it 'allows expense reporting' do
     cassette("reports2") do
       user = harvest.users.create(
-        "email"      => "simon@example.com",
-        "first_name" => "Simon",
-        "last_name"  => "Stir",
-        "password"   => "secure"
+        email:      "simon@example.com",
+        first_name: "Simon",
+        last_name:  "Stir",
+        password:   "secure"
       )
 
-      category = harvest.expense_categories.create("name" => "Reporting category", "unit_price" => 100, "unit_name"  => "deduction")
-      client  = harvest.clients.create("name" => "Philip's Butcher")
-      project = harvest.projects.create("name" => "Expense Reporting Project", "client_id" => client.id)
-      harvest.user_assignments.create("project" => project, "user" => user)
+      category = harvest.expense_categories.create(name: "Reporting category", "unit_price" => 100, "unit_name"  => "deduction")
+      client  = harvest.clients.create(name: "Philip's Butcher")
+      project = harvest.projects.create(name: "Expense Reporting Project", client_id: client.id)
+      harvest.user_assignments.create(project: project, user: user)
 
       expense                 = harvest.expenses.create({
-        "notes"               => "Drive to Chicago",
-        "total_cost"          => 75.0,
-        "spent_at"            => Time.utc(2009, 12, 28),
-        "expense_category_id" => category.id,
-        "project_id"          => project.id
+        notes:               "Drive to Chicago",
+        total_cost:          75.0,
+        spent_at:            Time.utc(2009, 12, 28),
+        expense_category_id: category.id,
+        project_id:          project.id
       }, user.id)
 
+      harvest.reports.expenses_by_project(project, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).first.should == expense
       harvest.reports.expenses_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).first.should == expense
 
-      harvest.reports.expenses_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), {:updated_since => Time.now.utc}).should == []
+      harvest.reports.expenses_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30), {updated_since: Time.now.utc}).should == []
 
       my_user = harvest.users.all.detect {|u| u.email == credentials["username"]}
       my_user.should_not be_nil
       harvest.reports.expenses_by_user(my_user, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).should == []
+
+      my_project = harvest.projects.create(name: "Travel Expense Project", client_id: client.id)
+      harvest.reports.expenses_by_project(my_project, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).should == []
     end
   end
 end

data/spec/functional/users_spec.rb

@@ -44,24 +44,6 @@ describe 'harvest users' do
     end
   end
 
-  it "allows password resets" do
-    cassette("users3") do
-      pending "Something is wrong with resetting passwords"
-      user = harvest.users.create(
-        "first_name"            => "Timmy",
-        "last_name"             => "Ruth",
-        "email"                 => "timmy@ruth.com",
-        "timezone"              => "cst",
-        "is_admin"             => "false",
-        "telephone"             => "444-4444"
-      )
-      user.should be_active
-
-      harvest.users.reset_password(user) # nothing else to assert
-      harvest.users.delete(user)
-    end
-  end
-
   context "assignments" do
     it "allows adding, updating, and removing users from projects" do
       cassette('users4') do

data/spec/harvest/base_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Harvest::Base do
   describe "username/password errors" do
     it "should raise error if missing a credential" do
-      lambda { Harvest::Base.new("subdomain", nil, "secure") }.should raise_error(Harvest::InvalidCredentials)
+      lambda { Harvest::Base.new(subdomain: "subdomain", password: "secure") }.should raise_error(/must provide either/i)
     end
   end
 end

data/spec/harvest/basic_auth_credentials_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Harvest::BasicAuthCredentials do
+  context '#set_authentication' do
+    it "should set the headers Authorization" do
+      credentials = Harvest::BasicAuthCredentials.new(subdomain: 'some-domain', username: 'username', password: 'password')
+      credentials.set_authentication(options = {})
+      options[:headers]['Authorization'].should == "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
+    end
+  end
+end

data/spec/harvest/oauth_credentials_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Harvest::OAuthCredentials do
+  context '#set_authentication' do
+    it "should set the access token in the query" do
+      credentials = Harvest::OAuthCredentials.new('theaccesstoken')
+      credentials.set_authentication(options = {})
+      options[:query]['access_token'].should == 'theaccesstoken'
+    end
+  end
+end

data/spec/harvest/task_spec.rb

@@ -2,6 +2,4 @@ require 'spec_helper'
 
 describe Harvest::Task do
   it_behaves_like 'a json sanitizer', %w(cache_version)
-  
-  it 'casts default_hourly_rate to float'
-end
+end

data/spec/support/harvested_helpers.rb

@@ -6,23 +6,23 @@ module HarvestedHelpers
   def credentials; HarvestedHelpers.credentials; end
 
   def self.simple_harvest
-    Harvest.client(credentials["subdomain"], credentials["username"], credentials["password"])
+    Harvest.client(subdomain: credentials["subdomain"], username: credentials["username"], password: credentials["password"])
   end
 
   def harvest; @harvest ||= HarvestedHelpers.simple_harvest; end
 
   def hardy_harvest
-    Harvest.hardy_client(credentials["subdomain"], credentials["username"], credentials["password"])
+    Harvest.hardy_client(subdomain: credentials["subdomain"], username: credentials["username"], password: credentials["password"])
   end
 
   def self.clean_remote
     harvest = simple_harvest
     harvest.users.all.each do |u|
-      harvest.reports.expenses_by_user(u, Time.utc(2000, 1, 1), Time.utc(2013, 6,21)).each do |expense|
+      harvest.reports.expenses_by_user(u, Time.utc(2000, 1, 1), Time.utc(2014, 6, 21)).each do |expense|
         harvest.expenses.delete(expense, u)
       end
 
-      harvest.reports.time_by_user(u, Time.utc(2000, 1, 1), Time.utc(2013, 6,21)).each do |time|
+      harvest.reports.time_by_user(u, Time.utc(2000, 1, 1), Time.utc(2014, 6, 21)).each do |time|
         harvest.time.delete(time, u)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harvested
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Zach Moazeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -65,7 +65,7 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - Gemfile
-- HISTORY
+- HISTORY.md
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -136,11 +136,12 @@ files:
 - spec/functional/time_tracking_spec.rb
 - spec/functional/users_spec.rb
 - spec/harvest/base_spec.rb
-- spec/harvest/credentials_spec.rb
+- spec/harvest/basic_auth_credentials_spec.rb
 - spec/harvest/expense_category_spec.rb
 - spec/harvest/expense_spec.rb
 - spec/harvest/invoice_payment_spec.rb
 - spec/harvest/invoice_spec.rb
+- spec/harvest/oauth_credentials_spec.rb
 - spec/harvest/project_spec.rb
 - spec/harvest/task_assignment_spec.rb
 - spec/harvest/task_spec.rb
@@ -165,12 +166,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -192,11 +193,12 @@ test_files:
 - spec/functional/time_tracking_spec.rb
 - spec/functional/users_spec.rb
 - spec/harvest/base_spec.rb
-- spec/harvest/credentials_spec.rb
+- spec/harvest/basic_auth_credentials_spec.rb
 - spec/harvest/expense_category_spec.rb
 - spec/harvest/expense_spec.rb
 - spec/harvest/invoice_payment_spec.rb
 - spec/harvest/invoice_spec.rb
+- spec/harvest/oauth_credentials_spec.rb
 - spec/harvest/project_spec.rb
 - spec/harvest/task_assignment_spec.rb
 - spec/harvest/task_spec.rb

data/spec/harvest/credentials_spec.rb

@@ -1,22 +0,0 @@
-require 'spec_helper'
-
-describe Harvest::Credentials do
-  describe "#valid?" do
-    it "should return true if domain, username, and password is filled out" do
-      Harvest::Credentials.new("some-domain", "username", "password").should be_valid
-    end
-    
-    it "should return false if either domain, username, or password is nil" do
-      Harvest::Credentials.new("some-domain", "username", nil).should_not be_valid
-      Harvest::Credentials.new("some-domain", nil, "password").should_not be_valid
-      Harvest::Credentials.new(nil, "username", "password").should_not be_valid
-      Harvest::Credentials.new(nil, nil, nil).should_not be_valid
-    end
-  end
-  
-  describe "#basic_auth" do
-    it "should base64 encode the credentials" do
-      Harvest::Credentials.new("some-domain", "username", "password").basic_auth.should == "dXNlcm5hbWU6cGFzc3dvcmQ="
-    end
-  end
-end