mt940 0.6.6 → 0.7.0

data/test/mt940_base_test.rb

@@ -3,17 +3,9 @@ require 'helper'
 class TestMt940Base < Test::Unit::TestCase
 
   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
+      assert_equal 6, MT940::Parser.new(file_name).transactions.size
     end
 
     #Tempfile is used by Paperclip, so the following will work:
@@ -22,30 +14,30 @@ class TestMt940Base < Test::Unit::TestCase
       file = Tempfile.new('temp')
       file.write(':940:')
       file.rewind
-      @transactions = MT940::Base.transactions(file)
-      assert_equal 0, @transactions.size
+      assert_equal 0, MT940::Parser.new(file).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)
+        file = MT940::Parser.new(file_name)
       end
     end
 
-    should 'raise an ArgumentError if a wrong argument was given' do
-      assert_raise ArgumentError do
-        MT940::Base.transactions(Hash.new)
+    should 'raise an NoFileGiven if a wrong argument was given' do
+      assert_raise MT940::NoFileGiven do
+        MT940::Parser.new(Hash.new)
       end
     end
   end
 
   context 'Unknown MT940 file' do
-    should 'return its bank' do
+    should 'raise an UnknownBank if bank could not be determined' do
       file_name = File.dirname(__FILE__) + '/fixtures/unknown.txt'
-      @transactions = MT940::Base.transactions(file_name)
-      assert_equal 'Unknown', @transactions.first.bank
+      assert_raise MT940::UnknownBank do
+        MT940::Parser.new(file_name)
+      end
     end
   end
 

data/test/mt940_ing_test.rb

@@ -2,45 +2,99 @@ require 'helper'
 
 class TestMt940Ing < Test::Unit::TestCase
 
-  def setup
-    file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
-    @transactions = MT940::Base.transactions(file_name)
-    @transaction = @transactions.first
-  end
-  
-  should 'have the correct number of transactions' do
-    assert_equal 6, @transactions.size
-  end
-
-  context 'Transaction' do
-    should 'have a bank_account' do
-      assert_equal '001234567', @transaction.bank_account
+  context 'Before SEPA' do
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
     end
-
-    should 'have an amount' do
-      assert_equal -25.03, @transaction.amount
+    
+    should 'have the correct number of transactions' do
+      assert_equal 6, @transactions.size
     end
 
-    should 'have a currency' do
-      assert_equal 'EUR', @transaction.currency
-    end
+    context 'Transaction' do
 
-    should 'have a date' do
-      assert_equal Date.new(2010,7,22), @transaction.date
-    end
+      setup do
+        @transaction = @transactions.first
+      end
 
-    should 'return its bank' do
-      assert_equal 'Ing', @transaction.bank
-    end
+      should 'have a bank_account' do
+        assert_equal '001234567', @transaction.bank_account
+      end
+
+      should 'have an amount' do
+        assert_equal -25.03, @transaction.amount
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      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
+
+      should 'have a description' do
+        assert_equal 'EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM', @transactions.last.description
+      end
+
+      should 'return the contra_account' do
+        assert_equal '123456789', @transactions.last.contra_account
+      end
 
-    should 'have a description' do
-      assert_equal 'EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM', @transactions.last.description
     end
+  end
 
-    should 'return the contra_account' do
-      assert_equal '123456789', @transactions.last.contra_account
+  context 'After SEPA' do
+    setup do
+      # Fixture contains a mixture of transactions with and without iban numbers
+      file_name = File.dirname(__FILE__) + '/fixtures/ing_sepa.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
+    end
+    
+    should 'have the correct number of transactions' do
+      assert_equal 8, @transactions.size
     end
 
+    context 'Transaction' do
+
+      setup do
+        @transaction = @transactions.first
+      end
+
+      should 'have a bank_account' do
+        assert_equal '654321789', @transaction.bank_account
+      end
+
+      should 'have an amount' do
+        assert_equal 1.41, @transaction.amount
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2012,8,10), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Ing', @transaction.bank
+      end
+
+      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
   end
 
 end

data/test/mt940_rabobank_test.rb

@@ -2,57 +2,126 @@ require 'helper'
 
 class TestMt940Rabobank < Test::Unit::TestCase
 
-  def setup
-    file_name = File.dirname(__FILE__) + '/fixtures/rabobank.txt'
-    @transactions = MT940::Base.transactions(file_name)
-    @transaction = @transactions.first
-  end
-
-  should 'have the correct number of transactions' do
-    assert_equal 3, @transactions.size
-  end
+  context 'Before SEPA' do
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/rabobank.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
+    end
 
-  context 'Transaction' do
-    should 'have a bank_account' do
-      assert_equal '129199348', @transaction.bank_account
+    should 'have the correct number of transactions' do
+      assert_equal 3, @transactions.size
     end
 
-    context 'Contra account' do
-      should 'be determined in case of a GIRO account' do
-        assert_equal '121470966', @transaction.contra_account
+    context 'Transaction' do
+
+      setup do
+        @transaction = @transactions.first
       end
 
-      should 'be determined in case of a regular bank' do
-        assert_equal '733959555', @transactions[1].contra_account
+      should 'have a bank_account' do
+        assert_equal '129199348', @transaction.bank_account
       end
 
-      should 'be determined in case of a NONREF' do
-        assert_equal 'NONREF', @transactions.last.contra_account
+      context 'Contra account' do
+        should 'be determined in case of a GIRO account' do
+          assert_equal '121470966', @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
-    end
 
-    should 'have an amount' do
-      assert_equal -1213.28, @transaction.amount
-    end
+      should 'have an amount' do
+        assert_equal -1213.28, @transaction.amount
+      end
 
-    should 'have a currency' do
-      assert_equal 'EUR', @transaction.currency
-    end
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      should 'have a contra_account_owner' do
+        assert_equal 'W.P. Jansen', @transaction.contra_account_owner
+      end
+
+      should 'have a description' do
+        assert_equal 'Terugboeking NIET AKKOORD MET AFSCHRIJVING KOSTEN KINDEROPVANG JUNI 20095731', @transaction.description
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2011,5,27), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Rabobank', @transaction.bank
+      end
 
-    should 'have a contra_account_owner' do
-      assert_equal 'W.P. Jansen', @transaction.contra_account_owner
     end
 
-    should 'have a description' do
-      assert_equal 'Terugboeking NIET AKKOORD MET AFSCHRIJVING KOSTEN KINDEROPVANG JUNI 20095731', @transaction.description
+  end
+
+  context 'After SEPA' do
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/rabobank_sepa.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
     end
 
-    should 'have a date' do
-      assert_equal Date.new(2011,5,27), @transaction.date
+    should 'have the correct number of transactions' do
+      assert_equal 12, @transactions.size
     end
 
-    should 'return its bank' do
-      assert_equal 'Rabobank', @transaction.bank
+    context 'Transaction' do
+
+      setup do
+        @transaction = @transactions.first
+      end
+
+      should 'have a bank_account' do
+        assert_equal 'NL50RABO0123456789', @transaction.bank_account
+      end
+
+      context 'Contra account' do
+        should 'be determined in case of a GIRO account' do
+          assert_equal 'NL96RBOS0523149468', @transaction.contra_account
+        end
+
+        should 'be determined in case of a regular bank' do
+          assert_equal '0663616476', @transactions[1].contra_account
+        end
+
+        should 'be determined in case of Postbank account' do
+          assert_equal 'P004500018', @transactions[4].contra_account
+        end
+      end
+
+      should 'have an amount' do
+        assert_equal -127.50, @transaction.amount
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      should 'not be able to determine a contra_account_owner' do
+        assert !@transaction.contra_account_owner
+      end
+
+      should 'have a description' do
+        assert_equal 'DIVV afd parkeergebouwewn Factuur 307472', @transactions[4].description
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2013,4,3), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Rabobank', @transaction.bank
+      end
+
     end
 
   end

data/test/mt940_triodos_test.rb

@@ -2,43 +2,120 @@ require 'helper'
 
 class TestMt940Triodos < Test::Unit::TestCase
 
-  def setup
-    file_name = File.dirname(__FILE__) + '/fixtures/triodos.txt'
-    @transactions = MT940::Base.transactions(file_name)
-    @transaction = @transactions.first
-  end
-  
-  should 'have the correct number of transactions' do
-    assert_equal 2, @transactions.size
-  end
+  context 'Before sepa' do
 
-  context 'Transaction' do
-    should 'have a bank_account' do
-      assert_equal '390123456', @transaction.bank_account
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/triodos.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
     end
-
-    should 'have an amount' do
-      assert_equal -15.7, @transaction.amount
+    
+    should 'have the correct number of transactions' do
+      assert_equal 2, @transactions.size
     end
 
-    should 'have a currency' do
-      assert_equal 'EUR', @transaction.currency
-    end
+    context 'Transaction' do
 
-    should 'have a description' do
-      assert_equal 'ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN M ET 31-12-20100390123456', @transaction.description
-    end
+      setup do
+        @transaction = @transactions.first
+      end
+
+      should 'have a bank_account' do
+        assert_equal '390123456', @transaction.bank_account
+      end
+
+      should 'have an amount' do
+        assert_equal -15.7, @transaction.amount
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      should 'have a description' do
+        assert_equal 'ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN MET 31-12-2010', @transaction.description
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2011,1,1), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Triodos', @transaction.bank
+      end
+
+      should 'return the contra_account' do
+        assert_equal '987654321', @transaction.contra_account
+      end
 
-    should 'have a date' do
-      assert_equal Date.new(2011,1,1), @transaction.date
     end
 
-    should 'return its bank' do
-      assert_equal 'Triodos', @transaction.bank
+  end
+
+  context 'After sepa' do
+
+    setup do
+      file_name = File.dirname(__FILE__) + '/fixtures/triodos_sepa.txt'
+      @transactions = MT940::Parser.new(file_name).transactions
+    end
+    
+    should 'have the correct number of transactions' do
+      assert_equal 8, @transactions.size
     end
 
-    should 'return the contra_account' do
-      assert_equal '987654321', @transaction.contra_account
+    context 'Transaction' do
+
+      setup do
+        @transaction = @transactions.first
+      end
+
+      should 'have a bank_account' do
+        assert_equal '666666666', @transaction.bank_account
+      end
+
+      should 'have an amount' do
+        assert_equal -10.00, @transaction.amount
+      end
+
+      should 'have a currency' do
+        assert_equal 'EUR', @transaction.currency
+      end
+
+      context 'description' do
+
+        setup do
+          @description = 'TENAAMSTELLING TEGENREKENING EN ADRES TEGENREKENING EN  PLAATS TEGENREKENING EN EEN LANGE OMSCHRIJVING VAN DE  TRANSACTIE'
+        end
+
+        should 'have the description in case of BBAN' do
+          assert_equal @description, @transaction.description
+        end
+
+        should 'have the description in case of IBAN' do
+          assert_equal @description, @transactions[2].description
+        end
+
+      end
+
+      should 'have a date' do
+        assert_equal Date.new(2012,11,23), @transaction.date
+      end
+
+      should 'return its bank' do
+        assert_equal 'Triodos', @transaction.bank
+      end
+
+      context 'contra_account' do
+
+        should 'return the contra_account in case of a BBAN' do
+          assert_equal '555555555', @transaction.contra_account
+        end
+
+        should 'return the contra_account in case of a IBAN' do
+          assert_equal 'AA99BBBB0555555555', @transactions[2].contra_account
+        end
+
+      end
+    
     end
 
   end

metadata

@@ -1,66 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mt940
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 6
-  version: 0.6.6
+version: !ruby/object:Gem::Version
+  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Frank Oxener
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+date: 2014-01-09 00:00:00.000000000 Z
+dependencies: []
 description: A basic MT940 parser with implementations for Dutch banks.
 email: frank.oxener@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
-- .document
-- .gitignore
-- .travis.yml
+files:
+- ".document"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- docs/Formaatverschillen_SEPA_MT940_MT942_v1-2.pdf
+- docs/MT940_Technische_handleiding_Mijn_ING_Zakelijk_tcm7-117274.pdf
+- docs/MT940_voorbeeldbestanden_abnamro.txt
+- docs/formaatbeschrijving_xml_sepa_dd_29541336.pdf
+- docs/sepa_mt940_mingz_formaatbeschrijving_tcm7-133393.pdf
+- docs/triodos_mt940.pdf
 - lib/mt940.rb
 - lib/mt940/banks/abnamro.rb
 - lib/mt940/banks/ing.rb
 - lib/mt940/banks/rabobank.rb
 - lib/mt940/banks/triodos.rb
 - lib/mt940/base.rb
+- lib/mt940/bic_codes.rb
+- lib/mt940/parser.rb
 - lib/mt940/transaction.rb
 - lib/mt940/version.rb
 - mt940.gemspec
 - test/fixtures/abnamro.txt
+- test/fixtures/abnamro_sepa.txt
 - test/fixtures/ing.txt
+- test/fixtures/ing_sepa.txt
 - test/fixtures/rabobank.txt
+- test/fixtures/rabobank_sepa.txt
 - test/fixtures/triodos.txt
+- test/fixtures/triodos_sepa.txt
 - test/fixtures/unknown.txt
 - test/helper.rb
 - test/mt940_abnamro_test.rb
@@ -68,41 +62,39 @@ files:
 - test/mt940_ing_test.rb
 - test/mt940_rabobank_test.rb
 - test/mt940_triodos_test.rb
-has_rdoc: true
 homepage: http://github.com/dovadi/mt940
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mt940
-rubygems_version: 1.3.6
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MT940 parser
-test_files: 
+test_files:
 - test/fixtures/abnamro.txt
+- test/fixtures/abnamro_sepa.txt
 - test/fixtures/ing.txt
+- test/fixtures/ing_sepa.txt
 - test/fixtures/rabobank.txt
+- test/fixtures/rabobank_sepa.txt
 - test/fixtures/triodos.txt
+- test/fixtures/triodos_sepa.txt
 - test/fixtures/unknown.txt
 - test/helper.rb
 - test/mt940_abnamro_test.rb
@@ -110,3 +102,4 @@ test_files:
 - test/mt940_ing_test.rb
 - test/mt940_rabobank_test.rb
 - test/mt940_triodos_test.rb
+has_rdoc: