costagent 0.1.5 → 0.1.6

data/lib/costagent.rb

@@ -7,8 +7,8 @@ require "open-uri"
 #  This exposes additional billable tracking functionality around the Freeagent API
 class CostAgent
   Project = Struct.new(:id, :name, :currency, :hourly_billing_rate, :daily_billing_rate, :hours_per_day)
-  Timeslip = Struct.new(:id, :project, :hours, :date, :cost, :comment, :status)
-  Task = Struct.new(:id, :name, :project)
+  Timeslip = Struct.new(:id, :project, :task, :hours, :date, :cost, :comment, :status)
+  Task = Struct.new(:id, :name, :project, :hourly_billing_rate, :daily_billing_rate, :billable)
   Invoice = Struct.new(:id, :project_id, :description, :reference, :amount, :status, :date, :due, :items)
   InvoiceItem = Struct.new(:id, :invoice_id, :project_id, :item_type, :description, :price, :quantity, :cost)
 
@@ -53,13 +53,16 @@ class CostAgent
       # Find the project and hours for this timeslip
       project = self.project((timeslip/"project-id").text.to_i)
       if project
+        task = self.tasks(project.id).detect { |t| t.id == (timeslip/"task-id").text.to_i }
         hours = (timeslip/"hours").text.to_f
+        cost = (task.nil? ? project : task).hourly_billing_rate * hours
         # Build the timeslip out using the timeslip data and the project it's tied to
         Timeslip.new((timeslip/"id").text.to_i,
                      project,
+                     task,
                      hours,
                      DateTime.parse((timeslip/"dated-on").text),
-                     project.hourly_billing_rate * hours,
+                     cost,
                      (timeslip/"comment").text,
                      (timeslip/"status").text)
       else
@@ -73,10 +76,18 @@ class CostAgent
     (self.api("projects/#{project_id}/tasks")/"task").collect do |task|
       # Find the project for this task
       project = self.project((task/"project-id").text.to_i)
+      # Calculate rates
+      billing_rate = (task/"billing-rate").text.to_f
+      billing_period = (task/"billing-period").text
+      hourly_rate = (billing_period == "hour" ? billing_rate : billing_rate / project.hours_per_day)
+      daily_rate = (billing_period == "hour" ? billing_rate * project.hours_per_day : billing_rate)
       # Build the task out using the task data and the project it's tied to
       Task.new((task/"id").text.to_i,
                    (task/"name").text,
-                   project)
+                   project,
+                   hourly_rate,
+                   daily_rate,
+                   (task/"is-billable").text == "true")
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Elliott Draper
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +01:00
+date: 2010-10-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency