xeroizer-float 2.15.3.16 → 2.15.5.1

data/VERSION

@@ -1 +1 @@
-2.15.3.16
+2.15.5.1

data/lib/xeroizer/models/allocation.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    class AllocationModel < BaseModel
+    end
+
+    class Allocation < Base
+      decimal :applied_amount
+      belongs_to :invoice
+
+      validates_presence_of :invoice
+    end
+  end
+end

data/lib/xeroizer/models/bank_transaction.rb

@@ -15,6 +15,7 @@ module Xeroizer
       } unless defined?(BANK_TRANSACTION_STATUS)
       BANK_TRANSACTION_STATUSES = BANK_TRANSACTION_STATUS.keys.sort
 
+      BANK_TRANSFER_TYPES = [ 'SPEND-TRANSFER', 'RECEIVE-TRANSFER' ]
 
       def initialize(parent)
         super parent
@@ -37,6 +38,10 @@ module Xeroizer
       string        :currency_code
       decimal       :currency_rate, :calculated => true
 
+      decimal :total, :calculated => true
+      decimal :sub_total, :calculated => true
+      decimal :total_tax, :calculated => true
+
       alias_method :reconciled?, :is_reconciled
 
       belongs_to :contact, :model_name => 'Contact'
@@ -73,6 +78,8 @@ module Xeroizer
       def total; sub_total + total_tax; end
 
       def sub_total
+        return attributes[:total] if is_transfer?
+
         if ought_to_recalculate_totals?
           result = LineItemSum.sub_total(self.line_items)
           result -= total_tax if line_amount_types == 'Inclusive'
@@ -83,11 +90,17 @@ module Xeroizer
       end
 
       def total_tax
+        return BigDecimal.new('0') if is_transfer?
+
         return ought_to_recalculate_totals? ?
           LineItemSum.total_tax(self.line_items) :
           attributes[:total_tax]
       end
 
+      def is_transfer?
+        BANK_TRANSFER_TYPES.include? attributes[:type]
+      end
+
       private
 
       def ought_to_recalculate_totals?

data/lib/xeroizer/models/credit_note.rb

@@ -64,11 +64,13 @@ module Xeroizer
       
       belongs_to    :contact
       has_many      :line_items
+      has_many      :allocations
       
       validates_inclusion_of :type, :in => CREDIT_NOTE_TYPES
       validates_inclusion_of :status, :in => CREDIT_NOTE_STATUSES, :allow_blanks => true
       validates_associated :contact
       validates_associated :line_items
+      validates_associated :allocations, :allow_blanks => true
       
       public
       

data/lib/xeroizer/models/invoice.rb

@@ -1,15 +1,15 @@
 module Xeroizer
   module Record
-    
+
     class InvoiceModel < BaseModel
       # To create a new invoice, use the folowing
       # $xero_client.Invoice.build(type: 'ACCREC', ..., contact: {name: 'Foo Bar'},...)
       # Note that we are not making an api request to xero just to get the contact
-            
+
       set_permissions :read, :write, :update
-      
+
       public
-      
+
         # Retrieve the PDF version of the invoice matching the `id`.
         # @param [String] id invoice's ID.
         # @param [String] filename optional filename to store the PDF in instead of returning the data.
@@ -22,11 +22,11 @@ module Xeroizer
             pdf_data
           end
         end
-      
+
     end
-    
+
     class Invoice < Base
-      
+
       INVOICE_TYPE = {
         'ACCREC' =>           'Accounts Receivable',
         'ACCPAY' =>           'Accounts Payable'
@@ -42,11 +42,11 @@ module Xeroizer
         'VOIDED' =>           'Approved invoices that are voided'
       } unless defined?(INVOICE_STATUS)
       INVOICE_STATUSES = INVOICE_STATUS.keys.sort
-      
+
       set_primary_key :invoice_id
       set_possible_primary_keys :invoice_id, :invoice_number
       list_contains_summary_only true
-      
+
       guid         :invoice_id
       string       :invoice_number
       string       :reference
@@ -68,12 +68,12 @@ module Xeroizer
       decimal      :currency_rate, :calculated => true
       datetime     :fully_paid_on_date
       boolean      :sent_to_contact
-      
+
       belongs_to   :contact
       has_many     :line_items
       has_many     :payments
       has_many     :credit_notes
-      
+
       validates_presence_of :date, :due_date, :unless => :new_record?
       validates_inclusion_of :type, :in => INVOICE_TYPES
       validates_inclusion_of :status, :in => INVOICE_STATUSES, :unless => :new_record?
@@ -81,9 +81,9 @@ module Xeroizer
       validates_associated :contact
       validates_associated :line_items, :allow_blanks => true, :unless => :approved?
       validates_associated :line_items, :if => :approved?
-      
+
       public
-      
+
         # Access the contact name without forcing a download of
         # an incomplete, summary invoice.
         def contact_name
@@ -95,12 +95,12 @@ module Xeroizer
         def contact_id
           attributes[:contact] && attributes[:contact][:contact_id]
         end
-        
+
         # Helper method to check if the invoice has been approved.
         def approved?
           [ 'AUTHORISED', 'PAID', 'VOIDED' ].include? status
         end
-        
+
         # Helper method to check if the invoice is accounts payable.
         def accounts_payable?
           type == 'ACCPAY'
@@ -127,7 +127,7 @@ module Xeroizer
           @sub_total_is_set = true
           attributes[:sub_total] = sub_total
         end
-        
+
         def total_tax=(total_tax)
           @total_tax_is_set = true
           attributes[:total_tax] = total_tax
@@ -142,9 +142,9 @@ module Xeroizer
         def sub_total(always_summary = false)
           if !@sub_total_is_set && not_summary_or_loaded_record(always_summary)
             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.
-            sum -= total_tax if line_amount_types == 'Inclusive' 
+            sum -= total_tax if line_amount_types == 'Inclusive'
             sum
           else
             attributes[:sub_total]
@@ -168,16 +168,16 @@ module Xeroizer
             attributes[:total]
           end
         end
-        
+
         def not_summary_or_loaded_record(always_summary)
           !always_summary && loaded_record?
         end
 
         def loaded_record?
-          new_record? || 
+          new_record? ||
             (!new_record? && line_items && line_items.size > 0)
         end
-          
+
         # Retrieve the PDF version of this invoice.
         # @param [String] filename optional filename to store the PDF in instead of returning the data.
         def pdf(filename = nil)
@@ -186,23 +186,28 @@ module Xeroizer
 
         # Delete an approved invoice with no payments.
         def delete!
-          delete_or_void_invoice!('DELETED')
+          change_status!('DELETED')
         end
 
         # Void an approved invoice with no payments.
         def void!
-          delete_or_void_invoice!('VOIDED')
+          change_status!('VOIDED')
+        end
+
+        # Approve a draft invoice
+        def approve!
+          change_status!('AUTHORISED')
         end
 
       protected
 
-        def delete_or_void_invoice!(new_status)
+        def change_status!(new_status)
           raise CannotChangeInvoiceStatus.new(record, new_status) unless self.payments.size == 0
           self.status = new_status
           self.save
         end
-      
+
     end
-    
+
   end
 end

data/lib/xeroizer/record/base.rb

@@ -14,6 +14,7 @@ module Xeroizer
                  
       attr_reader :attributes
       attr_reader :parent
+      attr_reader :model
       attr_accessor :errors
       attr_accessor :complete_record_downloaded
       
@@ -36,14 +37,19 @@ module Xeroizer
       end
       
       public
-      
+
         def initialize(parent)
           @parent = parent
+          @model = new_model_class(self.class.name.demodulize)
           @attributes = {}
         end
-        
+
         def new_model_class(model_name)
-          Xeroizer::Record.const_get("#{model_name}Model".to_sym).new(parent.application, model_name.to_s)
+          if parent
+            Xeroizer::Record.const_get("#{model_name}Model".to_sym).new(parent.application, model_name.to_s)
+          else
+            Xeroizer::Record.const_get("#{model_name}Model".to_sym).new(nil, model_name.to_s)
+          end
         end
         
         def [](attribute)
