harvested 0.3.3 → 0.4.0

data/lib/harvest/project.rb

@@ -1,5 +1,5 @@
 module Harvest
-  
+
   # The model that contains information about a project
   #
   # == Fields
@@ -22,35 +22,64 @@ 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 < BaseModel
-    include HappyMapper
-  
+  class Project < Hashie::Dash
+    include Harvest::Model
+
     api_path '/projects'
-  
-    element :id, Integer
-    element :client_id, Integer, :tag => 'client-id'
-    element :name, String
-    element :code, String
-    element :notes, String
-    element :fees, String
-    element :active, Boolean
-    element :billable, Boolean
-    element :budget, Float
-    element :budget_by, String, :tag => 'budget-by'
-    element :hourly_rate, Float, :tag => 'hourly-rate'
-    element :bill_by, String, :tag => 'bill-by'
-    element :created_at, Time, :tag => 'created-at'
-    element :updated_at, Time, :tag => 'updated-at'
-    element :notify_when_over_budget, Boolean, :tag => 'notify-when-over-budget'
-    element :over_budget_notification_percentage, Float, :tag => 'over-budget-notification-percentage'
-    element :show_budget_to_all, Boolean, :tag => 'show-budget-to-all'
-    element :basecamp_id, Integer, :tag => 'basecamp-id'
-    element :highrise_deal_id, Integer, :tag => 'highrise-deal-id'
-    element :active_task_assignments_count, Integer, :tag => 'active-task-assignments-count'
-  
+
+    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| 
+        # need to cleanup some attributes
+        project_attrs = attrs[json_root] || {}
+        project_attrs["hint_latest_record_at"]   = project_attrs.delete("hint-latest-record-at")
+        project_attrs["hint_earliest_record_at"] = project_attrs.delete("hint-earliest-record-at")
+      end
+      super(json)
+    end
   end
 end

data/lib/harvest/rate_limit_status.rb

@@ -8,15 +8,16 @@ 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 < BaseModel
-    include HappyMapper
+  class RateLimitStatus < Hashie::Dash
+    include Harvest::Model
     
-    tag 'hash'
-    element :last_access_at, Time, :tag => 'last-access-at'
-    element :count, Integer
-    element :timeframe_limit, Integer, :tag => 'timeframe-limit'
-    element :max_calls, Integer, :tag => 'max-calls'
-    element :lockout_seconds, Integer, :tag => 'lockout-seconds'
+    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]

data/lib/harvest/task.rb

@@ -1,5 +1,5 @@
 module Harvest
-  
+
   # The model that contains information about a task
   #
   # == Fields
@@ -9,22 +9,25 @@ 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 < BaseModel
-    include HappyMapper
-  
+  class Task < Hashie::Dash
+    include Harvest::Model
+
     api_path '/tasks'
-  
-    element :id, Integer
-    element :name, String
-    element :billable, Boolean, :tag => 'billable-by-default'
-    element :deactivated, Boolean, :tag => 'deactivated'
-    element :hourly_rate, Float, :tag => 'default-hourly-rate'
-    element :default, Boolean, :tag => '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?, :default
+
+    alias_method :default?, :is_default
   end
 end

data/lib/harvest/task_assignment.rb

@@ -1,36 +1,41 @@
 module Harvest
-  class TaskAssignment < BaseModel
-    include HappyMapper
+  class TaskAssignment < Hashie::Dash
+    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
     
-    tag 'task-assignment'
-    element :id, Integer
-    element :task_id, Integer, :tag => 'task-id'
-    element :project_id, Integer, :tag => 'project-id'
-    element :billable, Boolean
-    element :deactivated, Boolean
-    element :hourly_rate, Float, :tag => 'hourly-rate'
-    element :budget, Float
-    element :estimate, Float
+    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)
-      @task_id = task.to_i
+      self["task_id"] = task.to_i
     end
-    
+
     def project=(project)
-      @project_id = project.to_i
+      self["project_id"] = project.to_i
     end
-    
+
     def active?
       !deactivated
     end
-    
-    def task_xml
-      builder = Builder::XmlMarkup.new
-      builder.task do |t|
-        t.id(task_id)
-      end
+
+    def task_as_json
+      {"task" => {"id" => task_id}}
     end
-    
+
     alias_method :billable?, :billable
   end
 end

data/lib/harvest/time_entry.rb

@@ -1,43 +1,45 @@
 module Harvest
-  class TimeEntry < BaseModel
-    include HappyMapper
+  class TimeEntry < Hashie::Dash
+    include Harvest::Model
     
-    tag 'day_entry'
+    property :id
+    property :client
+    property :hours
+    property :notes
     
-    element :id, Integer
-    element :client, String
-    element :project, String
-    element :task, String
-    element :hours, Float
-    element :notes, String
+    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
     
