cmxl 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5e0a335b0d8a997acf80ab578362f77f08880b0d7258f3c3af365b71eb53925
-  data.tar.gz: b2d3c8dd9925866da29d27cc43457652f2fdf377bcd1080feb87d654a88b37e4
+  metadata.gz: 41f6f1b53eb060758d035fe5d0b3475b42b12bf10c749418a3b72b3c98482140
+  data.tar.gz: 1e5f3ee6fcbbdca480600b029c573ccc614a2adba34e66c440286a99d5be963b
 SHA512:
-  metadata.gz: fa0be57b4e8643e1a20f4bb276d7953eb7cc3f16cc3c89286b5ca6fa7e2a9b285b1358424f6904d086315907d1ba77f2d89616980a82bb4360f162e91eaf2477
-  data.tar.gz: 2990c106239b3f65c35abdc662af7afdba0ba4d539e1e9f3838179d5f238e1b72fbf43b82743bce5a060b291a4a9f28031f3bc4aba9e39f76c155d178d1f1b83
+  metadata.gz: 1f4af37922a0e6d14795c7274a64a60697660b6e0f7399947e7bdae6973b4ea3dbe22a3e73e2923004a16ce215577565ac4f609283752401359228d8709e7c57
+  data.tar.gz: 0a9aecfe5f17a5bd09dcce8e96c45af26c3d89c79ce505aad9806849e1fbaa082dccb02d562ff8552283a14d6027a4f5b11de3a1237dc790d0c609bdc1f15d1f

data/CHANGELOG.mdown

@@ -1,3 +1,8 @@
+# 1.4.1
+
+- [BUGFIX] changes entry date calculation for transaction
+  Thanks to [@grncdr](https://github.com/grncdr)
+
 # 1.4.0
 
 - [FEATURE] adds ability to parse non-numerical tags ([#23](https://github.com/railslove/cmxl/issues/23)) \

data/lib/cmxl/fields/transaction.rb

@@ -59,13 +59,19 @@ module Cmxl
       end
 
       def entry_date
-        if data['entry_date'] && date
-          if date.month == 1 && date.month < to_date(data['entry_date'], date.year).month
-            to_date(data['entry_date'], date.year - 1)
-          else
-            to_date(data['entry_date'], date.year)
-          end
-        end
+        return if !date || !data['entry_date']
+
+        e_date = to_date(data['entry_date'], date.year)
+        # we assume that valuta (date) and entry_date have a close connection. so valuta and entry_date should not be
+        # further apart than one month. this leads to some edge cases
+
+        # valuta is in january while entry_date is in december => entry_date was done the year before
+        e_date = to_date(data['entry_date'], date.year - 1) if date.month == 1 && e_date.month == 12
+
+        # valuta is in december but entry_date is in january => entry_date is actually in the year after valuta
+        e_date = to_date(data['entry_date'], date.year + 1) if date.month == 12 && e_date.month == 1
+
+        e_date
       end
 
       def supplementary

data/lib/cmxl/statement.rb

@@ -26,12 +26,9 @@ module Cmxl
     def parse!
       self.fields = []
 
-      # split transactions, each transaction starts with a colon after a linebreak
-      # do not remove line breaks within transaction lines as they are used to determine field details
-      # e.g. :61:-supplementary
-      source.split("\n:").each(&:strip!).each do |line|
-        line = ":#{line}" unless line =~ /^:/ # prepend lost : via split
+      lines = source.split(/(:[0-9A-Z]{2,3}:)/m).reject(&:empty?).each_slice(2).map(&:join)
 
+      lines.map do |line|
         if line =~ /\A:86:/
           if field = fields.last
             field.add_meta_data(line)

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/spec/fields/transaction_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 describe Cmxl::Fields::Transaction do
-  subject(:debit_transaction) { Cmxl::Fields::Transaction.parse(fixture.first) }
-  subject(:storno_credit_transaction) { Cmxl::Fields::Transaction.parse(fixture.last) }
+  subject(:debit_transaction) { Cmxl::Fields::Transaction.parse(fixture[0]) }
+  subject(:storno_credit_transaction) { Cmxl::Fields::Transaction.parse(fixture[1]) }
   subject(:ocmt_transaction) { Cmxl::Fields::Transaction.parse(fixture_line(:statement_ocmt)) }
   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(:entry_before_valuta_transaction) { Cmxl::Fields::Transaction.parse(fixture[2]) }
 
   let(:fixture) { fixture_line(:statement_line).split(/\n/) }
 
@@ -77,4 +79,16 @@ describe Cmxl::Fields::Transaction do
     it { expect(complex_supplementary_transaction.bank_reference).to eql('HERP-DERP-REF') }
     it { expect(complex_supplementary_transaction.supplementary.source).to eql('random text / and stuff') }
   end
+
+  context 'valuta and entry-date assumptions' do
+    it 'entry_date before valuta is recognized correclty 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))
+    end
+  end
 end

data/spec/fixtures/lines/statement_line.txt

@@ -1,2 +1,4 @@
 :61:1409010902DR000000000001,62NTRF0000549855700010//025498557/000001
 :61:1409010902RCR000000000001,62NTRF0000549855700010//025498557/000001
+:61:1401101224CR000000000001,62NTRF0000549855700010//025498557/000001
+:61:1412240102CR000000000001,62NTRF0000549855700010//025498557/000001

data/spec/fixtures/mt940-with-colon-after-line-break.txt

@@ -0,0 +1,11 @@
+:20:131110
+:25:45050050/76198810
+:28:27/01
+:60F:C131016DEM84349,74
+:61:131017D6800,NCHK16703074
+/OCMT/CAD47,11
+:86:106?109075/658?20EREF+000000000193592204?21MREF+CN3R3U?22CRED+DE7
+600200000132558?23SVWZ+STARTER//8449273399/US?24 22-04-2019T03:46
+:08 Karten?25nr. 5355999999999975  Origi?26nal 49,00 USD 1 EUR/1,
+12385?27 USD  Entgelt 0,44 EUR?30DEUTDEDBFRA?31DE1950070024000402
+0480?32DEUTSCHE BANK

data/spec/statement_spec.rb

@@ -120,6 +120,14 @@ describe Cmxl do
         expect(subject.bic).to eq('10020030')
       end
     end
+
+    describe 'statement with colon right after linebreak' do
+      subject { Cmxl.parse(mt940_file('mt940-with-colon-after-line-break')).first.transactions.first }
+
+      it 'has the right details' do
+        expect(subject.to_h['details']).to eq('?109075/658?20EREF+000000000193592204?21MREF+CN3R3U?22CRED+DE7600200000132558?23SVWZ+STARTER//8449273399/US?24 22-04-2019T03:46:08 Karten?25nr. 5355999999999975  Origi?26nal 49,00 USD 1 EUR/1,12385?27 USD  Entgelt 0,44 EUR?30DEUTDEDBFRA?31DE19500700240004020480?32DEUTSCHE BANK')
+      end
+    end
   end
 
   context 'mt942' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,6 +165,7 @@ files:
 - spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-headers.txt
 - spec/fixtures/mt940-iso8859-1.txt
+- spec/fixtures/mt940-with-colon-after-line-break.txt
 - spec/fixtures/mt940-with-detailed-end-balance.txt
 - spec/fixtures/mt940.txt
 - spec/fixtures/mt942.txt
@@ -239,6 +240,7 @@ test_files:
 - spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-headers.txt
 - spec/fixtures/mt940-iso8859-1.txt
+- spec/fixtures/mt940-with-colon-after-line-break.txt
 - spec/fixtures/mt940-with-detailed-end-balance.txt
 - spec/fixtures/mt940.txt
 - spec/fixtures/mt942.txt