@@ -55,6 +61,10 @@ module Xeroizer
           self.send("#{attribute}=".to_sym, value)
         end
 
+        def non_calculated_attributes
+          attributes.reject {|name| self.class.fields[name][:calculated] }
+        end
+
         def attributes=(new_attributes)
           return unless new_attributes.is_a?(Hash)
           parent.mark_dirty(self) if parent

data/lib/xeroizer/record/base_model.rb

@@ -141,6 +141,7 @@ module Xeroizer
         end
 
         def batch_save(chunk_size = DEFAULT_RECORDS_PER_BATCH_SAVE)
+          no_errors = true
           @objects = {}
           @allow_batch_operations = true
 
@@ -156,8 +157,9 @@ module Xeroizer
                 response = parse_response(self.send(http_method, request, {:summarizeErrors => false}))
                 response.response_items.each_with_index do |record, i|
                   if record and record.is_a?(model_class)
-                    some_records[i].attributes = record.attributes
+                    some_records[i].attributes = record.non_calculated_attributes
                     some_records[i].errors = record.errors
+                    no_errors = record.errors.nil? || record.errors.empty? if no_errors
                     some_records[i].saved!
                   end
                 end
@@ -167,7 +169,7 @@ module Xeroizer
 
           @objects = {}
           @allow_batch_operations = false
-          true
+          no_errors
         end
 
         def parse_response(response_xml, options = {})

data/lib/xeroizer/record/xml_helper.rb

@@ -61,7 +61,7 @@ module Xeroizer
           # Turn a record into its XML representation.
           def to_xml(b = Builder::XmlMarkup.new(:indent => 2))
             optional_root_tag(parent.class.optional_xml_root_name, b) do |b|
-              b.tag!(parent.class.xml_node_name || parent.model_name) { 
+              b.tag!(model.class.xml_node_name || model.model_name) {
                 attributes.each do | key, value |
                   field = self.class.fields[key]
                   value = self.send(key) if field[:calculated]

data/lib/xeroizer.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'date'
 require 'forwardable'
 require 'active_support/inflector'
-require 'active_support/memoizable'
 # require "active_support/core_ext"
 require 'oauth'
 require 'oauth/signature/rsa/sha1'
@@ -28,6 +27,7 @@ require 'xeroizer/configuration'
 # Include models
 require 'xeroizer/models/account'
 require 'xeroizer/models/address'
+require 'xeroizer/models/allocation'
 require 'xeroizer/models/branding_theme'
 require 'xeroizer/models/bank_transaction'
 require 'xeroizer/models/bank_account'

data/test/stub_responses/bank_transactions.xml

@@ -48,5 +48,21 @@
       <IsReconciled>false</IsReconciled>
       <CurrencyRate>1.519520</CurrencyRate>
     </BankTransaction>
+    <BankTransaction>
+      <Date>2013-09-17T00:00:00</Date>
+      <Status>AUTHORISED</Status>
+      <LineAmountTypes>NoTax</LineAmountTypes>
+      <Total>120.00</Total>
+      <UpdatedDateUTC>2013-09-17T14:47:58.95</UpdatedDateUTC>
+      <CurrencyCode>GBP</CurrencyCode>
+      <BankTransactionID>ea28d9c6-c9e8-4261-8c0f-cf04192f3726</BankTransactionID>
+      <BankAccount>
+        <AccountID>bd9e85e0-0478-433d-ae9f-0b3c4f04bfe4</AccountID>
+        <Code>090</Code>
+        <Name>Business Bank Account</Name>
+      </BankAccount>
+      <Type>SPEND-TRANSFER</Type>
+      <IsReconciled>false</IsReconciled>
+    </BankTransaction>
   </BankTransactions>
 </Response>

data/test/stub_responses/records/bank_transaction-ea28d9c6-c9e8-4261-8c0f-cf04192f3726.xml

@@ -0,0 +1,24 @@
+<Response xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Id>4e25a58b-02c4-40f7-9e8b-ca77b2a9d61a</Id>
+  <Status>OK</Status>
+  <ProviderName>Xero API Previewer</ProviderName>
+  <DateTimeUTC>2013-09-18T14:17:01.2026157Z</DateTimeUTC>
+  <BankTransactions>
+    <BankTransaction>
+      <Date>2013-09-17T00:00:00</Date>
+      <Status>AUTHORISED</Status>
+      <LineAmountTypes>NoTax</LineAmountTypes>
+      <Total>120.00</Total>
+      <UpdatedDateUTC>2013-09-17T14:47:58.95</UpdatedDateUTC>
+      <CurrencyCode>GBP</CurrencyCode>
+      <BankTransactionID>ea28d9c6-c9e8-4261-8c0f-cf04192f3726</BankTransactionID>
+      <BankAccount>
+        <AccountID>bd9e85e0-0478-433d-ae9f-0b3c4f04bfe4</AccountID>
+        <Code>090</Code>
+        <Name>Business Bank Account</Name>
+      </BankAccount>
+      <Type>SPEND-TRANSFER</Type>
+      <IsReconciled>false</IsReconciled>
+    </BankTransaction>
+  </BankTransactions>
+</Response>

data/test/unit/models/bank_transaction_test.rb

@@ -7,8 +7,7 @@ class BankTransactionTest < Test::Unit::TestCase
   def setup
     fake_parent = Class.new do
       attr_accessor :application
-      def mark_dirty(*args)
-      end
+      def mark_dirty(*args); end
     end.new
 
     the_line_items = [
@@ -52,7 +51,6 @@ class BankTransactionTest < Test::Unit::TestCase
   end
 
   context "bank transaction totals" do
-
     should "large-scale testing from API XML" do
       bank_transactions = @client.BankTransaction.all
       bank_transactions.each do | bank_transaction |
@@ -71,5 +69,15 @@ class BankTransactionTest < Test::Unit::TestCase
       end
     end
 
+    should "handle bank transfers properly" do
+      bank_transactions = @client.BankTransaction.all
+      bank_transaction = bank_transactions.find { |bt| bt.attributes[:type] == "SPEND-TRANSFER" }
+
+      assert( bank_transaction.is_transfer? )
+      assert_equal( bank_transaction.attributes[:total], bank_transaction.total)
+      assert_equal( bank_transaction.attributes[:total], bank_transaction.sub_total)
+      assert_equal( 0, bank_transaction.total_tax)
+    end
+
   end
 end

data/test/unit/models/line_item_sum_test.rb

@@ -4,9 +4,10 @@ class LineItemSumTest < Test::Unit::TestCase
   include Xeroizer::Record
 
   def setup
+    parent = stub(:application => nil, :mark_dirty => nil)
     @the_line_items = [
-      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.15}, nil),
-      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.30}, nil)
+      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.15}, parent),
+      LineItem.build({:quantity => 1, :unit_amount => 1.00, :tax_amount => 0.30}, parent),
     ]
   end
 

data/test/unit/record/model_definition_test.rb

@@ -16,6 +16,7 @@ class ModelDefinitionsTest < Test::Unit::TestCase
     datetime  :datetime1
     
   end
+  class Xeroizer::Record::FirstRecordModel < Xeroizer::Record::BaseModel; end
   
   class SecondRecord < Xeroizer::Record::Base
 
@@ -30,6 +31,7 @@ class ModelDefinitionsTest < Test::Unit::TestCase
     datetime  :datetime2
 
   end
+  class Xeroizer::Record::SecondRecordModel < Xeroizer::Record::BaseModel; end
     
   class TestRecord < Xeroizer::Record::Base
     
@@ -37,8 +39,10 @@ class ModelDefinitionsTest < Test::Unit::TestCase
     string    :name
     
   end
+  class Xeroizer::Record::TestRecordModel < Xeroizer::Record::BaseModel; end
   
   class SummaryOnlyRecord < Xeroizer::Record::Base
