cmxl 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9599937da1fa4217f44747b0214af2111514da12832eea323afca3ce1bf11b
-  data.tar.gz: 0b9bd79c985742fcfcaab730fe69eea91dc2d50b9d0cc1f3f96e6c15b50a3d16
+  metadata.gz: 661a3296bdc88ce9874f07cb4a1cf4220bf1a60ea559e289edc5c5c34774764b
+  data.tar.gz: 4f0217f656646bd14540e5993f6419354641f30d901e8b7afc884b46fc5ac69e
 SHA512:
-  metadata.gz: 48ce33cbd21b7df6dce69cc610ccd02efd01df7b2c080be21b47682ad8754b641ee0598795ff9ec380373cab2679cc0235f344e986e1c274d427a435895c2e5c
-  data.tar.gz: 0ee463246d09088cb8d4f9c7aa3979d19db3a4f487f8efdd359e01050503714d20e88a6fa40e1fd226dc83f785a031269516ca466b4ad974bc8c048127c72e50
+  metadata.gz: 407ecb157601f8cc767ddb7699edbadc66582041cdcd8d1de3b3e169a41865d3f81ffdb794b7b9f8add8a55ecea1e16e4048f30a117cfe2401b05b487d2e1bcf
+  data.tar.gz: 4cbfe3e46cc9a00527bfa1a4d465f5e0ad4311d915449b45a81b172e1a653ee3ec2605778bb1241aca752016651b8f54dad0daf00769349a6a80cb679cff0dcf

data/.travis.yml

@@ -0,0 +1,9 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+  - jruby-9.1.17.0
+  - jruby-9.2.11.1

data/CHANGELOG.mdown

@@ -1,3 +1,11 @@
+# NEXT release
+
+# 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,6 +1,4 @@
-[![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)
+[![Build Status](https://travis-ci.org/railslove/cmxl.svg?branch=master)](https://travis-ci.org/railslove/cmxl)
 [![Gem Version](https://badge.fury.io/rb/cmxl.svg)](http://badge.fury.io/rb/cmxl)
 
 # Cmxl - your friendly ruby MT940 parser
@@ -8,7 +6,7 @@
 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
 
 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
 
 
@@ -86,14 +84,14 @@ 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
 
@@ -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-Licence. 
 
-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/lib/cmxl.rb

@@ -36,9 +36,9 @@ module Cmxl
     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/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})?(?<storno_flag>R?)(?<funds_code>[CD]{1})(?<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
 

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 = '1.5.0'.freeze
 end

data/spec/fields/transaction_spec.rb

@@ -9,6 +9,7 @@ describe Cmxl::Fields::Transaction do
   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(: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/) }
 
@@ -91,4 +92,19 @@ describe Cmxl::Fields::Transaction do
       expect(valuta_after_enty_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
 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

@@ -145,4 +145,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".semaphore/semaphore.yml"
+- ".travis.yml"
 - CHANGELOG.mdown
 - Gemfile
 - LICENSE.txt
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser

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