mt940_parser 1.4.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6583d3241b3e23eb88a51f25872943ae27dd1a3a
-  data.tar.gz: ce62a74b3a9c0795ae92dc9c6739791acc10c341
+SHA256:
+  metadata.gz: '092f1e507213d85a4c94c5685e55a49c7dc9246ee6188c4c5d2cc7609355fa31'
+  data.tar.gz: 021d003331e57253a8e05e20847ebcdb0bbfbc173062960014cb99cf4cae081b
 SHA512:
-  metadata.gz: ed5cbc27df2583262ae2a321040b6076406cfc11a39a29e0feb4ef6f0d00eae144c56cabaa879fe912a158eb6899bf32fb5c176ac1adeb1aea1a80970bcef4e8
-  data.tar.gz: a0025cb263cddb8305c174a6d05247fb05a4215ad8970dfeadccfb35aa93a261672877d72e5be11beea8984c0de0cf05a47214236cb633b0c251f40772263957
+  metadata.gz: 54df6bec1b0ed2b7e6e8b63b3ef710ab886b78df5da253e977ad68f893d5118c8f189faaeca400305f01cf34fdd8368a12ccdf6934aca454a1a702e71ae63533
+  data.tar.gz: ac777c871fd6c0fd1e51461cf5ee2509085197e7036cda2aa297ebe05dfa90d473e61c45da9633f63c8670e3d30cd6e94001ce39a833dbc70b2157658c9a0190

data/.document

@@ -1,4 +1,4 @@
-README.rdoc
+README.md
 lib/**/*.rb
 bin/*
 features/**/*.feature

data/.specification

@@ -1,8 +1,8 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mt940
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
   hash: 23
-  segments: 
+  segments:
   - 1
   - 0
   - 0
@@ -10,58 +10,57 @@ version: !ruby/object:Gem::Version
 platform: ruby
 authors: []
 
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 
 date: 2010-03-24 00:00:00 +01:00
-default_executable: 
+default_executable:
 dependencies: []
 
-description: 
-email: 
+description:
+email:
 executables: []
 
 extensions: []
 
 extra_rdoc_files: []
 
-files: 
+files:
 - lib
 - lib/mt940.rb
-has_rdoc: true
-homepage: 
+has_rdoc: false
+homepage:
 licenses: []
 
-post_install_message: 
+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 
+    - !ruby/object:Gem::Version
       hash: 3
-      segments: 
+      segments:
       - 0
       version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+  version:
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       hash: 3
-      segments: 
+      segments:
       - 0
       version: "0"
-  version: 
+  version:
 requirements: []
 
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.3.7
-signing_key: 
+signing_key:
 specification_version: 3
-summary: 
+summary:
 test_files: []
-

data/.travis.yml

@@ -1,10 +1,18 @@
+before_install:
+  - gem update --system
+  - gem update bundler
+
 rvm:
-  - 2.0
   - 2.1
   - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+
+sudo: false

data/{README.rdoc → README.md}

@@ -1,12 +1,14 @@
-= mt940
+[![Gem Version](https://badge.fury.io/rb/mt940_parser.svg)](http://badge.fury.io/rb/mt940_parser) [![Build Status](https://secure.travis-ci.org/betterplace/mt940_parser.svg?branch=master)](http://travis-ci.org/betterplace/mt940_parser)
 
-This is a library to parse account statements which are formatted as SWIFT mt940. 
+# mt940_parser
+
+This is a library to parse account statements which are formatted as SWIFT mt940.
 
 See the following link for documentation of the format.
 http://www.google.de/url?sa=t&source=web&cd=1&ved=0CBwQFjAA&url=http%3A%2F%2Fmartin.hinner.info%2Fbankconvert%2Fswift_mt940_942.pdf&ei=alO_TObpPNGRswbD15WqDQ&usg=AFQjCNHkVGOfzofgKkk6dEkynAho02S2cg
 
-== Note on Patches/Pull Requests
- 
+## Note on Patches/Pull Requests
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -15,6 +17,6 @@ http://www.google.de/url?sa=t&source=web&cd=1&ved=0CBwQFjAA&url=http%3A%2F%2Fmar
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2010 Thies C. Arntzen. See LICENSE for details.

data/Rakefile

@@ -18,11 +18,10 @@ GemHadar do
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage',
     '.DS_Store', '.ruby-gemset', '.ruby-version', '.bundle', '.AppleDouble'
 
-  readme      'README.rdoc'
+  readme      'README.md'
   licenses    'MIT'
 
   development_dependency 'test-unit'
-  development_dependency 'simplecov'
 end
 
 task :default => :test

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.3

data/lib/mt940.rb

@@ -2,6 +2,8 @@ require 'mt940/version'
 require 'mt940/errors'
 require 'mt940/customer_statement_message'
 require 'bigdecimal'
+require 'bigdecimal/util'
+require 'date'
 
 class MT940
   class Field
@@ -13,12 +15,12 @@ class MT940
     class << self
 
       def for(line)
-        if line.match(/^:(\d{2,2})(\w)?:(.*)$/)
+        if line.match(/^:(\d{2})(\w)?:(.*)$/)
           number, modifier, content = $1, $2, $3
           klass = {
             '20' => Job,
             '21' => Reference,
-            '25' => Account,
+            '25' => AccountIdentification,
             '28' => Statement,
             '60' => AccountBalance,
             '61' => StatementLine,
@@ -48,17 +50,17 @@ class MT940
     def parse_amount_in_cents(amount)
       amount =~ /\A(\d+)(,\d*)?\z/ or
         raise Errors::InvalidAmountFormatError, "invalid amount #{amount.inspect}"
-      (100 * BigDecimal.new(amount.sub(?,, ?.))).floor
+      (100 * amount.sub(',', '.').sub(/\.\z/, '').to_d).floor
     end
 
     def parse_date(date)
       date.match(DATE)
-      Date.new("20#{$1}".to_i, $2.to_i, $3.to_i)
+      ::Date.new("20#{$1}".to_i, $2.to_i, $3.to_i)
     end
 
     def parse_entry_date(raw_entry_date, value_date)
       raw_entry_date.match(SHORT_DATE)
-      entry_date = Date.new(value_date.year, $1.to_i, $2.to_i)
+      entry_date = ::Date.new(value_date.year, $1.to_i, $2.to_i)
       unless entry_date.year == value_date.year
         raise "Unhandled case: value date and entry date are in different years"
       end
@@ -80,6 +82,30 @@ class MT940
   end
 
   # 25
+  class AccountIdentification < Field
+    attr_reader :account_identifier
+    CONTENT = /(.{1,35})/ #any 35 chars (35x from the docs)
+
+    def parse_content(content)
+      content.match(CONTENT)
+      @account_identifier = $1
+    end
+
+    # fail over to the old Account class
+    def method_missing(method, *args, &block)
+      @fail_over_implementation ||= Account.new(@modifier, @content)
+      value = @fail_over_implementation.send(method)
+      warn "[DEPRECATION]:"
+      warn "You used '#{method}' on the Account/AccountIdentification class"
+      warn "This field is not part of the MT940 specification but implementation specific"
+      warn "Please use the 'account_identifier' and parse yourself."
+
+      value
+    end
+  end
+
+  # 25 - Legacy
+  # This class is deprecated as it does not match the spec.
   class Account < Field
     attr_reader :bank_code, :account_number, :account_currency
 
@@ -141,7 +167,7 @@ class MT940
         when 'ALT', '0'
           nil
         when DATE
-          Date.new("20#{$1}".to_i, $2.to_i, $3.to_i)
+          ::Date.new("20#{$1}".to_i, $2.to_i, $3.to_i)
         end
     end
   end
@@ -246,8 +272,10 @@ class MT940
   class << self
     def parse(text)
       new_text = text.encode('UTF-8').strip
-      new_text << "\r\n" if new_text[-1,1] == '-'
-      raw_sheets = new_text.split(/^-\s*\r\n/).map { |sheet| sheet.gsub(/\r\n(?!:)/, '') }
+      new_text << "\r\n" if new_text.end_with?('-')
+      raw_sheets = new_text.split(/^-\s*\r\n/).map do |sheet|
+        sheet.gsub(/\r\n(?!:\d{2}\w?:)/, '')
+      end
       sheets = raw_sheets.map { |raw_sheet| parse_sheet(raw_sheet) }
     end
 

data/lib/mt940/customer_statement_message.rb

@@ -4,7 +4,7 @@
 class MT940
   class CustomerStatementMessage
 
-    attr_reader :statement_lines
+    attr_reader :account, :statement_lines
 
     def self.parse_file(file)
       self.parse(File.read(file))
@@ -16,7 +16,7 @@ class MT940
     end
 
     def initialize(lines)
-      @account = lines.find { |line| line.class == MT940::Account }
+      @account = lines.find { |line| line.class == MT940::AccountIdentification }
       @statement_lines = []
       lines.each_with_index do |line, i|
         next unless line.class == MT940::StatementLine

data/lib/mt940/version.rb

@@ -1,6 +1,6 @@
 class MT940
   # MT940 version
-  VERSION         = '1.4.1'
+  VERSION         = '1.5.3'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/mt940_parser.gemspec

@@ -1,40 +1,34 @@
 # -*- encoding: utf-8 -*-
-# stub: mt940_parser 1.4.1 ruby lib
+# stub: mt940_parser 1.5.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "mt940_parser"
-  s.version = "1.4.1"
+  s.name = "mt940_parser".freeze
+  s.version = "1.5.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Thies C. Arntzen", "Phillip Oertel"]
-  s.date = "2015-07-09"
-  s.description = "Ruby library that parses account statements in the SWIFT MT940 format."
-  s.email = "developers@betterplace.org"
-  s.extra_rdoc_files = ["README.rdoc", "lib/mt940.rb", "lib/mt940/customer_statement_message.rb", "lib/mt940/errors.rb", "lib/mt940/version.rb"]
-  s.files = [".document", ".gitignore", ".specification", ".travis.yml", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "VERSION.yml", "docs/0E0Y00DNY.pdf", "docs/FinTS_4.0_Formals.pdf", "docs/FinTS_4.0_Messages_Finanzdatenformate.pdf", "docs/MT940_Deutschland_Structure2002.pdf", "docs/SEPA_20MT940__Schnittstellenbeschreibung.pdf", "docs/mt940.pdf", "docs/swift_mt940_942.pdf", "docs/uebersicht_der_geschaeftsvorfallcodes_und_buchungs_textschluessel.pdf", "lib/mt940.rb", "lib/mt940/customer_statement_message.rb", "lib/mt940/errors.rb", "lib/mt940/version.rb", "mt940_parser.gemspec", "test/fixtures/amount_formats.txt", "test/fixtures/amount_formats.yml", "test/fixtures/currency_in_25.txt", "test/fixtures/currency_in_25.yml", "test/fixtures/empty_86.txt", "test/fixtures/empty_86.yml", "test/fixtures/empty_entry_date.txt", "test/fixtures/empty_entry_date.yml", "test/fixtures/empty_line.txt", "test/fixtures/empty_line.yml", "test/fixtures/missing_crlf_at_end.txt", "test/fixtures/missing_crlf_at_end.yml", "test/fixtures/sepa_mt9401.txt", "test/fixtures/sepa_mt9401.yml", "test/fixtures/sepa_snippet.txt", "test/fixtures/sepa_snippet_broken.txt", "test/fixtures/with_binary_character.txt", "test/fixtures/with_binary_character.yml", "test/helper.rb", "test/test_customer_statement_message.rb", "test/test_mt940.rb"]
-  s.homepage = "http://github.com/betterplace/mt940_parser"
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--title", "Mt940Parser - MT940 parses account statements in the SWIFT MT940 format.", "--main", "README.rdoc"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "MT940 parses account statements in the SWIFT MT940 format."
-  s.test_files = ["test/test_customer_statement_message.rb", "test/test_mt940.rb"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Thies C. Arntzen".freeze, "Phillip Oertel".freeze]
+  s.date = "2021-06-17"
+  s.description = "Ruby library that parses account statements in the SWIFT MT940 format.".freeze
+  s.email = "developers@betterplace.org".freeze
+  s.extra_rdoc_files = ["README.md".freeze, "lib/mt940.rb".freeze, "lib/mt940/customer_statement_message.rb".freeze, "lib/mt940/errors.rb".freeze, "lib/mt940/version.rb".freeze]
+  s.files = [".document".freeze, ".gitignore".freeze, ".specification".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "docs/0E0Y00DNY.pdf".freeze, "docs/FinTS_4.0_Formals.pdf".freeze, "docs/FinTS_4.0_Messages_Finanzdatenformate.pdf".freeze, "docs/MT940_Deutschland_Structure2002.pdf".freeze, "docs/SEPA_20MT940__Schnittstellenbeschreibung.pdf".freeze, "docs/mt940.pdf".freeze, "docs/swift_mt940_942.pdf".freeze, "docs/uebersicht_der_geschaeftsvorfallcodes_und_buchungs_textschluessel.pdf".freeze, "lib/mt940.rb".freeze, "lib/mt940/customer_statement_message.rb".freeze, "lib/mt940/errors.rb".freeze, "lib/mt940/version.rb".freeze, "mt940_parser.gemspec".freeze, "test/fixtures/amount_formats.txt".freeze, "test/fixtures/amount_formats.yml".freeze, "test/fixtures/colon_in_descriptor.txt".freeze, "test/fixtures/colon_in_descriptor.yml".freeze, "test/fixtures/currency_in_25.txt".freeze, "test/fixtures/currency_in_25.yml".freeze, "test/fixtures/empty_86.txt".freeze, "test/fixtures/empty_86.yml".freeze, "test/fixtures/empty_entry_date.txt".freeze, "test/fixtures/empty_entry_date.yml".freeze, "test/fixtures/empty_line.txt".freeze, "test/fixtures/empty_line.yml".freeze, "test/fixtures/missing_crlf_at_end.txt".freeze, "test/fixtures/missing_crlf_at_end.yml".freeze, "test/fixtures/sepa_mt9401.txt".freeze, "test/fixtures/sepa_mt9401.yml".freeze, "test/fixtures/sepa_snippet.txt".freeze, "test/fixtures/sepa_snippet_broken.txt".freeze, "test/fixtures/with_binary_character.txt".freeze, "test/fixtures/with_binary_character.yml".freeze, "test/test_account_identifier.rb".freeze, "test/test_customer_statement_message.rb".freeze, "test/test_helper.rb".freeze, "test/test_mt940.rb".freeze]
+  s.homepage = "http://github.com/betterplace/mt940_parser".freeze
+  s.licenses = ["MIT".freeze]
+  s.rdoc_options = ["--title".freeze, "Mt940Parser - MT940 parses account statements in the SWIFT MT940 format.".freeze, "--main".freeze, "README.md".freeze]
+  s.rubygems_version = "3.2.3".freeze
+  s.summary = "MT940 parses account statements in the SWIFT MT940 format.".freeze
+  s.test_files = ["test/test_account_identifier.rb".freeze, "test/test_customer_statement_message.rb".freeze, "test/test_helper.rb".freeze, "test/test_mt940.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
+    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
   end
 end

data/test/fixtures/colon_in_descriptor.txt

@@ -0,0 +1,3 @@
+:86:166?20Spende abcdefghijklmnopqrstuvwxyzabcde Verwendungszweck
+: ?701234567 Betterplace?30ABCDEFGH?31DE12345678912345789012?32Ab
+cdefg Hijklmnop

data/test/fixtures/colon_in_descriptor.yml

@@ -0,0 +1,13 @@
+---
+- - !ruby/object:MT940::StatementLineInformation
+    modifier:
+    content: '166?20Spende abcdefghijklmnopqrstuvwxyzabcde Verwendungszweck: ?701234567
+      Betterplace?30ABCDEFGH?31DE12345678912345789012?32Abcdefg Hijklmnop'
+    code: 166
+    bank_code: ABCDEFGH
+    account_number: DE12345678912345789012
+    not_implemented_fields:
+    - - '70'
+      - 1234567 Betterplace
+    details: 'Spende abcdefghijklmnopqrstuvwxyzabcde Verwendungszweck: '
+    account_holder: Abcdefg Hijklmnop

data/test/fixtures/currency_in_25.yml

@@ -1,7 +1,5 @@
 ---
-- - !ruby/object:MT940::Account
+- - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 51210600/9223382012EUR
-    bank_code: '51210600'
-    account_number: '9223382012'
-    account_currency: EUR
+    account_identifier: 51210600/9223382012EUR

data/test/fixtures/sepa_mt9401.yml

@@ -3,12 +3,10 @@
     modifier: 
     content: T089413946000001
     reference: T089413946000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194774600888
-    bank_code: '50880050'
-    account_number: 0194774600888
-    account_currency: 
+    account_identifier: 50880050/0194774600888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -192,12 +190,10 @@
     modifier: 
     content: T089413956000001
     reference: T089413956000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194777100888
-    bank_code: '50880050'
-    account_number: 0194777100888
-    account_currency: 
+    account_identifier: 50880050/0194777100888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -297,12 +293,10 @@
     modifier: 
     content: T089413966000001
     reference: T089413966000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194778300888
-    bank_code: '50880050'
-    account_number: 0194778300888
-    account_currency: 
+    account_identifier: 50880050/0194778300888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -477,12 +471,10 @@
     modifier: 
     content: T089413976000001
     reference: T089413976000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194779500888
-    bank_code: '50880050'
-    account_number: 0194779500888
-    account_currency: 
+    account_identifier: 50880050/0194779500888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -605,12 +597,10 @@
     modifier: 
     content: T089413986000001
     reference: T089413986000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194780100888
-    bank_code: '50880050'
-    account_number: 0194780100888
-    account_currency: 
+    account_identifier: 50880050/0194780100888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -751,12 +741,10 @@
     modifier: 
     content: T089413996000001
     reference: T089413996000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194780101888
-    bank_code: '50880050'
-    account_number: 0194780101888
-    account_currency: 
+    account_identifier: 50880050/0194780101888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -818,12 +806,10 @@
     modifier: 
     content: T089414006000001
     reference: T089414006000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194781300888
-    bank_code: '50880050'
-    account_number: 0194781300888
-    account_currency: 
+    account_identifier: 50880050/0194781300888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -985,12 +971,10 @@
     modifier: 
     content: T089414006000002
     reference: T089414006000002
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194781300888
-    bank_code: '50880050'
-    account_number: 0194781300888
-    account_currency: 
+    account_identifier: 50880050/0194781300888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00002
@@ -1158,12 +1142,10 @@
     modifier: 
     content: T089414016000001
     reference: T089414016000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194782500888
-    bank_code: '50880050'
-    account_number: 0194782500888
-    account_currency: 
+    account_identifier: 50880050/0194782500888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -1383,12 +1365,10 @@
     modifier: 
     content: T089414016000002
     reference: T089414016000002
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194782500888
-    bank_code: '50880050'
-    account_number: 0194782500888
-    account_currency: 
+    account_identifier: 50880050/0194782500888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00002
@@ -1490,12 +1470,10 @@
     modifier: 
     content: T089414026000001
     reference: T089414026000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194783700888
-    bank_code: '50880050'
-    account_number: 0194783700888
-    account_currency: 
+    account_identifier: 50880050/0194783700888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -1685,12 +1663,10 @@
     modifier: 
     content: T089414026000002
     reference: T089414026000002
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194783700888
-    bank_code: '50880050'
-    account_number: 0194783700888
-    account_currency: 
+    account_identifier: 50880050/0194783700888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00002
@@ -1878,12 +1854,10 @@
     modifier: 
     content: T089414036000001
     reference: T089414036000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194784900888
-    bank_code: '50880050'
-    account_number: 0194784900888
-    account_currency: 
+    account_identifier: 50880050/0194784900888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -2068,12 +2042,10 @@
     modifier: 
     content: T089414036000002
     reference: T089414036000002
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194784900888
-    bank_code: '50880050'
-    account_number: 0194784900888
-    account_currency: 
+    account_identifier: 50880050/0194784900888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00002
@@ -2173,12 +2145,10 @@
     modifier: 
     content: T089414046000001
     reference: T089414046000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194784901888
-    bank_code: '50880050'
-    account_number: 0194784901888
-    account_currency: 
+    account_identifier: 50880050/0194784901888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00003/00001
@@ -2245,12 +2215,10 @@
     modifier: 
     content: T089414056000001
     reference: T089414056000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194785000888
-    bank_code: '50880050'
-    account_number: 0194785000888
-    account_currency: 
+    account_identifier: 50880050/0194785000888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -2421,12 +2389,10 @@
     modifier: 
     content: T089414056000002
     reference: T089414056000002
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194785000888
-    bank_code: '50880050'
-    account_number: 0194785000888
-    account_currency: 
+    account_identifier: 50880050/0194785000888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00002
@@ -2594,12 +2560,10 @@
     modifier: 
     content: T089414056000003
     reference: T089414056000003
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194785000888
-    bank_code: '50880050'
-    account_number: 0194785000888
-    account_currency: 
+    account_identifier: 50880050/0194785000888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00003
@@ -2696,12 +2660,10 @@
     modifier: 
     content: T089414066000001
     reference: T089414066000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194785001888
-    bank_code: '50880050'
-    account_number: 0194785001888
-    account_currency: 
+    account_identifier: 50880050/0194785001888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -2763,12 +2725,10 @@
     modifier: 
     content: T089414076000001
     reference: T089414076000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194786200888
-    bank_code: '50880050'
-    account_number: 0194786200888
-    account_currency: 
+    account_identifier: 50880050/0194786200888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -2891,12 +2851,10 @@
     modifier: 
     content: T089414086000001
     reference: T089414086000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194787400888
-    bank_code: '50880050'
-    account_number: 0194787400888
-    account_currency: 
+    account_identifier: 50880050/0194787400888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -3043,12 +3001,10 @@
     modifier: 
     content: T089414096000001
     reference: T089414096000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194791600888
-    bank_code: '50880050'
-    account_number: 0194791600888
-    account_currency: 
+    account_identifier: 50880050/0194791600888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -3264,12 +3220,10 @@
     modifier: 
     content: T089414106000001
     reference: T089414106000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194791601888
-    bank_code: '50880050'
-    account_number: 0194791601888
-    account_currency: 
+    account_identifier: 50880050/0194791601888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -3385,12 +3339,10 @@
     modifier: 
     content: T089414116000001
     reference: T089414116000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194798900888
-    bank_code: '50880050'
-    account_number: 0194798900888
-    account_currency: 
+    account_identifier: 50880050/0194798900888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -3448,12 +3400,10 @@
     modifier: 
     content: T089414126000001
     reference: T089414126000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194799000888
-    bank_code: '50880050'
-    account_number: 0194799000888
-    account_currency: 
+    account_identifier: 50880050/0194799000888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00004/00001
@@ -3511,12 +3461,10 @@
     modifier: 
     content: T089414136000001
     reference: T089414136000001
-  - !ruby/object:MT940::Account
+  - !ruby/object:MT940::AccountIdentification
     modifier: 
     content: 50880050/0194804000888
-    bank_code: '50880050'
-    account_number: 0194804000888
-    account_currency: 
+    account_identifier: 50880050/0194804000888
   - !ruby/object:MT940::Statement
     modifier: C
     content: 00001/00001

data/test/test_account_identifier.rb

@@ -0,0 +1,32 @@
+require_relative 'test_helper'
+
+class TestAccountIdentification < Test::Unit::TestCase
+  def test_account_identifier
+    acc_ident = MT940::AccountIdentification.new('','12345690')
+    assert_equal '12345690', acc_ident.account_identifier
+  end
+
+  def test_account_identifier_gets_the_first_35_characters
+    content = '1' * 40
+    acc_ident = MT940::AccountIdentification.new('', content)
+    assert_equal 35, acc_ident.account_identifier.length
+  end
+
+  def test_DEPRECATED_bank_code
+    content = '123456789/987EUR'
+    acc_ident = MT940::AccountIdentification.new('', content)
+    assert_equal '123456789', acc_ident.bank_code
+  end
+
+  def test_DEPRECATED_account_number
+    content = '123456789/987EUR'
+    acc_ident = MT940::AccountIdentification.new('', content)
+    assert_equal '987', acc_ident.account_number
+  end
+
+  def test_DEPRECATED_account_currency
+    content = '123456789/987EUR'
+    acc_ident = MT940::AccountIdentification.new('', content)
+    assert_equal 'EUR', acc_ident.account_currency
+  end
+end

data/test/test_customer_statement_message.rb

@@ -1,4 +1,4 @@
-require_relative 'helper'
+require_relative 'test_helper'
 
 
 # $DEBUG = true
@@ -19,6 +19,10 @@ class TestCustomerStatementMessage < Test::Unit::TestCase
     assert_equal "0194787400888", @message.account_number
   end
 
+  def test_it_should_have_an_account_identification
+    assert @message.account.is_a?(MT940::AccountIdentification)
+  end
+
   def test_it_should_have_statement_lines
     assert @message.statement_lines.respond_to?(:each)
     assert_equal 4, @message.statement_lines.size

data/test/{helper.rb → test_helper.rb}

@@ -1,11 +1,3 @@
-if ENV['START_SIMPLECOV'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "#{File.basename(File.dirname(__FILE__))}/"
-  end
-end
-require 'rubygems'
-require 'yaml'
 require 'test/unit'
 begin
   require 'byebug'

data/test/test_mt940.rb

@@ -1,4 +1,5 @@
-require_relative 'helper'
+require_relative 'test_helper'
+require 'yaml'
 
 # $DEBUG = true
 class TestMt940 < Test::Unit::TestCase

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mt940_parser
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Thies C. Arntzen
 - Phillip Oertel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -39,26 +39,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ruby library that parses account statements in the SWIFT MT940 format.
 email: developers@betterplace.org
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - lib/mt940.rb
 - lib/mt940/customer_statement_message.rb
 - lib/mt940/errors.rb
@@ -70,10 +56,9 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
-- VERSION.yml
 - docs/0E0Y00DNY.pdf
 - docs/FinTS_4.0_Formals.pdf
 - docs/FinTS_4.0_Messages_Finanzdatenformate.pdf
@@ -89,6 +74,8 @@ files:
 - mt940_parser.gemspec
 - test/fixtures/amount_formats.txt
 - test/fixtures/amount_formats.yml
+- test/fixtures/colon_in_descriptor.txt
+- test/fixtures/colon_in_descriptor.yml
 - test/fixtures/currency_in_25.txt
 - test/fixtures/currency_in_25.yml
 - test/fixtures/empty_86.txt
@@ -105,19 +92,20 @@ files:
 - test/fixtures/sepa_snippet_broken.txt
 - test/fixtures/with_binary_character.txt
 - test/fixtures/with_binary_character.yml
-- test/helper.rb
+- test/test_account_identifier.rb
 - test/test_customer_statement_message.rb
+- test/test_helper.rb
 - test/test_mt940.rb
 homepage: http://github.com/betterplace/mt940_parser
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Mt940Parser - MT940 parses account statements in the SWIFT MT940 format.
 - "--main"
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -131,11 +119,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: MT940 parses account statements in the SWIFT MT940 format.
 test_files:
+- test/test_account_identifier.rb
 - test/test_customer_statement_message.rb
+- test/test_helper.rb
 - test/test_mt940.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
----
-:major: 1
-:minor: 3
-:patch: 0
-:build: