mt940 0.4.1 → 0.5.0

data/README.md

@@ -31,6 +31,7 @@ or with the file itself:
 * Independent of the bank, a transaction always consists of:
 
   - accountnumber
+  - bank (for example Ing, Rabobank or Unknown)
   - date
   - amount (which is negative in case of a withdrawal)
   - description

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/mt940/banks/abnamro.rb

@@ -3,7 +3,7 @@ class MT940::Abnamro < MT940::Base
   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)
+      @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($3 + '.' + $4).to_f, :bank => @bank)
       @transaction.date = parse_date($1)
       @transactions << @transaction
       @tag86 = false

data/lib/mt940/banks/ing.rb

@@ -1,2 +1,2 @@
-class MT940::ING < MT940::Base
+class MT940::Ing < MT940::Base
 end

data/lib/mt940/banks/rabobank.rb

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

data/lib/mt940/base.rb

@@ -2,10 +2,16 @@ module MT940
 
   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)
-        instance = determine_bank(file.readline).new(file)
+        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
@@ -24,13 +30,15 @@ module MT940
 
     private
 
-    def self.determine_bank(first_line)
+    def self.determine_bank(first_line, second_line)
       if first_line.match(/INGBNL/)
-        ING
+        Ing
       elsif first_line.match(/ABNANL/)
         Abnamro
       elsif first_line.match(/^:940:/)
         Rabobank
+      elsif first_line.match(/^:20:/) && second_line && second_line.match(/^:25:TRIODOSBANK/)
+        Triodos
       else
         self
       end
@@ -38,6 +46,8 @@ module MT940
 
     def initialize(file)
       @transactions = []
+      @bank  = self.class.to_s.split('::').last
+      @bank  = 'Unknown' if @bank == 'Base'
       @lines = file.readlines
     end
 
@@ -52,7 +62,7 @@ module MT940
     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)
+        @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($3 + '.' + $4).to_f, :bank => @bank)
         @transaction.date = parse_date($1)
         @transactions << @transaction
         @tag86 = false

data/lib/mt940/transaction.rb

@@ -2,10 +2,11 @@ module MT940
 
   class Transaction
 
-    attr_accessor :bank_account, :contra_account, :amount, :description, :contra_account_owner, :date
+    attr_accessor :bank_account, :contra_account, :amount, :description, :contra_account_owner, :date, :bank
 
     def initialize(attributes = {})
       @bank_account        = attributes[:bank_account]
+      @bank                = attributes[:bank]
       @amount              = attributes[:amount]
       @description         = attributes[:description]
       @date                = attributes[:date]

data/mt940.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mt940}
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dovadi"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "test/fixtures/ing.txt",
     "test/fixtures/rabobank.txt",
     "test/fixtures/triodos.txt",
+    "test/fixtures/unknown.txt",
     "test/helper.rb",
     "test/test_mt940_abnamro.rb",
     "test/test_mt940_base.rb",

data/test/fixtures/unknown.txt

@@ -0,0 +1,22 @@
+940 00
+:20:MPBZ
+:25:0001234567
+:28C:000
+:60F:C100722EUR0,00
+:61:100722D25,03NOV NONREF
+:86: RC AFREKENING BETALINGSVERKEER
+BETREFT REKENING 4715589 PERIODE: 01-10-2010 / 31-12-2010
+ING Bank N.V. tarifering ING
+:61:100722D3,03NOV NONREF
+:86:0111111111 GPSEOUL SPOEDBETALING	MPBZS1016000047 GPSEOUL
+:61:100722D1,11NGT TMG TANGO
+:86:0111111111 ING iDEAL KN: TMG TANGO TRANSACTIENR 0050000534527978 10­06­2010 15:32 TMG TANGO ING Bank inzake GPKyoto
+:61:100722D20,00NGM NONREF
+:86: ABN AMRO BANK>AMSTERDAM 22­07­2010 09:57 002	5595781
+:61:100722D1,10NGT NONREF
+:86:0111111111 GPPeking 170000001AC
+:61:100722C3,68NVZ NONREF
+:86:0111111111 EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM
+:62F:C100723EUR3,47
+:86:D000004C000002D25,24C28,71
+-XXX

data/test/test_mt940_abnamro.rb

@@ -29,6 +29,10 @@ class TestMt940Abnamro < Test::Unit::TestCase
       assert_equal Date.new(2011,5,24), @transaction.date
     end
 
+    should 'return its bank' do
+      assert_equal 'Abnamro', @transaction.bank
+    end
+
   end
 
 end

data/test/test_mt940_base.rb

@@ -2,40 +2,50 @@ require 'helper'
 
 class TestMt940Base < Test::Unit::TestCase
 
-  should 'read the transactions with the filename of the MT940 file' do
-    file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
-    @transactions = MT940::Base.transactions(file_name)
-    assert_equal 6, @transactions.size
-  end
+  context 'MT940::Base' do
+    should 'read the transactions with the filename of the MT940 file' do
+      file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
+      @transactions = MT940::Base.transactions(file_name)
+      assert_equal 6, @transactions.size
+    end
 
-  should 'read the transactions with the handle to the mt940 file itself' do
-    file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
-    file = File.open(file_name)
-    @transactions = MT940::Base.transactions(file)
-    assert_equal 6, @transactions.size
-  end
+    should 'read the transactions with the handle to the mt940 file itself' do
+      file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
+      file = File.open(file_name)
+      @transactions = MT940::Base.transactions(file)
+      assert_equal 6, @transactions.size
+    end
 
-  #Tempfile is used by Paperclip, so the following will work:
-  #MT940::Base.transactions(@mt940_file.attachment.to_file)
-  should 'read the transactions with the handle of a Tempfile' do
-    file = Tempfile.new('temp')
-    file.write(':940:')
-    file.rewind
-    @transactions = MT940::Base.transactions(file)
-    assert_equal 0, @transactions.size
-    file.unlink
-  end
+    #Tempfile is used by Paperclip, so the following will work:
+    #MT940::Base.transactions(@mt940_file.attachment.to_file)
+    should 'read the transactions with the handle of a Tempfile' do
+      file = Tempfile.new('temp')
+      file.write(':940:')
+      file.rewind
+      @transactions = MT940::Base.transactions(file)
+      assert_equal 0, @transactions.size
+      file.unlink
+    end
 
-  should 'raise an exception if the file does not exist' do
-    file_name = File.dirname(__FILE__) + '/fixtures/123.txt'
-    assert_raise Errno::ENOENT do
-      @transactions = MT940::Base.transactions(file_name)
+    should 'raise an exception if the file does not exist' do
+      file_name = File.dirname(__FILE__) + '/fixtures/123.txt'
+      assert_raise Errno::ENOENT do
+        @transactions = MT940::Base.transactions(file_name)
+      end
+    end
+
+    should 'raise an ArgumentError if a wrong argument was given' do
+      assert_raise ArgumentError do
+        MT940::Base.transactions(Hash.new)
+      end
     end
   end
 
-  should 'raise an ArgumentError if a wrong argument was given' do
-    assert_raise ArgumentError do
-      MT940::Base.transactions(Hash.new)
+  context 'Unknown MT940 file' do
+    should 'return its bank' do
+      file_name = File.dirname(__FILE__) + '/fixtures/unknown.txt'
+      @transactions = MT940::Base.transactions(file_name)
+      assert_equal 'Unknown', @transactions.first.bank
     end
   end
 

data/test/test_mt940_ing.rb

@@ -28,6 +28,11 @@ class TestMt940Ing < Test::Unit::TestCase
     should 'have a date' do
       assert_equal Date.new(2010,7,22), @transaction.date
     end
+
+    should 'return its bank' do
+      assert_equal 'Ing', @transaction.bank
+    end
+
   end
 
 end

data/test/test_mt940_rabobank.rb

@@ -37,6 +37,10 @@ class TestMt940Rabobank < Test::Unit::TestCase
       assert_equal Date.new(2011,6,15), @transaction.date
     end
 
+    should 'return its bank' do
+      assert_equal 'Rabobank', @transaction.bank
+    end
+
   end
 
 end

data/test/test_mt940_triodos.rb

@@ -29,6 +29,10 @@ class TestMt940Triodos < Test::Unit::TestCase
       assert_equal Date.new(2011,1,1), @transaction.date
     end
 
+    should 'return its bank' do
+      assert_equal 'Triodos', @transaction.bank
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - dovadi
@@ -87,6 +87,7 @@ files:
 - test/fixtures/ing.txt
 - test/fixtures/rabobank.txt
 - test/fixtures/triodos.txt
+- test/fixtures/unknown.txt
 - test/helper.rb
 - test/test_mt940_abnamro.rb
 - test/test_mt940_base.rb