paperless_to_xero 1.1.1 → 1.2.0

data/MIT-LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2009 Matt Patterson
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,3 +1,4 @@
+require "rubygems"
 require 'rake'
 require 'rake/rdoctask'
 gem 'rspec'
@@ -39,101 +40,30 @@ namespace :spec do
   end
 end
 
-require "rubygems"
-require "rake/gempackagetask"
-
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
-spec = Gem::Specification.new do |s|
-  
-  # Change these as appropriate
-  s.name              = "paperless_to_xero"
-  s.version           = PaperlessToXero::Version()
-  s.summary           = "Convert Paperless CSV exports to Xero invoice import CSV"
-  s.description       = File.read('README.rdoc')
-  s.author            = "Matt Patterson"
-  s.email             = "matt@reprocessed.org"
-  s.homepage          = "http://reprocessed.org/"
-
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w(README.rdoc)
-  s.rdoc_options      = %w(--main README.rdoc)
-
-  # Add any extra files to include in the gem
-  s.files             = %w(Rakefile README.rdoc) + Dir.glob("{bin,spec,lib}/**/*")
-  s.executables       = FileList["bin/**"].map { |f| File.basename(f) }
-   
-  s.require_paths     = ["lib"]
-  
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  
-  s.add_development_dependency("rspec") # add any other gems for testing/development
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name              = "paperless_to_xero"
+    s.summary           = "Convert Paperless CSV exports to Xero invoice import CSV"
+    s.description       = File.read('README.rdoc')
+    s.authors           = ["Matt Patterson"]
+    s.email             = "matt@reprocessed.org"
+    s.homepage          = "http://github.com/fidothe/paperless_to_xero/"
+    
+    s.extra_rdoc_files  = %w(README.rdoc)
+    s.rdoc_options      = %w(--main README.rdoc)
 
-  # If you want to publish automatically to rubyforge, you'll may need
-  # to tweak this, and the publishing task below too.
-  s.rubyforge_project = "paperless_to_xero"
-end
+    s.require_paths     = ["lib"]
 
-# This task actually builds the gem. We also regenerate a static 
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-  
-  # Generate the gemspec file for github.
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
+    # If you want to depend on other gems, add them here, along with any
+    # relevant versions
 
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
-end
+    s.add_development_dependency("rspec") # add any other gems for testing/development
 
-# If you want to publish to RubyForge automatically, here's a simple 
-# task to help do that. If you don't, just get rid of this.
-# Be sure to set up your Rubyforge account details with the Rubyforge
-# gem; you'll need to run `rubyforge setup` and `rubyforge config` at
-# the very least.
-begin
-  require "rake/contrib/sshpublisher"
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Release a new version of this gem"
-      task :gem => [:package] do
-        require 'rubyforge'
-        rubyforge = RubyForge.new
-        rubyforge.configure
-        rubyforge.login
-        rubyforge.userconfig['release_notes'] = spec.summary
-        path_to_gem = File.join(File.dirname(__FILE__), "pkg", "#{spec.name}-#{spec.version}.gem")
-        puts "Publishing #{spec.name}-#{spec.version.to_s} to Rubyforge..."
-        rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version.to_s, path_to_gem)
-      end
-      
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-        
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/coop_to_ofx/" # Should be the same as the rubyforge project name
-        local_dir = 'rdoc'
-        
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
+    # If you want to publish automatically to rubyforge, you'll may need
+    # to tweak this, and the publishing task below too.
+    s.rubyforge_project = "paperless_to_xero"
   end
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -0,0 +1 @@
+1.2.0

data/lib/paperless_to_xero/converter.rb

@@ -1,8 +1,12 @@
 require 'csv'
 require 'date'
+require 'paperless_to_xero/errors'
 
 module PaperlessToXero
+  PAPERLESS_HEADER_ROW = ["Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"]
   class Converter
+    VAT_RATE_CHANGE_2008_12_01 = Date.parse('2008-12-01')
+    VAT_RATE_CHANGE_2010_01_01 = Date.parse('2010-01-01')
     attr_reader :input_path, :output_path
     
     def initialize(input_path, output_path)
@@ -13,12 +17,17 @@ module PaperlessToXero
       @invoices ||= []
     end
     
+    def verify_header_row!(row)
+      raise UnknownHeaderRow unless row == PaperlessToXero::PAPERLESS_HEADER_ROW
+    end
+    
     def parse
       input_csv = CSV.read(input_path)
-      # remove Paperless header row
-      input_csv.shift
+      # verify Paperless header row
+      verify_header_row!(input_csv.shift)
       
