xeroizer 2.16.4 → 2.16.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc0fe7184f644131b2630c193d88ce469d3109d
-  data.tar.gz: 3da9e63fe020b3c77224de62c4d3d250e7123958
+  metadata.gz: 661b00281b09048f7c58f3bc0e4c12d3401fc9c3
+  data.tar.gz: 79db1f4fa930e1deb41f78fd0cee48ee6e30ab95
 SHA512:
-  metadata.gz: 266f870812795987caafea77646dc52a52dff4cc9208b3de83e692cf339966b70af9994a226c17891bfbdd92a5791c2c2eb2dca17e3aab6b0e567f61fb92044a
-  data.tar.gz: 402f1cf46c08333f92d9159896ede4eaa2fb6c73645166d9bdf63f78c12bc6c0bd62e01bd17d815b66ebd3f9a3a107267e2e237bb21b095ec4522d1b4b604cda
+  metadata.gz: 5dec38c448515e18f9aad030a0ae05bcd7504133474fcc8b52d06be00947db73556416414bb528483810d894a97785d862540b4d7a4cdd948632b99c5ef0abdf
+  data.tar.gz: 091ef6309c0a17f85976b1135eaca233de6b3e7031b972bfbdc14c81b9016c67177f6fdf1ebdca9694047aba232a5f5c6d7e95cf2f1f1f49c13c3cab7b139156

data/README.md

@@ -531,7 +531,7 @@ are welcome).
 Reports are accessed like the following example:
 
 ```ruby
-trial_balance = xero.TrialBalance.get(:date => '2011-03-21')
+trial_balance = xero.TrialBalance.get(:date => DateTime.new(2011,3,21))
 
 # Array containing report headings.
 trial_balance.header.cells.map { | cell | cell.value }
@@ -588,6 +588,25 @@ client = Xeroizer::PublicApplication.new(YOUR_OAUTH_CONSUMER_KEY,
                                          :rate_limit_sleep => 2)
 ```
 
+Xero API Nonce Used
+-------------------
+
+The Xero API seems to reject requests due to conflicts on occasion.
+
+By default, the library will raise a `Xeroizer::OAuth::NonceUsed`
+exception when one of these limits is exceeded.
+
+If required, the library can handle these exceptions internally by sleeping 1 second and then repeating the last request.
+You can set this option when initializing an application:
+
+```ruby
+# Sleep for 2 seconds every time the rate limit is exceeded.
+client = Xeroizer::PublicApplication.new(YOUR_OAUTH_CONSUMER_KEY,
+                                         YOUR_OAUTH_CONSUMER_SECRET,
+                                         :nonce_used_max_attempts => 3)
+```
+
+
 Logging
 ---------------
 

data/lib/xeroizer.rb

@@ -3,6 +3,7 @@ require 'date'
 require 'forwardable'
 require 'active_support/inflector'
 require "active_support/core_ext/array"
+require "active_support/core_ext/big_decimal/conversions"
 require 'oauth'
 require 'oauth/signature/rsa/sha1'
 require 'nokogiri'
@@ -13,7 +14,6 @@ require 'cgi'
 
 $: << File.expand_path(File.dirname(__FILE__))
 
-require 'big_decimal_to_s'
 require 'class_level_inheritable_attributes'
 require 'xeroizer/oauth'
 require 'xeroizer/http_encoding_helper'
@@ -51,6 +51,7 @@ require 'xeroizer/models/organisation'
 require 'xeroizer/models/payment'
 require 'xeroizer/models/prepayment'
 require 'xeroizer/models/phone'
+require 'xeroizer/models/purchase_order'
 require 'xeroizer/models/receipt'
 require 'xeroizer/models/repeating_invoice'
 require 'xeroizer/models/schedule'

data/lib/xeroizer/generic_application.rb

@@ -7,7 +7,7 @@ module Xeroizer
     extend Record::ApplicationHelper
 
     attr_reader :client, :xero_url, :logger, :rate_limit_sleep, :rate_limit_max_attempts,
-                :default_headers, :unitdp, :before_request, :after_request
+                :default_headers, :unitdp, :before_request, :after_request, :nonce_used_max_attempts
 
     extend Forwardable
     def_delegators :client, :access_token
@@ -29,6 +29,7 @@ module Xeroizer
     record :Organisation
     record :Payment
     record :Prepayment
+    record :PurchaseOrder
     record :Receipt
     record :RepeatingInvoice
     record :Schedule
@@ -58,6 +59,7 @@ module Xeroizer
         @xero_url = options[:xero_url] || "https://api.xero.com/api.xro/2.0"
         @rate_limit_sleep = options[:rate_limit_sleep] || false
         @rate_limit_max_attempts = options[:rate_limit_max_attempts] || 5
+        @nonce_used_max_attempts = options[:nonce_used_max_attempts] || 1
         @default_headers = options[:default_headers] || {}
         @before_request = options.delete(:before_request)
         @after_request = options.delete(:after_request)

data/lib/xeroizer/http.rb

@@ -121,6 +121,11 @@ module Xeroizer
             else
               handle_unknown_response_error!(response)
           end
+        rescue Xeroizer::OAuth::NonceUsed => exception
+          raise if attempts > nonce_used_max_attempts
+          logger.info("Nonce used: " + exception.to_s) if self.logger
+          sleep_for(1)
+          retry
         rescue Xeroizer::OAuth::RateLimitExceeded
           if self.rate_limit_sleep
             raise if attempts > rate_limit_max_attempts
@@ -157,6 +162,7 @@ module Xeroizer
             when "token_rejected"               then raise OAuth::TokenInvalid.new(description)
             when "rate limit exceeded"          then raise OAuth::RateLimitExceeded.new(description)
             when "consumer_key_unknown"         then raise OAuth::ConsumerKeyUnknown.new(description)
+            when "nonce_used"                   then raise OAuth::NonceUsed.new(description)
             else raise OAuth::UnknownError.new(problem + ':' + description)
           end
         else

data/lib/xeroizer/models/accounts_payable.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    
+    class AccountsPayableModel < BaseModel
+      set_permissions :read
+    end
+    
+    class AccountsPayable < Base
+      decimal :outstanding
+      decimal :overdue
+    end
+  end
+end

data/lib/xeroizer/models/accounts_receivable.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    
+    class AccountsReceivableModel < BaseModel
+      set_permissions :read
+    end
+    
+    class AccountsReceivable < Base
+      decimal :outstanding
+      decimal :overdue
+    end
+  end
+end

data/lib/xeroizer/models/balances.rb

@@ -0,0 +1,16 @@
+require "xeroizer/models/accounts_receivable"
+require "xeroizer/models/accounts_payable"
+
+module Xeroizer
+  module Record
+    
+    class BalancesModel < BaseModel
+      set_permissions :read
+    end
+    
+    class Balances < Base
+      has_one :accounts_receivable
+      has_one :accounts_payable
+    end
+  end
+end

data/lib/xeroizer/models/batch_payments.rb

@@ -0,0 +1,14 @@
+module Xeroizer
+  module Record
+    
+    class BatchPaymentsModel < BaseModel
+      set_permissions :read
+    end
+    
+    class BatchPayments < Base
+      guid   :bank_account_number
+      string :bank_account_name
+      string :details
+    end
+  end
+end

data/lib/xeroizer/models/bills.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    
+    class BillsModel < BaseModel
+      set_permissions :read
+    end
+    
+    class Bills < Base
+      string :day
+      string :type
+    end
+  end
+end

data/lib/xeroizer/models/contact.rb

@@ -1,4 +1,7 @@
 require "xeroizer/models/contact_person"
+require "xeroizer/models/balances"
+require "xeroizer/models/batch_payments"
+require "xeroizer/models/payment_terms"
 
 module Xeroizer
   module Record
@@ -36,12 +39,12 @@ module Xeroizer
       string        :skype_user_name
       string        :contact_groups
       string        :default_currency
-      string        :purchases_default_account_code 
-      string        :sales_default_account_code 
+      string        :purchases_default_account_code
+      string        :sales_default_account_code
       datetime_utc  :updated_date_utc, :api_name => 'UpdatedDateUTC'
       boolean       :is_supplier
       boolean       :is_customer
-      
+
       has_many  :addresses, :list_complete => true
       has_many  :phones, :list_complete => true
       has_many  :contact_groups
@@ -50,6 +53,10 @@ module Xeroizer
       has_many :sales_tracking_categories, :model_name => 'ContactSalesTrackingCategory'
       has_many :purchases_tracking_categories, :model_name => 'ContactPurchasesTrackingCategory'
 
