mt940 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4974b89c12da285719a0002bc6e59fe132940b3
-  data.tar.gz: f35f1ab7264f07e3a55196bb9adadebc083779fa
+  metadata.gz: 794cd939c7e990345e04bd179fcca0b985dc7f8b
+  data.tar.gz: 10d1457e0f6b4fc18f483a0871175f72a43775ff
 SHA512:
-  metadata.gz: eb4dc9a5a936a255a97dcc605de144481cf72a49956f8d9f85ee583e3192ad72b5751adeb8549db4f8d443512f95e0dfc407566cf83700de83a98a03767253e7
-  data.tar.gz: 84ea5616194fd6b27c65d296dc9178a155431b7a1b0552bd3ee51a9885f0c8f7499365f245efd16d742534114fb562454469dafddffdcf9f92fff8bb8103fd86
+  metadata.gz: f316f5881c67da96a2730633f67d62f8e08f4b38de3e234b1def293232bbd271f8900fab8ecf1eece387d5faae11e34ed218489e2eb52f3f0b8fdf7d411c7294
+  data.tar.gz: a913ab92d962f68b164515dd58b96d867da2b51e5250021dfbf2af5db2abbb2c323290c0ed130512c0131b14fd4e4e9fae817835a5bf47ee7607396e64b3fc29

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 0.8.0
+  - BUG FIX: correct parsing of tag 86 ING in case it doesn't contain an IBAN number
+  - Now with a more general IBAN regexp pattern
+
+* 0.7.1
+  - Small fix, prevent invalid byte sequence in UTF-8 while reading mt940 file
+  - Replace more than two or more spaces with only one 
+
 * 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mt940 (0.7.1)
+    mt940 (0.8.0)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -5,7 +5,7 @@ MT940 (Dutch banks only)
 ![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). This library is only meant for collection the transactions. No bank statements or balance (previous or new) is determined.
+Basis parser for MT940 files, see [MT940](http://nl.wikipedia.org/wiki/MT940). This library is only meant for collecting the transactions. No bank statements or balance (previous or new) is determined.
 
 The following Dutch banks are implemented with support for IBAN numbers:
 

data/lib/mt940.rb

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

data/lib/mt940/banks/ing.rb

@@ -12,7 +12,7 @@ class MT940::Ing < MT940::Base
 
   def parse_line_after_sepa
     if @line.match(MT940::SEPA_PATTERN)
-      @contra_account = $2
+      @contra_account = $1
       @description    = $4.strip
     end
   end

data/lib/mt940/base.rb

@@ -1,9 +1,9 @@
 module MT940
 
   BBAN_PATTERN     = '^\d{10}'
-  IBAN_PATTERN     = 'NL\d{2}[A-Z]{4}\d{10}'
+  IBAN_PATTERN     = '[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}'
   BIC_CODE_PATTERN = MT940::BIC_CODES.values.join('|')
-  SEPA_PATTERN     = Regexp.new "(#{BBAN_PATTERN})\\s+(#{IBAN_PATTERN})\\s+(#{BIC_CODE_PATTERN})(.+)$"
+  SEPA_PATTERN     = Regexp.new "(#{IBAN_PATTERN})\\s+(#{BIC_CODE_PATTERN})(.+)$"
 
   class Base
 
@@ -67,9 +67,10 @@ module MT940
     def parse_tag_86
       if @line.match(/^:86:\s?(.*)$/)
         @line = $1.strip
+        @description, @contra_account = nil, nil
         sepa? ? parse_line_after_sepa : parse_line_before_sepa
         @transaction.contra_account = @contra_account
-        @transaction.description    = @description
+        @transaction.description    = @description || @line
       end
     end
 

data/lib/mt940/version.rb

@@ -1,3 +1,3 @@
 module MT940
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/test/fixtures/ing_sepa.txt

@@ -5,26 +5,39 @@
 :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 
+
+:61:140301D1234,00NDV NONREF
+:86: Reguliere aflossing
+Starters Investeri 11.22.33.444 Rest hoofdsom EUR 99.000,00
+
 :62F:C120811EUR1005,83 
 :64:C120811EUR1005,83 
 :65:C120811EUR1005,83 

data/test/mt940_ing_test.rb

@@ -57,7 +57,7 @@ class TestMt940Ing < Test::Unit::TestCase
     end
     
     should 'have the correct number of transactions' do
-      assert_equal 8, @transactions.size
+      assert_equal 9, @transactions.size
     end
 
     context 'Transaction' do
@@ -86,12 +86,24 @@ class TestMt940Ing < Test::Unit::TestCase
         assert_equal 'Ing', @transaction.bank
       end
 
-      should 'have a description' do
-        assert_equal 'J. Janssen 20120123456789 Factuurnr 123456 Klantnr 00123', @transactions[1].description
+      context 'With an iban number in :86' do
+        should 'have a description' do
+          assert_equal 'J. Janssen 20120123456789 Factuurnr 123456 Klantnr 00123', @transactions[1].description
+        end
+
+        should 'return the contra_account' do
+          assert_equal 'NL69INGB0123456789', @transactions[1].contra_account
+        end
       end
 
-      should 'return the contra_account' do
-        assert_equal 'NL69INGB0123456789', @transactions[1].contra_account
+      context 'Without an iban number in :86' do
+        should 'have a description' do
+          assert_equal 'Reguliere aflossingStarters Investeri 11.22.33.444 Rest hoofdsom EUR 99.000,00', @transactions[8].description
+        end
+
+        should 'return the contra_account' do
+          assert_equal nil, @transactions[8].contra_account
+        end
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mt940
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Frank Oxener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies: []
 description: A basic MT940 parser with implementations for Dutch banks.
 email: frank.oxener@gmail.com