-      input_csv.each do |row|
+      input_csv.each_with_index do |row, index|
+        line_number = index + 1
         date, merchant, paperless_currency, amount, vat, category, payment_method, notes_field, description, reference, status, *extras = row
         negative = amount.index('--') == 0
         category = category[0..2] unless category.nil?
@@ -30,17 +39,25 @@ module PaperlessToXero
           total_vat = vat.nil? ? "0.00" : vat
           invoice = PaperlessToXero::Invoice.new(extract_date(date), merchant, reference, amount, total_vat, inc_vat?(notes), extract_currency(notes))
           if extras.empty?
-            invoice.add_item(description, amount, vat, category, extract_vat_note(vat, notes))
+            begin
+              invoice.add_item(description, amount, vat, category, extract_vat_note(invoice.date, vat, notes))
+            rescue
+              raise BadItem.new(line_number, row, "Couldn't process this item")
+            end
           else
-            raise RangeError, "input CSV row is badly formatted" unless extras.size % 6 == 0
+            raise IncorrectNumberOfColumns.new(line_number, row, "Extra items are badly formatted") unless extras.size % 6 == 0
             items = chunk_extras(extras)
             items.each do |item|
-              description, paperless_currency, amount, unknown, category, notes_field = item
-              category = category[0..2]
-              notes = extract_notes(notes_field)
-              vat_amount = extract_vat_amount(notes)
-              vat_note = extract_vat_note(vat_amount, notes)
-              invoice.add_item(description, amount, vat_amount, category, vat_note)
+              begin
+                description, paperless_currency, amount, unknown, category, notes_field = item
+                category = category[0..2]
+                notes = extract_notes(notes_field)
+                vat_amount = extract_vat_amount(notes)
+                vat_note = extract_vat_note(invoice.date, vat_amount, notes)
+                invoice.add_item(description, amount, vat_amount, category, vat_note)
+              rescue
+                raise BadItem.new(line_number, row, "Couldn't process this item")
+              end
             end
           end
           invoices << invoice
@@ -117,7 +134,7 @@ module PaperlessToXero
       nil
     end
     
-    def extract_vat_note(vat_amount, notes)
+    def extract_vat_note(date, vat_amount, notes)
       notes.each do |item|
         return item if item.match(/^VAT/)
       end
@@ -128,7 +145,8 @@ module PaperlessToXero
       when nil
         'No VAT'
       else
-        'VAT - 15%'
+        return 'VAT - 15%' if date >= VAT_RATE_CHANGE_2008_12_01 && date < VAT_RATE_CHANGE_2010_01_01
+        'VAT - 17.5%'
       end
     end
   end

data/lib/paperless_to_xero/errors.rb

@@ -0,0 +1,15 @@
+module PaperlessToXero
+  class UnknownHeaderRow < StandardError; end
+  class RowError < StandardError
+    def initialize(line_number, row, explanation = "")
+      @line_number, @row, @explanation = line_number, row, explanation
+    end
+    
+    def to_s
+      "Error processing line #{@line_number.to_s}: #{@explanation}. Row was #{@row.inspect}"
+    end
+  end
+  
+  class IncorrectNumberOfColumns < RowError; end
+  class BadItem < RowError; end
+end

data/lib/paperless_to_xero/invoice_item.rb

@@ -17,6 +17,7 @@ module PaperlessToXero
           '21.5% (Ireland, VAT on expenses)' => 1.215.to_d,
           '15% (EU VAT ID)' => 1.15.to_d,
           '15% (VAT on expenses)' => 1.15.to_d,
+          '17.5% (VAT on expenses)' => 1.175.to_d,
           'Zero Rated Expenses' => 0,
           '15% (Luxembourg, VAT on expenses)' => 1.15.to_d
         }
@@ -76,6 +77,8 @@ module PaperlessToXero
         '15% (EU VAT ID)'
       when 'VAT - 15%'
         '15% (VAT on expenses)'
+      when 'VAT - 17.5%'
+        '17.5% (VAT on expenses)'
       when 'VAT - 0%'
         'Zero Rated Expenses'
       when 'No VAT'

data/paperless_to_xero.gemspec

@@ -0,0 +1,91 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{paperless_to_xero}
+  s.version = "1.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matt Patterson"]
+  s.date = %q{2010-02-27}
+  s.default_executable = %q{paperless_to_xero}
+  s.description = %q{= Paperless-to-Xero
+
+A simple translator which takes a CSV file from Mariner's Paperless receipt/document management software and makes a Xero accounts payable invoice CSV, for import into Xero.
+
+Formatting in Paperless is very important, so you probably want to wait until I've written the docs}
+  s.email = %q{matt@reprocessed.org}
+  s.executables = ["paperless_to_xero"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/paperless_to_xero",
+     "lib/paperless_to_xero.rb",
+     "lib/paperless_to_xero/converter.rb",
+     "lib/paperless_to_xero/decimal_helpers.rb",
+     "lib/paperless_to_xero/errors.rb",
+     "lib/paperless_to_xero/invoice.rb",
+     "lib/paperless_to_xero/invoice_item.rb",
+     "lib/paperless_to_xero/version.rb",
+     "paperless_to_xero.gemspec",
+     "spec/fixtures/dodgy-header.csv",
+     "spec/fixtures/end_to_end-input.csv",
+     "spec/fixtures/end_to_end-output.csv",
+     "spec/fixtures/multi-ex-vat.csv",
+     "spec/fixtures/multi-foreign.csv",
+     "spec/fixtures/multi-item-mixed_vat_and_exempt.csv",
+     "spec/fixtures/multi-item.csv",
+     "spec/fixtures/single-1000.csv",
+     "spec/fixtures/single-basic.csv",
+     "spec/fixtures/single-dkk.csv",
+     "spec/fixtures/single-foreign.csv",
+     "spec/fixtures/single-no-vat.csv",
+     "spec/fixtures/single-vat-2008-11-30.csv",
+     "spec/fixtures/single-vat-2008-12-01.csv",
+     "spec/fixtures/single-vat-2009-12-31.csv",
+     "spec/fixtures/single-vat-2009.csv",
+     "spec/fixtures/single-vat-2010-01-01.csv",
+     "spec/fixtures/single-vat-pre-2008-12.csv",
+     "spec/fixtures/single-zero_rated.csv",
+     "spec/paperless_to_xero/converter_spec.rb",
+     "spec/paperless_to_xero/errors_spec.rb",
+     "spec/paperless_to_xero/invoice_item_spec.rb",
+     "spec/paperless_to_xero/invoice_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/fidothe/paperless_to_xero/}
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{paperless_to_xero}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Convert Paperless CSV exports to Xero invoice import CSV}
+  s.test_files = [
+    "spec/paperless_to_xero/converter_spec.rb",
+     "spec/paperless_to_xero/errors_spec.rb",
+     "spec/paperless_to_xero/invoice_item_spec.rb",
+     "spec/paperless_to_xero/invoice_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  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
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end
+

data/spec/fixtures/dodgy-header.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+26/01/2009,"Fastlane Cabs","£","4.50",,"493 - Travel National","Cash",,"Taxi in Nottingham","2009-01-26-03",

data/spec/fixtures/multi-item-mixed_vat_and_exempt.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+23/07/2009,"Post Office","£","3.55","0.29","425 - Postage, Freight & Courier","Credit Card",,,"2009-07-23-03",,"Envelopes","£","2.19",,"429 - General Expenses","0.29; VAT - 15%","Postage","£","1.36",,"425 - Postage, Freight & Courier","VAT - 0%"

data/spec/fixtures/single-vat-2008-11-30.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+30/11/2008,"Apple Store, Regent Street","£","117.50","17.50","429 - General Expenses","Debit Card",,"Phone case","2008-11-30-05",

data/spec/fixtures/single-vat-2008-12-01.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+01/12/2008,"Apple Store, Regent Street","£","115","15","429 - General Expenses","Debit Card",,"Phone case","2008-12-01-05",

data/spec/fixtures/single-vat-2009-12-31.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+31/12/2009,"Apple Store, Regent Street","£","115","15","429 - General Expenses","Debit Card",,"Phone case","2009-12-31-05",

data/spec/fixtures/single-vat-2009.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+01/06/2009,"Apple Store, Regent Street","£","115","15","429 - General Expenses","Debit Card",,"Phone case","2009-06-01-05",

data/spec/fixtures/single-vat-2010-01-01.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+01/01/2010,"Apple Store, Regent Street","£","117.50","17.50","429 - General Expenses","Debit Card",,"Phone case","2010-01-01-05",

data/spec/fixtures/single-vat-pre-2008-12.csv

@@ -0,0 +1,2 @@
+"Date","Merchant","Currency","Amount","Tax","Category","Payment Method","Notes","Description","Reference #","Status"
+18/05/2008,"Apple Store, Regent Street","£","117.50","17.50","429 - General Expenses","Debit Card",,"Phone case","2008-05-18-05",

data/spec/paperless_to_xero/converter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'tempfile'
 
 Spec::Matchers.define :have_detail_matching do |key, value|
@@ -48,6 +48,13 @@ describe PaperlessToXero::Converter do
     end
   end
   
+  describe "checking the header row" do
+    it "should raise an UnknownHeaderRow error if it doesn't recognise the header..." do
+      @converter.stubs(:input_path).returns(fixture_path('dodgy-header'))
+      lambda { @converter.parse }.should raise_error(PaperlessToXero::UnknownHeaderRow)
+    end
+  end
+  
   describe "single item inputs" do
     it "should able to create an invoice for a basic single-item invoice" do
       @converter.stubs(:input_path).returns(fixture_path('single-basic'))
@@ -133,6 +140,110 @@ describe PaperlessToXero::Converter do
         ]
       )
     end
+    
+    describe "UK VAT rate changes" do
+      describe "pre 2008-12 17.5% VAT" do
+        it "correctly handles days in that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-pre-2008-12'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2008-05-18'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2008-05-18-05', :inc_vat_total => '117.50', :vat_total => '17.50', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '17.5% (VAT on expenses)',
+               :vat_inclusive_amount => '117.50', :vat_exclusive_amount => '100.00', :vat_amount => '17.50'}
+            ]
+          )
+        end
+        
+        it "correctly handles the last day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2008-11-30'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2008-11-30'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2008-11-30-05', :inc_vat_total => '117.50', :vat_total => '17.50', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '17.5% (VAT on expenses)',
+               :vat_inclusive_amount => '117.50', :vat_exclusive_amount => '100.00', :vat_amount => '17.50'}
+            ]
+          )
+        end
+      end
+      
+      describe "2009's 15% VAT rate" do
+        it "correctly handles the first day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2008-12-01'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2008-12-01'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2008-12-01-05', :inc_vat_total => '115.00', :vat_total => '15.00', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '15% (VAT on expenses)',
+               :vat_inclusive_amount => '115.00', :vat_exclusive_amount => '100.00', :vat_amount => '15.00'}
+            ]
+          )
+        end
+        
+        it "correctly handles days in that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2009'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2009-06-01'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2009-06-01-05', :inc_vat_total => '115.00', :vat_total => '15.00', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '15% (VAT on expenses)',
+               :vat_inclusive_amount => '115.00', :vat_exclusive_amount => '100.00', :vat_amount => '15.00'}
+            ]
+          )
+        end
+        
+        it "correctly handles the last day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2009-12-31'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2009-12-31'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2009-12-31-05', :inc_vat_total => '115.00', :vat_total => '15.00', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '15% (VAT on expenses)',
+               :vat_inclusive_amount => '115.00', :vat_exclusive_amount => '100.00', :vat_amount => '15.00'}
+            ]
+          )
+        end
+      end
+      
+      describe "2010-01-01's return to 17.5% VAT" do
+        it "correctly handles the first day of that VAT rate" do
+          @converter.stubs(:input_path).returns(fixture_path('single-vat-2010-01-01'))
+          @converter.parse
+          
+          verify_invoice_details(
+            :invoice => {:date => Date.parse('2010-01-01'), :merchant => 'Apple Store, Regent Street', 
+                         :reference_id => '2010-01-01-05', :inc_vat_total => '117.50', :vat_total => '17.50', 
+                         :ex_vat_total => '100.00', :currency => 'GBP'},
+            :vat_inclusive => true,
+            :line_items => [
+              {:description => 'Phone case', :category => '429', :vat_type => '17.5% (VAT on expenses)',
+               :vat_inclusive_amount => '117.50', :vat_exclusive_amount => '100.00', :vat_amount => '17.50'}
+            ]
+          )
+        end
+      end
+    end
   end
   
   describe "multi-item inputs" do
@@ -192,6 +303,24 @@ describe PaperlessToXero::Converter do
         ]
       )
     end
+    
+    it "should be able to cope with an multi-line invoice with mixed VAT and VAT-exempt lines" do
+      @converter.stubs(:input_path).returns(fixture_path('multi-item-mixed_vat_and_exempt'))
+      @converter.parse
+      
+      verify_invoice_details(
+        :invoice => {:date => Date.parse('2009-07-23'), :merchant => 'Post Office', 
+                     :reference_id => '2009-07-23-03', :inc_vat_total => '3.55', :vat_total => '0.29', 
+                     :ex_vat_total => '3.26', :currency => 'GBP'},
+        :vat_inclusive => false,
+        :line_items => [
+          {:description => 'Envelopes', :category => '429', :vat_type => '15% (VAT on expenses)',
+           :vat_inclusive_amount => '2.19', :vat_exclusive_amount => '1.90', :vat_amount => '0.29'},
+          {:description => 'Postage', :category => '425', :vat_type => 'Zero Rated Expenses',
+           :vat_inclusive_amount => '1.36', :vat_exclusive_amount => '1.36', :vat_amount => '0.00'}
+        ]
+      )
+    end
   end
   
   describe "end-to-end" do

data/spec/paperless_to_xero/errors_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe PaperlessToXero::RowError do
+  it "should be able to be instantiated with the line number, row contents and error message" do
+    PaperlessToXero::RowError.new(1, ["thing", "other thing"], "Bad thing happened").should be_instance_of(PaperlessToXero::RowError)
+  end
+end

data/spec/paperless_to_xero/invoice_item_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe PaperlessToXero::InvoiceItem do
   describe "the creation basics" do
@@ -144,6 +144,7 @@ describe PaperlessToXero::InvoiceItem do
          'VAT - Luxembourg'       => '15% (Luxembourg, VAT on expenses)',
          'VAT - EU'               => '15% (EU VAT ID)',
          'VAT - EU - EU372000063' => '15% (EU VAT ID)',
+         'VAT - 17.5%'              => '17.5% (VAT on expenses)',
          'VAT - 15%'              => '15% (VAT on expenses)',
          'VAT - 0%'               => 'Zero Rated Expenses',
          'VAT'                    => '15% (VAT on expenses)',

data/spec/paperless_to_xero/invoice_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe PaperlessToXero::Invoice do
   describe "the creation basics" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: paperless_to_xero
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Matt Patterson
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-22 00:00:00 +01:00
-default_executable: 
+date: 2010-02-27 00:00:00 +00:00
+default_executable: paperless_to_xero
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: |-
   = Paperless-to-Xero
   
@@ -36,33 +43,46 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Rakefile
+- MIT-LICENSE
 - README.rdoc
+- Rakefile
+- VERSION
 - bin/paperless_to_xero
+- lib/paperless_to_xero.rb
+- lib/paperless_to_xero/converter.rb
+- lib/paperless_to_xero/decimal_helpers.rb
+- lib/paperless_to_xero/errors.rb
+- lib/paperless_to_xero/invoice.rb
+- lib/paperless_to_xero/invoice_item.rb
+- lib/paperless_to_xero/version.rb
+- paperless_to_xero.gemspec
+- spec/fixtures/dodgy-header.csv
 - spec/fixtures/end_to_end-input.csv
 - spec/fixtures/end_to_end-output.csv
 - spec/fixtures/multi-ex-vat.csv
 - spec/fixtures/multi-foreign.csv
+- spec/fixtures/multi-item-mixed_vat_and_exempt.csv
 - spec/fixtures/multi-item.csv
 - spec/fixtures/single-1000.csv
 - spec/fixtures/single-basic.csv
 - spec/fixtures/single-dkk.csv
 - spec/fixtures/single-foreign.csv
 - spec/fixtures/single-no-vat.csv
+- spec/fixtures/single-vat-2008-11-30.csv
+- spec/fixtures/single-vat-2008-12-01.csv
+- spec/fixtures/single-vat-2009-12-31.csv
+- spec/fixtures/single-vat-2009.csv
+- spec/fixtures/single-vat-2010-01-01.csv
+- spec/fixtures/single-vat-pre-2008-12.csv
 - spec/fixtures/single-zero_rated.csv
 - spec/paperless_to_xero/converter_spec.rb
+- spec/paperless_to_xero/errors_spec.rb
 - spec/paperless_to_xero/invoice_item_spec.rb
 - spec/paperless_to_xero/invoice_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- lib/paperless_to_xero/converter.rb
-- lib/paperless_to_xero/decimal_helpers.rb
-- lib/paperless_to_xero/invoice.rb
-- lib/paperless_to_xero/invoice_item.rb
-- lib/paperless_to_xero/version.rb
-- lib/paperless_to_xero.rb
 has_rdoc: true
-homepage: http://reprocessed.org/
+homepage: http://github.com/fidothe/paperless_to_xero/
 licenses: []
 
 post_install_message: 
@@ -75,20 +95,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: paperless_to_xero
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Convert Paperless CSV exports to Xero invoice import CSV
-test_files: []
-
+test_files: 
+- spec/paperless_to_xero/converter_spec.rb
+- spec/paperless_to_xero/errors_spec.rb
+- spec/paperless_to_xero/invoice_item_spec.rb
+- spec/paperless_to_xero/invoice_spec.rb
+- spec/spec_helper.rb