mt940 0.6.5 → 0.6.6

data/.gitignore

@@ -46,3 +46,6 @@ pkg
 
 # For rubinius:
 #*.rbc
+
+# rvmrc
+.rvmrc

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 0.6.6
+  - Added currency support in transaction (contribution of Bob Forma)
+
+* 0.6.5
+
+  - Use bundler for gem building and release
+  - Add travis configuration
+
 * 0.6.4
 
   - Fix for multiline description for Rabobank

data/README.md

@@ -64,5 +64,5 @@ Contributing to MT940
 Copyright
 ==========
 
-Copyright (c) 2011 Frank Oxener - Agile Dovadi BV. See LICENSE.txt for further details.
+Copyright (c) 2012 Frank Oxener - Agile Dovadi BV. See LICENSE.txt for further details.
 

data/Rakefile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-
+require 'rubygems'
 require 'bundler/gem_helper'
 Bundler::GemHelper.install_tasks
 

data/lib/mt940/banks/abnamro.rb

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

data/lib/mt940/banks/rabobank.rb

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

data/lib/mt940/base.rb

@@ -23,7 +23,7 @@ module MT940
       @tag86 = false
       @lines.each do |line|
         @line = line
-        @line.match(/^:(\d{2}):/) ? eval('parse_tag_'+ $1) : parse_line
+        @line.match(/^:(\d{2}F?):/) ? eval('parse_tag_'+ $1) : parse_line
       end
       @transactions
     end
@@ -56,10 +56,14 @@ module MT940
       end
     end
 
+    def parse_tag_60F
+      @currency = @line[12..14]
+    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, :bank => @bank)
+        @transaction = MT940::Transaction.new(:bank_account => @bank_account, :amount => type * ($3 + '.' + $4).to_f, :bank => @bank, :currency => @currency)
         @transaction.date = parse_date($1)
         @transactions << @transaction
         @tag86 = false

data/lib/mt940/transaction.rb

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

data/lib/mt940/version.rb

@@ -1,3 +1,3 @@
 module MT940
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/test/mt940_abnamro_test.rb

@@ -27,7 +27,7 @@ class TestMt940Abnamro < Test::Unit::TestCase
       end
 
       should 'have the correct description in case of a regular bank' do
-        assert_equal 'MYCOM DEN HAAG  S-GRAVEN,PAS999 :62F:C110524EUR1849,75', @transactions.last.description
+        assert_equal 'MYCOM DEN HAAG  S-GRAVEN,PAS999', @transactions.last.description
       end
     end
 
@@ -39,6 +39,10 @@ class TestMt940Abnamro < Test::Unit::TestCase
       assert_equal 'Abnamro', @transaction.bank
     end
 
+    should 'have a currency' do
+      assert_equal 'EUR', @transaction.currency
+    end
+
     context 'Contra account' do
       should 'be determined in case of a GIRO account' do
         assert_equal '000428428', @transaction.contra_account

data/test/mt940_ing_test.rb

@@ -21,6 +21,10 @@ class TestMt940Ing < Test::Unit::TestCase
       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
@@ -30,7 +34,7 @@ class TestMt940Ing < Test::Unit::TestCase
     end
 
     should 'have a description' do
-      assert_equal 'EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM :62F:C100723EUR3,47', @transactions.last.description
+      assert_equal 'EJ46GREENP100610T1456 CLIEOP TMG GPHONGKONG AMSTERDAM', @transactions.last.description
     end
 
     should 'return the contra_account' do

data/test/mt940_rabobank_test.rb

@@ -35,6 +35,10 @@ class TestMt940Rabobank < Test::Unit::TestCase
       assert_equal -1213.28, @transaction.amount
     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

data/test/mt940_triodos_test.rb

@@ -21,6 +21,10 @@ class TestMt940Triodos < Test::Unit::TestCase
       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 M ET 31-12-20100390123456', @transaction.description
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Frank Oxener
@@ -14,21 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-10 00:00:00 +01:00
+date: 2012-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  name: shoulda
-  prerelease: false
   type: :development
+  version_requirements: *id001
 description: A basic MT940 parser with implementations for Dutch banks.
 email: frank.oxener@gmail.com
 executables: []