mt940 0.1.0 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,8 @@
+* 0.2.0
+  
+  - General parse method refactored and broke down in individual parse methods per tag
+  - Automatic determination of bank on the base of the first line implemented
+
+* 0.1.0
+  
+  Initial release

data/Gemfile

@@ -1,5 +1,5 @@
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+source :rubygems
+
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -1,4 +1,5 @@
 GEM
+  remote: http://rubygems.org/
   specs:
     git (1.2.5)
     jeweler (1.6.2)

data/README.md

@@ -13,10 +13,9 @@ The following Dutch banks are implemented:
 Usage
 =====
 
-* At this moment there is no automatic determination which bank needs to be parsed. So you need to choose the corresponding MT940 subclass for the specific bank you want to parse. 
-
     `file_name = File.dirname(__FILE__) + 'ing.940'`
-    `@transactions = MT940::ING.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.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mt940/banks/abnamro.rb

@@ -1,22 +1,11 @@
 class MT940::Abnamro < MT940::Base
 
-  def parse
-    tag86 = false
-    @lines.each do |line|
-      if line.match(/^:25:(\d*)/) 
-        @bank_account = $1
-        tag86 = false
-      elsif line.match(/^:61:\d{6}\d{4}(C|D)(\d+),(\d{0,2})/) #:61:1105240524D9,N192NONREF
-        type = $1 == 'D' ? -1 : 1
-        @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($2 + '.' + $3).to_f)
-        @transactions << @transaction
-        tag86 = false
-      elsif line.match(/^:86:(.*)$/)
-        @transaction.description = $1.strip
-        tag86 = true
-      elsif tag86 && line.match(/^[^:]/)
-        @transaction.description += ' ' + line.strip.gsub(/\n/,'')
-      end
+  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)
+      @transactions << @transaction
+      @tag86 = false
     end
   end
 

data/lib/mt940/banks/ing.rb

@@ -1,23 +1,2 @@
 class MT940::ING < MT940::Base
-
-  def parse
-    tag86 = false
-    @lines.each do |line|
-      if line.match(/^:25:(\d{10})/)
-        @bank_account = $1
-        tag86 = false
-      elsif 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)
-        @transactions << @transaction
-        tag86 = false
-      elsif line.match(/^:86:\s?(.*)$/)
-        tag86 = true
-        @transaction.description = $1
-      elsif tag86 && line.match(/^[^:]/)
-        @transaction.description += ' ' + line.strip.gsub(/\n/,'')
-      end
-    end
-  end
-
 end

data/lib/mt940/banks/rabobank.rb

@@ -1,19 +1,17 @@
 class MT940::Rabobank < MT940::Base
 
-  def parse
-    @lines.each do |line|
-      if line.match(/^:25:(\d{4}.\d{2}.\d{3})/)
-        @bank_account = $1
-      elsif 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
-        @transactions << @transaction
-      elsif line.match(/^:86:(.*)$/)
-        @transaction.description = $1.strip
-      end
+  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
+      @transactions << @transaction
     end
   end
 
-end
+  def parse_tag_86
+    @transaction.description = $1.strip if @line.match(/^:86:(.*)$/)
+  end
+
+end

data/lib/mt940/banks/triodos.rb

@@ -1,23 +1,2 @@
 class MT940::Triodos < MT940::Base
-
-  def parse
-    tag86 = false
-    @lines.each do |line|
-      if line.match(/^:25:TRIODOSBANK\/(\d*)$/) 
-        @bank_account = $1
-        tag86 = false
-      elsif line.match(/^:61:\d{6}(C|D)(\d+),(\d{0,2})/) #:61:1105240524D9,N192NONREF
-        type = $1 == 'D' ? -1 : 1
-        @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($2 + '.' + $3).to_f)
-        @transactions << @transaction
-        tag86 = false
-      elsif line.match(/^:86:(.*)$/)
-        @transaction.description = $1.strip.gsub(/>\d{2}/,'')
-        tag86 = true
-      elsif tag86 && line.match(/^[^:]/)
-        @transaction.description += line.strip.gsub(/\n/,'').gsub(/>\d{2}/,'')
-      end
-    end
-  end
-
 end

data/lib/mt940/base.rb

@@ -3,11 +3,30 @@ module MT940
   class Base
 
     def self.transactions(file_name)
-      instance = self.new(file_name)
+      first_line = File.open(file_name) {|f| f.readline}
+      klass = if first_line.match(/INGBNL/)
+        ING
+      elsif first_line.match(/ABNANL/)
+        Abnamro
+      elsif first_line.match(/^:940:/)
+        Rabobank
+      else
+        self
+      end
+      instance = klass.new(file_name)
       instance.parse
       instance.instance_variable_get('@transactions')
     end
 
+    def parse
+      @tag86 = false
+      @lines.each do |line|
+        @line = line
+        @line.match(/^:(\d{2}):/) ? eval('parse_tag_'+ $1) : parse_line
+      end
+      @transactions
+    end
+
     private
 
     def initialize(file_name)
@@ -15,8 +34,36 @@ module MT940
       @lines = File.readlines(file_name)
     end
 
-    def parse
-      raise NoMethodError, 'Code must be implemented in subclass'
+    def parse_tag_25
+      @line.gsub!('.','')
+      if @line.match(/^:\d{2}:[^\d]*(\d*)/)
+        @bank_account = $1
+        @tag86 = false
+      end
+    end
+
+    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)
+        @transactions << @transaction
+        @tag86 = false
+      end
+    end
+
+    def parse_tag_86
+      if !@tag86 && @line.match(/^:86:\s?(.*)$/)
+        @tag86 = true
+        @transaction.description = $1.gsub(/>\d{2}/,'')
+      end
+    end
+
+    def parse_line
+      @transaction.description += ' ' + @line.gsub(/\n/,'').gsub(/>\d{2}/,'') if @tag86
+    end
+
+    #Fail silently
+    def method_missing(*args)
     end
 
   end

data/mt940.gemspec

@@ -0,0 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{mt940}
+  s.version = "0.2.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.description = %q{A basic MT940 parser with implementations for Dutch banks.}
+  s.email = %q{frank.oxener@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "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/transaction.rb",
+    "mt940.gemspec",
+    "test/fixtures/abnamro.txt",
+    "test/fixtures/ing.txt",
+    "test/fixtures/rabobank.txt",
+    "test/fixtures/triodos.txt",
+    "test/helper.rb",
+    "test/test_mt940_abnamro.rb",
+    "test/test_mt940_ing.rb",
+    "test/test_mt940_rabobank.rb",
+    "test/test_mt940_triodos.rb"
+  ]
+  s.homepage = %q{http://github.com/dovadi/mt940}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{MT940 parser}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+  end
+end
+

data/test/test_mt940_abnamro.rb

@@ -4,7 +4,7 @@ class TestMt940Abnamro < Test::Unit::TestCase
 
   def setup
     file_name = File.dirname(__FILE__) + '/fixtures/abnamro.txt'
-    @transactions = MT940::Abnamro.transactions(file_name)
+    @transactions = MT940::Base.transactions(file_name)
     @transaction = @transactions.first
   end
   

data/test/test_mt940_ing.rb

@@ -4,7 +4,7 @@ class TestMt940Ing < Test::Unit::TestCase
 
   def setup
     file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
-    @transactions = MT940::ING.transactions(file_name)
+    @transactions = MT940::Base.transactions(file_name)
     @transaction = @transactions.first
   end
   

data/test/test_mt940_rabobank.rb

@@ -4,7 +4,7 @@ class TestMt940Rabobank < Test::Unit::TestCase
 
   def setup
     file_name = File.dirname(__FILE__) + '/fixtures/rabobank.txt'
-    @transactions = MT940::Rabobank.transactions(file_name)
+    @transactions = MT940::Base.transactions(file_name)
     @transaction = @transactions.first
   end
   
@@ -14,7 +14,7 @@ class TestMt940Rabobank < Test::Unit::TestCase
 
   context 'Transaction' do
     should 'have a bank_account' do
-      assert_equal '1291.99.348', @transaction.bank_account
+      assert_equal '129199348', @transaction.bank_account
     end
 
     should 'have a contra_account' do

data/test/test_mt940_triodos.rb

@@ -4,7 +4,7 @@ class TestMt940Triodos < Test::Unit::TestCase
 
   def setup
     file_name = File.dirname(__FILE__) + '/fixtures/triodos.txt'
-    @transactions = MT940::Triodos.transactions(file_name)
+    @transactions = MT940::Base.transactions(file_name)
     @transaction = @transactions.first
   end
   
@@ -22,7 +22,7 @@ class TestMt940Triodos < Test::Unit::TestCase
     end
 
     should 'have a description' do
-      assert_equal '0000000000000ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN MET 31-12-20100390123456', @transaction.description
+      assert_equal '0000000000000 ALGEMENE TUSSENREKENING KOSTEN VAN 01-10-2010 TOT EN M ET 31-12-20100390123456', @transaction.description
     end
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - dovadi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 +02:00
+date: 2011-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .document
+- CHANGELOG
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -81,12 +82,12 @@ files:
 - lib/mt940/banks/triodos.rb
 - lib/mt940/base.rb
 - lib/mt940/transaction.rb
+- mt940.gemspec
 - test/fixtures/abnamro.txt
 - test/fixtures/ing.txt
 - test/fixtures/rabobank.txt
 - test/fixtures/triodos.txt
 - test/helper.rb
-- test/test_mt940.rb
 - test/test_mt940_abnamro.rb
 - test/test_mt940_ing.rb
 - test/test_mt940_rabobank.rb

data/test/test_mt940.rb

@@ -1,13 +0,0 @@
-require 'helper'
-
-class TestMt940 < Test::Unit::TestCase
-
-  def setup
-    @file_name = File.dirname(__FILE__) + '/fixtures/ing.txt'
-  end
-
-  should 'raise a NoMethodError if not implemented' do
-    assert_raise(NoMethodError) { MT940::Base.get_transactions(@file_name) }
-  end
-
-end