-    element :project_id, Integer
-    element :task_id, Integer
-    element :spent_at, Time
-    element :created_at, Time
-    element :updated_at, Time
-    element :user_id, Integer
-    element :closed, Boolean, :tag => 'is-closed'
-    element :billed, Boolean, :tag => 'is-billed'
-    element :of_user, Integer
+    skip_json_root true
+    
+    def initialize(args = {})
+      args = args.stringify_keys
+      self.spent_at = args.delete("spent_at") if args["spent_at"]
+      super
+    end
     
     def spent_at=(date)
-      @spent_at = (String === date ? Time.parse(date) : date)
+      self["spent_at"] = (String === date ? Time.parse(date) : date)
     end
     
-    def to_xml
-      builder = Builder::XmlMarkup.new
-      builder.request do |r|
-        r.tag!('notes', notes) if notes
-        r.tag!('hours', hours) if hours
-        r.tag!('project_id', project_id) if project_id
-        r.tag!('task_id', task_id) if task_id
-        r.tag!('spent_at', spent_at) if spent_at
-        r.tag!('of_user', of_user) if of_user
+    def as_json(args = {})
+      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?, :closed
-    alias_method :billed?, :billed
+    alias_method :closed?, :is_closed
+    alias_method :billed?, :is_billed
   end
 end

data/lib/harvest/user.rb

@@ -9,35 +9,59 @@ module Harvest
   # [+last_name+] the last name for the user
   # [+telephone+] the telephone for the user
   # [+department] the department for the user
-  # [+password|password_confirmation+] the password for the user (only used on create.)
   # [+has_access_to_all_future_projects+] whether the user should be added to future projects by default
   # [+hourly_rate+] what the default hourly rate for the user is
   # [+admin?+] whether the user is an admin
   # [+contractor?+] whether the user is a contractor
   # [+contractor?+] whether the user is a contractor
   # [+timezone+] the timezone for the user.
-  class User < BaseModel
-    include HappyMapper
+  class User < Hashie::Dash
+    include Harvest::Model
     
     api_path '/people'
-    element :id, Integer
-    element :email, String
-    element :first_name, String, :tag => 'first-name'
-    element :last_name, String, :tag => 'last-name'
-    element :has_access_to_all_future_projects, Boolean, :tag => 'has-access-to-all-future-projects'
-    element :hourly_rate, Float, :tag => 'default-hourly-rate'
-    element :active, Boolean, :tag => 'is-active'
-    element :admin, Boolean, :tag => 'is-admin'
-    element :contractor, Boolean, :tag => 'is-contractor'
-    element :telephone, String
-    element :department, String
-    element :timezone, String
-    element :password, String
-    element :password_confirmation, String, :tag => 'password-confirmation'
+    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
     
-    alias_method :active?, :active
-    alias_method :admin?, :admin
-    alias_method :contractor?, :contractor
+    alias_method :active?, :is_active
+    alias_method :admin?, :is_admin
+    alias_method :contractor?, :is_contractor
+    
+    def initialize(args = {})
+      args          = args.stringify_keys
+      args["is_admin"] = args.delete("admin") if args["admin"]
+      self.timezone = args.delete("timezone") if args["timezone"]
+      super
+    end
     
     # Sets the timezone for the user. This can be done in a variety of ways.
     # 
@@ -56,9 +80,9 @@ module Harvest
       when 'pst', 'pdt' then self.timezone = 'america/los_angeles'
       else
         if Harvest::Timezones::MAPPING[tz]
-          @timezone = Harvest::Timezones::MAPPING[tz]
+          self["timezone"] = Harvest::Timezones::MAPPING[tz]
         else
-          @timezone = timezone
+          self["timezone"] = timezone
         end
       end
     end

data/lib/harvest/user_assignment.rb

@@ -1,34 +1,41 @@
 module Harvest
-  class UserAssignment < BaseModel
-    include HappyMapper
+  class UserAssignment < Hashie::Dash
+    include Harvest::Model
     
-    tag 'user-assignment'
-    element :id, Integer
-    element :user_id, Integer, :tag => 'user-id'
-    element :project_id, Integer, :tag => 'project-id'
-    element :deactivated, Boolean
-    element :project_manager, Boolean, :tag => 'is-project-manager'
-    element :hourly_rate, Float, :tag => 'hourly-rate'
+    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
+    
+    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)
-      @user_id = user.to_i
+      self["user_id"] = user.to_i
     end
     
     def project=(project)
-      @project_id = project.to_i
+      self["project_id"] = project.to_i
     end
     
     def active?
       !deactivated
     end
     
-    def user_xml
-      builder = Builder::XmlMarkup.new
-      builder.user do |t|
-        t.id(user_id)
-      end
+    def user_as_json
+      {"user" => {"id" => user_id}}
     end
     
-    alias_method :project_manager?, :project_manager
+    alias_method :project_manager?, :is_project_manager
   end
 end