cmxl 1.4.6 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9599937da1fa4217f44747b0214af2111514da12832eea323afca3ce1bf11b
-  data.tar.gz: 0b9bd79c985742fcfcaab730fe69eea91dc2d50b9d0cc1f3f96e6c15b50a3d16
+  metadata.gz: 1c172d6b56767a8860f57c4b802c7ed2ed2bae3658f6db104f44795a377bf067
+  data.tar.gz: ececb262e0d6a40c97e7ca54dcac08208e1942792c5f493be179ba3c81ece6b7
 SHA512:
-  metadata.gz: 48ce33cbd21b7df6dce69cc610ccd02efd01df7b2c080be21b47682ad8754b641ee0598795ff9ec380373cab2679cc0235f344e986e1c274d427a435895c2e5c
-  data.tar.gz: 0ee463246d09088cb8d4f9c7aa3979d19db3a4f487f8efdd359e01050503714d20e88a6fa40e1fd226dc83f785a031269516ca466b4ad974bc8c048127c72e50
+  metadata.gz: f0f673453d6bbbc39313ed7ae86ff574c4c9d60a0ea5543283f38d1f3bf4f7477625e2bc87a1fbdc62714c86461735a7e16796edd54cd361d52d49d2eb05d8db
+  data.tar.gz: a197094a3ccd4235f8811a456dbd54c43bc3b49a47062a72f7b9ee53610ddbb4e79ce97e53e0f90670a0c5e3cb5f08ef490792506dc6cc1202d5442c4f724710

data/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - 3.3
+          - 3.2
+          - 3.1
+          - "3.0"
+          - jruby-9.4
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Run tests
+        run: bundle exec rake

data/.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      contents: write # IMPORTANT: this permission is required for `rake release` to push the release tag
+
+    steps:
+      # Set up
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - uses: rubygems/release-gem@v1

data/.rspec

@@ -1 +1 @@
---color
+--color

data/CHANGELOG.mdown

@@ -1,3 +1,16 @@
+# NEXT release
+
+# 2.0
+- `[REFACTOR]` **DEPRECATED:** `storno?` and related methods `storno_credit`, `storno_debit`. Use `reversal?` and related methods `reversal_credit?`, `reversal_debit?` instead
+- `[BUGFIX]` **DEPRECATED:** `funds_code` method returns the `credit_debit_indicator` from the SWIFT definition. Therefore the method is deprecated in favor of `credit_debit_indicator` method
+- `[HOUSEKEEPING]` [Replace Travis CI with github actions](https://github.com/railslove/cmxl/pull/57)
+
+# 1.5.0
+
+- `[BUGFIX]` fix potential bug when generation_date is not provided in field 20 and 13 (issue: [#35](https://github.com/railslove/cmxl/issues/35) PR: [#36](https://github.com/railslove/cmxl/pull/36))
+- `[FEATURE]` add transaction type 'S' to Field 61 (swift_code) (issue: [#38](https://github.com/railslove/cmxl/issues/38) PR: [#42](https://github.com/railslove/cmxl/pull/42)
+- `[ENHANCEMENT]` [Fix deprecations in ruby 2.7 for kw params](https://github.com/railslove/cmxl/commit/905cd50e5372da312a653c89e77727a14751b5ec)
+
 # 1.4.6
 
 - `[ENHANCEMENT]` make sure that tag, gemversion and readme align ʘ‿ʘ

data/README.md

@@ -1,14 +1,12 @@
-[![Build Status](https://railslove.semaphoreci.com/badges/cmxl/branches/master.svg?style=shields)](https://railslove.semaphoreci.com/branches/96e7bf8e-be69-4f01-878c-be3dac0e6e8d)
-[![Code Climate](https://codeclimate.com/github/railslove/cmxl/badges/gpa.svg)](https://codeclimate.com/github/railslove/cmxl)
-[![Test Coverage](https://codeclimate.com/github/railslove/cmxl/badges/coverage.svg)](https://codeclimate.com/github/railslove/cmxl)
-[![Gem Version](https://badge.fury.io/rb/cmxl.svg)](http://badge.fury.io/rb/cmxl)
+[![CI](https://github.com/railslove/cmxl/actions/workflows/ci.yml/badge.svg)](https://github.com/railslove/cmxl/actions/workflows/ci.yml)
+[![Gem Version](https://badge.fury.io/rb/cmxl.svg)](https://rubygems.org/gems/cmxl)
 
 # Cmxl - your friendly ruby MT940 parser
 
 At [Railslove](http://railslove.com) we build a lot of financial applications and work on integrating applications with banks and banking functionality.
 Our goal is to make simple solutions for what often looks complicated.
 
-Cmxl is a friendly and extendible MT940 bank statement file parser that helps your extracting data from the bank statement files.
+Cmxl is a friendly and extensible MT940 bank statement file parser that helps you extract data from bank statement files.
 
 ## What is MT940 & MT942?
 
@@ -16,13 +14,13 @@ MT940 (MT = Message Type) is the SWIFT-Standard for the electronic transfer of b
 When integrating with banks you often get MT940 or MT942 files as interface.
 For more information have a look at the different [SWIFT message types](http://en.wikipedia.org/wiki/SWIFT_message_types)
 
-At some point in the future MT940 file should be exchanged with newer XML documents - but banking institutions are slow so MT940 will stick around for a while.
+At some point in the future MT940 file should be exchanged with newer XML documents - but banking institutions are slow, so MT940 will stick around for a while.
 
-## Reqirements
+## Requirements
 
 Cmxl is a pure ruby parser and has no dependency on native extensions.
 
-- Ruby 1.9.3 or newer (jruby, etc.)
+- Ruby (current officially supported distributions)
 
 ## Installation
 
@@ -52,7 +50,7 @@ Cmxl.config[:statement_separator] = /\n-.\n/m
 # do you want an error to be raised when a line can not be parsed? default is true
 Cmxl.config[:raise_line_format_errors] = true
 
-# try to stip the SWIFT header data. This strips everything until the actual first MT940 field. (if parsing fails try this!)
+# try to stip the SWIFT header data. This strips everything until the actual first MT940 field. (if parsing fails, try this!)
 Cmxl.config[:strip_headers] = true
 
 
@@ -70,7 +68,7 @@ statements.each do |s|
     puts t.information
     puts t.description
     puts t.entry_date
-    puts t.funds_code
+    puts t.credit_debit_indicator
     puts t.credit?
     puts t.debit?
     puts t.sign # -1 if it's a debit; 1 if it's a credit
@@ -86,19 +84,19 @@ end
 
 ```
 
-Every object responds to `to_h` and let's you easily convert the data to a hash. Also every object responds to `to_json` which lets you easily represent the statements as JSON with your favorit JSON library.
+Every object responds to `to_h` and let's you easily convert the data to a hash. Also every object responds to `to_json` which lets you easily represent the statements as JSON with your favorite JSON library.
 
-#### A note about encoding and file wirednesses
+#### A note about encoding and file weirdnesses
 
 You probably will encounter encoding issues (hey, you are building banking applications!).
-We try to handle encoding and format wirednesses as much as possible. If no encoding is passed we try to guess the encoding of the data and convert it to UTF8.
-In the likely case that you encouter encoding issues you can pass encoding options to the `Cmxl.parse(<string>, <options hash>)` it accepts the same options as [String#encode](http://ruby-doc.org/core-2.1.3/String.html#method-i-encode)
-If that fails try to motify the file before you pass it to the parser - and please create an issue.
+We try to handle encoding and format weirdnesses as much as possible. If no encoding is passed we try to guess the encoding of the data and convert it to UTF8.
+In the likely case that you encounter encoding issues you can pass encoding options to `Cmxl.parse(<string>, <options hash>)`. It accepts the same options as [String#encode](http://ruby-doc.org/core-2.1.3/String.html#method-i-encode)
+If that fails, try to modify the file before you pass it to the parser - and please create an issue.
 
 ### MT940 SWIFT header data
 
 Cmxl currently does not support parsing of the SWIFT headers (like {1:F01AXISINBBA ....)
-If your file comes with these headers try the `strip_headers` configuration option to strip data execpt the actual MT940 fields.
+If your file comes with these headers try the `strip_headers` configuration option to strip data except the actual MT940 fields.
 
 ```ruby
 Cmxl.config[:strip_headers] = true
@@ -188,5 +186,7 @@ other parsers:
 - [gmitrev/mt940parser](https://github.com/gmitrev/mt940parser)
 
 ---
+built with love by [Railslove](http://railslove.com) and some [amazing people](https://github.com/railslove/cmxl/graphs/contributors).  
+Released under the MIT-License. 
 
-2014 - built with love by [Railslove](http://railslove.com) and released under the MIT-Licence. We have built quite a number of FinTech products. If you need support we are happy to help. Please contact us at team@railslove.com.
+Railslove builds FinTech products, if you need support for your project we are happy to help. Please contact us at team@railslove.com.

data/cmxl.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'rchardet'
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~>3.0'
   spec.add_development_dependency 'simplecov'
-
-  spec.add_dependency 'rchardet19'
 end

data/lib/cmxl/field.rb

@@ -13,7 +13,7 @@ module Cmxl
 
     # The parser class variable is the registry of all available parser.
     # It is a hash with the tag (MT940 field number/tag) as key and the class as value
-    # When parsing a statment line we look for a matching entry or use the Unknown class as default
+    # When parsing a statement line we look for a matching entry or use the Unknown class as default
     @@parsers = {}
     @@parsers.default = Unknown
     def self.parsers

data/lib/cmxl/fields/transaction.rb

@@ -2,7 +2,7 @@ module Cmxl
   module Fields
     class Transaction < Field
       self.tag = 61
-      self.parser = %r{^(?<date>\d{6})(?<entry_date>\d{4})?(?<storno_flag>R?)(?<funds_code>[CD]{1})(?<currency_letter>[a-zA-Z])?(?<amount>\d{1,12},\d{0,2})(?<swift_code>(?:N|F).{3})(?<reference>NONREF|(.(?!\/\/)){,16}([^\/]){,1})((?:\/\/)(?<bank_reference>[^\n]{,16}))?((?:\n)(?<supplementary>.{,34}))?$}
+      self.parser = %r{^(?<date>\d{6})(?<entry_date>\d{4})?(?<credit_debit_indicator>D|C|RD|RC|ED|EC)(?<currency_letter>[a-zA-Z])?(?<amount>\d{1,12},\d{0,2})(?<swift_code>(?:N|F|S).{3})(?<reference>NONREF|(.(?!\/\/)){,16}([^\/]){,1})((?:\/\/)(?<bank_reference>[^\n]{,16}))?((?:\n)(?<supplementary>.{,34}))?$}
 
       attr_accessor :details
 
@@ -15,31 +15,63 @@ module Cmxl
       end
 
       def credit?
-        data['funds_code'].to_s.casecmp('C').zero?
+        credit_debit_indicator.include?('C')
       end
 
       def debit?
-        data['funds_code'].to_s.casecmp('D').zero?
+        credit_debit_indicator.include?('D')
       end
 
       def storno_credit?
+        warn "[DEPRECATION] `storno_credit?` is deprecated.  Please use `reversal_credit?` instead. It will be removed in version 3.0."
+        reversal_credit?
+      end
+
+      def reversal_credit?
         credit? && storno?
       end
 
       def storno_debit?
+        warn "[DEPRECATION] `storno_debit?` is deprecated.  Please use `reversal_debit?` instead. It will be removed in version 3.0."
+        reversal_debit?
+      end
+
+      def reversal_debit?
         debit? && storno?
       end
 
       def storno?
-        !storno_flag.empty?
+        warn "[DEPRECATION] `storno?` is deprecated.  Please use `reversal?` instead. It will be removed in version 3.0."
+        reversal?
+      end
+
+      def reversal?
+        credit_debit_indicator.include?('R')
+      end
+
+      def expected_credit?
+        credit? && expected?
+      end
+
+      def expected_debit?
+        debit? && expected?
+      end
+
+      def expected?
+        credit_debit_indicator.include?('E')
+      end
+
+      def credit_debit_indicator
+        data['credit_debit_indicator'].to_s
       end
 
       def funds_code
-        data.values_at('storno_flag', 'funds_code').join
+        warn "[DEPRECATION] `funds_code` is deprecated.  Please use `credit_debit_indicator` instead. It will be removed in version 3.0."
+        data['credit_debit_indicator'].to_s
       end
 
       def storno_flag
-        data['storno_flag']
+        reversal? ? 'R' : ''
       end
 
       def sign
@@ -140,8 +172,11 @@ module Cmxl
           'sign' => sign,
           'debit' => debit?,
           'credit' => credit?,
-          'storno' => storno?,
-          'funds_code' => funds_code,
+          'storno' => reversal?,
+          'reversal' => reversal?,
+          'expected' => expected?,
+          'funds_code' => credit_debit_indicator,
+          'credit_debit_indicator' => credit_debit_indicator,
           'swift_code' => swift_code,
           'reference' => reference,
           'bank_reference' => bank_reference,

data/lib/cmxl/statement.rb

@@ -58,8 +58,9 @@ module Cmxl
       field(20).reference
     end
 
+    #Get generation date from field 20. If generation date is not provided in field 20, method will fall back to field 13 if present.
     def generation_date
-      field(20).date || field(13).date
+      field(20).date || (field(13).nil? ? nil : field(13).date)
     end
 
     def account_identification

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = '1.4.6'.freeze
+  VERSION = '2.0'.freeze
 end

data/lib/cmxl.rb

@@ -1,6 +1,6 @@
 require 'cmxl/version'
 
-require 'rchardet19'
+require 'rchardet'
 
 require 'cmxl/field'
 require 'cmxl/statement'
@@ -31,14 +31,14 @@ module Cmxl
   def self.parse(data, options = {})
     options[:statement_separator] ||= config[:statement_separator]
     # if no encoding is provided we try to guess using CharDet
-    if options[:encoding].nil? && cd = CharDet.detect(data, silent: true)
-      options[:encoding] = cd.encoding
+    if options[:encoding].nil? && cd = CharDet.detect(data)
+      options[:encoding] = cd['encoding']
     end
 
     if options[:encoding]
-      data.encode!('UTF-8', options.delete(:encoding), options)
+      data.encode!('UTF-8', options.delete(:encoding), **options)
     else
-      data.encode!('UTF-8', options) unless options.empty?
+      data.encode!('UTF-8', **options) unless options.empty?
     end
 
     data.split(options[:statement_separator]).reject { |s| s.strip.empty? }.collect { |s| Cmxl::Statement.new(s.strip) }

data/spec/fields/transaction_spec.rb

@@ -7,8 +7,9 @@ describe Cmxl::Fields::Transaction do
   subject(:ocmt_cghs_transaction) { Cmxl::Fields::Transaction.parse(fixture_line(:statement_ocmt_chgs)) }
   subject(:supplementary_transaction) { Cmxl::Fields::Transaction.parse(fixture_line(:statement_supplementary_plain)) }
   subject(:complex_supplementary_transaction) { Cmxl::Fields::Transaction.parse(fixture_line(:statement_supplementary_complex)) }
-  subject(:valuta_after_enty_date) { Cmxl::Fields::Transaction.parse(fixture[3]) }
+  subject(:valuta_after_entry_date) { Cmxl::Fields::Transaction.parse(fixture[3]) }
   subject(:entry_before_valuta_transaction) { Cmxl::Fields::Transaction.parse(fixture[2]) }
+  subject(:transaction_type_swift) { Cmxl::Fields::Transaction.parse(fixture[4]) }
 
   let(:fixture) { fixture_line(:statement_line).split(/\n/) }
 
@@ -69,6 +70,11 @@ describe Cmxl::Fields::Transaction do
   end
 
   context 'statement with complex supplementary' do
+    it 'future reference' do
+      result = Cmxl::Fields::Transaction.parse(':61:2412121212ED162,57NDDTNONREF//950\n')
+      expect(result.amount).to eql(162.57)
+    end
+
     it { expect(complex_supplementary_transaction.initial_amount_in_cents).to eql(nil) }
     it { expect(complex_supplementary_transaction.initial_currency).to eql(nil) }
 
@@ -81,14 +87,102 @@ describe Cmxl::Fields::Transaction do
   end
 
   context 'valuta and entry-date assumptions' do
-    it 'entry_date before valuta is recognized correclty when including year-change' do
+    it 'entry_date before valuta is recognized correctly when including year-change' do
       expect(entry_before_valuta_transaction.date).to eql(Date.new(2014, 1, 10))
       expect(entry_before_valuta_transaction.entry_date).to eql(Date.new(2013, 12, 24))
     end
 
     it 'entry_date after valuta is recognized correctly when including year-change' do
-      expect(valuta_after_enty_date.date).to eql(Date.new(2014, 12, 24))
-      expect(valuta_after_enty_date.entry_date).to eql(Date.new(2015, 1, 2))
+      expect(valuta_after_entry_date.date).to eql(Date.new(2014, 12, 24))
+      expect(valuta_after_entry_date.entry_date).to eql(Date.new(2015, 1, 2))
+    end
+  end
+
+  context 'transaction type swift transfer' do
+    it { expect(transaction_type_swift.date).to eql(Date.new(2019, 11, 18)) }
+    it { expect(transaction_type_swift.entry_date).to eql(Date.new(2019, 11, 18)) }
+    it { expect(transaction_type_swift.funds_code).to eql('C') }
+    it { expect(transaction_type_swift.currency_letter).to eql('R') }
+    it { expect(transaction_type_swift.amount).to eql(653.0) }
+    it { expect(transaction_type_swift.amount_in_cents).to eql(65300) }
+    it { expect(transaction_type_swift.swift_code).to eql('S445') }
+    it { expect(transaction_type_swift.reference).to eql('328556-76501096') }
+    it { expect(transaction_type_swift).to be_credit }
+    it { expect(transaction_type_swift).not_to be_debit }
+    it { expect(transaction_type_swift).not_to be_storno }
+    it { expect(transaction_type_swift.sign).to eql(1) }
+  end
+
+  describe '#credit_debit_indicator' do
+    it 'returns the credit_debit_indicator as debit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902DR000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result.credit_debit_indicator).to eql('D')
+    end
+
+    it 'returns the credit_debit_indicator as credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902CR000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result.credit_debit_indicator).to eql('C')
+    end
+
+    it 'returns the credit_debit_indicator as reversal credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902RC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result.credit_debit_indicator).to eql('RC')
+    end
+
+    it 'returns the credit_debit_indicator as reversal debit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902RD000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result.credit_debit_indicator).to eql('RD')
+    end
+
+    it 'returns the credit_debit_indicator as expected credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902EC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result.credit_debit_indicator).to eql('EC')
+    end
+  end
+
+  describe '#expected?' do
+    it 'returns true if the transaction is expected' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902EC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).to be_expected
+    end
+
+    it 'returns false if the transaction is not expected' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902RD000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).not_to be_expected
+    end
+  end
+
+  describe '#expected_credit?' do
+    it 'returns true if the transaction is expected and credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902EC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).to be_expected_credit
+    end
+
+    it 'returns false if the transaction is not expected and credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902RC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).not_to be_expected_credit
+    end
+
+    it 'returns false if the transaction is expected and debit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902ED000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).not_to be_expected_credit
+    end
+  end
+
+  describe '#expected_debit?' do
+    it 'returns true if the transaction is expected and debit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902ED000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).to be_expected_debit
+    end
+
+    it 'returns false if the transaction is not expected and debit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902RD000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).not_to be_expected_debit
+    end
+
+    it 'returns false if the transaction is expected and credit' do
+      result = Cmxl::Fields::Transaction.parse(':61:1409010902EC000000000001,62NTRF0000549855700010//025498557/000001')
+      expect(result).not_to be_expected_debit
     end
   end
 end

data/spec/fixtures/lines/statement_line.txt

@@ -2,3 +2,5 @@
 :61:1409010902RCR000000000001,62NTRF0000549855700010//025498557/000001
 :61:1401101224CR000000000001,62NTRF0000549855700010//025498557/000001
 :61:1412240102CR000000000001,62NTRF0000549855700010//025498557/000001
+:61:1911181118CR653,00S445328556-76501096
+

data/spec/fixtures/mt940.txt

@@ -74,3 +74,34 @@ Interest credit
 :62F:C020325PLN50040,00
 
 -
+
+:20:01ANWZTPJTYEGJWA
+:25:45050050/76198810
+:28:27/01
+:60F:C131016DEM84349,74
+:61:131017D6800,NCHK16703074
+:86:999PN5477SCHECK-NR. 0000016703074
+:61:131017D620,3NSTON
+:86:999PN0911DAUERAUFTR.NR. 14
+:61:131017C18500,NCLRN
+:86:999PN2406SCHECK
+:61:131015D14220,NBOEN
+:86:999PN0920WECHSEL
+:61:131017D1507,NTRFN
+:86:999PN0920SCHNELLUEB
+:61:131024C4200,NMSCN
+:86:999PN2506AUSSENH. NR. 1
+:61:131017D19900,NTRFN
+:86:999PN0907UEBERTRAG
+:61:131017D400,NTRFN
+:86:999PN0891BTX
+:61:131018C3656,74NMSCN
+:86:999PN0850EINZAHLG.N
+:61:131019C23040,NMSCN
+:86:999PN0812LT.ANLAGE
+:61:131027D5862,14NCHKN
+:86:999PN5329AUSLSCHECK
+:62F:C131017DEM84437,04
+
+-
+

data/spec/fixtures/mt942.txt

@@ -7,3 +7,15 @@
 :86:008?00DAUERAUFTRAG?100599?20Miete Dezember?3010020030?31234567?32MUELLER?34339
 :90D:0EUR0,00
 :90C:1EUR9792,00
+
+-
+
+:20:01ANWZTPJTYEGJWA
+:25:45050050/76198810
+:28C:13/37
+:34F:EURD12345,67
+:13D:1901091733+0100
+:61:190109C9792,00FTRFNONREF
+:86:008?00DAUERAUFTRAG?100599?20Miete Dezember?3010020030?31234567?32MUELLER?34339
+:90D:0EUR0,00
+:90C:1EUR9792,00

data/spec/mt940_parsing_spec.rb

@@ -61,11 +61,18 @@ describe 'parsing a statement' do
     it { expect(subject.field('NS').to_h).to eql({tag: 'NS', modifier: 'F', source: 'HelloWorld'}) }
   end
 
+  context 'no generation date' do
+    subject { Cmxl.parse(mt940_file('mt940'))[3] }
+
+    it { expect(subject.reference).to eql('01ANWZTPJTYEGJWA') }
+    it { expect(subject.generation_date).to eql(nil) }
+  end
+
   context 'statement separator as used by most banks' do
     subject { Cmxl.parse(mt940_file('mt940')) }
 
     it 'detects all statements by default' do
-      expect(subject.size).to eq(3)
+      expect(subject.size).to eq(4)
     end
   end
 

data/spec/statement_spec.rb

@@ -27,9 +27,12 @@ describe Cmxl do
           'bank_reference' => '025498557/000001',
           'amount_in_cents' => 162,
           'sign' => -1,
+          'credit_debit_indicator' => 'D',
           'debit' => true,
           'credit' => false,
           'storno' => false,
+          'reversal' => false,
+          'expected' => false,
           'bic' => 'HYVEDEMMXXX',
           'iban' => 'HUkkbbbsssskcccccccccccccccx',
           'name' => 'Peter Pan',
@@ -81,6 +84,7 @@ describe Cmxl do
           'sha' => '3c5e65aa3d3878b06b58b6f1ae2f3693004dfb04e3ab7119a1c1244e612293da',
           'entry_date' => Date.new(2014, 9, 2),
           'funds_code' => 'D',
+          'credit_debit_indicator' => 'D',
           'currency_letter' => 'R',
           'amount' => 1.62,
           'swift_code' => 'NTRF',
@@ -90,7 +94,9 @@ describe Cmxl do
           'sign' => -1,
           'debit' => true,
           'credit' => false,
-          'storno' => false
+          'storno' => false,
+          'reversal' => false,
+          'expected' => false,
         )
       end
     end
@@ -145,4 +151,20 @@ describe Cmxl do
       expect(subject.transactions.first.iban).to eq('234567')
     end
   end
+
+  context 'mt942 generation date from field 20' do
+    subject(:statement) { Cmxl.parse(mt940_file('mt942')).first }
+
+    it { expect(statement.mt942?).to be_truthy }
+    it { expect(statement.generation_date).to eql(Date.new(2013, 11, 10)) }
+
+  end
+
+  context 'mt942 generation date from field 13' do
+    subject(:statement) { Cmxl.parse(mt940_file('mt942'))[1] }
+
+    it { expect(statement.mt942?).to be_truthy }
+    it { expect(statement.generation_date).to eql(Date.new(2019, 1, 9)) }
+  end
+
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: '2.0'
 platform: ruby
 authors:
 - Michael Bumann
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rchardet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rchardet19
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Cmxl provides an friendly, extensible and customizable parser for the
   MT940 bank statement format.
 email:
@@ -102,9 +101,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".semaphore/semaphore.yml"
 - CHANGELOG.mdown
 - Gemfile
 - LICENSE.txt
@@ -198,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser
 test_files:

data/.semaphore/semaphore.yml

@@ -1,101 +0,0 @@
-version: v1.0
-name: Test
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804
-blocks:
-  - name: Setup
-    task:
-      jobs:
-        - name: Checkout
-          commands:
-            - checkout
-            - ls
-            - rm -f .rbenv-version .ruby-version
-
-  - name: Tests
-    task:
-      env_vars:
-        - name: CC_TEST_REPORTER_ID
-          value: 149f0d20e17ace00c44be432a4194bc441ba805da89a7708fca0f4a2c3f2aed7
-      jobs:
-        - name: "2.0.0-p648"
-          commands:
-            - checkout
-            - sem-version ruby 2.0.0-p648
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.1.10"
-          commands:
-            - checkout
-            - sem-version ruby 2.1.10
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.2.10"
-          commands:
-            - checkout
-            - sem-version ruby 2.2.10
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.3"
-          commands:
-            - checkout
-            - sem-version ruby 2.3
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.4"
-          commands:
-            - checkout
-            - sem-version ruby 2.4
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.5"
-          commands:
-            - checkout
-            - sem-version ruby 2.5
-            - cache restore
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "2.6 including Code Climate"
-          commands:
-            - checkout
-            - sem-version ruby 2.6
-            - cache restore
-            - bundle install
-            - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-            - chmod +x ./cc-test-reporter
-            - cache store
-            - ./cc-test-reporter before-build
-            - bundle exec rspec
-            - ./cc-test-reporter after-build
-
-        - name: "jruby-9.1.17.0"
-          commands:
-            - checkout
-            - sem-version ruby jruby-9.1.17.0
-            - cache restore
-            - gem install bundler
-            - bundle install
-            - cache store
-            - bundle exec rspec
-        - name: "jruby-9.2.0.0"
-          commands:
-            - checkout
-            - sem-version ruby jruby-9.2.0.0
-            - cache restore
-            - gem install bundler
-            - bundle install
-            - cache store
-            - bundle exec rspec