+      has_one :balances ,:model_name => 'Balances', :list_complete => true
+      has_one :batch_payments ,:model_name => 'BatchPayments', :list_complete => true
+      has_one :payment_terms ,:model_name => 'PaymentTerms', :list_complete => true
+
       validates_presence_of :name, :unless => Proc.new { | contact | contact.contact_id.present?}
       validates_inclusion_of :contact_status, :in => CONTACT_STATUS.keys, :allow_blanks => true
 

data/lib/xeroizer/models/payment_terms.rb

@@ -0,0 +1,16 @@
+require "xeroizer/models/bills"
+require "xeroizer/models/sales"
+
+module Xeroizer
+  module Record
+    
+    class PaymentTermsModel < BaseModel
+      set_permissions :read
+    end
+    
+    class PaymentTerms < Base
+      has_one :bills, :model_name => 'Bills'
+      has_one :sales, :model_name => 'Sales'
+    end
+  end
+end

data/lib/xeroizer/models/purchase_order.rb

@@ -0,0 +1,49 @@
+require "xeroizer/models/attachment"
+
+module Xeroizer
+  module Record
+    
+    class PurchaseOrderModel < BaseModel
+        
+      set_permissions :read, :write, :update
+
+      include AttachmentModel::Extensions
+    end
+    
+    class PurchaseOrder < Base
+      include Attachment::Extensions
+      
+      set_primary_key :purchase_order_id
+      set_possible_primary_keys :purchase_order_id
+      
+      guid    :purchase_order_id
+      string  :purchase_order_number
+      string  :date_string
+      date    :date
+      string  :delivery_date_string
+      date    :delivery_date
+      string  :delivery_address
+      string  :attention_to
+      string  :telephone
+      string  :delivery_instructions
+      boolean :has_errors 
+      boolean :is_discounted 
+      string  :reference
+      string  :type
+      string  :currency_rate
+      string  :currency_code
+      guid  :branding_theme_id 
+      string  :status 
+      string  :line_amount_types
+      string  :sub_total
+      string  :total_tax
+      string  :total 
+      date    :updated_date_UTC
+      boolean :has_attachments
+
+      has_many     :line_items
+      belongs_to :contact, :model_name => 'Contact'      
+    end
+    
+  end
+end

data/lib/xeroizer/models/sales.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    
+    class SalesModel < BaseModel
+      set_permissions :read
+    end
+    
+    class Sales < Base
+      string :day
+      string :type
+    end
+  end
+end

data/lib/xeroizer/oauth.rb

@@ -1,9 +1,9 @@
 # Copyright (c) 2008 Tim Connor <tlconnor@gmail.com>
-# 
+#
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
 # copyright notice and this permission notice appear in all copies.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ -13,21 +13,22 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 module Xeroizer
-  
-  # Shamelessly taken from the XeroGateway library by Tim Connor which is shamelessly 
+
+  # Shamelessly taken from the XeroGateway library by Tim Connor which is shamelessly
   # based on the Twitter Gem's OAuth implementation by John Nunemaker
   # Thanks!
-  # 
+  #
   # http://github.com/tlconnor/xero_gateway
   # http://twitter.rubyforge.org/
   # http://github.com/jnunemaker/twitter/
-  
+
   class OAuth
-    
+
     class TokenExpired < StandardError; end
     class TokenInvalid < StandardError; end
     class RateLimitExceeded < StandardError; end
     class ConsumerKeyUnknown < StandardError; end
+    class NonceUsed < StandardError; end
     class UnknownError < StandardError; end
 
     unless defined? XERO_CONSUMER_OPTIONS
@@ -36,20 +37,20 @@ module Xeroizer
         :request_token_path => "/oauth/RequestToken",
         :access_token_path  => "/oauth/AccessToken",
         :authorize_path     => "/oauth/Authorize",
-        :ca_file            => File.expand_path(File.join(File.dirname(__FILE__), 'ca-certificates.crt'))
+        #:ca_file            => File.expand_path(File.join(File.dirname(__FILE__), 'ca-certificates.crt'))
       }.freeze
     end
-    
+
     # Mixin real OAuth methods for consumer.
     extend Forwardable
     def_delegators :access_token, :get, :post, :put, :delete
-    
+
     # @attr_reader [String] ctoken consumer key/token from application developer (found at http://api.xero.com for your application).
     # @attr_reader [String] csecret consumer secret from application developer (found at http://api.xero.com for your application).
     # @attr_reader [Time] expires_at time the AccessToken expires if using the PartnerApplication mode (usually 30 minutes for Xero).
     # @attr_reader [Time] authorization_expires_at time the session expires if using the ParnterApplication mode (usually 365 days for Xero).
     attr_reader :ctoken, :csecret, :consumer_options, :expires_at, :authorization_expires_at
-    
+
     # @attr_reader [String] session_handle session handle used to renew AccessToken if using the PartnerApplication mode.
     # @attr_writer [String] session_handle session handle used to renew AccessToken if using the PartnerApplication mode.
     attr_accessor :session_handle
@@ -72,35 +73,35 @@ module Xeroizer
       @ctoken, @csecret = ctoken, csecret
       @consumer_options = XERO_CONSUMER_OPTIONS.merge(options)
     end
-    
+
     # OAuth consumer creator.
-    # 
+    #
     # @return [OAuth::Consumer] consumer object for GET/POST/PUT methods.
     def consumer
       create_consumer
     end
-    
-    # RequestToken for PUBLIC/PARTNER authorisation 
+
+    # RequestToken for PUBLIC/PARTNER authorisation
     # (used to redirect to Xero for authentication).
     #
     # @option params [String] :oauth_callback URL to redirect user to when they have authenticated your application with Xero. If not specified, the user will be shown an authorisation code on the screen that they need to get into your application.
     def request_token(params = {})
       consumer.get_request_token(params, {}, @consumer_options[:default_headers])
     end
-    
+
     # Create an AccessToken from a PUBLIC/PARTNER authorisation.
     def authorize_from_request(rtoken, rsecret, params = {})
       request_token = ::OAuth::RequestToken.new(consumer, rtoken, rsecret)
       access_token = request_token.get_access_token(params, {}, @consumer_options[:default_headers])
       update_attributes_from_token(access_token)
     end
-    
+
     # AccessToken created from authorize_from_access method.
     def access_token
       ::OAuth::AccessToken.new(consumer, @atoken, @asecret)
     end
-    
-    # Used for PRIVATE applications where the AccessToken uses the 
+
+    # Used for PRIVATE applications where the AccessToken uses the
     # token/secret from Xero which would normally be used in the request.
     # No request authorisation necessary.
     #
@@ -109,13 +110,13 @@ module Xeroizer
     def authorize_from_access(atoken, asecret)
       @atoken, @asecret = atoken, asecret
     end
-    
+
     # Renew an access token from a previously authorised token for a
     # PARTNER application.
     def renew_access_token(atoken = nil, asecret = nil, session_handle = nil)
       old_token = ::OAuth::RequestToken.new(consumer, atoken || @atoken, asecret || @asecret)
       access_token = old_token.get_access_token({
-        :oauth_session_handle => (session_handle || @session_handle), 
+        :oauth_session_handle => (session_handle || @session_handle),
         :token => old_token
       }, {}, @consumer_options[:default_headers])
       update_attributes_from_token(access_token)

data/lib/xeroizer/record/base_model.rb

@@ -19,7 +19,7 @@ module Xeroizer
       class_inheritable_attributes :optional_xml_root_name
       class_inheritable_attributes :xml_node_name
 
-      DEFAULT_RECORDS_PER_BATCH_SAVE = 2000
+      DEFAULT_RECORDS_PER_BATCH_SAVE = 50
 
       include BaseModelHttpProxy
 

data/lib/xeroizer/record/record_association_helper.rb

@@ -29,6 +29,8 @@ module Xeroizer
             self.attributes[field_name] = record
           end
         end
+        
+        alias_method :has_one, :belongs_to
 
         def has_many(field_name, options = {})
           internal_field_name = options[:internal_name] || field_name

data/lib/xeroizer/report/factory.rb

@@ -35,7 +35,7 @@ module Xeroizer
 
         def klass
           begin
-            @_klass_cache ||= Xeroizer::Report.const_get(report_type)
+            @_klass_cache ||= Xeroizer::Report.const_get(report_type, false)
           rescue NameError => ex # use default class
             Base
           end

data/lib/xeroizer/version.rb

@@ -1,3 +1,3 @@
 module Xeroizer
-  VERSION = "2.16.4".freeze
+  VERSION = "2.16.5".freeze
 end

data/test/stub_responses/contact.xml

@@ -5,36 +5,50 @@
   <DateTimeUTC>2010-12-20T04:13:44.7828584Z</DateTimeUTC>
   <Contacts>
     <Contact>
-      <ContactID>f7eca431-5c97-4d24-93fd-004bb8a6c644</ContactID>
+      <ContactID>bd2270c3-8706-4c11-9cfb-000b551c3f51</ContactID>
       <ContactStatus>ACTIVE</ContactStatus>
-      <Name>Test Company Changed 923099849</Name>
-      <FirstName>Wayne</FirstName>
-      <LastName>Robinson</LastName>
+      <Name>ABC Limited</Name>
+      <FirstName>Andrea</FirstName>
+      <LastName>Dutchess</LastName>
+      <EmailAddress>a.dutchess@abclimited.com</EmailAddress>
+      <SkypeUserName>skype.dutchess@abclimited.com</SkypeUserName>
+      <BankAccountDetails>skype.dutchess@abclimited.com</BankAccountDetails>
+      <TaxNumber>skype.dutchess@abclimited.com</TaxNumber>
+      <AccountsReceivableTaxType>INPUT2</AccountsReceivableTaxType>
+      <AccountsPayableTaxType>OUTPUT2</AccountsPayableTaxType>
       <Addresses>
         <Address>
           <AddressType>POBOX</AddressType>
-        </Address>
+            <AddressLine1>P O Box 123</AddressLine1>
+            <City>Wellington</City>
+            <PostalCode>6011</PostalCode>
+            <AttentionTo>Andrea</AttentionTo>
+          </Address>
         <Address>
           <AddressType>STREET</AddressType>
         </Address>
       </Addresses>
       <Phones>
         <Phone>
-          <PhoneType>DDI</PhoneType>
+          <PhoneType>DEFAULT</PhoneType>
+          <PhoneNumber>1111111</PhoneNumber>
+          <PhoneAreaCode>04</PhoneAreaCode>
+          <PhoneCountryCode>64</PhoneCountryCode>
         </Phone>
         <Phone>
-          <PhoneType>DEFAULT</PhoneType>
+          <PhoneType>FAX</PhoneType>
         </Phone>
         <Phone>
           <PhoneType>MOBILE</PhoneType>
         </Phone>
         <Phone>
-          <PhoneType>FAX</PhoneType>
+          <PhoneType>DDI</PhoneType>
         </Phone>
       </Phones>
-      <UpdatedDateUTC>2010-12-16T15:06:41.727</UpdatedDateUTC>
+      <UpdatedDateUTC>2009-05-14T01:44:26.747</UpdatedDateUTC>
       <IsSupplier>false</IsSupplier>
-      <IsCustomer>false</IsCustomer>
+      <IsCustomer>true</IsCustomer>
+      <DefaultCurrency>NZD</DefaultCurrency>  
     </Contact>
   </Contacts>
-</Response>
+</Response>

data/test/stub_responses/contact_with_details.xml

@@ -0,0 +1,79 @@
+<Response xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <Id>1238b00c-2fdd-4a8a-9b84-82cfe78ff34a</Id>
+  <Status>OK</Status>
+  <ProviderName>Test Provider Name</ProviderName>
+  <DateTimeUTC>2010-12-20T04:13:44.7828584Z</DateTimeUTC>
+  <Contacts>
+    <Contact>
+      <ContactID>bd2270c3-8706-4c11-9cfb-000b551c3f51</ContactID>
+      <ContactStatus>ACTIVE</ContactStatus>
+      <Name>ABC Limited</Name>
+      <FirstName>Andrea</FirstName>
+      <LastName>Dutchess</LastName>
+      <EmailAddress>a.dutchess@abclimited.com</EmailAddress>
+      <SkypeUserName>skype.dutchess@abclimited.com</SkypeUserName>
+      <BankAccountDetails>skype.dutchess@abclimited.com</BankAccountDetails>
+      <TaxNumber>skype.dutchess@abclimited.com</TaxNumber>
+      <AccountsReceivableTaxType>INPUT2</AccountsReceivableTaxType>
+      <AccountsPayableTaxType>OUTPUT2</AccountsPayableTaxType>
+      <Addresses>
+        <Address>
+          <AddressType>POBOX</AddressType>
+            <AddressLine1>P O Box 123</AddressLine1>
+            <City>Wellington</City>
+            <PostalCode>6011</PostalCode>
+            <AttentionTo>Andrea</AttentionTo>
+          </Address>
+        <Address>
+          <AddressType>STREET</AddressType>
+        </Address>
+      </Addresses>
+      <Phones>
+        <Phone>
+          <PhoneType>DEFAULT</PhoneType>
+          <PhoneNumber>1111111</PhoneNumber>
+          <PhoneAreaCode>04</PhoneAreaCode>
+          <PhoneCountryCode>64</PhoneCountryCode>
+        </Phone>
+        <Phone>
+          <PhoneType>FAX</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>MOBILE</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>DDI</PhoneType>
+        </Phone>
+      </Phones>
+      <UpdatedDateUTC>2009-05-14T01:44:26.747</UpdatedDateUTC>
+      <IsSupplier>false</IsSupplier>
+      <IsCustomer>true</IsCustomer>
+      <DefaultCurrency>NZD</DefaultCurrency>
+      <Balances>
+        <AccountsReceivable>
+          <Outstanding>849.50</Outstanding>
+          <Overdue>910.00</Overdue>
+        </AccountsReceivable>
+        <AccountsPayable>
+          <Outstanding>0.00</Outstanding>
+          <Overdue>0.00</Overdue>
+        </AccountsPayable>
+      </Balances>
+      <BatchPayments>
+        <BankAccountNumber>123456</BankAccountNumber>
+        <BankAccountName>bank account</BankAccountName>
+        <Details>details</Details>
+      </BatchPayments>
+      <PaymentTerms>
+        <Bills>
+          <Day>4</Day>
+          <Type>OFFOLLOWINGMONTH</Type>
+        </Bills>
+        <Sales>
+          <Day>2</Day>
+          <Type>OFFOLLOWINGMONTH</Type>
+        </Sales>
+       </PaymentTerms>
+    </Contact>
+  </Contacts>
+</Response>

data/test/stub_responses/nonce_used

@@ -0,0 +1 @@
+oauth_problem=nonce_used&oauth_problem_advice=The%20nonce%20value%20%22potatocakes%22%20has%20already%20been%20used%20

data/test/unit/models/bank_transaction_test.rb

@@ -6,8 +6,8 @@ class BankTransactionTest < Test::Unit::TestCase
   def setup
 
     the_line_items = [
-      LineItem.build({:quantity => 1, :tax_amount => 0.15, :unit_amount => 1.00, :tax_amount => 0.50}, nil),
-      LineItem.build({:quantity => 1, :tax_amount => 0.15, :unit_amount => 1.00, :tax_amount => 0.50}, nil)
+      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.50}, nil),
+      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.50}, nil)
     ]
 
     @the_bank_transaction = BankTransaction.new(nil)

data/test/unit/models/contact_test.rb

@@ -2,23 +2,54 @@ require 'test_helper'
 
 class ContactTest < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
     @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
-    @contact = @client.Contact.build
   end
-  
+
   context "contact validators" do
-    
     should "have a name" do
-      assert_equal(false, @contact.valid?)
-      blank_error = @contact.errors_for(:name).first
+      contact = @client.Contact.build
+
+      assert_equal(false, contact.valid?)
+      blank_error = contact.errors_for(:name).first
       assert_not_nil(blank_error)
       assert_equal("can't be blank", blank_error)
-      
-      @contact.name = "SOMETHING"
-      assert_equal(true, @contact.valid?)
-      assert_equal(0, @contact.errors.size)
+
+      contact.name = "SOMETHING"
+      assert_equal(true, contact.valid?)
+      assert_equal(0, contact.errors.size)
+    end
+  end
+
+  context "response parsing" do
+    it "parses default attributes" do
+      @instance = Xeroizer::Record::ContactModel.new(nil, "Contact")
+
+      some_xml = get_record_xml("contact")
+
+      result = @instance.parse_response(some_xml)
+      contact = result.response_items.first
+
+      keys = [:contact_id,
+              :contact_status,
+              :name,
+              :first_name,
+              :last_name,
+              :email_address,
+              :skype_user_name,
+              :bank_account_details,
+              :tax_number,
+              :accounts_receivable_tax_type,
+              :accounts_payable_tax_type,
+              :addresses,
+              :phones,
+              :updated_date_utc,
+              :is_supplier,
+              :is_customer,
+              :default_currency]
+
+      assert_equal(contact.attributes.keys, keys)
     end
 
     should "be able to have no name if has a contact_id" do
@@ -28,6 +59,49 @@ class ContactTest < Test::Unit::TestCase
       assert_equal(0, @contact.errors.size)
     end
 
+    it "parses extra attributes when present" do
+      @instance = Xeroizer::Record::ContactModel.new(nil, "Contact")
+      some_xml = get_record_xml("contact_with_details")
+
+      result = @instance.parse_response(some_xml)
+      contact = result.response_items.first
+
+      keys = [:contact_id,
+              :contact_status,
+              :name,
+              :first_name,
+              :last_name,
+              :email_address,
+              :skype_user_name,
+              :bank_account_details,
+              :tax_number,
+              :accounts_receivable_tax_type,
+              :accounts_payable_tax_type,
+              :addresses,
+              :phones,
+              :updated_date_utc,
+              :is_supplier,
+              :is_customer,
+              :default_currency,
+              :balances,
+              :batch_payments,
+              :payment_terms]
+
+      assert_equal(contact.attributes.keys, keys)
+
+      assert_equal(contact.balances.accounts_receivable.outstanding, 849.50)
+      assert_equal(contact.balances.accounts_receivable.overdue, 910.00)
+      assert_equal(contact.balances.accounts_payable.outstanding, 0.00)
+      assert_equal(contact.balances.accounts_payable.overdue, 0.00)
+
+      assert_equal(contact.batch_payments.bank_account_number, "123456")
+      assert_equal(contact.batch_payments.bank_account_name, "bank account")
+      assert_equal(contact.batch_payments.details, "details")
+
+      assert_equal(contact.payment_terms.bills.day, "4")
+      assert_equal(contact.payment_terms.bills.type, "OFFOLLOWINGMONTH")
+      assert_equal(contact.payment_terms.sales.day, "2")
+      assert_equal(contact.payment_terms.sales.type, "OFFOLLOWINGMONTH")
+    end
   end
-  
 end

data/test/unit/oauth_test.rb

@@ -32,7 +32,15 @@ class OAuthTest < Test::Unit::TestCase
         @client.Organisation.first
       end
     end
+
+    should "handle nonce used" do
+      Xeroizer::OAuth.any_instance.stubs(:get).returns(stub(:plain_body => get_file_as_string("nonce_used"), :code => "401"))
       
+      assert_raises Xeroizer::OAuth::NonceUsed do
+        @client.Organisation.first
+      end
+    end
+
     should "raise rate limit exceeded" do
       Xeroizer::OAuth.any_instance.stubs(:get).returns(stub(:plain_body => get_file_as_string("rate_limit_exceeded"), :code => "401"))
       
@@ -65,7 +73,18 @@ class OAuthTest < Test::Unit::TestCase
         auto_rate_limit_client.Organisation.first
       end
     end
-      
+
+    should "retry nonce_used failures a configurable number of times" do
+      nonce_used_client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET, :nonce_used_max_attempts => 4)
+      Xeroizer::OAuth.any_instance.stubs(:get).returns(stub(:plain_body => get_file_as_string("nonce_used"), :code => "401"))
+
+      nonce_used_client.expects(:sleep_for).with(1).times(4).returns(1)
+
+      assert_raises Xeroizer::OAuth::NonceUsed do
+        nonce_used_client.Organisation.first
+      end
+    end
+
     should "handle unknown errors" do
       Xeroizer::OAuth.any_instance.stubs(:get).returns(stub(:plain_body => get_file_as_string("bogus_oauth_error"), :code => "401"))
       

data/test/unit/report_test.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 
+class MockNonReportClassDefinition; end
+
 class FactoryTest < Test::Unit::TestCase
   include TestHelper
   
@@ -128,7 +130,16 @@ class FactoryTest < Test::Unit::TestCase
     end
     
   end
-  
+
+  context "report factory in the dirty real world" do
+
+    should "not use inheritance to find report class" do
+      report = Xeroizer::Report::Factory.new(@client, :MockNonReportClassDefinition).klass
+      assert_equal(Xeroizer::Report::Base, report)
+    end
+
+  end
+
   private
   
     def check_valid_report_type(row)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xeroizer
 version: !ruby/object:Gem::Version
-  version: 2.16.4
+  version: 2.16.5
 platform: ruby
 authors:
 - Wayne Robinson
@@ -242,7 +242,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- lib/big_decimal_to_s.rb
 - lib/class_level_inheritable_attributes.rb
 - lib/xeroizer.rb
 - lib/xeroizer/application_http_proxy.rb
@@ -254,11 +253,16 @@ files:
 - lib/xeroizer/http_encoding_helper.rb
 - lib/xeroizer/logging.rb
 - lib/xeroizer/models/account.rb
+- lib/xeroizer/models/accounts_payable.rb
+- lib/xeroizer/models/accounts_receivable.rb
 - lib/xeroizer/models/address.rb
 - lib/xeroizer/models/allocation.rb
 - lib/xeroizer/models/attachment.rb
+- lib/xeroizer/models/balances.rb
 - lib/xeroizer/models/bank_account.rb
 - lib/xeroizer/models/bank_transaction.rb
+- lib/xeroizer/models/batch_payments.rb
+- lib/xeroizer/models/bills.rb
 - lib/xeroizer/models/branding_theme.rb
 - lib/xeroizer/models/contact.rb
 - lib/xeroizer/models/contact_group.rb
@@ -285,10 +289,13 @@ files:
 - lib/xeroizer/models/option.rb
 - lib/xeroizer/models/organisation.rb
 - lib/xeroizer/models/payment.rb
+- lib/xeroizer/models/payment_terms.rb
 - lib/xeroizer/models/phone.rb
 - lib/xeroizer/models/prepayment.rb
+- lib/xeroizer/models/purchase_order.rb
 - lib/xeroizer/models/receipt.rb
 - lib/xeroizer/models/repeating_invoice.rb
+- lib/xeroizer/models/sales.rb
 - lib/xeroizer/models/schedule.rb
 - lib/xeroizer/models/tax_component.rb
 - lib/xeroizer/models/tax_rate.rb
@@ -336,6 +343,7 @@ files:
 - test/stub_responses/bogus_oauth_error
 - test/stub_responses/branding_themes.xml
 - test/stub_responses/contact.xml
+- test/stub_responses/contact_with_details.xml
 - test/stub_responses/contacts.xml
 - test/stub_responses/create_credit_note.xml
 - test/stub_responses/create_invoice.xml
@@ -353,6 +361,7 @@ files:
 - test/stub_responses/items.xml
 - test/stub_responses/manual_journal.xml
 - test/stub_responses/manual_journals.xml
+- test/stub_responses/nonce_used
 - test/stub_responses/organisation.xml
 - test/stub_responses/organisations.xml
 - test/stub_responses/payments.xml
@@ -619,7 +628,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Xero library
@@ -634,6 +643,7 @@ test_files:
 - test/stub_responses/bogus_oauth_error
 - test/stub_responses/branding_themes.xml
 - test/stub_responses/contact.xml
+- test/stub_responses/contact_with_details.xml
 - test/stub_responses/contacts.xml
 - test/stub_responses/create_credit_note.xml
 - test/stub_responses/create_invoice.xml
@@ -651,6 +661,7 @@ test_files:
 - test/stub_responses/items.xml
 - test/stub_responses/manual_journal.xml
 - test/stub_responses/manual_journals.xml
+- test/stub_responses/nonce_used
 - test/stub_responses/organisation.xml
 - test/stub_responses/organisations.xml
 - test/stub_responses/payments.xml
@@ -897,4 +908,3 @@ test_files:
 - test/unit/record_definition_test.rb
 - test/unit/report_definition_test.rb
 - test/unit/report_test.rb
-has_rdoc: 

data/lib/big_decimal_to_s.rb

@@ -1,9 +0,0 @@
-class BigDecimal
-  
-  def to_s_with_default_format(format = 'F')
-    to_s_without_default_format(format)
-  end
-  alias_method :to_s_without_default_format, :to_s
-  alias_method :to_s, :to_s_with_default_format
-  
-end