xeroizer 0.4.1 → 0.4.2

data/Gemfile

@@ -8,9 +8,10 @@ gem 'i18n'
 gem 'yard'
 
 group :test do
+  gem 'test-unit'
   gem 'mocha'
   gem 'shoulda'
-  gem "jeweler", "~> 1.5.2"
+  gem "jeweler"
   gem "rest-client"
   gem "turn"
   gem "ansi"

data/Gemfile.lock

@@ -0,0 +1,55 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    ansi (1.4.2)
+    builder (3.0.0)
+    git (1.2.5)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.6.6)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
+    nokogiri (1.5.2)
+    oauth (0.4.5)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    test-unit (2.4.8)
+    turn (0.9.4)
+      ansi
+    yard (0.7.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  ansi
+  builder (>= 2.1.2)
+  i18n
+  jeweler
+  mocha
+  nokogiri
+  oauth (>= 0.3.6)
+  rest-client
+  shoulda
+  test-unit
+  turn
+  yard

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/xeroizer/models/bank_account.rb

@@ -5,7 +5,7 @@ module Xeroizer
     end
 
     class BankAccount < Base
-      string :account_id
+      guid   :account_id
       string :code
     end
   end

data/lib/xeroizer/record/base_model.rb

@@ -5,8 +5,6 @@ module Xeroizer
     
     class BaseModel
 
-      extend ActiveSupport::Memoizable
-      
       include ClassLevelInheritableAttributes
       class_inheritable_attributes :api_controller_name
       

data/lib/xeroizer/report/aged_receivables_by_contact.rb

@@ -2,29 +2,29 @@ module Xeroizer
   module Report
     class AgedReceivablesByContact < Base
 
-      extend ActiveSupport::Memoizable
-
       public
 
         def total
-          summary.cell(:Total).value 
+          @_total_cache ||= summary.cell(:Total).value 
         end
 
         def total_paid
-          summary.cell(:Paid).value
+          @_total_paid_cache ||= summary.cell(:Paid).value
         end
 
         def total_credited
-          summary.cell(:Credited).value
+          @_total_credited_cache ||= summary.cell(:Credited).value
         end
 
         def total_due
-          summary.cell(:Due).value
+          @_total_due_cache ||= summary.cell(:Due).value
         end
 
         def total_overdue
+          return @_total_due_cache if @_total_due_cache
+          
           now = Time.now
-          sum(:Due) do | row | 
+          @_total_due_cache = sum(:Due) do | row | 
             due_date = row.cell('Due Date').value
             due_date && due_date < now
           end
@@ -37,7 +37,6 @@ module Xeroizer
             sum
           end
         end
-        memoize :total, :total_paid, :total_credited, :total_due, :total_overdue, :sum
       
     end
   end

data/lib/xeroizer/report/factory.rb

@@ -6,7 +6,6 @@ module Xeroizer
   module Report
     class Factory
       
-      extend ActiveSupport::Memoizable
       include ApplicationHttpProxy
 
       attr_reader :application
@@ -35,12 +34,11 @@ module Xeroizer
 
         def klass
           begin
-            Xeroizer::Report.const_get(report_type)
+            @_klass_cache ||= Xeroizer::Report.const_get(report_type)
           rescue NameError => ex # use default class
             Base
           end
         end
-        memoize :klass
 
       protected
               

data/lib/xeroizer/report/row/header.rb

@@ -3,9 +3,9 @@ module Xeroizer
     class HeaderRow < Row
 
         def column_index(column_name)
-          cells.find_index { | cell | cell.value == column_name.to_s }
+          @_column_index_cache ||= {}
+          @_column_index_cache[column_name] ||= cells.find_index { | cell | cell.value == column_name.to_s }
         end
-        memoize :column_index
         
     end
   end

data/lib/xeroizer/report/row/row.rb

@@ -4,7 +4,6 @@ module Xeroizer
   module Report
     class Row
       
-      extend ActiveSupport::Memoizable
       include RowXmlHelper
       
       attr_reader :report

data/test/acceptance/about_creating_bank_transactions_test.rb

@@ -11,8 +11,8 @@ class AboutCreatingBankTransactions < Test::Unit::TestCase
   def setup
     super
     all_accounts = client.Account.all
-    @account = all_accounts.select{|account| account.status == "ACTIVE" && account.type == "REVENUE"}.first
-    @bank_account = all_accounts.select{|account| account.status == "ACTIVE" && account.type == "BANK"}.first
+    @account = all_accounts.select{|acct| acct.status == "ACTIVE" && acct.type == "REVENUE"}.first
+    @bank_account = all_accounts.select{|acct| acct.status == "ACTIVE" && acct.type == "BANK"}.first    
   end
 
   can "create a new SPEND bank transaction" do
@@ -20,7 +20,7 @@ class AboutCreatingBankTransactions < Test::Unit::TestCase
       :type => "SPEND",
       :contact => { :name => "Jazz Kang" },
       :line_items => any_line_items(@account),
-      :bank_account => { :code => @bank_account.code }
+      :bank_account => { :account_id => @bank_account.account_id }
     )
 
     assert new_transaction.save, "Save failed with the following errors: #{new_transaction.errors.inspect}"
@@ -32,7 +32,7 @@ class AboutCreatingBankTransactions < Test::Unit::TestCase
       :type => "SPEND",
       :contact => { :name => "Jazz Kang" },
       :line_items => any_line_items(@account),
-      :bank_account => { :code => @bank_account.code }
+      :bank_account => { :account_id => @bank_account.account_id }
     )
 
     assert new_transaction.save, "Save failed with the following errors: #{new_transaction.errors.inspect}"
@@ -60,7 +60,7 @@ class AboutCreatingBankTransactions < Test::Unit::TestCase
       :type => "SPEND",
       :contact => { :name => "Jazz Kang" },
       :line_items => any_line_items(@account),
-      :bank_account => { :code => @bank_account.code },
+      :bank_account => { :account_id => @bank_account.account_id },
       :line_amount_types => "Exclusive"
     )
 
@@ -123,7 +123,7 @@ class AboutCreatingBankTransactions < Test::Unit::TestCase
       :type => "RECEIVE",
       :contact => { :name => "Jazz Kang" },
       :line_items => any_line_items(@account),
-      :bank_account => { :code => @bank_account.code }
+      :bank_account => { :account_id => @bank_account.account_id }
     )
 
     assert new_transaction.save, "Save failed with the following errors: #{new_transaction.errors.inspect}"

data/test/acceptance/acceptance_test.rb

@@ -14,7 +14,7 @@ module AcceptanceTest
           return unless block_given?
 
           unless respond_to? symbol
-            define_method symbol, do
+            define_method symbol do
               cached_method_result = instance_variable_get ivar_name = "@#{symbol}"
               instance_variable_set(ivar_name, instance_eval(&block)) if cached_method_result.nil?
               instance_variable_get ivar_name
@@ -36,7 +36,7 @@ module AcceptanceTest
   private
 
   def load_config_from_file
-    the_file_name = ".oauth"
+    the_file_name = File.join(File.dirname(__FILE__), '..', '..', '.oauth')
 
     return nil unless File.exists? the_file_name
 

data/test/acceptance/bank_transaction_reference_data.rb

@@ -7,9 +7,9 @@ class BankTransactionReferenceData
   def new_bank_transaction
     all_accounts = @client.Account.all
 
-    account = all_accounts.select{|account| account.status == "ACTIVE" && account.type == "REVENUE"}.first
-    bank_account = all_accounts.select{|account| account.status == "ACTIVE" && account.type == "BANK"}.first
-
+    account = all_accounts.select{|acct| acct.status == "ACTIVE" && acct.type == "REVENUE"}.first
+    bank_account = all_accounts.select{|acct| acct.status == "ACTIVE" && acct.type == "BANK"}.first
+    
     result = @client.BankTransaction.build(
       :type => "SPEND",
       :contact => { :name => "Jazz Kang" },
@@ -21,7 +21,7 @@ class BankTransactionReferenceData
         :account_code => account.code,
         :tax_type => account.tax_type
       ],
-      :bank_account => { :code => bank_account.code }
+      :bank_account => { :account_id => bank_account.account_id }
     )
 
     fail("Expected save to have succeeded, but it failed. #{result.errors.inspect}") unless result.save

data/test/test_helper.rb

@@ -58,7 +58,7 @@ module TestHelper
     
 end
 
-Shoulda::ClassMethods.class_eval do
+Shoulda::Context::ClassMethods.class_eval do
   %w{it must can}.each do |m|
     alias_method m, :should
   end

data/xeroizer.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{xeroizer}
-  s.version = "0.4.1"
+  s.name = "xeroizer"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Robinson"]
-  s.date = %q{2012-02-29}
-  s.description = %q{Ruby library for the Xero accounting system API.}
-  s.email = %q{wayne.robinson@gmail.com}
+  s.date = "2012-04-09"
+  s.description = "Ruby library for the Xero accounting system API."
+  s.email = "wayne.robinson@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".bundle/config",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -350,46 +351,16 @@ Gem::Specification.new do |s|
     "test/unit/report_test.rb",
     "xeroizer.gemspec"
   ]
-  s.homepage = %q{http://github.com/waynerobinson/xeroizer}
+  s.homepage = "http://github.com/waynerobinson/xeroizer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Xero library}
-  s.test_files = [
-    "test/acceptance/about_creating_bank_transactions_test.rb",
-    "test/acceptance/about_fetching_bank_transactions_test.rb",
-    "test/acceptance/acceptance_test.rb",
-    "test/acceptance/bank_transaction_reference_data.rb",
-    "test/stub_responses/refresh_responses.rb",
-    "test/test_helper.rb",
-    "test/unit/models/bank_transaction_model_parsing_test.rb",
-    "test/unit/models/bank_transaction_test.rb",
-    "test/unit/models/bank_transaction_validation_test.rb",
-    "test/unit/models/contact_test.rb",
-    "test/unit/models/credit_note_test.rb",
-    "test/unit/models/invoice_test.rb",
-    "test/unit/models/line_item_sum_test.rb",
-    "test/unit/models/line_item_test.rb",
-    "test/unit/oauth_config_test.rb",
-    "test/unit/oauth_test.rb",
-    "test/unit/private_application_test.rb",
-    "test/unit/record/base_model_test.rb",
-    "test/unit/record/base_test.rb",
-    "test/unit/record/block_validator_test.rb",
-    "test/unit/record/model_definition_test.rb",
-    "test/unit/record/parse_where_hash_test.rb",
-    "test/unit/record/record_association_test.rb",
-    "test/unit/record/validators_test.rb",
-    "test/unit/record_definition_test.rb",
-    "test/unit/report_definition_test.rb",
-    "test/unit/report_test.rb"
-  ]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Xero library"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.3.6"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xeroizer
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  segments_generated: true
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Wayne Robinson
@@ -15,173 +15,184 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-29 00:00:00 +10:00
-default_executable: 
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: builder
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
         - 2
-        segments_generated: true
         version: 2.1.2
   requirement: *id001
+  name: builder
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: oauth
-  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 3
         - 6
-        segments_generated: true
         version: 0.3.6
   requirement: *id002
+  name: oauth
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
-  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id003
+  name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: nokogiri
-  type: :runtime
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id004
+  name: nokogiri
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: i18n
-  type: :runtime
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id005
+  name: i18n
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: yard
-  type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id006
+  name: yard
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: builder
-  type: :runtime
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
         - 2
-        segments_generated: true
         version: 2.1.2
   requirement: *id007
+  name: builder
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: oauth
-  type: :runtime
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 3
         - 6
-        segments_generated: true
         version: 0.3.6
   requirement: *id008
+  name: oauth
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
-  type: :runtime
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id009
+  name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: nokogiri
-  type: :runtime
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id010
+  name: nokogiri
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: mocha
-  type: :development
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id011
+  name: mocha
+  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: shoulda
-  type: :development
   version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
   requirement: *id012
+  name: shoulda
+  type: :development
 description: Ruby library for the Xero accounting system API.
 email: wayne.robinson@gmail.com
 executables: []
@@ -194,6 +205,7 @@ extra_rdoc_files:
 files: 
 - .bundle/config
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -524,7 +536,6 @@ files:
 - test/unit/report_definition_test.rb
 - test/unit/report_test.rb
 - xeroizer.gemspec
-has_rdoc: true
 homepage: http://github.com/waynerobinson/xeroizer
 licenses: 
 - MIT
@@ -534,53 +545,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Xero library
-test_files: 
-- test/acceptance/about_creating_bank_transactions_test.rb
-- test/acceptance/about_fetching_bank_transactions_test.rb
-- test/acceptance/acceptance_test.rb
-- test/acceptance/bank_transaction_reference_data.rb
-- test/stub_responses/refresh_responses.rb
-- test/test_helper.rb
-- test/unit/models/bank_transaction_model_parsing_test.rb
-- test/unit/models/bank_transaction_test.rb
-- test/unit/models/bank_transaction_validation_test.rb
-- test/unit/models/contact_test.rb
-- test/unit/models/credit_note_test.rb
-- test/unit/models/invoice_test.rb
-- test/unit/models/line_item_sum_test.rb
-- test/unit/models/line_item_test.rb
-- test/unit/oauth_config_test.rb
-- test/unit/oauth_test.rb
-- test/unit/private_application_test.rb
-- test/unit/record/base_model_test.rb
-- test/unit/record/base_test.rb
-- test/unit/record/block_validator_test.rb
-- test/unit/record/model_definition_test.rb
-- test/unit/record/parse_where_hash_test.rb
-- test/unit/record/record_association_test.rb
-- test/unit/record/validators_test.rb
-- test/unit/record_definition_test.rb
-- test/unit/report_definition_test.rb
-- test/unit/report_test.rb
+test_files: []
+