+  class Xeroizer::Record::SummaryOnlyRecordModel < Xeroizer::Record::BaseModel; end
     
     list_contains_summary_only true
     set_possible_primary_keys :primary_key_id
@@ -49,6 +53,7 @@ class ModelDefinitionsTest < Test::Unit::TestCase
   end
   
   class SummaryOnlyOffRecord < Xeroizer::Record::Base
+  class Xeroizer::Record::SummaryOnlyOffRecordModel < Xeroizer::Record::BaseModel; end
     
     set_possible_primary_keys :primary_key_id
     set_primary_key :primary_key_id
@@ -59,8 +64,9 @@ class ModelDefinitionsTest < Test::Unit::TestCase
   
   def setup
     @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
-    @first = FirstRecord.new(@client)
-    @second = SecondRecord.new(@client)
+    parent = stub(:application => @client, :mark_dirty => nil)
+    @first = FirstRecord.new(parent)
+    @second = SecondRecord.new(parent)
     @record = TestRecord.build({}, @client.Contact)
     @contact = @client.Contact.build
   end
@@ -93,7 +99,7 @@ class ModelDefinitionsTest < Test::Unit::TestCase
     
     should "define primary key with shortcut #id method" do
       assert_nil(@first.id)
-      value = "PRIMARKY KEY VALUE"
+      value = "PRIMARY KEY VALUE"
       @first.id = value
       assert_equal(value, @first.id)
       assert_equal(value, @first.primary_key_id)

data/xeroizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "xeroizer"
-  s.version = "2.15.3"
+  s.version = "2.15.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Robinson"]
-  s.date = "2012-12-07"
+  s.date = "2013-07-04"
   s.description = "Ruby library for the Xero accounting system API."
   s.email = "wayne.robinson@gmail.com"
   s.extra_rdoc_files = [
@@ -99,6 +99,7 @@ Gem::Specification.new do |s|
     "test/acceptance/about_fetching_bank_transactions_test.rb",
     "test/acceptance/acceptance_test.rb",
     "test/acceptance/bank_transaction_reference_data.rb",
+    "test/acceptance/bulk_operations_test.rb",
     "test/stub_responses/accounts.xml",
     "test/stub_responses/api_exception.xml",
     "test/stub_responses/bogus_oauth_error",
@@ -357,7 +358,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/waynerobinson/xeroizer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "Xero library"
 
   if s.respond_to? :specification_version then
@@ -367,6 +368,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<oauth>, ["= 0.4.5"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
@@ -379,6 +381,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<oauth>, ["= 0.4.5"])
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
@@ -392,6 +395,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<oauth>, ["= 0.4.5"])
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xeroizer-float
 version: !ruby/object:Gem::Version
-  version: 2.15.3.16
+  version: 2.15.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -233,6 +233,7 @@ files:
 - lib/xeroizer/logging.rb
 - lib/xeroizer/models/account.rb
 - lib/xeroizer/models/address.rb
+- lib/xeroizer/models/allocation.rb
 - lib/xeroizer/models/bank_account.rb
 - lib/xeroizer/models/bank_transaction.rb
 - lib/xeroizer/models/branding_theme.rb
@@ -323,6 +324,7 @@ files:
 - test/stub_responses/payments.xml
 - test/stub_responses/rate_limit_exceeded
 - test/stub_responses/records/bank_transaction-8644472b-ea4e-4e5a-9987-f79250ece35e.xml
+- test/stub_responses/records/bank_transaction-ea28d9c6-c9e8-4261-8c0f-cf04192f3726.xml
 - test/stub_responses/records/bank_transaction-ee4c4d5a-437d-4369-b152-848bd932f431.xml
 - test/stub_responses/records/contact-043892a1-aef1-4c18-88d8-b8ccb6d31466.xml
 - test/stub_responses/records/contact-09664078-efe2-4a88-89a5-67eac9b0047b.xml
@@ -565,6 +567,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4125047856813018795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: