mt940 0.2.0 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+* 0.3.0
+
+  - Added a date to a transaction
+  - Change transaction attribute name of contra_account_name into contra_account_owner
+
 * 0.2.0
   
   - General parse method refactored and broke down in individual parse methods per tag

data/README.md

@@ -13,12 +13,18 @@ The following Dutch banks are implemented:
 Usage
 =====
 
-    `file_name = File.dirname(__FILE__) + 'ing.940'`
+    file_name = File.dirname(__FILE__) + 'ing.940'
 
-    `@transactions = MT940:::Base.transactions(file_name)`
+    @transactions = MT940:::Base.transactions(file_name)
 
-* Independent of the bank, a transaction always consists of an amount and a description. 
-* With some implementations the contra_account with its owner is extracted as well.
+* Independent of the bank, a transaction always consists of:
+
+  - accountnumber
+  - date
+  - amount (which is negative in case of a withdrawal)
+  - description
+
+* With the Rabobank the contra_account with its owner is extracted as well.
 
 
 Contributing to MT940

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/mt940/banks/abnamro.rb

@@ -1,9 +1,10 @@
 class MT940::Abnamro < MT940::Base
 
   def parse_tag_61
-    if @line.match(/^:61:\d{6}\d{4}(C|D)(\d+),(\d{0,2})/)
-      type = $1 == 'D' ? -1 : 1
-      @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($2 + '.' + $3).to_f)
+    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.date = parse_date($1)
       @transactions << @transaction
       @tag86 = false
     end

data/lib/mt940/banks/rabobank.rb

@@ -1,11 +1,12 @@
 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 = $1 == 'D' ? -1 : 1
-      @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($2 + '.' + $3).to_f)
-      @transaction.contra_account = $4.strip
-      @transaction.contra_account_name = $5.strip
+    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.date = parse_date($1)
+      @transaction.contra_account = $5.strip
+      @transaction.contra_account_owner = $6.strip
       @transactions << @transaction
     end
   end

data/lib/mt940/base.rb

@@ -46,6 +46,7 @@ module MT940
       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.date = parse_date($1)
         @transactions << @transaction
         @tag86 = false
       end
@@ -62,6 +63,10 @@ module MT940
       @transaction.description += ' ' + @line.gsub(/\n/,'').gsub(/>\d{2}/,'') if @tag86
     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
+
     #Fail silently
     def method_missing(*args)
     end

data/lib/mt940/transaction.rb

@@ -2,13 +2,15 @@ module MT940
 
   class Transaction
 
-    attr_accessor :bank_account, :contra_account, :amount, :description, :contra_account_name
+    attr_accessor :bank_account, :contra_account, :amount, :description, :contra_account_owner, :date
 
     def initialize(attributes = {})
       @bank_account        = attributes[:bank_account]
       @amount              = attributes[:amount]
       @description         = attributes[:description]
-      @contra_account_name = attributes[:contra_account_name]
+      @date                = attributes[:date]
+      @contra_account      = attributes[:contra_account]
+      @contra_account_name = attributes[:contra_account_owner]
     end
 
   end

data/mt940.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mt940}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dovadi"]
-  s.date = %q{2011-06-24}
+  s.date = %q{2011-06-27}
   s.description = %q{A basic MT940 parser with implementations for Dutch banks.}
   s.email = %q{frank.oxener@gmail.com}
   s.extra_rdoc_files = [

data/test/test_mt940_abnamro.rb

@@ -24,6 +24,11 @@ class TestMt940Abnamro < Test::Unit::TestCase
     should 'have a description' do
       assert_equal 'GIRO   428428 KPN - DIGITENNE    BETALINGSKENM.  000000042188659 5314606715                       BETREFT FACTUUR D.D. 20-05-2011 INCL. 1,44 BTW', @transaction.description
     end
+
+    should 'have a date' do
+      assert_equal Date.new(2011,5,24), @transaction.date
+    end
+
   end
 
 end

data/test/test_mt940_ing.rb

@@ -24,6 +24,10 @@ class TestMt940Ing < Test::Unit::TestCase
     should 'have a description' do
       assert_equal 'RC AFREKENING BETALINGSVERKEER BETREFT REKENING 4715589 PERIODE: 01-10-2010 / 31-12-2010 ING Bank N.V. tarifering ING', @transaction.description
     end
+
+    should 'have a date' do
+      assert_equal Date.new(2010,7,22), @transaction.date
+    end
   end
 
 end

data/test/test_mt940_rabobank.rb

@@ -25,13 +25,18 @@ class TestMt940Rabobank < Test::Unit::TestCase
       assert_equal -77.35, @transaction.amount
     end
 
-    should 'have a contra_account_name' do
-      assert_equal 'Uitgeverij De Druif', @transaction.contra_account_name
+    should 'have a contra_account_owner' do
+      assert_equal 'Uitgeverij De Druif', @transaction.contra_account_owner
     end
 
     should 'have a description' do
       assert_equal 'Factuurnummer 234578', @transaction.description
     end
+
+    should 'have a date' do
+      assert_equal Date.new(2011,6,15), @transaction.date
+    end
+
   end
 
 end

data/test/test_mt940_triodos.rb

@@ -24,6 +24,11 @@ class TestMt940Triodos < Test::Unit::TestCase
     should 'have a description' do
       assert_equal '0000000000000 ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN M ET 31-12-20100390123456', @transaction.description
     end
+
+    should 'have a date' do
+      assert_equal Date.new(2011,1,1), @transaction.date
+    end
+
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - dovadi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 +02:00
+date: 2011-06-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency