xero_gateway 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15bce269e603d39203dbafb5858843c8e8fe8b3e
-  data.tar.gz: a996fa84e4ca2471b3efc06eb68c080fbe4ed8cb
+  metadata.gz: '0195a3504b16daf5f4e5ef6c9644fcb7fd8ea146'
+  data.tar.gz: 770b6ae03cf67b5f9575b83ad446e9b049c619ce
 SHA512:
-  metadata.gz: 57f8ec61dbe74dcd7fb6fbdb4a2f65087079e2f4808bc8a08696e445d6f91b2b9ec4661ca557029041b1ffe35a11e3b2f49f42faf458c9b42c4bacad77b02cca
-  data.tar.gz: 4a203e5a9a76a0146c758249126bc595946422960d4cb37a056fb9607e0e5ad1493d336f5b24ad02a87076875a41b5dfd2ed09c3cc51f5d14b27caccb9158045
+  metadata.gz: e236f63458fa76c432032efd36ae3449c2d2aec38c43d0912d0015eb0536fdca81cd2ac58ca8f526d3c68032bff7f7f4348d1ac969abcf4095a52b3556ee5ce9
+  data.tar.gz: 914c8e0ed970d288f04ab4bcd2f7bf9ff538034882c62647926ee78f898fdcc53e7c001f1873e74230a7abc0c7f3923295361d5ae967bf7aa3884a8eb91c33a3

data/lib/xero_gateway.rb

@@ -19,12 +19,15 @@ require File.join(File.dirname(__FILE__), 'xero_gateway', 'money')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'line_item_calculations')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'response')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'base_record')
+require File.join(File.dirname(__FILE__), 'xero_gateway', 'branding_theme')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'account')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'accounts_list')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'tracking_category')
+require File.join(File.dirname(__FILE__), 'xero_gateway', 'address')
+require File.join(File.dirname(__FILE__), 'xero_gateway', 'phone')
+require File.join(File.dirname(__FILE__), 'xero_gateway', 'contact_person')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'contact')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'contact_group')
-require File.join(File.dirname(__FILE__), 'xero_gateway', 'contact_person')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'line_item')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'payment')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'payroll_calendar')
@@ -34,9 +37,7 @@ require File.join(File.dirname(__FILE__), 'xero_gateway', 'bank_transaction')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'credit_note')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'journal_line')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'manual_journal')
-require File.join(File.dirname(__FILE__), 'xero_gateway', 'address')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'report')
-require File.join(File.dirname(__FILE__), 'xero_gateway', 'phone')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'organisation')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'tax_rate')
 require File.join(File.dirname(__FILE__), 'xero_gateway', 'currency')

data/lib/xero_gateway/bank_transaction.rb

@@ -157,16 +157,16 @@ module XeroGateway
           when "UpdatedDateUTC" then bank_transaction.updated_at = parse_date_time(element.text)
           when "Type" then bank_transaction.type = element.text
           when "CurrencyCode" then bank_transaction.currency_code = element.text
-          when "CurrencyRate" then bank_transaction.currency_rate = BigDecimal.new(element.text)
+          when "CurrencyRate" then bank_transaction.currency_rate = BigDecimal(element.text)
           when "Contact" then bank_transaction.contact = Contact.from_xml(element)
           when "BankAccount" then bank_transaction.bank_account = Account.from_xml(element)
           when "Date" then bank_transaction.date = parse_date(element.text)
           when "Status" then bank_transaction.status = element.text
           when "Reference" then bank_transaction.reference = element.text
           when "LineItems" then element.children.each {|line_item| bank_transaction.line_items_downloaded = true; bank_transaction.line_items << LineItem.from_xml(line_item) }
-          when "Total" then bank_transaction.total = BigDecimal.new(element.text)
-          when "SubTotal" then bank_transaction.sub_total = BigDecimal.new(element.text)
-          when "TotalTax" then bank_transaction.total_tax = BigDecimal.new(element.text)
+          when "Total" then bank_transaction.total = BigDecimal(element.text)
+          when "SubTotal" then bank_transaction.sub_total = BigDecimal(element.text)
+          when "TotalTax" then bank_transaction.total_tax = BigDecimal(element.text)
           when "IsReconciled" then bank_transaction.is_reconciled = (element.text.strip.downcase == "true")
           when "Url" then bank_transaction.url = element.text
         end

data/lib/xero_gateway/base_record.rb

@@ -5,6 +5,10 @@ module XeroGateway
 
     class_attribute :element_name
     class_attribute :attribute_definitions
+    class_attribute :attribute_definitions_readonly
+
+    # The source XML record that initialized this instance.
+    attr_reader :source_xml
 
     class << self
       def attributes(hash)
@@ -27,8 +31,15 @@ module XeroGateway
         end
       end
 
-      def from_xml(base_element)
-        new.from_xml(base_element)
+      # Set list of attributes that should never be included in update/create responses.
+      def readonly_attributes(*attrs)
+        self.attribute_definitions_readonly ||= []
+        self.attribute_definitions_readonly += attrs.flatten
+      end
+
+      def from_xml(base_element, gateway = nil)
+        args = gateway ? [{ gateway: gateway }] : []
+        new(*args).from_xml(base_element)
       end
 
       def xml_element
@@ -46,14 +57,14 @@ module XeroGateway
       to_xml == other.to_xml
     end
 
-    def to_xml
-      builder = Builder::XmlMarkup.new
+    def to_xml(builder = Builder::XmlMarkup.new)
       builder.__send__(self.class.xml_element) do
         to_xml_attributes(builder)
       end
     end
 
     def from_xml(base_element)
+      @source_xml = base_element
       from_xml_attributes(base_element)
       self
     end
@@ -79,11 +90,13 @@ module XeroGateway
         when :boolean      then  element.text == "true"
         when :float        then  element.text.to_f
         when :integer      then  element.text.to_i
-        when :currency     then  BigDecimal.new(element.text)
-        when :date         then  Date.strptime(element.text, "%Y-%m-%d")
-        when :datetime     then  Date.strptime(element.text, "%Y-%m-%dT%H:%M:%S")
-        when :datetime_utc then  Date.strptime(element.text + "Z", "%Y-%m-%dT%H:%M:%S%Z")
+        when :currency     then  BigDecimal(element.text)
+        when :date         then  Dates::Helpers.parse_date(element.text)
+        when :datetime     then  Dates::Helpers.parse_date_time(element.text)
+        when :datetime_utc then  Dates::Helpers.parse_date_time_utc(element.text)
         when Array     then  array_from_xml(element, attr_definition)
+        when Class
+          attr_definition.from_xml(element) if attr_definition.respond_to?(:from_xml)
         else                 element.text
       end if element.text.present? || element.children.present?
 
@@ -97,6 +110,8 @@ module XeroGateway
 
     def to_xml_attributes(builder = Builder::XmlMarkup.new, path = nil, attr_definitions = self.class.attribute_definitions)
       attr_definitions.each do |attr, value|
+        next if self.class.attribute_definitions_readonly && self.class.attribute_definitions_readonly.include?(attr)
+
         case value
         when Hash
           builder.__send__(attr) do
@@ -104,14 +119,19 @@ module XeroGateway
           end
         when Array
           raise UnsupportedAttributeType.new("#{value} instances don't respond to #to_xml") unless value.first.method_defined?(:to_xml)
-          value = send("#{path}#{attr}".underscore) || []
+          options = value.length > 1 ? value.last : {}
+
+          value = send("#{path}#{attr}".underscore)
+          value ||= [] unless options[:omit_if_empty]
+
           builder.__send__(attr) do |array_wrapper|
             value.map do |k|
               k.to_xml(array_wrapper)
             end
-          end
+          end unless value.nil?
         else
-          builder.__send__(attr, send("#{path}#{attr}".underscore))
+          value = send("#{path}#{attr}".underscore)
+          builder.__send__(attr, value) unless value.nil?
         end
       end
     end

data/lib/xero_gateway/branding_theme.rb

@@ -0,0 +1,14 @@
+module XeroGateway
+  class BrandingTheme < BaseRecord
+    attributes({
+      "BrandingThemeID"        => :string,
+      "Name" 	                => :string,
+      "SortOrder"             => :integer,
+      "CreatedDateUTC"        => :string
+    })
+
+    def default?
+      sort_order == 0
+    end
+  end
+end

data/lib/xero_gateway/contact.rb

@@ -1,7 +1,5 @@
 module XeroGateway
-  class Contact
-    include Dates
-
+  class Contact < BaseRecord
     GUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ unless defined?(GUID_REGEX)
 
     CONTACT_STATUS = {
@@ -9,29 +7,50 @@ module XeroGateway
       'DELETED' =>    'Deleted'
     } unless defined?(CONTACT_STATUS)
 
-    # Xero::Gateway associated with this contact.
-    attr_accessor :gateway
-
-    # Any errors that occurred when the #valid? method called.
-    attr_reader :errors
-
-    attr_accessor :contact_id, :contact_number, :account_number, :status, :name, :first_name, :last_name, :email, :addresses, :phones, :updated_at,
-                  :bank_account_details, :tax_number, :accounts_receivable_tax_type, :accounts_payable_tax_type, :is_customer, :is_supplier,
-                  :default_currency, :contact_groups, :contact_persons
-
+    attr_accessor :gateway, :errors
+
+    attributes({
+      "ContactID" => :string,
+      "ContactNumber" => :string,
+      "AccountNumber" => :string,
+      "ContactStatus" => :string,
+      "Name" => :string,
+      "FirstName" => :string,
+      "LastName" => :string,
+      "EmailAddress" => :string,
+      "Addresses" => [Address, { :omit_if_empty => true }],
+      "Phones" => [Phone],
+      "BankAccountDetails" => :string,
+      "TaxNumber" => :string,
+      "AccountsReceivableTaxType" => :string,
+      "AccountsPayableTaxType" => :string,
+      "ContactGroups"  => :string,
+      "IsCustomer" => :boolean,
+      "IsSupplier" => :boolean,
+      "DefaultCurrency" => :string,
+      "UpdatedDateUTC" => :datetime_utc,
+      "ContactPersons" => [ContactPerson],
+      "BrandingTheme" => BrandingTheme
+    })
+
+    readonly_attributes "IsCustomer", "IsSupplier", "BrandingTheme"
+
+    { :updated_at => :updated_date_utc,
+      :status => :contact_status,
+      :email => :email_address }.each do |alt, orig|
+      alias_method alt, orig 
+      alias_method "#{alt}=", "#{orig}="
+    end
 
     def initialize(params = {})
-      @errors ||= []
-
-      params = {}.merge(params)
-      params.each do |k,v|
-        self.send("#{k}=", v)
-      end
+      super
 
+      @errors ||= []
       @phones ||= []
       @addresses ||= nil
     end
 
+
     def address=(address)
       self.addresses = [address]
     end
@@ -84,6 +103,7 @@ module XeroGateway
       self.contact_persons << ContactPerson.new(contact_person_params)
     end
 
+
     # Validate the Contact record according to what will be valid by the gateway.
     #
     # Usage:
@@ -142,73 +162,5 @@ module XeroGateway
       gateway.update_contact(self)
     end
 
-    def to_xml(b = Builder::XmlMarkup.new)
-      b.Contact {
-        b.ContactID self.contact_id if self.contact_id
-        b.ContactNumber self.contact_number if self.contact_number
-        b.AccountNumber self.account_number if self.account_number
-        b.Name self.name if self.name
-        b.EmailAddress self.email if self.email
-        b.FirstName self.first_name if self.first_name
-        b.LastName self.last_name if self.last_name
-        b.BankAccountDetails self.bank_account_details if self.bank_account_details
-        b.TaxNumber self.tax_number if self.tax_number
-        b.AccountsReceivableTaxType self.accounts_receivable_tax_type if self.accounts_receivable_tax_type
-        b.AccountsPayableTaxType self.accounts_payable_tax_type if self.accounts_payable_tax_type
-        b.ContactGroups if self.contact_groups
-        b.IsCustomer true if self.is_customer
-        b.IsSupplier true if self.is_supplier
-        b.DefaultCurrency if self.default_currency
-        b.Addresses {
-          addresses.each { |address| address.to_xml(b) }
-        } unless addresses.nil?
-        b.Phones {
-          phones.each { |phone| phone.to_xml(b) }
-        } if self.phones.any?
-        b.ContactPersons {
-          contact_persons.each { |contact_person| contact_person.to_xml(b) }
-        } unless contact_persons.nil?
-      }
-    end
-
-    # Take a Contact element and convert it into an Contact object
-    def self.from_xml(contact_element, gateway = nil)
-      contact = Contact.new(:gateway => gateway)
-      contact_element.children.each do |element|
-        case(element.name)
-          when "ContactID" then contact.contact_id = element.text
-          when "ContactNumber" then contact.contact_number = element.text
-          when "AccountNumber" then contact.account_number = element.text
-          when "ContactStatus" then contact.status = element.text
-          when "Name" then contact.name = element.text
-          when "FirstName" then contact.first_name = element.text
-          when "LastName" then contact.last_name = element.text
-          when "EmailAddress" then contact.email = element.text
-          when "Addresses" then element.children.each { |address_element| contact.addresses ||= []; contact.addresses << Address.from_xml(address_element) }
-          when "Phones" then element.children.each { |phone_element| contact.phones << Phone.from_xml(phone_element) }
-          when "BankAccountDetails" then contact.bank_account_details = element.text
-          when "TaxNumber" then contact.tax_number = element.text
-          when "AccountsReceivableTaxType" then contact.accounts_receivable_tax_type = element.text
-          when "AccountsPayableTaxType" then contact.accounts_payable_tax_type = element.text
-          when "ContactGroups" then contact.contact_groups = element.text
-          when "IsCustomer" then contact.is_customer = (element.text == "true")
-          when "IsSupplier" then contact.is_supplier = (element.text == "true")
-          when "DefaultCurrency" then contact.default_currency = element.text
-          when "UpdatedDateUTC" then contact.updated_at = parse_date_time(element.text)
-          when "ContactPersons" then element.children.each { |contact_person_element| contact.contact_persons ||= []; contact.contact_persons << ContactPerson.from_xml(contact_person_element) }
-        end
-      end
-      contact
-    end
-
-    def ==(other)
-      [ :contact_id, :contact_number, :account_number, :status, :name, :first_name, :last_name, :email, :addresses, :phones, :updated_at,
-        :bank_account_details, :tax_number, :accounts_receivable_tax_type, :accounts_payable_tax_type, :is_customer, :is_supplier,
-        :default_currency, :contact_groups ].each do |field|
-        return false if send(field) != other.send(field)
-      end
-      return true
-    end
-
   end
 end

data/lib/xero_gateway/credit_note.rb

@@ -197,13 +197,13 @@ module XeroGateway
           when "Reference" then credit_note.reference = element.text
           when "LineAmountTypes" then credit_note.line_amount_types = element.text
           when "LineItems" then element.children.each {|line_item| credit_note.line_items_downloaded = true; credit_note.line_items << LineItem.from_xml(line_item) }
-          when "SubTotal" then credit_note.sub_total = BigDecimal.new(element.text)
-          when "TotalTax" then credit_note.total_tax = BigDecimal.new(element.text)
-          when "Total" then credit_note.total = BigDecimal.new(element.text)
+          when "SubTotal" then credit_note.sub_total = BigDecimal(element.text)
+          when "TotalTax" then credit_note.total_tax = BigDecimal(element.text)
+          when "Total" then credit_note.total = BigDecimal(element.text)
           when "Payments" then element.children.each { | payment | credit_note.payments << Payment.from_xml(payment) }
-          when "AmountDue" then credit_note.amount_due = BigDecimal.new(element.text)
-          when "AmountPaid" then credit_note.amount_paid = BigDecimal.new(element.text)
-          when "AmountCredited" then credit_note.amount_credited = BigDecimal.new(element.text)
+          when "AmountDue" then credit_note.amount_due = BigDecimal(element.text)
+          when "AmountPaid" then credit_note.amount_paid = BigDecimal(element.text)
+          when "AmountCredited" then credit_note.amount_credited = BigDecimal(element.text)
         end
       end
       credit_note

data/lib/xero_gateway/dates.rb

@@ -25,5 +25,9 @@ module XeroGateway
         Time.utc(time[0..3].to_i, time[5..6].to_i, time[8..9].to_i, time[11..12].to_i, time[14..15].to_i, time[17..18].to_i)
       end
     end
+
+    module Helpers
+      extend ClassMethods
+    end
   end
 end

data/lib/xero_gateway/gateway.rb

@@ -165,14 +165,16 @@ module XeroGateway
 
       request_params = {}
 
-      request_params[:InvoiceID]     = options[:invoice_id] if options[:invoice_id]
-      request_params[:InvoiceNumber] = options[:invoice_number] if options[:invoice_number]
-      request_params[:order]         = options[:order] if options[:order]
-      request_params[:ModifiedAfter] = options[:modified_since] if options[:modified_since]
-      request_params[:ContactIDs]    = Array(options[:contact_ids]).join(",") if options[:contact_ids]
-      request_params[:page]          = options[:page]  if options[:page]
+      request_params[:InvoiceID]      = options[:invoice_id] if options[:invoice_id]
+      request_params[:InvoiceNumber]  = options[:invoice_number] if options[:invoice_number]
+      request_params[:order]          = options[:order] if options[:order]
+      request_params[:ModifiedAfter]  = options[:modified_since] if options[:modified_since]
+      request_params[:IDs]            = Array(options[:invoice_ids]).join(",") if options[:invoice_ids]
+      request_params[:InvoiceNumbers] = Array(options[:invoice_numbers]).join(",") if options[:invoice_numbers]
+      request_params[:ContactIDs]     = Array(options[:contact_ids]).join(",") if options[:contact_ids]
+      request_params[:page]           = options[:page]  if options[:page]
 
-      request_params[:where]         = options[:where] if options[:where]
+      request_params[:where]          = options[:where] if options[:where]
 
       response_xml = http_get(@client, "#{@xero_url}/Invoices", request_params)
 

data/lib/xero_gateway/invoice.rb

@@ -209,7 +209,7 @@ module XeroGateway
           when "InvoiceNumber" then invoice.invoice_number = element.text
           when "Type" then invoice.invoice_type = element.text
           when "CurrencyCode" then invoice.currency_code = element.text
-          when "CurrencyRate" then invoice.currency_rate = BigDecimal.new(element.text)
+          when "CurrencyRate" then invoice.currency_rate = BigDecimal(element.text)
           when "Contact" then invoice.contact = Contact.from_xml(element)
           when "Date" then invoice.date = parse_date(element.text)
           when "DueDate" then invoice.due_date = parse_date(element.text)
@@ -220,13 +220,13 @@ module XeroGateway
           when "BrandingThemeID" then invoice.branding_theme_id = element.text
           when "LineAmountTypes" then invoice.line_amount_types = element.text
           when "LineItems" then element.children.each {|line_item| invoice.line_items_downloaded = true; invoice.line_items << LineItem.from_xml(line_item) }
-          when "SubTotal" then invoice.sub_total = BigDecimal.new(element.text)
-          when "TotalTax" then invoice.total_tax = BigDecimal.new(element.text)
-          when "Total" then invoice.total = BigDecimal.new(element.text)
+          when "SubTotal" then invoice.sub_total = BigDecimal(element.text)
+          when "TotalTax" then invoice.total_tax = BigDecimal(element.text)
+          when "Total" then invoice.total = BigDecimal(element.text)
           when "Payments" then element.children.each { | payment | invoice.payments << Payment.from_xml(payment) }
-          when "AmountDue" then invoice.amount_due = BigDecimal.new(element.text)
-          when "AmountPaid" then invoice.amount_paid = BigDecimal.new(element.text)
-          when "AmountCredited" then invoice.amount_credited = BigDecimal.new(element.text)
+          when "AmountDue" then invoice.amount_due = BigDecimal(element.text)
+          when "AmountPaid" then invoice.amount_paid = BigDecimal(element.text)
+          when "AmountCredited" then invoice.amount_credited = BigDecimal(element.text)
           when "SentToContact" then invoice.sent_to_contact = (element.text.strip.downcase == "true")
           when "Url" then invoice.url = element.text
           when "ValidationErrors" then invoice.errors = element.children.map { |error| Error.parse(error) }

data/lib/xero_gateway/journal_line.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'account')
 module XeroGateway
   class JournalLine
     include Money
-    
+
     TAX_TYPE = Account::TAX_TYPE unless defined?(TAX_TYPE)
 
     # Any errors that occurred when the #valid? method called.
@@ -11,29 +11,29 @@ module XeroGateway
 
     # All accessible fields
     attr_accessor :journal_line_id, :line_amount, :account_code, :description, :tax_type, :tracking
-        
+
     def initialize(params = {})
       @errors ||= []
       @tracking ||= []
-      
+
       params.each do |k,v|
         self.send("#{k}=", v)
       end
     end
-    
+
     # Validate the JournalLineItem record according to what will be valid by the gateway.
     #
-    # Usage: 
+    # Usage:
     #  journal_line_item.valid?     # Returns true/false
-    #  
+    #
     #  Additionally sets journal_line_item.errors array to an array of field/error.
     def valid?
       @errors = []
-      
+
       if !journal_line_id.nil? && journal_line_id !~ GUID_REGEX
         @errors << ['journal_line_id', 'must be blank or a valid Xero GUID']
       end
-      
+
       unless line_amount
         @errors << ['line_amount', "can't be blank"]
       end
@@ -41,20 +41,20 @@ module XeroGateway
       unless account_code
         @errors << ['account_code', "can't be blank"]
       end
-      
+
       @errors.size == 0
     end
