mt940 0.6.6 → 0.7.0

data/lib/mt940/base.rb

@@ -1,100 +1,96 @@
 module MT940
 
+  BBAN_PATTERN     = '^\d{10}'
+  IBAN_PATTERN     = 'NL\d{2}[A-Z]{4}\d{10}'
+  BIC_CODE_PATTERN = MT940::BIC_CODES.values.join('|')
+  SEPA_PATTERN     = Regexp.new "(#{BBAN_PATTERN})\\s+(#{IBAN_PATTERN})\\s+(#{BIC_CODE_PATTERN})(.+)$"
+
   class Base
 
-    attr_accessor :bank
-
-    def self.transactions(file)
-      file  = File.open(file) if file.is_a?(String) 
-      if file.is_a?(File) || file.is_a?(Tempfile)
-        first_line  = file.readline
-        second_line = file.readline unless file.eof?
-        klass       = determine_bank(first_line, second_line)
-        file.rewind
-        instance = klass.new(file)
-        file.close
-        instance.parse
-      else
-        raise ArgumentError.new('No file is given!')
+    attr_accessor :bank, :transactions
+
+    def initialize(file)
+      @transactions, @lines = [], []
+      @bank = self.class.to_s.split('::').last
+      file.readlines.each do |line|
+        begin_of_line?(line) ? @lines << line : @lines[-1] += line
       end
     end
 
     def parse
-      @tag86 = false
       @lines.each do |line|
-        @line = line
-        @line.match(/^:(\d{2}F?):/) ? eval('parse_tag_'+ $1) : parse_line
+        @line = line.strip.gsub(/\n/,'')
+        if @line.match(/^:(\d{2}F?):/)
+          case $1
+          when '25'
+            parse_tag_25
+          when '60F'
+            parse_tag_60F
+          when '61'
+            parse_tag_61
+            @transactions << @transaction if @transaction
+          when '86'
+            parse_tag_86 if @transaction
+          when '62F'
+            @transaction = nil #Ignore 'eindsaldo'
+          end
+        end
       end
-      @transactions
     end
 
     private
 
-    def self.determine_bank(*args)
-      Dir.foreach(File.dirname(__FILE__) + '/banks/') do |file|
-        if file.match(/\.rb$/)
-          klass = eval(file.gsub(/\.rb$/,'').capitalize)
-          bank  = klass.determine_bank(*args)
-          return bank if bank
-        end
-      end
-      self
-    end
-
-    def initialize(file)
-      @transactions = []
-      @bank  = self.class.to_s.split('::').last
-      @bank  = 'Unknown' if @bank == 'Base'
-      @lines = file.readlines
+    def begin_of_line?(line)
+      line.match /^:|^940|^0000\s|^ABNA/
     end
 
     def parse_tag_25
       @line.gsub!('.','')
-      if @line.match(/^:\d{2}:[^\d]*(\d*)/)
-        @bank_account = $1.gsub(/^0/,'')
-        @tag86 = false
-      end
+      @bank_account = $1.gsub(/^0/,'') if @line.match(/^:\d{2}:[^\d]*(\d*)/)
     end
 
     def parse_tag_60F
       @currency = @line[12..14]
     end
 
-    def parse_tag_61
-      if @line.match(/^:61:(\d{6})(C|D)(\d+),(\d{0,2})/)
-        type = $2 == 'D' ? -1 : 1
-        @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($3 + '.' + $4).to_f, :bank => @bank, :currency => @currency)
-        @transaction.date = parse_date($1)
-        @transactions << @transaction
-        @tag86 = false
+    def parse_tag_61(pattern = nil)
+      pattern = pattern || /^:61:(\d{6})(C|D)(\d+),(\d{0,2})/
+      match = @line.match(pattern)
+      if match
+        @transaction = create_transaction(match)
+        @transaction.date = parse_date(match[1])
       end
+      match
     end
 
     def parse_tag_86
-      if !@tag86 && @line.match(/^:86:\s?(.*)$/)
-        @tag86 = true
-        @transaction.description = $1.gsub(/>\d{2}/,'').strip
-        parse_contra_account
+      if @line.match(/^:86:\s?(.*)$/)
+        @line = $1.strip
+        sepa? ? parse_line_after_sepa : parse_line_before_sepa
+        @transaction.contra_account = @contra_account
+        @transaction.description    = @description
       end
     end
 
-    def parse_line
-      if @tag86 && @transaction.description
-        @transaction.description.lstrip!
-        @transaction.description += ' ' + @line.gsub(/\n/,'').gsub(/>\d{2}\s*/,'').gsub(/\-XXX/,'').gsub(/-$/,'').strip
-        @transaction.description.strip!
+    def hashify_description(description)
+      hash = {} 
+      description.gsub!(/[^A-Z]\/[^A-Z]/,' ') #Remove single forward slashes '/', which are not part of a swift code
+      description[1..-1].split('/').each_slice(2).each do |first, second|
+        hash[first] = second
       end
+      hash
     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
+    def create_transaction(match)
+      type = match[2] == 'D' ? -1 : 1
+      MT940::Transaction.new(:bank_account => @bank_account,
+                             :amount       => type * (match[3] + '.' + match[4]).to_f,
+                             :bank         => @bank,
+                             :currency     => @currency)
     end
 
-    #Fail silently
-    def method_missing(*args)
+    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
 
   end

data/lib/mt940/bic_codes.rb

@@ -0,0 +1,74 @@
+module MT940
+
+  BIC_CODES =
+
+  {
+    ABNA: 'ABNANL2A',
+    AEGO: 'AEGONL2U',
+    ANDL: 'ANDLNL2A',
+    ARBN: 'ARBNNL22',
+    ARSN: 'ARSNNL21',
+    ARTE: 'ARTENL2A',
+    ASNB: 'ASNBNL21',
+    ASRB: 'ASRBNL2R',
+    ATBA: 'ATBANL2A',
+    BBRU: 'BBRUNL2X',
+    BCDM: 'BCDMNL22',
+    BCIT: 'BCITNL2A',
+    BICK: 'BICKNL2A',
+    BKMG: 'BKMGNL2A',
+    BLGW: 'BLGWNL21',
+    BNGH: 'BNGHNL2G',
+    BNPA: 'BNPANL2A',
+    BOFA: 'BOFANLNX',
+    BOFS: 'BOFSNL21002',
+    BOTK: 'BOTKNL2X',
+    CITC: 'CITCNL2A',
+    CITI: 'CITINL2X',
+    COBA: 'COBANL2X',
+    DEUT: 'DEUTNL2N',
+    DHBN: 'DHBNNL2R',
+    DLBK: 'DLBKNL2A',
+    DNIB: 'DNIBNL2G',
+    FBHL: 'FBHLNL2A',
+    FLOR: 'FLORNL2A',
+    FRBK: 'FRBKNL2L',
+    FRGH: 'FRGHNL21',
+    FTSB: 'ABNANL2A',
+    FVLB: 'FVLBNL22',
+    GILL: 'GILLNL2A',
+    HAND: 'HANDNL2A',
+    HHBA: 'HHBANL22',
+    HSBC: 'HSBCNL2A',
+    ICBK: 'ICBKNL2A',
+    INGB: 'INGBNL2A',
+    INSI: 'INSINL2A',
+    ISBK: 'ISBKNL2A',
+    KABA: 'KABANL2A',
+    KASA: 'KASANL2A',
+    KNAB: 'KNABNL2H',
+    KOEX: 'KOEXNL2A',
+    KRED: 'KREDNL2X',
+    LOCY: 'LOCYNL2A',
+    LOYD: 'LOYDNL2A',
+    LPLN: 'LPLNNL2F',
+    MHCB: 'MHCBNL2A',
+    NNBA: 'NNBANL2G',
+    NWAB: 'NWABNL2G',
+    OVBN: 'OVBNNL22',
+    RABO: 'RABONL2U',
+    RBOS: 'RBOSNL2A',
+    RBRB: 'RBRBNL21',
+    SNSB: 'SNSBNL2A',
+    SOGE: 'SOGENL2A',
+    STAL: 'STALNL2G',
+    TEBU: 'TEBUNL2A',
+    TRIO: 'TRIONL2U',
+    UBSW: 'UBSWNL2A',
+    UGBI: 'UGBINL2A',
+    VOWA: 'VOWANL21',
+    VPVG: 'VPVGNL22',
+    ZWLB: 'ZWLBNL21'
+  }
+
+end

data/lib/mt940/parser.rb

