volksbanker 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 
 
+## 1.0.2 (8 October 2012)
+
+* Only show recipient/payer if present.
+* More robust handling of line breaks.
+* Handle variable length headers.
+
+
 ## 1.0.1 (30 August 2012)
 
 * Include payer in output description.

data/lib/volksbanker/cli.rb

@@ -11,10 +11,18 @@ module Volksbanker
           $stderr.puts "Skipping non-EUR currency line item: #{vli.inspect}"
           next
         end
-        ali = AmexLineItem.new vli.posting_date, vli.value, "#{vli.description} (#{vli.recipient_or_payer})"
+        ali = AmexLineItem.new vli.posting_date, vli.value, description_for(vli)
         CSV { |out| out << [ali.date, ali.amount, ali.description] }
       end
     end
+
+    private
+
+    def self.description_for(volksbank_line_item)
+      desc = volksbank_line_item.description
+      desc += " (#{volksbank_line_item.recipient_or_payer})" unless volksbank_line_item.recipient_or_payer.nil?
+      desc
+    end
   end
 
 end

data/lib/volksbanker/version.rb

@@ -1,3 +1,3 @@
 module Volksbanker
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/volksbanker/volksbank_file_reader.rb

@@ -1,6 +1,6 @@
 # Volksbank format line by line:
 #
-# Lines 1-13: header
+# Header information including blank lines.
 # Subsequent non-blank lines: semi-colon separated values
 #   posting date
 #   value date
@@ -11,7 +11,7 @@
 #   description
 #   currency
 #   amount
-#   credit (H) /debit (S)
+#   credit (H) / debit (S)
 # Blank line
 # Footer (opening and closing balances)
 
@@ -30,30 +30,41 @@ module Volksbanker
       data = File.open(@file,'r:iso-8859-1:utf-8') { |f| f.read }
       data = clean_line_breaks data
 
-      line_number = 0
+      header = true
       data.each_line do |line|
-        line_number += 1           # 1-based line numbering
-        next if line_number <= 13  # skip header
+        # skip header
+        if line =~ /^"Buchungstag";"Valuta";/  # final line of header
+          header = false
+          next
+        end
+        next if header
+
         line.chomp!
-        break if line.empty?       # skip footer
+        break if line.empty?  # stop before footer
 
-        yield VolksbankLineItem.new_from_csv line
+        yield VolksbankLineItem.new_from_csv line rescue $stderr.puts "Problem with #{line}: #{$!}"
       end
     end
 
     private
 
     def clean_line_breaks(str)
-      # Format uses \r\n for line breaks between inter-line breaks and \n for intra-line breaks.
+      # Format uses CRLF (\r\n) for line breaks and LF (\n) for intra-line breaks (whatever
+      # they are).
       # There must be a neat Ruby way to do this...
-      remove_inter_line_breaks remove_intra_line_breaks(str)
+      unixify_line_breaks remove_intra_line_breaks(str)
     end
 
     def remove_intra_line_breaks(str)
-      str.gsub /([^\r])\n/, '\1 '
+      # Replace LF, but not CRLF, with space.
+      str.
+        gsub(/^\n/, ' ').          # a line beginning with a LF character
+        gsub(/([^\r])\n/, '\1 ').  # a non-CR character followed by a LF character
+        squeeze(' ')
     end
 
-    def remove_inter_line_breaks(str)
+    def unixify_line_breaks(str)
+      # Replace CRLF with LF.
       str.gsub "\r\n", "\n"
     end
   end

data/test/cli_test.rb

@@ -22,4 +22,12 @@ class CliTest < MiniTest::Unit::TestCase
     assert_match /Skipping/, err
   end
 
+  def test_handles_line_feed_shenanigans
+    out, err = capture_io do
+      Volksbanker::Cli.run fixture('newlines.csv')
+    end
+
+    assert_equal '', err
+  end
+
 end

data/test/fixtures/newlines.csv

@@ -0,0 +1,19 @@
+"Volksbank Rhein-Wehra eG"
+
+"Umsatzanzeige"
+
+"BLZ:";"68490000";;"Datum:";"08.10.2012"
+"Konto:";"44318105";;"Uhrzeit:";"10:33:22"
+"Abfrage von:";"Andrew Stewart";;"Kontoinhaber:";"Foo GmbH"
+
+"Zeitraum:";"1 Woche";"von:";;"bis:";
+"Betrag in EUR:";;"von:";" ";"bis:";" "
+"Sortiert nach:";"Buchungstag";"absteigend"
+
+"Buchungstag";"Valuta";"Auftraggeber/Zahlungsempf�nger";"Empf�nger/Zahlungspflichtiger";"Konto-Nr.";"BLZ";"Vorgang/Verwendungszweck";"W�hrung";"Umsatz";" "
+"02.10.2012";"30.09.2012";;;;;"Abschluss
+
+ABSCHLUSS PER 30.09.2012";"EUR";"10,27";"S"
+
+"01.10.2012";;;;;;"EUR";"Anfangssaldo";"1.234,56";"H"
+"05.10.2012";;;;;;"EUR";"Endsaldo";"3.456,67";"H"

data/test/fixtures/result.csv

@@ -1,4 +1,4 @@
-08/08/2012,-7.5,Bankcard-Gebühr FOLGE-NR.   0 VERFALL 12.15 PREIS BEZAHLT BIS 12.2012 (PREIS VR-BANKCARD)
+08/08/2012,-7.5,Bankcard-Gebühr FOLGE-NR. 0 VERFALL 12.15 PREIS BEZAHLT BIS 12.2012 (PREIS VR-BANKCARD)
 08/08/2012,170.0,Vergütung INVOICE 7004 (Jane Doe)
 07/08/2012,170.0,"Vergütung INVOICE 7003 Acme GmbH, JULY 2012 (Sarah Smith)"
 03/08/2012,2023.0,Vergütung INVOICE 7002 (Some Firm GmbH)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volksbanker
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155443660 !ruby/object:Gem::Requirement
+  requirement: &2164669360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2155443660
+  version_requirements: *2164669360
 description: Prepares Volksbank's electronic statements for upload to Freeagent.
 email:
 - boss@airbladesoftware.com
@@ -43,6 +43,7 @@ files:
 - lib/volksbanker/volksbank_file_reader.rb
 - lib/volksbanker/volksbank_line_item.rb
 - test/cli_test.rb
+- test/fixtures/newlines.csv
 - test/fixtures/result.csv
 - test/fixtures/transactions-with-non-euro.csv
 - test/fixtures/transactions.csv
@@ -62,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 390847453253936748
+      hash: -982126049656369425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 390847453253936748
+      hash: -982126049656369425
 requirements: []
 rubyforge_project: volksbanker
 rubygems_version: 1.8.11
@@ -80,6 +81,7 @@ specification_version: 3
 summary: Prepares Volksbank's electronic statements for upload to Freeagent.
 test_files:
 - test/cli_test.rb
+- test/fixtures/newlines.csv
 - test/fixtures/result.csv
 - test/fixtures/transactions-with-non-euro.csv
 - test/fixtures/transactions.csv