xeroizer 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/xeroizer/models/contact.rb

@@ -16,6 +16,7 @@ module Xeroizer
       
       set_primary_key :contact_id
       set_possible_primary_keys :contact_id, :contact_number
+      list_contains_summary_only true
       
       guid      :contact_id
       string    :contact_number
@@ -28,14 +29,15 @@ module Xeroizer
       string    :first_name
       string    :last_name
       string    :email_address
+      string    :skype_user_name
       string    :contact_groups
       string    :default_currency
       datetime  :updated_date_utc, :api_name => 'UpdatedDateUTC'
       boolean   :is_supplier
       boolean   :is_customer
       
-      has_many  :addresses
-      has_many  :phones
+      has_many  :addresses, :list_complete => true
+      has_many  :phones, :list_complete => true
       has_many  :contact_groups
       
       validates_presence_of :name

data/lib/xeroizer/models/credit_note.rb

@@ -70,14 +70,26 @@ module Xeroizer
       
       public
       
+        # Access the contact name without forcing a download of
+        # an incomplete, summary credit note.
+        def contact_name
+          attributes[:contact] && attributes[:contact][:name]
+        end
+
+        # Access the contact ID without forcing a download of an
+        # incomplete, summary credit note.
+        def contact_id
+          attributes[:contact] && attributes[:contact][:contact_id]
+        end      
+      
         # Swallow assignment of attributes that should only be calculated automatically.
         def sub_total=(value);  raise SettingTotalDirectlyNotSupported.new(:sub_total);   end
         def total_tax=(value);  raise SettingTotalDirectlyNotSupported.new(:total_tax);   end
         def total=(value);      raise SettingTotalDirectlyNotSupported.new(:total);       end
       
         # Calculate sub_total from line_items.
-        def sub_total
-          if new_record? || complete_record_downloaded?
+        def sub_total(always_summary = false)
+          if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
             sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
             
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
@@ -87,19 +99,23 @@ module Xeroizer
             attributes[:sub_total]
           end
         end
-      
+
         # Calculate total_tax from line_items.
-        def total_tax
-          if new_record? || complete_record_downloaded?
+        def total_tax(always_summary = false)
+          if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
             (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.tax_amount }
           else
             attributes[:total_tax]
           end
         end
-      
+
         # Calculate the total from line_items.
-        def total
-          sub_total + total_tax
+        def total(always_summary = false)
+          unless always_summary
+            sub_total + total_tax
+          else
+            attributes[:total]
+          end
         end
         
         # Retrieve the PDF version of this credit note.

data/lib/xeroizer/models/invoice.rb

@@ -113,8 +113,8 @@ module Xeroizer
         def total=(value);      raise SettingTotalDirectlyNotSupported.new(:total);       end
 
         # Calculate sub_total from line_items.
-        def sub_total
-          if new_record? || (!new_record? && line_items && line_items.size > 0)
+        def sub_total(always_summary = false)
+          if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
             sum = (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.line_amount }
             
             # If the default amount types are inclusive of 'tax' then remove the tax amount from this sub-total.
@@ -126,8 +126,8 @@ module Xeroizer
         end
 
         # Calculate total_tax from line_items.
-        def total_tax
-          if new_record? || (!new_record? && line_items && line_items.size > 0)
+        def total_tax(always_summary = false)
+          if !always_summary && (new_record? || (!new_record? && line_items && line_items.size > 0))
             (line_items || []).inject(BigDecimal.new('0')) { | sum, line_item | sum + line_item.tax_amount }
           else
             attributes[:total_tax]
@@ -135,8 +135,12 @@ module Xeroizer
         end
 
         # Calculate the total from line_items.
-        def total
-          sub_total + total_tax
+        def total(always_summary = false)
+          unless always_summary
+            sub_total + total_tax
+          else
+            attributes[:total]
+          end
         end
         
         # Retrieve the PDF version of this invoice.

data/lib/xeroizer/models/line_item.rb

@@ -26,7 +26,9 @@ module Xeroizer
       
       # Calculate the line_total (if there is a quantity and unit_amount).
       # Description-only lines have been allowed since Xero V2.09.
-      def line_amount
+      def line_amount(summary_only = false)
+        return attributes[:line_amount] if summary_only
+        
         BigDecimal((quantity * unit_amount).to_s).round(2) if quantity && unit_amount
       end
       

data/lib/xeroizer/models/organisation.rb

@@ -10,16 +10,21 @@ module Xeroizer
     
     class Organisation < Base
       
+      string    :api_key, :api_name => 'APIKey'
       string    :name
       string    :legal_name
       boolean   :pays_tax
       string    :version
       string    :organisation_type
       string    :base_currency
+      string    :country_code
+      boolean   :is_demo_company
+      string    :organisation_status
       integer   :financial_year_end_day
       integer   :financial_year_end_month
       date      :period_lock_date
       date      :end_of_year_lock_date
+      string    :tax_number
       string    :registration_number
       datetime  :created_date_utc, :api_name => 'CreatedDateUTC'
 

data/lib/xeroizer/models/payment.rb

@@ -16,11 +16,26 @@ module Xeroizer
       date      :date
       decimal   :amount
       decimal   :currency_rate
+      string    :payment_type
+      string    :status
       string    :reference
-            
+      datetime  :updated_date_utc, :api_name => 'UpdatedDateUTC'
+
       belongs_to  :account
       belongs_to  :invoice
       
+      def invoice_id
+        invoice.id if invoice
+      end
+      
+      def account_id
+        account.id if account
+      end
+      
+      def account_code
+        account.code if account
+      end
+      
     end
     
   end

data/lib/xeroizer/record/record_association_helper.rb

@@ -125,7 +125,7 @@ module Xeroizer
           # the complete version of the record before accessing the association.
           if list_contains_summary_only?
             define_method internal_field_name do
-              download_complete_record! unless new_record? || complete_record_downloaded?
+              download_complete_record! unless new_record? || options[:list_complete] || complete_record_downloaded?
               self.attributes[field_name] || ((association_type == :has_many) ? [] : nil)
             end
           end

data/xeroizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xeroizer"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Robinson"]
-  s.date = "2012-04-09"
+  s.date = "2012-04-16"
   s.description = "Ruby library for the Xero accounting system API."
   s.email = "wayne.robinson@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xeroizer
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Wayne Robinson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-09 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false