-    
+
     def has_tracking?
       return false if tracking.nil?
-      
+
       if tracking.is_a?(Array)
         return tracking.any?
       else
         return tracking.is_a?(TrackingCategory)
       end
     end
-    
+
     def to_xml(b = Builder::XmlMarkup.new)
       b.JournalLine {
         b.LineAmount line_amount # mandatory
@@ -73,12 +73,12 @@ module XeroGateway
         end
       }
     end
-    
+
     def self.from_xml(journal_line_element)
       journal_line = JournalLine.new
       journal_line_element.children.each do |element|
         case(element.name)
-          when "LineAmount" then journal_line.line_amount = BigDecimal.new(element.text)
+          when "LineAmount" then journal_line.line_amount = BigDecimal(element.text)
           when "AccountCode" then journal_line.account_code = element.text
           when "JournalLineID" then journal_line.journal_line_id = element.text
           when "Description" then journal_line.description = element.text
@@ -90,7 +90,7 @@ module XeroGateway
         end
       end
       journal_line
-    end    
+    end
 
     def ==(other)
       [:description, :line_amount, :account_code, :tax_type].each do |field|
@@ -98,5 +98,5 @@ module XeroGateway
       end
       return true
     end
-  end  
+  end
 end

data/lib/xero_gateway/line_item.rb

@@ -16,7 +16,7 @@ module XeroGateway
       @errors ||= []
       @tracking ||= []
       @quantity = 1
-      @unit_amount = BigDecimal.new('0')
+      @unit_amount = BigDecimal('0')
 
       params.each do |k,v|
         self.send("#{k}=", v)
@@ -68,7 +68,7 @@ module XeroGateway
     # for the API call to succeed.
     def line_amount
       total = quantity * unit_amount
-      total = total * (1 - (discount_rate / BigDecimal.new(100))) if discount_rate
+      total = total * (1 - (discount_rate / BigDecimal(100))) if discount_rate
       total
     end
 
@@ -103,12 +103,12 @@ module XeroGateway
           when "LineItemID" then line_item.line_item_id = element.text
           when "Description" then line_item.description = element.text
           when "Quantity" then line_item.quantity = BigDecimal(element.text)
-          when "UnitAmount" then line_item.unit_amount = BigDecimal.new(element.text)
+          when "UnitAmount" then line_item.unit_amount = BigDecimal(element.text)
           when "ItemCode" then line_item.item_code = element.text
           when "TaxType" then line_item.tax_type = element.text
-          when "TaxAmount" then line_item.tax_amount = BigDecimal.new(element.text)
-          when "LineAmount" then line_item.line_amount = BigDecimal.new(element.text)
-          when "DiscountRate" then line_item.discount_rate = BigDecimal.new(element.text)
+          when "TaxAmount" then line_item.tax_amount = BigDecimal(element.text)
+          when "LineAmount" then line_item.line_amount = BigDecimal(element.text)
+          when "DiscountRate" then line_item.discount_rate = BigDecimal(element.text)
           when "AccountCode" then line_item.account_code = element.text
           when "Tracking" then
             element.children.each do | tracking_element |

data/lib/xero_gateway/line_item_calculations.rb

@@ -40,8 +40,8 @@ module XeroGateway
       end
 
       def sum_line_items(lines, sum_type = :line_amount)
-        lines.inject(BigDecimal.new('0')) do |sum, line|
-          sum + BigDecimal.new(line.send(sum_type).to_s)
+        lines.inject(BigDecimal('0')) do |sum, line|
+          sum + BigDecimal(line.send(sum_type).to_s)
         end
       end
 

data/lib/xero_gateway/payment.rb

@@ -26,9 +26,9 @@ module XeroGateway
           when 'PaymentType'    then payment.payment_type = element.text
           when 'Date'           then payment.date = parse_date_time(element.text)
           when 'UpdatedDateUTC' then payment.updated_at = parse_date_time(element.text)
-          when 'Amount'         then payment.amount = BigDecimal.new(element.text)
+          when 'Amount'         then payment.amount = BigDecimal(element.text)
           when 'Reference'      then payment.reference = element.text
-          when 'CurrencyRate'   then payment.currency_rate = BigDecimal.new(element.text)
+          when 'CurrencyRate'   then payment.currency_rate = BigDecimal(element.text)
           when 'Invoice'
             payment.invoice_id = element.elements["//InvoiceID"].text
             payment.invoice_number = element.elements["//InvoiceNumber"].text

data/lib/xero_gateway/version.rb

@@ -1,3 +1,3 @@
 module XeroGateway
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

data/test/test_helper.rb

@@ -161,8 +161,8 @@ module TestHelper
       line_item_params[0] = {
         :description  => "A LINE ITEM",
         :account_code => "200",
-        :unit_amount  => BigDecimal.new("100"),
-        :tax_amount   => BigDecimal.new("12.5"),
+        :unit_amount  => BigDecimal("100"),
+        :tax_amount   => BigDecimal("12.5"),
         :tracking     => XeroGateway::TrackingCategory.new(:name => "blah", :options => "hello")
       }.merge(line_item_params[0])
 
@@ -230,14 +230,14 @@ module TestHelper
       journal_line_params[0] = {
         :description  => "FIRST LINE",
         :account_code => "200",
-        :line_amount  => BigDecimal.new("100"),
+        :line_amount  => BigDecimal("100"),
         :tracking     => XeroGateway::TrackingCategory.new(:name => "blah", :options => "hello")
       }.merge(journal_line_params[0])
       params_line_1 = journal_line_params[1] || {}
       journal_line_params[1] = {
         :description  => "SECOND LINE",
         :account_code => "200",
-        :line_amount  => BigDecimal.new("-100"),
+        :line_amount  => BigDecimal("-100"),
         :tracking     => XeroGateway::TrackingCategory.new(:name => "blah2", :options => "hello2")
       }.merge(params_line_1)
 

data/test/unit/bank_transaction_test.rb

@@ -30,8 +30,8 @@ class BankTransactionTest < Test::Unit::TestCase
       line_item = bank_transaction.line_items.first
       assert_equal('A LINE ITEM', line_item.description)
       assert_equal('200', line_item.account_code)
-      assert_equal(BigDecimal.new('100'), line_item.unit_amount)
-      assert_equal(BigDecimal.new('12.5'), line_item.tax_amount)
+      assert_equal(BigDecimal('100'), line_item.unit_amount)
+      assert_equal(BigDecimal('12.5'), line_item.tax_amount)
     end
 
     should "allow overriding transaction defaults" do
@@ -114,7 +114,7 @@ class BankTransactionTest < Test::Unit::TestCase
       XeroGateway::BankTransaction.any_instance.stubs(:line_items_downloaded?).returns(false)
       parsed_bank_transaction = XeroGateway::BankTransaction.from_xml(bank_transaction_element)
       assert_equal 'http://example.com?with=params&and=more', parsed_bank_transaction.url
-      assert_equal BigDecimal.new('1000'), parsed_bank_transaction.total
+      assert_equal BigDecimal('1000'), parsed_bank_transaction.total
     end
 
     should "ignore missing contact" do

data/test/unit/contact_test.rb

@@ -98,7 +98,7 @@ class ContactTest < Test::Unit::TestCase
     contact_element = REXML::XPath.first(REXML::Document.new(test_xml.gsub(/\s/, "")), "/Contact")
     contact = XeroGateway::Contact.from_xml(contact_element)
 
-    assert_equal Time.new(2016, 8, 31, 04, 55, 39), contact.updated_at.utc
+    assert_equal Time.utc(2016, 8, 31, 04, 55, 39), contact.updated_at.utc
 
   end
 
@@ -165,6 +165,59 @@ class ContactTest < Test::Unit::TestCase
     assert(!phone.valid?)
   end
 
+  def test_loads_branding_theme_if_set
+    test_xml = <<-TESTING.strip_heredoc.chomp
+    <Contact>
+      <ContactID>f1d403d1-7d30-46c2-a2be-fc2bb29bd295</ContactID>
+      <ContactStatus>ACTIVE</ContactStatus>
+      <Name>24 Locks</Name>
+      <Addresses>
+        <Address>
+          <AddressType>POBOX</AddressType>
+        </Address>
+        <Address>
+          <AddressType>STREET</AddressType>
+        </Address>
+      </Addresses>
+      <Phones>
+        <Phone>
+          <PhoneType>DDI</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>DEFAULT</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>FAX</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>MOBILE</PhoneType>
+        </Phone>
+      </Phones>
+      <ContactPersons>
+        <ContactPerson>
+          <FirstName>John</FirstName>
+          <LastName>Smith</LastName>
+          <EmailAddress>john@acme.com</EmailAddress>
+          <IncludeInEmails>true</IncludeInEmails>
+        </ContactPerson>
+      </ContactPersons>
+      <UpdatedDateUTC>2016-08-31T04:55:39.217</UpdatedDateUTC>
+      <IsSupplier>false</IsSupplier>
+      <IsCustomer>false</IsCustomer>
+      <HasAttachments>false</HasAttachments>
+      <BrandingTheme>
+        <BrandingThemeID>3761deb4-209e-4197-80bb-2993aff35387</BrandingThemeID>
+        <Name>Test_Theme</Name>
+      </BrandingTheme>
+    </Contact>
+    TESTING
+
+    contact_element = REXML::XPath.first(REXML::Document.new(test_xml.gsub(/\s/, "")), "/Contact")
+    contact = XeroGateway::Contact.from_xml(contact_element)
+
+    assert_equal "Test_Theme", contact.branding_theme.name
+  end
+
   private
 
   def create_test_contact

data/test/unit/credit_note_test.rb

@@ -24,14 +24,14 @@ class CreditNoteTest < Test::Unit::TestCase
     line_item = credit_note.line_items.first
 
     # Make sure that everything adds up to begin with.
-    expected_sub_total = credit_note.line_items.inject(BigDecimal.new('0')) { | sum, l | l.line_amount }
+    expected_sub_total = credit_note.line_items.inject(BigDecimal('0')) { | sum, l | l.line_amount }
     assert_equal(expected_sub_total, credit_note.sub_total)
 
     # Change the amount of the first line item and make sure that
     # everything still continues to add up.
     line_item.unit_amount = line_item.unit_amount + 10
     assert_not_equal(expected_sub_total, credit_note.sub_total)
-    expected_sub_total = credit_note.line_items.inject(BigDecimal.new('0')) { | sum, l | l.line_amount }
+    expected_sub_total = credit_note.line_items.inject(BigDecimal('0')) { | sum, l | l.line_amount }
     assert_equal(expected_sub_total, credit_note.sub_total)
   end
 
@@ -41,14 +41,14 @@ class CreditNoteTest < Test::Unit::TestCase
     line_item = credit_note.line_items.first
 
     # Make sure that everything adds up to begin with.
-    expected_total_tax = credit_note.line_items.inject(BigDecimal.new('0')) { | sum, l | l.tax_amount }
+    expected_total_tax = credit_note.line_items.inject(BigDecimal('0')) { | sum, l | l.tax_amount }
     assert_equal(expected_total_tax, credit_note.total_tax)
 
     # Change the tax_amount of the first line item and make sure that
     # everything still continues to add up.
     line_item.tax_amount = line_item.tax_amount + 10
     assert_not_equal(expected_total_tax, credit_note.total_tax)
-    expected_total_tax = credit_note.line_items.inject(BigDecimal.new('0')) { | sum, l | l.tax_amount }
+    expected_total_tax = credit_note.line_items.inject(BigDecimal('0')) { | sum, l | l.tax_amount }
     assert_equal(expected_total_tax, credit_note.total_tax)
   end
 
@@ -96,9 +96,9 @@ class CreditNoteTest < Test::Unit::TestCase
     credit_note.line_items = []
 
     assert_nothing_raised(Exception) {
-      assert_equal(BigDecimal.new('0'), credit_note.sub_total)
-      assert_equal(BigDecimal.new('0'), credit_note.total_tax)
-      assert_equal(BigDecimal.new('0'), credit_note.total)
+      assert_equal(BigDecimal('0'), credit_note.sub_total)
+      assert_equal(BigDecimal('0'), credit_note.total_tax)
+      assert_equal(BigDecimal('0'), credit_note.total)
     }
   end
 
@@ -142,8 +142,8 @@ class CreditNoteTest < Test::Unit::TestCase
     # Test the line_item defaults.
     assert_equal('A LINE ITEM', credit_note.line_items.first.description)
     assert_equal('200', credit_note.line_items.first.account_code)
-    assert_equal(BigDecimal.new('100'), credit_note.line_items.first.unit_amount)
-    assert_equal(BigDecimal.new('12.5'), credit_note.line_items.first.tax_amount)
+    assert_equal(BigDecimal('100'), credit_note.line_items.first.unit_amount)
+    assert_equal(BigDecimal('12.5'), credit_note.line_items.first.tax_amount)
 
     # Test overriding an credit_note parameter (assume works for all).
     credit_note = create_test_credit_note({:type => 'ACCPAYCREDIT'})
@@ -159,18 +159,18 @@ class CreditNoteTest < Test::Unit::TestCase
     credit_note = create_test_credit_note({}, {}, {:description => 'OVERRIDDEN LINE ITEM'})
     assert_equal(1, credit_note.line_items.size)
     assert_equal('OVERRIDDEN LINE ITEM', credit_note.line_items.first.description)
-    assert_equal(BigDecimal.new('100'), credit_note.line_items.first.unit_amount)
+    assert_equal(BigDecimal('100'), credit_note.line_items.first.unit_amount)
 
     # Test overriding line_items with array of 2 line_items.
     credit_note = create_test_credit_note({}, {}, [
       {:description => 'OVERRIDDEN ITEM 1'},
-      {:description => 'OVERRIDDEN ITEM 2', :account_code => '200', :unit_amount => BigDecimal.new('200'), :tax_amount => '25.0'}
+      {:description => 'OVERRIDDEN ITEM 2', :account_code => '200', :unit_amount => BigDecimal('200'), :tax_amount => '25.0'}
     ])
     assert_equal(2, credit_note.line_items.size)
     assert_equal('OVERRIDDEN ITEM 1', credit_note.line_items[0].description)
-    assert_equal(BigDecimal.new('100'), credit_note.line_items[0].unit_amount)
+    assert_equal(BigDecimal('100'), credit_note.line_items[0].unit_amount)
     assert_equal('OVERRIDDEN ITEM 2', credit_note.line_items[1].description)
-    assert_equal(BigDecimal.new('200'), credit_note.line_items[1].unit_amount)
+    assert_equal(BigDecimal('200'), credit_note.line_items[1].unit_amount)
   end
 
   def test_auto_creation_of_associated_contact
@@ -256,8 +256,8 @@ class CreditNoteTest < Test::Unit::TestCase
       line_item_params[0] = {
         :description => "A LINE ITEM",
         :account_code => "200",
-        :unit_amount => BigDecimal.new("100"),
-        :tax_amount => BigDecimal.new("12.5"),
+        :unit_amount => BigDecimal("100"),
+        :tax_amount => BigDecimal("12.5"),
         :tracking => XeroGateway::TrackingCategory.new(:name => "blah", :options => "hello")
       }.merge(line_item_params[0])
 

data/test/unit/invoice_test.rb

@@ -97,7 +97,7 @@ class InvoiceTest < Test::Unit::TestCase
     line_item = invoice.line_items.first
 
     # Make sure that everything adds up to begin with.
-    expected_sub_total = invoice.line_items.inject(BigDecimal.new('0')) { | sum, l | l.line_amount }
+    expected_sub_total = invoice.line_items.inject(BigDecimal('0')) { | sum, l | l.line_amount }
     assert_equal(expected_sub_total, invoice.sub_total)
 
     # Change the sub_total and check that it doesn't modify anything.
@@ -108,7 +108,7 @@ class InvoiceTest < Test::Unit::TestCase
     # everything still continues to add up.
     line_item.unit_amount = line_item.unit_amount + 10
     assert_not_equal(expected_sub_total, invoice.sub_total)
-    expected_sub_total = invoice.line_items.inject(BigDecimal.new('0')) { | sum, l | l.line_amount }
+    expected_sub_total = invoice.line_items.inject(BigDecimal('0')) { | sum, l | l.line_amount }
     assert_equal(expected_sub_total, invoice.sub_total)
   end
 
@@ -118,7 +118,7 @@ class InvoiceTest < Test::Unit::TestCase
     line_item = invoice.line_items.first
 
     # Make sure that everything adds up to begin with.
-    expected_total_tax = invoice.line_items.inject(BigDecimal.new('0')) { | sum, l | l.tax_amount }
+    expected_total_tax = invoice.line_items.inject(BigDecimal('0')) { | sum, l | l.tax_amount }
     assert_equal(expected_total_tax, invoice.total_tax)
 
     # Change the total_tax and check that it doesn't modify anything.
@@ -129,7 +129,7 @@ class InvoiceTest < Test::Unit::TestCase
     # everything still continues to add up.
     line_item.tax_amount = line_item.tax_amount + 10
     assert_not_equal(expected_total_tax, invoice.total_tax)
-    expected_total_tax = invoice.line_items.inject(BigDecimal.new('0')) { | sum, l | l.tax_amount }
+    expected_total_tax = invoice.line_items.inject(BigDecimal('0')) { | sum, l | l.tax_amount }
     assert_equal(expected_total_tax, invoice.total_tax)
   end
 
@@ -202,9 +202,9 @@ class InvoiceTest < Test::Unit::TestCase
     invoice.line_items = []
 
     assert_nothing_raised(Exception) {
-      assert_equal(BigDecimal.new('0'), invoice.sub_total)
-      assert_equal(BigDecimal.new('0'), invoice.total_tax)
-      assert_equal(BigDecimal.new('0'), invoice.total)
+      assert_equal(BigDecimal('0'), invoice.sub_total)
+      assert_equal(BigDecimal('0'), invoice.total_tax)
+      assert_equal(BigDecimal('0'), invoice.total)
     }
   end
 
@@ -250,8 +250,8 @@ class InvoiceTest < Test::Unit::TestCase
     # Test the line_item defaults.
     assert_equal('A LINE ITEM', invoice.line_items.first.description)
     assert_equal('200', invoice.line_items.first.account_code)
-    assert_equal(BigDecimal.new('100'), invoice.line_items.first.unit_amount)
-    assert_equal(BigDecimal.new('12.5'), invoice.line_items.first.tax_amount)
+    assert_equal(BigDecimal('100'), invoice.line_items.first.unit_amount)
+    assert_equal(BigDecimal('12.5'), invoice.line_items.first.tax_amount)
 
     # Test optional params
     assert_nil invoice.url
@@ -270,18 +270,18 @@ class InvoiceTest < Test::Unit::TestCase
     invoice = create_test_invoice({}, {}, {:description => 'OVERRIDDEN LINE ITEM'})
     assert_equal(1, invoice.line_items.size)
     assert_equal('OVERRIDDEN LINE ITEM', invoice.line_items.first.description)
-    assert_equal(BigDecimal.new('100'), invoice.line_items.first.unit_amount)
+    assert_equal(BigDecimal('100'), invoice.line_items.first.unit_amount)
 
     # Test overriding line_items with array of 2 line_items.
     invoice = create_test_invoice({}, {}, [
       {:description => 'OVERRIDDEN ITEM 1'},
-      {:description => 'OVERRIDDEN ITEM 2', :account_code => '200', :unit_amount => BigDecimal.new('200'), :tax_amount => '25.0'}
+      {:description => 'OVERRIDDEN ITEM 2', :account_code => '200', :unit_amount => BigDecimal('200'), :tax_amount => '25.0'}
     ])
     assert_equal(2, invoice.line_items.size)
     assert_equal('OVERRIDDEN ITEM 1', invoice.line_items[0].description)
-    assert_equal(BigDecimal.new('100'), invoice.line_items[0].unit_amount)
+    assert_equal(BigDecimal('100'), invoice.line_items[0].unit_amount)
     assert_equal('OVERRIDDEN ITEM 2', invoice.line_items[1].description)
-    assert_equal(BigDecimal.new('200'), invoice.line_items[1].unit_amount)
+    assert_equal(BigDecimal('200'), invoice.line_items[1].unit_amount)
   end
 
   def test_auto_creation_of_associated_contact
@@ -391,8 +391,8 @@ class InvoiceTest < Test::Unit::TestCase
       line_item_params[0] = {
         :description => "A LINE ITEM",
         :account_code => "200",
-        :unit_amount => BigDecimal.new("100"),
-        :tax_amount => BigDecimal.new("12.5"),
+        :unit_amount => BigDecimal("100"),
+        :tax_amount => BigDecimal("12.5"),
         :tracking => XeroGateway::TrackingCategory.new(:name => "blah", :options => "hello")
       }.merge(line_item_params[0])
 

data/test/unit/manual_journal_test.rb

@@ -16,7 +16,7 @@ class ManualJournalTest < Test::Unit::TestCase
       journal_line = manual_journal.journal_lines.first
       assert_equal('FIRST LINE', journal_line.description)
       assert_equal('200', journal_line.account_code)
-      assert_equal(BigDecimal.new('100'), journal_line.line_amount)
+      assert_equal(BigDecimal('100'), journal_line.line_amount)
     end
 
     should "allow overriding transaction defaults" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xero_gateway
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Tim Connor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -188,6 +188,7 @@ files:
 - lib/xero_gateway/address.rb
 - lib/xero_gateway/bank_transaction.rb
 - lib/xero_gateway/base_record.rb
+- lib/xero_gateway/branding_theme.rb
 - lib/xero_gateway/ca-certificates.crt
 - lib/xero_gateway/contact.rb
 - lib/xero_gateway/contact_group.rb