@@ -0,0 +1,53 @@
+module MT940
+
+  class NoFileGiven < Exception; end
+  class UnknownBank < Exception; end
+
+  class Parser
+
+    attr_accessor :transactions
+
+    def initialize(file)
+      file = File.open(file) if file.is_a?(String) 
+      if file.is_a?(File) || file.is_a?(Tempfile)
+        process(file)
+        file.close
+      else
+        raise NoFileGiven.new('No file is given!')
+      end
+    end
+
+    private
+
+    def process(file)
+      begin
+        bank_class = determine_bank_class(file)
+        instance   = bank_class.new(file)
+        instance.parse
+        @transactions = instance.transactions
+      rescue NoMethodError => exception
+         if exception.message == "undefined method `new' for nil:NilClass"
+          raise UnknownBank.new('Could not determine bank!') 
+        else
+          raise exception
+        end
+      end
+    end
+
+    def determine_bank_class(file)
+      first_line = file.readline
+      case first_line
+      when /^:940:/
+        Rabobank
+      when /INGBNL/
+        Ing
+      when /ABNANL/
+        Abnamro
+      when /^:20:/
+        Triodos
+      end
+    end
+
+  end
+
+end

data/lib/mt940/version.rb

@@ -1,3 +1,3 @@
 module MT940
-  VERSION = '0.6.6'
+  VERSION = '0.7.0'
 end

data/lib/mt940.rb

@@ -2,6 +2,8 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'tempfile'
+require 'mt940/bic_codes'
+require 'mt940/parser'
 require 'mt940/base'
 require 'mt940/transaction'
 require 'mt940/banks/ing'

data/mt940.gemspec

@@ -25,6 +25,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split(/\n/)
   s.executables   = `git ls-files -- bin/*`.split(/\n/).map{ |f| File.basename(f) }
   s.require_paths = ['lib']
-
-  s.add_development_dependency 'shoulda'
 end

data/test/fixtures/abnamro_sepa.txt

@@ -0,0 +1,12 @@
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1209270927C0,01N944NONREF
+:86:/TRTP/IDEAL/IBAN/NL73ANDL0123456789/BIC/ANDLNL20/NAME/NAAMXXX
+ 1/REMI/Dit zijn de omschrijvingsregels/EREF/INNDNL2U200001001348
+24001/ORDP//ID/1234567890AQCDEFGHIJ1234567890KLMNO
+:62F:C120518EUR1945,65

data/test/fixtures/ing_sepa.txt

@@ -0,0 +1,33 @@
+0000 01INGBNL2AXXXX00001 
+0000 01INGBNL2AXXXX00001 
+940 00 
+:20:MPBZ 
+:25:0654321789 
+:28C:000 
+:60F:C120810EUR68,20 
+:61:120810C1,41NOV EV41411REP170112 
+:86:0654321789 J. Janssen Factuurnr 123456 klantnr 00123 
+:61:120810C1,56NOV EREF 
+:86:0123456789 NL69INGB0123456789 INGBNL2A J. Janssen 
+20120123456789 Factuurnr 123456 Klantnr 00123 
+:61:120810D2,13NVZ NONREF 
+:86:TOTAAL 1 VZ 4444444 
+:61:120810D1,57NVZ PREF 
+:86:VERZAMEL EUROBETALING M000000001111111 REMI TOTAAL 1 POSTEN 
+:61:120810C1,44NIC NONREF 
+:86:TOTAAL 1 IC 4444444 
+:61:120810D1,54NIC EV54541REP180112 
+:86:000754321 KN: EV54541REP180112 
+EV54541REP180112T1630 ING BANK NV INZAKE WEB?AMSTERDAM 
+:61:120810D1,14NIC MARF 
+:86:0123456789 Europese Incasso doorlopend NL69INGB0123456789 INGBNL2A 
+J. Jansen NL32ZZZ999999991234 MND-120123 20120501P01234785 CONTRIB 
+UTIE MEI 2012 
+:61:120810C939,60NAC NONREF 
+:86:0675432198 J. JANSSEN AMSTERDAM KN:3300169406045025 
+:62F:C120811EUR1005,83 
+:64:C120811EUR1005,83 
+:65:C120811EUR1005,83 
+:65:C120811EUR1005,83 
+:86:D000004C000004D6,38C944,01 
+-XXX

data/test/fixtures/rabobank_sepa.txt

@@ -0,0 +1,74 @@
+:940:
+:20:940S130403
+:25:NL50RABO0123456789
+:28C:0
+:60F:C130402EUR000000001147,95
+
+:61:130403D000000000127,50N102EREF
+NL96RBOS0523149468
+:86:/EREF/02-04-2013 22:56 1120000153447185/BENM//NAME/Nespresso Nede
+rland B.V./REMI/674725433 1120000153447185 14144467636004962
+/ISDT/2013-04-03
+
+:61:130403C000000000169,90N122NONREF
+0663616476
+:86:/ORDP//NAME/Bedrijf B.V./REMI/NR.201303-111/11.3.2013
+NR.201303-112/11.3.2013/ISDT/2013-04-03
+
+:61:131125C000000000173,50N541NONREF
+NL02INGB0002447973
+:86:/ORDP//NAME/Hr R Kuil en/of Mw A Kuil-Germain/REMI/861835-5746311
+43
+
+:61:131206C000000000171,66N122NONREF
+0444656227
+:86:/ORDP//NAME/D VAN WAARD CJ/REMI//IBS.00008908/ 1001680-P796142 KI
+NDEROPVANG
+
+:62F:C130403EUR000000001190,35
+
+:20:940S130404
+:25:NL50RABO0123456789
+:28C:0
+:60F:C130403EUR000000001190,35
+
+:61:130404D000000000585,60N071NONREF
+P004500018
+:86:/BENM//NAME/DIVV afd parkeergebouwewn/REMI/Factuur 307472/ISDT/20
+13-04-04
+
+:61:130404C000000001640,76N127NONREF
+0117888613
+:86:/ORDP//NAME/DLN CONSULTING/REMI/factuurnummer 201303-128cursus ce
+rtified PO/ISDT/2013-04-04
+
+:61:130404D000000000674,73N060NONREF
+P004238192
+:86:/BENM//NAME/INFRACOM INTERNET BV/REMI/BETALINGSKENM. 231732INCASS
+O FACTUUR 231732INCASSO 02-04-2013INFRACOM INTERNET BV*ZWOLLE
+/ISDT/2013-04-04
+
+:61:130401D000000000130,29N093NONREF
+:86:/REMI/KostenPeriode 01-01-2013 t/m 31-03-2013/ISDT/2013-04-01
+
+:61:130404C000000002050,95N122NONREF
+0691765731
+:86:/ORDP//NAME/Wehkamp BV
+04
+
+:61:130404C000000001923,90N541EREF
+NL82RBOS0602069890
+:86:/EREF/1134027115/ORDP//NAME/BEDRIJF NV/ADDR/STRAATWEG 68 123
+2 AA AMSTERDAM THE NETHERLANDS NL/REMI/Ref: 201302-080/ISDT/2013-04-
+04
+
+:61:130404C000000013431,00N122NONREF
+0477502946
+:86:/ORDP//NAME/EVEREST BV/REMI/12420/20001512 201303-088 XX201303-08
+8XX ZILVERLINE TRAINING1098 TW AMSTERDAM/ISDT/2013-04-04
+
+:61:130920C000000000384,75N541NONREF
+NL54INGB0006752576
+:86:/ACCW/NL54INGB0006752576,INGBNL2A/ORDP//NAME/Hr A B Huibers en/of
+ Mw S L Huibers-Huveneers/REMI/1000122-P5549161
+:62F:C130404EUR000000018846,34

data/test/fixtures/triodos_sepa.txt

@@ -0,0 +1,62 @@
+:20:1352294232659/1
+:25:TRIODOSBANK/0666666666
+:28:1
+:60F:C121123EUR1000,00
+
+:61:121123D10,00NIT NONREF
+:86:000>100555555555
+>20TENAAMSTELLING TEGENREKENIN>21G EN ADRES TEGENREKENING EN >22 PLAATS TEGENREKENING EN EE>23N LANGE OMSCHRIJVING VAN DE >24 TRANSACTIE
+>310666666666
+
+:61:121123D250,00NAC NONREF
+:86:000>100555555555
+>20TENAAMSTELLING TEGENREKENIN>21G 1111222233334444 >310666666666
+
+:61:121123C150,00NET NONREF
+:86:000>100000000000
+>20BBBBAA2U
+>21AA99BBBB0555555555
+>22TENAAMSTELLING TEGENREKENIN>23G EN ADRES TEGENREKENING EN >24 PLAATS TEGENREKENING EN EE>25N LANGE OMSCHRIJVING VAN DE >26 TRANSACTIE
+>310666666666
+
+:61:121123D40,00NET NONREF
+:86:000>100000000000
+>20BBBBAA2U
+>21AA99BBBB0555555555
+>22TENAAMSTELLING TEGENREKENIN>23G EN ADRES TEGENREKENING EN >24 PLAATS TEGENREKENING EN EE>25N LANGE OMSCHRIJVING VAN DE >26 TRANSACTIE 111122223333444>274
+>310666666666
+
+:62F:C121123EUR850,00
+-
+
+:20:1352294232659/2
+:25:TRIODOSBANK/0999999999
+:28:1
+:60F:C121123EUR950,12
+
+:61:121123D8,95NIT NONREF
+:86:000>100888888888
+>20TENAAMSTELLING TEGENREKENIN>21G EN ADRES TEGENREKENING EN >22 PLAATS TEGENREKENING EN EE>23N LANGE OMSCHRIJVING VAN DE
+>24 TRANSACTIE
+>310999999999
+
+:61:121123D25,25NAC NONREF
+:86:000>100888888888
+>20TENAAMSTELLING TEGENREKENIN>21G 1111222233334444 >310999999999
+
+:61:121123C150,00NET NONREF
+:86:000>100000000000
+>20BBBBAA2U
+>21AA99BBBB0888888888
+>22TENAAMSTELLING TEGENREKENIN>23G EN ADRES TEGENREKENING EN >24 PLAATS TEGENREKENING EN EE>25N LANGE OMSCHRIJVING VAN DE >26 TRANSACTIE
+>310999999999
+
+:61:121123D56,78NET NONREF
+:86:000>100000000000
+>20BBBBAA2U
+>21AA99BBBB0888888888
+>22TENAAMSTELLING TEGENREKENIN>23G EN ADRES TEGENREKENING EN >24 PLAATS TEGENREKENING EN EE>25N LANGE OMSCHRIJVING VAN DE >26 TRANSACTIE 111122223333444>274
+>310999999999
+
+:62F:C121123EUR1009,14
+-

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'awesome_print'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/mt940_abnamro_test.rb

@@ -2,56 +2,114 @@ require 'helper'
 
 class TestMt940Abnamro < Test::Unit::TestCase
 
-  def setup
-    file_name = File.dirname(__FILE__) + '/fixtures/abnamro.txt'
-    @transactions = MT940::Base.transactions(file_name)
-    @transaction = @transactions.first
-  end
-  
-  should 'have the correct number of transactions' do
-    assert_equal 10, @transactions.size
-  end
+  context 'Before SEPA' do
 
-  context 'Transaction' do
-    should 'have a bank_account' do
-      assert_equal '517852257', @transaction.bank_account
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/abnamro.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
     end
-
-    should 'have an amount' do
-      assert_equal -9.00, @transaction.amount
+    
+    should 'have the correct number of transactions' do
+      assert_equal 10, @transactions.size
     end
 
-    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
+    context 'Transaction' do
+
+      setup do 
+        @transaction = @transactions.first
       end
 
-      should 'have the correct description in case of a regular bank' do
-        assert_equal 'MYCOM DEN HAAG  S-GRAVEN,PAS999', @transactions.last.description
+      should 'have a bank_account' do
+        assert_equal '517852257', @transaction.bank_account
       end
-    end
 
-    should 'have a date' do
-      assert_equal Date.new(2011,5,24), @transaction.date
-    end
+      should 'have an amount' do
+        assert_equal -9.00, @transaction.amount
+      end
+
+      context 'Description' do
+        should 'have the correct description in case of a GIRO account' do
+          assert_equal ' KPN - DIGITENNE    BETALINGSKENM.  0000000421886595314606715                       BETREFT FACTUUR D.D. 20-05-2011INCL. 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', @transactions.last.description
+        end
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2011,5,24), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Abnamro', @transaction.bank
+      end
 
-    should 'return its bank' do
-      assert_equal 'Abnamro', @transaction.bank
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      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
 
-    should 'have a currency' do
-      assert_equal 'EUR', @transaction.currency
+  end
+
+  context 'After SEPA' do
+
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/abnamro_sepa.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
+    end
+    
+    should 'have the correct number of transactions' do
+      assert_equal 1, @transactions.size
     end
 
-    context 'Contra account' do
+    context 'Transaction' do
+
+      setup do 
+        @transaction = @transactions.first
+      end
+
+      should 'have a bank_account' do
+        assert_equal '123456789', @transaction.bank_account
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2012,9,27), @transaction.date
+      end
+
+      should 'have an amount' do
+        assert_equal 0.01, @transaction.amount
+      end
+
+      should 'return its bank' do
+        assert_equal 'Abnamro', @transaction.bank
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
       should 'be determined in case of a GIRO account' do
-        assert_equal '000428428', @transaction.contra_account
+        assert_equal 'NL73ANDL0123456789', @transaction.contra_account
       end
 
-      should 'be determined in case of a regular bank' do
-        assert_equal '528939882', @transactions.last.contra_account
+      should 'have the correct description in case of a regular bank' do
+        assert_equal 'Dit zijn de omschrijvingsregels', @transactions.last.description
       end
+
     end
+
   end
 
+
 end