mt940 0.5.1 → 0.6.3

data/CHANGELOG

@@ -1,3 +1,18 @@
+* 0.6.3
+
+  - include the updated Changelog and README as well
+
+* 0.6.2 (Was never released)
+
+  - Parse a NONREF contra account for the rabobank correctly
+
+* 0.6.1 (Was never released)
+
+  - Extracting contra account for ING, AbnAmro and Triodos as well
+  - Standardized all account numbers to exactly 9 digits
+
+* 0.6.0 (Was never released)
+
 * 0.5.1
 
   - Delegated determination of bank to corresponding subclass

data/README.md

@@ -35,8 +35,9 @@ or with the file itself:
   - date
   - amount (which is negative in case of a withdrawal)
   - description
+  - contra account
 
-* With the Rabobank the contra_account with its owner is extracted as well.
+* With the Rabobank its owner is extracted as well.
 
 
 Contributing to MT940

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.3

data/lib/mt940/banks/abnamro.rb

@@ -14,4 +14,16 @@ class MT940::Abnamro < MT940::Base
     end
   end
 
+  def parse_contra_account
+    if @transaction
+      if @transaction.description.match(/^(GIRO)\s+(\d+)(.+)/)
+        @transaction.contra_account = $2.rjust(9, '000000000')
+        @transaction.description    = $3
+      elsif @transaction.description.match(/^(\d{2}.\d{2}.\d{2}.\d{3})(.+)/)
+        @transaction.description    = $2
+        @transaction.contra_account = $1.gsub('.','')
+      end
+    end
+  end
+
 end

data/lib/mt940/banks/ing.rb

@@ -4,4 +4,11 @@ class MT940::Ing < MT940::Base
     self if args[0].match(/INGBNL/)
   end
 
+  def parse_contra_account
+    if @transaction && @transaction.description.match(/^\d(\d{9})(.+)/)
+       @transaction.contra_account = $1
+       @transaction.description = $2
+     end
+  end
+
 end

data/lib/mt940/banks/rabobank.rb

@@ -5,7 +5,7 @@ class MT940::Rabobank < MT940::Base
   end
 
   def parse_tag_61
-    if @line.match(/^:61:(\d{6})(C|D)(\d+),(\d{0,2})\w{4}(.{16})(.+)$/)
+    if @line.match(/^:61:(\d{6})(C|D)(\d+),(\d{0,2})\w{4}\w{1}(\d{9}|NONREF)(.+)$/)
       type = $2 == 'D' ? -1 : 1
       @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($3 + '.' + $4).to_f, :bank => @bank)
       @transaction.date = parse_date($1)

data/lib/mt940/banks/triodos.rb

@@ -4,4 +4,11 @@ class MT940::Triodos < MT940::Base
     self if args[0].match(/^:20:/) && args[1] && args[1].match(/^:25:TRIODOSBANK/)
   end
 
+  def parse_contra_account
+    if @transaction && @transaction.description.match(/\d+(\d{9})$/)
+      @transaction.contra_account = $1.rjust(9, '000000000')
+      @transaction.description = ''
+    end
+  end
+
 end

data/lib/mt940/base.rb

@@ -31,7 +31,7 @@ module MT940
     private
 
     def self.determine_bank(*args)
-      Dir.foreach('lib/mt940/banks/') do |file|
+      Dir.foreach(File.dirname(__FILE__) + '/banks/') do |file|
         if file.match(/\.rb$/)
           klass = eval(file.gsub(/\.rb$/,'').capitalize)
           bank  = klass.determine_bank(*args)
@@ -51,7 +51,7 @@ module MT940
     def parse_tag_25
       @line.gsub!('.','')
       if @line.match(/^:\d{2}:[^\d]*(\d*)/)
-        @bank_account = $1
+        @bank_account = $1.gsub(/^0/,'')
         @tag86 = false
       end
     end
@@ -69,18 +69,26 @@ module MT940
     def parse_tag_86
       if !@tag86 && @line.match(/^:86:\s?(.*)$/)
         @tag86 = true
-        @transaction.description = $1.gsub(/>\d{2}/,'')
+        @transaction.description = $1.gsub(/>\d{2}/,'').strip
+        parse_contra_account
       end
     end
 
     def parse_line
-      @transaction.description += ' ' + @line.gsub(/\n/,'').gsub(/>\d{2}/,'') if @tag86
+      if @tag86 && @transaction.description
+        @transaction.description.lstrip!
+        @transaction.description += ' ' + @line.gsub(/\n/,'').gsub(/>\d{2}\s*/,'').gsub(/\-XXX/,'').gsub(/-$/,'').strip
+        @transaction.description.strip!
+      end
     end
 
     def parse_date(string)
       Date.new(2000 + string[0..1].to_i, string[2..3].to_i, string[4..5].to_i) if string
     end
 
+    def parse_contra_account
+    end
+
     #Fail silently
     def method_missing(*args)
     end

data/mt940.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mt940}
-  s.version = "0.5.1"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dovadi"]
-  s.date = %q{2011-07-05}
+  s.date = %q{2011-07-06}
   s.description = %q{A basic MT940 parser with implementations for Dutch banks.}
   s.email = %q{frank.oxener@gmail.com}
   s.extra_rdoc_files = [

data/test/fixtures/abnamro.txt

@@ -36,6 +36,6 @@ ABNANL2A
 :61:1105240524D9,49N426NONREF
 :86:BEA   NR:XXX1234   24.05.11/09.18 PETS PLACE KATWIJK KATWI,PAS999
 :61:1105240524D15,N426NONREF
-:86:BEA   NR:XXX1234   24.05.11/09.17 BRAINWASH KATWIJK KATWIJ,PAS999
+:86:52.89.39.882 MYCOM DEN HAAG  S-GRAVEN,PAS999
 :62F:C110524EUR1849,75
 -

data/test/fixtures/ing.txt

@@ -18,7 +18,7 @@ ING Bank N.V. tarifering ING
 :61:100722D1,10NGT NONREF
 :86:0111111111 GPPeking 170000001AC
 :61:100722C3,68NVZ NONREF
-:86:0111111111 EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM
+:86:0123456789 EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM
 :62F:C100723EUR3,47
 :86:D000004C000002D25,24C28,71
 -XXX

data/test/fixtures/rabobank.txt

@@ -1,5 +1,4 @@
 :940:
-
 :20:940A110615
 :25:1291.99.348EUR
 :28:00000/00
@@ -21,4 +20,6 @@
 :61:110617D000000000044,95N0600733959555      T-MOBILE NETHERLANDS BV
 :86:BETALINGSKENM.  123456789
 :86:FACTUURNUMMER 987654321
+:61:110721D000000000236,56N030NONREF          TOMTE TUMMETOT AMERSFOORT         
+:86:Betaalautomaat 14:23 pasnr. 065
 :62F:C110617EUR0000000001250,87

data/test/fixtures/triodos.txt

@@ -3,7 +3,7 @@
 :28:1
 :60F:C110101EUR4975,09
 :61:110101D15,70N000NONREF
-:86:000>100000000000
+:86:000>100987654321
 >20ALGEMENE TUSSENREKENING KOS>21TEN VAN 01-10-2010 TOT EN M
 >22ET 31-12-2010>310390123456
 :61:110125D700,00N000NONREF

data/test/test_mt940_abnamro.rb

@@ -21,8 +21,14 @@ class TestMt940Abnamro < Test::Unit::TestCase
       assert_equal -9.00, @transaction.amount
     end
 
-    should 'have a description' do
-      assert_equal 'GIRO   428428 KPN - DIGITENNE    BETALINGSKENM.  000000042188659 5314606715                       BETREFT FACTUUR D.D. 20-05-2011 INCL. 1,44 BTW', @transaction.description
+    context 'Description' do
+      should 'have the correct description in case of a GIRO account' do
+        assert_equal 'KPN - DIGITENNE    BETALINGSKENM.  000000042188659 5314606715                       BETREFT FACTUUR D.D. 20-05-2011 INCL. 1,44 BTW', @transaction.description
+      end
+
+      should 'have the correct description in case of a regular bank' do
+        assert_equal 'MYCOM DEN HAAG  S-GRAVEN,PAS999 :62F:C110524EUR1849,75', @transactions.last.description
+      end
     end
 
     should 'have a date' do
@@ -33,6 +39,15 @@ class TestMt940Abnamro < Test::Unit::TestCase
       assert_equal 'Abnamro', @transaction.bank
     end
 
+    context 'Contra account' do
+      should 'be determined in case of a GIRO account' do
+        assert_equal '000428428', @transaction.contra_account
+      end
+
+      should 'be determined in case of a regular bank' do
+        assert_equal '528939882', @transactions.last.contra_account
+      end
+    end
   end
 
 end

data/test/test_mt940_ing.rb

@@ -14,17 +14,13 @@ class TestMt940Ing < Test::Unit::TestCase
 
   context 'Transaction' do
     should 'have a bank_account' do
-      assert_equal '0001234567', @transaction.bank_account
+      assert_equal '001234567', @transaction.bank_account
     end
 
     should 'have an amount' do
       assert_equal -25.03, @transaction.amount
     end
 
-    should 'have a description' do
-      assert_equal 'RC AFREKENING BETALINGSVERKEER BETREFT REKENING 4715589 PERIODE: 01-10-2010 / 31-12-2010 ING Bank N.V. tarifering ING', @transaction.description
-    end
-
     should 'have a date' do
       assert_equal Date.new(2010,7,22), @transaction.date
     end
@@ -33,6 +29,14 @@ class TestMt940Ing < Test::Unit::TestCase
       assert_equal 'Ing', @transaction.bank
     end
 
+    should 'have a description' do
+      assert_equal 'EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM :62F:C100723EUR3,47', @transactions.last.description
+    end
+
+    should 'return the contra_account' do
+      assert_equal '123456789', @transactions.last.contra_account
+    end
+
   end
 
 end

data/test/test_mt940_rabobank.rb

@@ -9,7 +9,7 @@ class TestMt940Rabobank < Test::Unit::TestCase
   end
   
   should 'have the correct number of transactions' do
-    assert_equal 2, @transactions.size
+    assert_equal 3, @transactions.size
   end
 
   context 'Transaction' do
@@ -17,8 +17,18 @@ class TestMt940Rabobank < Test::Unit::TestCase
       assert_equal '129199348', @transaction.bank_account
     end
 
-    should 'have a contra_account' do
-      assert_equal 'P005675159', @transaction.contra_account
+    context 'Contra account' do
+      should 'be determined in case of a GIRO account' do
+        assert_equal '005675159', @transaction.contra_account
+      end
+
+      should 'be determined in case of a regular bank' do
+        assert_equal '733959555', @transactions[1].contra_account
+      end
+
+      should 'be determined in case of a NONREF' do
+        assert_equal 'NONREF', @transactions.last.contra_account
+      end
     end
 
     should 'have an amount' do

data/test/test_mt940_triodos.rb

@@ -14,7 +14,7 @@ class TestMt940Triodos < Test::Unit::TestCase
 
   context 'Transaction' do
     should 'have a bank_account' do
-      assert_equal '0390123456', @transaction.bank_account
+      assert_equal '390123456', @transaction.bank_account
     end
 
     should 'have an amount' do
@@ -22,7 +22,7 @@ class TestMt940Triodos < Test::Unit::TestCase
     end
 
     should 'have a description' do
-      assert_equal '0000000000000 ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN M ET 31-12-20100390123456', @transaction.description
+      assert_equal 'ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN M ET 31-12-20100390123456', @transaction.description
     end
 
     should 'have a date' do
@@ -33,6 +33,10 @@ class TestMt940Triodos < Test::Unit::TestCase
       assert_equal 'Triodos', @transaction.bank
     end
 
+    should 'return the contra_account' do
+      assert_equal '987654321', @transaction.contra_account
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - dovadi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +02:00
+date: 2011-07-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency