harvested 0.5.3 → 0.6.0

data/Gemfile

@@ -6,10 +6,9 @@ gem 'json'
 
 group :development, :test do
   gem  "rspec", "~> 2"
-  gem 'ruby-debug',   :platform => [:mri_18, :jruby]
-  gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
   gem 'jruby-openssl', :platform => [:jruby], :require => false
   gem  "webmock"
   gem  "vcr"
   gem 'jeweler', :require => false
-end
+  gem 'debugger'
+end

data/HISTORY

@@ -1,3 +1,5 @@
+0.6.0 - August 22, 2012
+  * Replaces Dash with Mash
 0.5.3 - August 21, 2012
   * Adding new fields has_timesheet_2012_beta and timesheet_2012_beta_control_group to Users (thanks Aldric Giacomoni)
 0.5.2 - August 17, 2012

data/Rakefile

@@ -21,7 +21,7 @@ end
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => %w(spec features)
+task :default => %w(spec)
 
 begin
   require 'yard'
@@ -38,6 +38,3 @@ task 'clean_remote' do
   require "spec/support/harvested_helpers"
   HarvestedHelpers.clean_remote
 end
-
-task :foo do
-end

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/harvested.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "harvested"
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zach Moazeni"]
-  s.date = "2012-08-21"
+  s.date = "2012-08-23"
   s.description = "Harvested wraps the Harvest API concisely without the use of Rails dependencies. More information about the Harvest API can be found on their website (http://www.getharvest.com/api). For support hit up the Mailing List (http://groups.google.com/group/harvested)"
   s.email = "zach.moazeni@gmail.com"
   s.extra_rdoc_files = [
@@ -113,35 +113,32 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hashie>, ["~> 1"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<vcr>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<hashie>, ["~> 1"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<vcr>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<hashie>, ["~> 1"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<vcr>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
   end
 end
 

data/lib/harvest/client.rb

@@ -10,26 +10,13 @@ module Harvest
   # [+active?+] true|false on whether the client is active
   # [+highrise_id+] (READONLY) the highrise id associated with this client
   # [+update_at+] (READONLY) the last modification timestamp
-  class Client < Hashie::Dash
+  class Client < Hashie::Mash
     include Harvest::Model
-    
+
     api_path '/clients'
-    
 
-    property :id
-    property :active
-    property :name
-    property :details
-    property :currency
-    property :currency_symbol
-    property :cache_version
-    property :created_at
-    property :updated_at
-    property :highrise_id
-    property :default_invoice_timeframe
-    property :last_invoice_kind
-    
-    alias_method :active?, :active
-    alias_method :is_active=, :active=
+    def is_active=(val)
+      self.active = val
+    end
   end
-end
+end

data/lib/harvest/contact.rb

@@ -11,21 +11,9 @@ module Harvest
   # [+phone_office+] the office phone number of the contact
   # [+phone_moble+] the moble phone number of the contact
   # [+fax+] the fax number of the contact
-  class Contact < Hashie::Dash
+  class Contact < Hashie::Mash
     include Harvest::Model
-    
+
     api_path '/contacts'
-    
-    property :id
-    property :client_id
-    property :email
-    property :first_name
-    property :last_name
-    property :phone_office
-    property :phone_mobile
-    property :fax
-    property :title
-    property :created_at
-    property :updated_at
   end
-end
+end

data/lib/harvest/expense.rb

@@ -1,24 +1,10 @@
 module Harvest
-  class Expense < Hashie::Dash
+  class Expense < Hashie::Mash
     include Harvest::Model
 
     api_path '/expenses'
-
-    property :id
-    property :notes
-    property :units
-    property :total_cost
-    property :project_id
-    property :expense_category_id
-    property :user_id
-    property :spent_at
-    property :created_at
-    property :updated_at
-    property :is_billed
-    property :is_closed
-    property :invoice_id
-    property :has_receipt
-    property :receipt_url
+    delegate_methods(:billed? => :is_billed,
+                     :closed? => :is_closed)
 
     def initialize(args = {})
       args          = args.stringify_keys
@@ -37,9 +23,5 @@ module Harvest
         hash[json_root].delete("receipt_url")
       end
     end
-
-    alias_method :billed?, :is_billed
-    alias_method :closed?, :is_closed
-    alias_method :has_receipt?, :has_receipt
   end
 end

data/lib/harvest/expense_category.rb

@@ -1,19 +1,10 @@
 module Harvest
-  class ExpenseCategory < Hashie::Dash
+  class ExpenseCategory < Hashie::Mash
     include Harvest::Model
     api_path '/expense_categories'
-    
-    property :id
-    property :name
-    property :unit_name
-    property :unit_price
-    property :deactivated
-    property :created_at
-    property :updated_at
-    property :cache_version
-    
+
     def active?
       !deactivated
     end
   end
-end
+end

data/lib/harvest/invoice.rb

@@ -1,46 +1,14 @@
 module Harvest
-  class Invoice < Hashie::Dash
+  class Invoice < Hashie::Mash
     include Harvest::Model
-    
+
     api_path '/invoices'
-    
+
     attr_reader :line_items
-    
-    property :id
-    property :subject
-    property :number
-    property :created_at
-    property :updated_at
-    property :issued_at
-    property :due_at
-    property :due_at_human_format
-    property :due_amount
-    property :notes
-    property :recurring_invoice_id
-    property :period_start
-    property :period_end
-    property :discount
-    property :discount_amount
-    property :client_key
-    property :amount
-    property :tax
-    property :tax2
-    property :tax_amount
-    property :tax2_amount
-    property :csv_line_items
-    property :client_id
-    property :estimate_id
-    property :purchase_order
-    property :retainer_id
-    property :currency
-    property :state
-    property :kind
-    property :import_hours
-    property :import_expenses
-    
+
     def self.json_root; "doc"; end
     # skip_json_root true
-    
+
     def initialize(args = {})
       @line_items = []
       args            = args.stringify_keys
@@ -48,7 +16,7 @@ module Harvest
       self.line_items = args.delete("line_items")
       super
     end
-    
+
     def line_items=(raw_or_rich)
       unless raw_or_rich.nil?
         @line_items = case raw_or_rich
@@ -59,13 +27,13 @@ module Harvest
         end
       end
     end
-    
+
     def as_json(*options)
       json = super(*options)
       json[json_root]["csv_line_items"] = encode_csv(@line_items)
       json
     end
-    
+
     private
       def decode_csv(string)
         csv = CSV.parse(string)
@@ -73,19 +41,19 @@ module Harvest
         csv.map! {|row| headers.zip(row) }
         csv.map {|row| row.inject({}) {|h, tuple| h.update(tuple[0] => tuple[1]) } }
       end
-      
+
       def encode_csv(line_items)
         if line_items.empty?
           ""
         else
           header = %w(kind description quantity unit_price amount taxed taxed2 project_id)
-          
+
           # writing this in stdlib so we don't force 1.8 users to install FasterCSV and make gem dependencies wierd
           if RUBY_VERSION =~ /1.8/
             csv_data = ""
             CSV.generate_row(header, header.size, csv_data)
             line_items.each do |item|
-              row_data = header.inject([]) {|row, attr| row << item[attr] } 
+              row_data = header.inject([]) {|row, attr| row << item[attr] }
               CSV.generate_row(row_data, row_data.size, csv_data)
             end
             csv_data
@@ -93,11 +61,11 @@ module Harvest
             CSV.generate do |csv|
               csv << header
               line_items.each do |item|
-                csv << header.inject([]) {|row, attr| row << item[attr] } 
+                csv << header.inject([]) {|row, attr| row << item[attr] }
               end
             end
           end
         end
       end
   end
-end
+end

data/lib/harvest/invoice_category.rb

@@ -1,18 +1,9 @@
 module Harvest
-  class InvoiceCategory < Hashie::Dash
+  class InvoiceCategory < Hashie::Mash
     include Harvest::Model
-    
+
     api_path '/invoice_item_categories'
     def self.json_root; "category"; end
-    
-    property :id
-    property :name
-    property :created_at
-    property :updated_at
-    property :use_as_expense
-    property :use_as_service
-    
-    alias_method :use_as_expense?, :use_as_expense
-    alias_method :use_as_service?, :use_as_service
+
   end
-end
+end

data/lib/harvest/line_item.rb

@@ -1,12 +1,4 @@
 module Harvest
-  class LineItem < Hashie::Dash
-    property :kind
-    property :description
-    property :quantity
-    property :unit_price
-    property :amount
-    property :taxed
-    property :taxed2
-    property :project_id
+  class LineItem < Hashie::Mash
   end
-end
+end

data/lib/harvest/model.rb

@@ -4,12 +4,12 @@ module Harvest
       base.send :include, InstanceMethods
       base.send :extend, ClassMethods
     end
-    
+
     module InstanceMethods
       def to_json(*args)
         as_json(*args).to_json(*args)
       end
-      
+
       def as_json(args = {})
         inner_json = self.to_hash.stringify_keys
         inner_json.delete("cache_version")
@@ -19,13 +19,13 @@ module Harvest
           { self.class.json_root => inner_json }
         end
       end
-      
+
       def to_i; id; end
-      
+
       def ==(other)
         id == other.id
       end
-      
+
       def impersonated_user_id
         if respond_to?(:of_user) && respond_to?(:user_id)
           of_user || user_id
@@ -35,41 +35,41 @@ module Harvest
           of_user
         end
       end
-      
+
       def json_root
         self.class.json_root
       end
     end
-    
+
     module ClassMethods
       # This sets the API path so the API collections can use them in an agnostic way
       # @return [void]
       def api_path(path = nil)
         @_api_path ||= path
       end
-      
+
       def skip_json_root(skip = nil)
         @_skip_json_root ||= skip
       end
-      
+
       def skip_json_root?
         @_skip_json_root == true
       end
-      
+
       def parse(json)
         parsed = String === json ? JSON.parse(json) : json
         Array.wrap(parsed).map {|attrs| skip_json_root? ? new(attrs) : new(attrs[json_root])}
       end
-      
+
       def json_root
         Harvest::Model::Utility.underscore(
           Harvest::Model::Utility.demodulize(to_s)
         )
       end
-      
+
       def wrap(model_or_attrs)
         case model_or_attrs
-        when Hashie::Dash
+        when Hashie::Mash
           model_or_attrs
         when Hash
           new(model_or_attrs)
@@ -77,13 +77,24 @@ module Harvest
           model_or_attrs
         end
       end
+
+      def delegate_methods(options)
+        raise "no methods given" if options.empty?
+        options.each do |source, dest|
+          class_eval <<-EOV
+            def #{source}
+              #{dest}
+            end
+          EOV
+        end
+      end
     end
-    
+
     module Utility
       class << self
-        
+
         # Both methods are shamelessly ripped from https://github.com/rails/rails/blob/master/activesupport/lib/active_support/inflector/inflections.rb
-        
+
         # Removes the module part from the expression in the string.
         #
         # Examples:
@@ -92,7 +103,7 @@ module Harvest
         def demodulize(class_name_in_module)
           class_name_in_module.to_s.gsub(/^.*::/, '')
         end
-        
+
         # Makes an underscored, lowercase form from the expression in the string.
         #
         # Changes '::' to '/' to convert namespaces to paths.
@@ -117,4 +128,4 @@ module Harvest
       end
     end
   end
-end
+end

data/lib/harvest/project.rb

@@ -22,58 +22,21 @@ module Harvest
   # [+active_task_assignments_count+] (READONLY) the number of active task assignments
   # [+created_at+] (READONLY) when the project was created
   # [+updated_at+] (READONLY) when the project was updated
-  class Project < Hashie::Dash
+  class Project < Hashie::Mash
     include Harvest::Model
 
     api_path '/projects'
 
-    property :id
-    property :client_id
-    property :name
-    property :code
-    property :notes
-    property :fees
-    property :active
-    property :billable
-    property :budget
-    property :budget_by
-    property :hourly_rate
-    property :bill_by
-    property :created_at
-    property :updated_at
-    property :notify_when_over_budget
-    property :over_budget_notification_percentage
-    property :show_budget_to_all
-    property :basecamp_id
-    property :highrise_deal_id
-    property :active_task_assignments_count
-    property :over_budget_notified_at
-    property :earliest_record_at
-    property :cost_budget
-    property :cost_budget_include_expenses
-    property :latest_record_at
-    property :estimate_by
-    property :hint_earliest_record_at
-    property :hint_latest_record_at
-    property :active_user_assignments_count
-    property :cache_version
-    property :estimate
-
-    alias_method :active?, :active
-    alias_method :billable?, :billable
-    alias_method :notify_when_over_budget?, :notify_when_over_budget
-    alias_method :show_budget_to_all?, :show_budget_to_all
-    
     def as_json(args = {})
       super(args).tap do |json|
         json[json_root].delete("hint_earliest_record_at")
         json[json_root].delete("hint_latest_record_at")
       end
     end
-    
+
     def self.parse(json)
       json = String === json ? JSON.parse(json) : json
-      Array.wrap(json).each do |attrs| 
+      Array.wrap(json).each do |attrs|
         # need to cleanup some attributes
         project_attrs = attrs[json_root] || {}
         project_attrs["hint_latest_record_at"]   = project_attrs.delete("hint-latest-record-at")
@@ -82,4 +45,4 @@ module Harvest
       super(json)
     end
   end
-end
+end

data/lib/harvest/rate_limit_status.rb

@@ -1,5 +1,5 @@
 module Harvest
-  
+
   # The model that contains the information about the user's rate limit
   #
   # == Fields
@@ -8,17 +8,11 @@ module Harvest
   # [+timeframe_limit+] The amount of seconds before a rate limit refresh occurs
   # [+max_calls+] The number of requests you can make within the +timeframe_limit+
   # [+lockout_seconds+] If you exceed the rate limit, how long you will be locked out from Harvest
-  class RateLimitStatus < Hashie::Dash
+  class RateLimitStatus < Hashie::Mash
     include Harvest::Model
-    
+
     skip_json_root true
-    
-    property :last_access_at
-    property :count
-    property :timeframe_limit
-    property :max_calls
-    property :lockout_seconds
-    
+
     # Returns true if the user is over their rate limit
     # @return [Boolean]
     # @see http://www.getharvest.com/api
@@ -26,4 +20,4 @@ module Harvest
       count > max_calls
     end
   end
-end
+end

data/lib/harvest/task.rb

@@ -9,25 +9,14 @@ module Harvest
   # [+deactivated+] whether the task is deactivated
   # [+hourly_rate+] what the default hourly rate for the task is
   # [+default?+] whether to add this task to new projects by default
-  class Task < Hashie::Dash
+  class Task < Hashie::Mash
     include Harvest::Model
 
     api_path '/tasks'
+    delegate_methods :default? => :is_default
 
-    property :id
-    property :name
-    property :billable_by_default
-    property :deactivated
-    property :default_hourly_rate
-    property :is_default
-    property :created_at
-    property :updated_at
-    property :cache_version
-    
     def active?
       !deactivated
     end
-
-    alias_method :default?, :is_default
   end
-end
+end

data/lib/harvest/task_assignment.rb

@@ -1,25 +1,14 @@
 module Harvest
-  class TaskAssignment < Hashie::Dash
+  class TaskAssignment < Hashie::Mash
     include Harvest::Model
 
-    property :id
-    property :task_id
-    property :project_id
-    property :billable
-    property :deactivated
-    property :hourly_rate
-    property :budget
-    property :estimate
-    property :created_at
-    property :updated_at
-    
     def initialize(args = {})
       args = args.stringify_keys
       self.task    = args.delete("task") if args["task"]
       self.project = args.delete("project") if args["project"]
       super
     end
-    
+
     def task=(task)
       self["task_id"] = task.to_i
     end
@@ -35,7 +24,5 @@ module Harvest
     def task_as_json
       {"task" => {"id" => task_id}}
     end
-
-    alias_method :billable?, :billable
   end
-end
+end

data/lib/harvest/time_entry.rb

@@ -1,46 +1,25 @@
 module Harvest
-  class TimeEntry < Hashie::Dash
+  class TimeEntry < Hashie::Mash
     include Harvest::Model
-    
-    property :id
-    property :client
-    property :hours
-    property :notes
-    
-    property :project_id
-    property :task_id
-    property :project
-    property :task
-    property :spent_at
-    property :created_at
-    property :updated_at
-    property :user_id
-    property :of_user
-    property :is_closed
-    property :is_billed
-    property :timer_started_at
-    property :adjustment_record
-    property :hours_without_timer
-    
+
     skip_json_root true
-    
+    delegate_methods(:closed? => :is_closed,
+                     :billed? => :is_billed)
+
     def initialize(args = {})
       args = args.stringify_keys
       self.spent_at = args.delete("spent_at") if args["spent_at"]
       super
     end
-    
+
     def spent_at=(date)
       self["spent_at"] = (String === date ? Time.parse(date) : date)
     end
-    
+
     def as_json(args = {})
-      super(args).stringify_keys.tap do |hash| 
+      super(args).stringify_keys.tap do |hash|
         hash.update("spent_at" => (spent_at.nil? ? nil : spent_at.to_time.xmlschema))
       end
     end
-    
-    alias_method :closed?, :is_closed
-    alias_method :billed?, :is_billed
   end
 end

data/lib/harvest/user.rb

@@ -15,51 +15,14 @@ module Harvest
   # [+contractor?+] whether the user is a contractor
   # [+contractor?+] whether the user is a contractor
   # [+timezone+] the timezone for the user.
-  class User < Hashie::Dash
+  class User < Hashie::Mash
     include Harvest::Model
 
     api_path '/people'
-    property :id
-    property :email
-    property :first_name
-    property :last_name
-    property :has_access_to_all_future_projects
-    property :default_hourly_rate
-    property :is_active
-    property :is_admin
-    property :is_contractor
-    property :telephone
-    property :department
-    property :timezone
-    property :password
-    property :first_timer
-    property :wants_newsletter
-    property :preferred_project_status_reports_screen
-    property :preferred_approval_screen
-    property :created_at
-    property :updated_at
-    property :twitter_username
-    property :preferred_entry_method
-    property :default_time_project_id
-    property :default_task_id
-    property :default_expense_category_id
-    property :opensocial_identifier
-    property :duplicate_timesheet_wants_notes
-    property :wants_timesheet_duplication
-    property :cache_version
-    property :email_after_submit
-    property :default_expense_project_id
-    property :identity_url
-    property :timestamp_timers
-    property :weekly_digest_sent_on
-    property :wants_weekly_digest
-    property :password_change_required
-    property :has_timesheet_2012_beta
-    property :timesheet_2012_beta_control_group
 
-    alias_method :active?, :is_active
-    alias_method :admin?, :is_admin
-    alias_method :contractor?, :is_contractor
+    delegate_methods(:active?     => :is_active,
+                     :admin?      => :is_admin,
+                     :contractor? => :is_contractor)
 
     def initialize(args = {})
       args          = args.stringify_keys

data/lib/harvest/user_assignment.rb

@@ -1,41 +1,30 @@
 module Harvest
-  class UserAssignment < Hashie::Dash
+  class UserAssignment < Hashie::Mash
     include Harvest::Model
-    
-    property :id
-    property :user_id
-    property :project_id
-    property :deactivated
-    property :is_project_manager
-    property :hourly_rate
-    property :created_at
-    property :updated_at
-    property :budget
-    property :estimate
-    
+
+    delegate_methods :project_manager? => :is_project_manager
+
     def initialize(args = {})
       args = args.stringify_keys
       self.user    = args.delete("user") if args["user"]
       self.project = args.delete("project") if args["project"]
       super
     end
-    
+
     def user=(user)
       self["user_id"] = user.to_i
     end
-    
+
     def project=(project)
       self["project_id"] = project.to_i
     end
-    
+
     def active?
       !deactivated
     end
-    
+
     def user_as_json
       {"user" => {"id" => user_id}}
     end
-    
-    alias_method :project_manager?, :is_project_manager
   end
-end
+end

data/spec/functional/reporting_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'harvest reporting' do  
+describe 'harvest reporting' do
   it 'allows project and people entry reporting' do
     cassette("reports1") do
       user = harvest.users.create(
@@ -20,8 +20,8 @@ describe 'harvest reporting' do
       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" => "12/28/2009", "task_id" => task1.id, "project_id" => project1.id, "of_user" => user.id)
-      entry2 = harvest.time.create("notes" => "non billable entry2", "hours" => 6, "spent_at" => "12/28/2009", "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
 
@@ -40,7 +40,7 @@ describe 'harvest reporting' do
 
       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
-      
+
       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 == []
@@ -69,9 +69,9 @@ describe 'harvest reporting' do
         "project_id"          => project.id,
         "user_id"             => user.id
       )
-      
+
       harvest.reports.expenses_by_user(user, Time.utc(2009, 12, 20), Time.utc(2009,12,30)).first.should == expense
-      
+
       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 == []

data/spec/functional/time_tracking_spec.rb

@@ -7,23 +7,23 @@ describe 'harvest time tracking' do
       project = harvest.projects.create("name" => "Tracking Project", "client_id" => client.id)
       harvest.projects.create_task(project, "A billable task")
       task = harvest.tasks.all.detect {|t| t.name == "A billable task"}
-      
-      entry = harvest.time.create("notes" => "Test api support", "hours" => 3, "spent_at" => "12/28/2009", "task_id" => task.id, "project_id" => project.id)
+
+      entry = harvest.time.create("notes" => "Test api support", "hours" => 3, "spent_at" => "2009/12/28", "task_id" => task.id, "project_id" => project.id)
       entry.notes.should == "Test api support"
-      
+
       entry.notes = "Upgraded to JSON"
       entry = harvest.time.update(entry)
       entry.notes.should == "Upgraded to JSON"
-      
+
       harvest.time.delete(entry)
       harvest.time.all(Time.utc(2009, 12, 28)).should == []
     end
   end
-  
+
   it 'allows you to save entries for a different user' do
     cassette("time_tracking2") do
       user = harvest.users.create(
-        "email"      => "frank@example.com", 
+        "email"      => "frank@example.com",
         "first_name" => "Frank",
         "last_name"  => "Doe",
         "password"   => "secure"
@@ -33,21 +33,21 @@ describe 'harvest time tracking' do
       harvest.user_assignments.create("project" => project, "user" => user)
       harvest.projects.create_task(project, "A billable task for tuxes")
       task = harvest.tasks.all.detect {|t| t.name == "A billable task for tuxes"}
-      
-      entry = harvest.time.create("notes" => "Test api support", "hours" => 3, "spent_at" => "12/28/2009", "task_id" => task.id, "project_id" => project.id, "of_user" => user.id)
+
+      entry = harvest.time.create("notes" => "Test api support", "hours" => 3, "spent_at" => "2009/12/28", "task_id" => task.id, "project_id" => project.id, "of_user" => user.id)
       harvest.time.all(Time.utc(2009, 12, 28), user).should == [entry]
-      
+
       entry.notes = "Updating notes"
       entry = harvest.time.update(entry, user)
       entry.notes.should == "Updating notes"
-      
+
       entry = harvest.time.find(entry, user)
       entry.notes.should == "Updating notes"
-      
+
       harvest.time.delete(entry, user)
       harvest.time.all(Time.utc(2009, 12, 28), user).should == []
     end
   end
-  
+
   it 'allows toggling of timers'
-end
+end

data/spec/functional/users_spec.rb

@@ -7,60 +7,61 @@ describe 'harvest users' do
         "first_name"            => "Edgar",
         "last_name"             => "Ruth",
         "email"                 => "edgar@ruth.com",
-        "password"              => "mypassword",
         "timezone"              => "cst",
         "is_admin"                 => "false",
         "telephone"             => "444-4444"
       )
-      user.id.should_not be_blank
-    
+      user.id.should_not be_nil
+
       user.first_name = "Joey"
       user = harvest.users.update(user)
       user.first_name.should == "Joey"
-    
+
       id = harvest.users.delete(user)
       harvest.users.all.map(&:id).should_not include(id)
     end
   end
-  
+
   it "allows activating and deactivating users" do
     cassette("users2") do
       user = harvest.users.create(
         "first_name"            => "John",
         "last_name"             => "Ruth",
         "email"                 => "john@ruth.com",
-        "password"              => "mypassword",
         "timezone"              => "cst",
         "is_admin"              => "false",
         "telephone"             => "444-4444"
       )
       user.should be_active
-      
+
       user = harvest.users.deactivate(user)
       user.should_not be_active
-      
+
       user = harvest.users.activate(user)
       user.should be_active
+
+      harvest.users.delete(user)
     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",
-        "password"              => "mypassword",
         "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
@@ -85,10 +86,10 @@ describe 'harvest users' do
           "is_admin"              => "false",
           "telephone"             => "444-4444"
         )
-        
+
 
         assignment = harvest.user_assignments.create("project" => project, "user" => user)
-        
+
         assignment.hourly_rate = 100
         assignment = harvest.user_assignments.update(assignment)
         assignment.hourly_rate.should == "100.0"
@@ -99,4 +100,4 @@ describe 'harvest users' do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,36 +4,28 @@ require 'vcr'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require File.expand_path(f) }
 
-VCR.config do |c|
+VCR.configure do |c|
   c.cassette_library_dir = '.cassettes'
-  c.stub_with :webmock
+  c.hook_into :webmock
 end
 
+FileUtils.rm(Dir["#{VCR.configuration.cassette_library_dir}/*"]) if ENV['VCR_REFRESH'] == 'true'
+
 RSpec.configure do |config|
   config.include HarvestedHelpers
-  
+
   config.before(:suite) do
     WebMock.allow_net_connect!
     cassette("clean") do
       HarvestedHelpers.clean_remote
     end
   end
-  
+
   config.before(:each) do
     WebMock.allow_net_connect!
   end
-  
+
   def cassette(*args)
-    if ENV['CACHE'] == "false"
-      if args.last.is_a?(Hash)
-        last = args.pop
-        last[:record] = :all
-        args << last
-      else
-        args << {:record => :all}
-      end
-    end
-    
     VCR.use_cassette(*args) do
       yield
     end

data/spec/support/harvested_helpers.rb

@@ -4,33 +4,33 @@ module HarvestedHelpers
     @credentials ||= YAML.load_file("#{File.dirname(__FILE__)}/harvest_credentials.yml")
   end
   def credentials; HarvestedHelpers.credentials; end
-  
+
   def self.simple_harvest
     Harvest.client(credentials["subdomain"], credentials["username"], credentials["password"], :ssl => true)
   end
-  
+
   # def connect_to_harvest
   #   @harvest = Harvest.hardy_client(credentials["subdomain"], credentials["username"], credentials["password"], :ssl => true)
   # end
-  
+
   # def harvest; @harvest; end
   def harvest; @harvest ||= HarvestedHelpers.simple_harvest; end
-  
+
   def hardy_harvest
     Harvest.hardy_client(credentials["subdomain"], credentials["username"], credentials["password"], :ssl => true)
   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(2011, 6,21)).each do |expense|
+      harvest.reports.expenses_by_user(u, Time.utc(2000, 1, 1), Time.utc(2013, 6,21)).each do |expense|
         harvest.expenses.delete(expense, u)
       end
-      
-      harvest.reports.time_by_user(u, Time.utc(2000, 1, 1), Time.utc(2011, 6,21)).each do |time|
+
+      harvest.reports.time_by_user(u, Time.utc(2000, 1, 1), Time.utc(2013, 6,21)).each do |time|
         harvest.time.delete(time, u)
       end
-      
+
       harvest.users.delete(u) if u.email != credentials["username"]
     end
 
@@ -41,4 +41,4 @@ module HarvestedHelpers
       harvest.send(collection).all.each {|m| harvest.send(collection).delete(m) }
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harvested
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -76,23 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jruby-openssl
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -277,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -914741534374254830
+      hash: -3859920276334034236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: