mt940 0.6.6 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9687025fcee76507ec72ba177dbacfeedd3b755e
+  data.tar.gz: 2be9f9cf8bd116eabd1e5e28c1470809fe8f51ca
+SHA512:
+  metadata.gz: eb88e8a1b47dee2efa2ea6cf008e92d3bf40a578eb834ddf469a00464b2b868a37f95b0ecfefad789bbae745196b53bf1cd3417621e277e2785477e263c4e0af
+  data.tar.gz: 65323779df20a4a8d4ce4f24994406026b70152b72ad5a31b3de95e3e778761bf6637245cd9aaf4ad67e0447ca70354845623a33b84fffc00ba788f97b0de606

data/.ruby-gemset

@@ -0,0 +1 @@
+mt940

data/.ruby-version

@@ -0,0 +1 @@
+2.1.0

data/.travis.yml

@@ -1,10 +1,11 @@
 rvm:
+  - 2.1.0
+  - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
 
 branches:
   only:
     - master
+    - sepa
 
 script: "bundle exec rake test"

data/CHANGELOG

@@ -1,3 +1,8 @@
+* 0.7.0
+  - No support for Ruby 1.8.7, default 2.1.0
+  - I was uncomfortable with using class methods, so I introduced the Mt940::Parser and refactored. See Readme
+  - Parser now works for mt940 files after SEPA was introduced (with the so called structured export format)
+
 * 0.6.6
   - Added currency support in transaction (contribution of Bob Forma)
 

data/Gemfile

@@ -1,5 +1,10 @@
 source "http://rubygems.org"
 
-gem 'rake', '0.8.7'
+group :development, :test do
+  gem 'rake', '~> 10.1.1'
+  gem 'shoulda'
+  gem 'guard-test'
+  gem 'awesome_print'
+end
 
 gemspec

data/Gemfile.lock

@@ -1,18 +1,52 @@
 PATH
   remote: .
   specs:
-    mt940 (0.6.5)
+    mt940 (0.7.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.8.7)
+    awesome_print (1.2.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.2.5)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-test (2.0.3)
+      guard (~> 2.0)
+      test-unit (~> 2.2)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rake (10.1.1)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     shoulda (2.11.3)
+    slop (3.4.7)
+    test-unit (2.5.5)
+    thor (0.18.1)
+    timers (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
+  guard-test
   mt940!
-  rake (= 0.8.7)
+  rake (~> 10.1.1)
   shoulda

data/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :test do
+  watch(%r{^lib/mt940/banks/(.+)\.rb$}) {|m| "test/mt940_#{m[1]}_test.rb" }
+  watch(%r{^test/.+_test\.rb$}) 
+  watch('test/test_helper.rb')  { "test" }
+  watch('lib/mt940/base.rb')  { "test" }
+  watch('lib/mt940/parser.rb')  { "test" }
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Frank Oxener - Agile Dovadi BV
+Copyright (c) 2014 Frank Oxener
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,9 +5,9 @@ MT940
 ![http://travis-ci.org/dovadi/mt940](https://secure.travis-ci.org/dovadi/mt940.png)
 </a>
 
-Basis parser for MT940 files, see [MT940](http://nl.wikipedia.org/wiki/MT940)
+Basis parser for MT940 files, see [MT940](http://nl.wikipedia.org/wiki/MT940). This library is only meant for collection the transactions. No bank statements or balance (previous or new) is determined.
 
-The following Dutch banks are implemented:
+The following Dutch banks are implemented with support for IBAN numbers:
 
 * ABN Amro
 * ING
@@ -21,7 +21,7 @@ With the file name as argument:
 
     file_name = '/Users/dovadi/Downloads/ing.940'
 
-    @transactions = MT940:::Base.transactions(file_name)
+    @transactions = MT940::Parser.new(file_name).transactions
 
 or with the file itself:
 
@@ -29,19 +29,19 @@ or with the file itself:
 
     file = File.open(file_name)
 
-    @transactions = MT940:::Base.transactions(file)
+    @transactions = MT940::Parser.new(file).transactions
 
 
 * Independent of the bank, a transaction always consists of:
 
-  - accountnumber
-  - bank (for example Ing, Rabobank or Unknown)
+  - accountnumber (BBAN or IBAN)
+  - bank (for example Ing, Rabobank etc )
   - date
   - amount (which is negative in case of a withdrawal)
   - description
   - contra account
 
-* With the Rabobank its owner is extracted as well.
+  (Pre sepa: with the Rabobank the contra_account owner is extracted as well)
 
 Running tests
 =============
@@ -64,5 +64,5 @@ Contributing to MT940
 Copyright
 ==========
 
-Copyright (c) 2012 Frank Oxener - Agile Dovadi BV. See LICENSE.txt for further details.
+Copyright (c) 2014 Frank Oxener. See LICENSE.txt for further details.
 

data/docs/MT940_voorbeeldbestanden_abnamro.txt

@@ -0,0 +1,213 @@
+MT940 voorbeeldbestanden 16-4-2013
+
+Change History
+- Corrected debit/credit indicator in 1.
+- Corrected end balances
+- Corrected CRLF (are not allowed mid label)
+- Added REMI field
+- 6a changed TRTP content, removed not used INF tag
+- Removed final slashes where applicable
+
+
+Inhoudsopgave:
+
+1.  SCT overboeking credit
+2.  SCT overboeking debet
+3.  SCT batch
+4.  SCT batch salaris
+5.  SCT terugboeking (return en reject)
+6.  SDD core batch incasso
+7.  SDD core incasso (geincasseerde)
+8.  SDD core incasso (cancellation, reversal, refund en refusal)
+9.  SCT iDEAL
+10. SCT IBAN Acceptgiro
+
+1. SCT overboeking credit
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13501/1
+:60F:C120511EUR5138,61
+:61:1205120514C500,01N654NONREF
+:86:/TRTP/SEPA OVERBOEKING/IBAN/FR12345678901234/BIC/GEFRADAM
+/NAME/QASD JGRED/REMI/Dit zijn de omschrijvingsregels/EREF/NOTPRO
+VIDED
+:62F:C120514EUR5638,62
+
+2. SCT overboeking debet
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:14901/1
+:60F:D120525EUR1627,85
+:61:1205280528D135,12N658NONREF
+:86:/TRTP/SEPA OVERBOEKING/IBAN/BE12345678901234/BIC/KREDBEBB
+/NAME/BELEKET/REMI/Omschrijving van de klant/EREF/05844183645
+:62F:C120528EUR1492,73
+
+3. SCT batch
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:14901/1
+:60F:D120525EUR1627,85
+:61:1205280528D135,12N655NONREF
+:86:/TRTP/SEPA BATCH/PREF/109180/NRTX/162
+:62F:C120528EUR1492,73
+
+4. SCT batch salaris
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:14901/1
+:60F:D120525EUR1627,85
+:61:1205280528D135,12N652NONREF
+:86:/TRTP/SEPA BATCH SALARIS/PREF/109180/NRTX/162
+:62F:C120528EUR1492,73
+
+5. SCT terugboeking (return en reject)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:12901/1
+:60F:C120507EUR5596,98
+:61:1205080508C1,01N657NONREF
+:86:/TRTP/SEPA TERUGBOEKING/IBAN/NL89ABNA1234567890/BIC/ABNANL2A
+/NAME/M. GRSSUGE/RTRN/MS02/REMI/DIT IS EEN TESTBETALING OM TE KIJ
+KEN OF DE BIC WEL GOED AFGEVANGEN WORDT/EREF/TESTBIC
+:62F:C120508EUR5597,99
+
+6a. SDD core batch incasso
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1112061206C0,05N247NONREF
+:86:/TRTP/SEPA Incasso batch/PREF/109180-911/NRTX/162/PIND/BRUTO
+:62F:C120518EUR1945,69
+
+6b. SDD B2B batch incasso
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1112061206C0,05N249NONREF
+:86:/TRTP/SEPA Incasso batch bedrijven/PREF/109180-911/NRTX/162
+/PIND/BRUTO
+:62F:C120518EUR1945,69
+
+7. SDD core incasso (geincasseerde)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1204240424D233,77N248NONREF
+:86:/TRTP/SEPA Incasso algemeen doorlopend/CSID/NL13ZZZ0606057800
+00/NAME/Electriciteit leverancier BV/MARF/123456789XXmandaat
+/REMI/Levering maand mei, zie nota 1234556. Uw klantnummer 123455
+666/IBAN/NL66ABNA1234567890/BIC/ABNANL2A/EREF/1234567X908303803
+:62F:C120518EUR1711,87
+
+8a. SDD core incasso (Return)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1112081208D0,05N245NONREF
+:86:/RTYP/SEPA Incasso Terugboeking/MARF/123456789XXmandaat/RTRN/
+AC01/IBAN/ NL71ABNA1234567890/NAME/Debtor waarop geincasseeerd wo
+rdt/REMI/Levering maand mei, zie nota 1234556. Uw klantnummer 123
+455666/EREF/1234567X908303803
+:62F:C120518EUR1945,59
+
+8b. SDD core incasso (Reject)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13901/1
+:60F:C120517EUR1945,64
+:61:1112081208D0,06N246NONREF
+:86:/RTYP/SEPA Incasso niet uitgevoerd/MARF/123456789XXmandaat
+/RTRN/MS02/IBAN/NL71ABNA1234567890/NAME/Debtor waarop geincasseee
+rd wordt/REMI/Levering maand mei, zie nota 1234556. Uw klantnumme
+r 123455666/EREF/1234567X908303803
+:62F:C120518EUR1945,58
+
+9. SCT iDEAL
+
+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/0030000322071306 18-06-12 21*09/EREF/INNDNL2U200001001348
+24001/ORDP//ID/1234567890AQCDEFGHIJ1234567890KLMNO
+:62F:C120518EUR1945,65
+
+10a. SCT IBAN Acceptgiro (debet)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13501/1
+:60F:C120511EUR5138,61
+:61:1205120514d1,01N946NONREF
+:86:/TRTP/SEPA ACCEPTGIRO/IBAN/NL02ABNA0123456789/BIC/ABNANL2A
+/NAME/Naam/REMI/Issuer: CUR Ref: 1234567812345678/EREF/NOTPROVIDE
+D
+:62F:C120514EUR5137,60
+
+10b. SCT IBAN Acceptgiro (credit)
+
+ABNANL2A
+940
+ABNANL2A
+:20:ABN AMRO BANK NV
+:25:123456789
+:28:13501/1
+:60F:C120511EUR5138,61
+:61:1205120514C500,01N946NONREF
+:86:/TRTP/SEPA ACCEPTGIRO/IBAN/NL02ABNA0123456789/BIC/ABNANL2A
+/NAME/Naam/REMI/Issuer: CUR Ref: 1234567812345678/EREF/NOTPROVIDE
+D
+:62F:C120514EUR5538,62

data/lib/mt940/banks/abnamro.rb

@@ -1,29 +1,31 @@
 class MT940::Abnamro < MT940::Base
 
-  def self.determine_bank(*args)
-    self if args[0].match(/ABNANL/)
-  end
+  private
 
   def parse_tag_61
-    if @line.match(/^:61:(\d{6})\d{4}(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
-    end
+    super(/^:61:(\d{6})\d{4}(C|D)(\d+),(\d{0,2})/)
   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
+  def parse_line_before_sepa
+    @description = @line.gsub(/>\d{2}/,'').strip
+    if @description.match(/^(GIRO)\s+(\d+)(.+)/)
+      @contra_account = $2.rjust(9, '000000000')
+      @description    = $3
+    elsif @description.match(/^(\d{2}.\d{2}.\d{2}.\d{3})(.+)/)
+      @description    = $2
+      @contra_account = $1.gsub('.','')
     end
   end
 
+  def parse_line_after_sepa
+    hash = hashify_description(@line)
+    @description    = hash['REMI']
+    @contra_account = hash['IBAN']
+  end
+
+  def sepa?
+    @line[0] == '/'
+  end
+
 end
+

data/lib/mt940/banks/ing.rb

@@ -1,14 +1,24 @@
 class MT940::Ing < MT940::Base
 
-  def self.determine_bank(*args)
-    self if args[0].match(/INGBNL/)
+  private
+
+  def parse_line_before_sepa
+    pattern = Regexp.new "(#{MT940::BBAN_PATTERN})(.+)"
+    if @line.match(pattern)
+      @description    = $2.strip
+      @contra_account = $1[/[^0+]\d*/]
+    end
+  end
+
+  def parse_line_after_sepa
+    if @line.match(MT940::SEPA_PATTERN)
+      @contra_account = $2
+      @description    = $4.strip
+    end
   end
 
-  def parse_contra_account
-    if @transaction && @transaction.description.match(/^\d(\d{9})(.+)/)
-       @transaction.contra_account = $1
-       @transaction.description = $2
-     end
+  def sepa?
+    @line.match(MT940::SEPA_PATTERN)
   end
 
 end

data/lib/mt940/banks/rabobank.rb

@@ -1,28 +1,51 @@
 class MT940::Rabobank < MT940::Base
 
-  def self.determine_bank(*args)
-    self if args[0].match(/^:940:/)
+  private
+
+  def parse_tag_25
+    @line.gsub!('.','')
+    if @line.match(Regexp.new ":25:(#{MT940::IBAN_PATTERN})")
+      @bank_account = $1
+      @sepa = true
+    else
+      @bank_account = $1.gsub(/^0/,'') if @line.match(/^:\d{2}:[^\d]*(\d*)/)
+    end
   end
 
   def parse_tag_61
-    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, :currency => @currency)
-      @transaction.date = parse_date($1)
-      @transaction.contra_account = $5.strip
-      @transaction.contra_account_owner = $6.strip
-      @transactions << @transaction
+    match = super(/^:61:(\d{6})(C|D)(\d+),(\d{0,2})\w{4}\w{1}(\d{9}|NONREF|EREF)(.*)$/)
+    if match
+      if @sepa
+        @transaction.contra_account = match[6].strip
+      else
+        @transaction.contra_account = match[5].strip
+        @transaction.contra_account_owner = match[6].strip
+      end
     end
   end
 
   def parse_tag_86
     if @line.match(/^:86:(.*)$/)
-      if @transaction.description.nil? 
-        @transaction.description= $1.strip 
-      else
-        @transaction.description += ' ' +$1.strip 
-      end
+      @line = $1.strip
+      @sepa ? determine_description_after_sepa : determine_description_before_sepa
+      @transaction.description = @description.strip
     end
   end
 
-end
+  def determine_description_before_sepa
+    if @description.nil? 
+      @description = @line
+    else
+      @description += ' ' + @line
+    end
+  end
+
+  def determine_description_after_sepa
+    hash = hashify_description(@line)
+    @description = ''
+    @description += hash['NAME'] if hash['NAME']
+    @description += ' '
+    @description += hash['REMI'] if hash['REMI']
+  end
+
+end

data/lib/mt940/banks/triodos.rb

@@ -1,14 +1,45 @@
 class MT940::Triodos < MT940::Base
 
-  def self.determine_bank(*args)
-    self if args[0].match(/^:20:/) && args[1] && args[1].match(/^:25:TRIODOSBANK/)
+  private
+
+  def parse_tag_86
+    if @line.match(/^:86:000(.*)$/)
+      processed_description = hashify_description($1)
+
+      @transaction.contra_account = if sepa?(processed_description)
+        processed_description['21']
+      else
+        processed_description['10'][/[^0+]\d*/]
+      end
+
+      @transaction.description = extract_description(processed_description)
+    end
+  end
+
+  def bic_code?(text)
+     MT940::BIC_CODES.values.include?(text)
   end
 
-  def parse_contra_account
-    if @transaction && @transaction.description.match(/\d+(\d{9})$/)
-      @transaction.contra_account = $1.rjust(9, '000000000')
-      @transaction.description = ''
+  def extract_description(text)
+    identifier = sepa?(text) ? 22 : 20
+    description = ''
+    text.each do |k,v|
+      description += v if k.to_i >= identifier && k.to_i < 30
     end
+    description
+  end
+
+  def hashify_description(description)
+    hash = {}
+    description.split('>').compact.each do |slice|
+      next if slice.empty?
+      hash[slice[0..1]] = slice[2..-1]
+    end
+    hash
+  end
+
+  def sepa?(text)
+    text['10'] == '0000000000'
   end
 
-end
+end