cmxl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42504a4554682fd712473e3e744db2892083965e
-  data.tar.gz: 3830a7a989cb7f5d490122d2079e67a45dcc75a3
+  metadata.gz: cd3e4666e761be27044a4b4e97aabb85ad3d714d
+  data.tar.gz: 2333bb6d9680fbf7ffafd4488f53760cbce29960
 SHA512:
-  metadata.gz: 4fc0b6927125e065f9c5b9f8c15f2e6ee7d35feb938a72f9bfde9e059e672389e2a00c6e747e81dacf50ca062a8eb1dd39cac7c30272d40fd282022124ddd56a
-  data.tar.gz: f64a53ecbf51cedbaf80fdcad20a9e0e1aa47bd9780cb05768401d3449756344ad4956e4bb4eaef10bfe2851409b72c95cdc6ba0298582a95a51ce1568c1d766
+  metadata.gz: 3bbb768c8b133798c7208f38d62def5b8282661c8eca73a0178eea1826170e1d69bdc200b23ae42b30af38e738368d7641f2babe3c178fc8b5752ff58e0348b7
+  data.tar.gz: 5fcd0c23e6bdbdb8b1c3465089c76025dc19bce761eb7f7b848287ae82a5138d669857c1719fbc345f0df5377ab69889c7387b4c5a03ab56c9a4c331cbfb5c23

data/.travis.yml

@@ -1,15 +1,13 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - jruby
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
+  - 2.2.8
+  - 2.3.4
+  - 2.4.3
+  - 2.5.0
+  - jruby-9.1.10.0
+before_install:
+  gem update --system
 after_success:
   - bundle exec codeclimate-test-reporter
 addons:

data/CHANGELOG.mdown

@@ -1,3 +1,9 @@
+# 0.2.1
+  * addressing an bug that occoured for transactions submitted end of
+    but were fetched in the new year -> those ended up with the wrong year
+    on the entry date
+  * MT942 support for field 13
+
 # 0.2.0
   * added several balance related accessors (#7)
   * configuration option for `statement separator` (#5)

data/lib/cmxl/fields/entry_date.rb

@@ -0,0 +1,12 @@
+module Cmxl
+  module Fields
+    class EntryDate < Field
+      self.tag = 13
+      self.parser = DATE
+
+      def date
+        to_date(source)
+      end
+    end
+  end
+end

data/lib/cmxl/fields/statement_details.rb

@@ -23,7 +23,9 @@ module Cmxl
 
       def sepa
         if self.information =~ /([A-Z]{4})\+/
-          Hash[*self.information.split(/([A-Z]{4})\+/)[1..-1]]
+          Hash[
+            *self.information.split(/([A-Z]{4})\+/)[1..-1].tap {|info| info << "" if info.size.odd? }
+          ]
         else
           {}
         end

data/lib/cmxl/fields/transaction.rb

@@ -37,8 +37,15 @@ module Cmxl
       def date
         to_date(self.data['date'])
       end
+
       def entry_date
-        to_date(self.data['entry_date'], self.date.year) if self.data['entry_date'] && self.date
+        if self.data['entry_date'] && self.date
+          if date.month == 1 && date.month < to_date(self.data['entry_date'], self.date.year).month
+            to_date(self.data['entry_date'], self.date.year - 1)
+          else
+            to_date(self.data['entry_date'], self.date.year)
+          end
+        end
       end
 
       # Fields from details

data/lib/cmxl/statement.rb

@@ -73,7 +73,7 @@ module Cmxl
     end
 
     def generation_date
-      self.field(20).date
+      self.field(20).date || self.field(13).date
     end
 
     def account_identification

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fields/entry_date_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Cmxl::Fields::EntryDate do
+  context 'iban' do
+    subject { Cmxl::Fields::EntryDate.parse( fixture_line(:entry_date) ) }
+
+    it { expect(subject.date).to eql(Date.parse('2017/12/29')) }
+  end
+end

data/spec/fields/statement_details_spec.rb

@@ -73,4 +73,12 @@ describe Cmxl::Fields::StatementDetails do
     it { expect(subject.to_hash).to eql(subject.to_h) }
   end
 
+  describe 'information parsing with empty fields on the end' do
+    subject { Cmxl::Fields::StatementDetails.parse(fixture_line(:statement_details_empty_fields)) }
+
+    it { expect(subject.sepa).to eql({
+          "EREF" => "S1001675",
+          "SVWZ" => ""
+    }) }
+  end
 end

data/spec/fixtures/lines/entry_date.txt

@@ -0,0 +1 @@
+:13D:1712290540+0100

data/spec/fixtures/lines/statement_details_empty_fields.txt

@@ -0,0 +1 @@
+:86:166?00SEPA-CT HABEN EINZELBUCHUNG?1097261?20EREF+S1001675?21SVWZ+?30DEUTDEDB510?31DE23510700240352432900?32John Doe

data/spec/fixtures/statement-mt940.txt

@@ -1 +1,2 @@
 :61:1409010902DR000000000001,62NTRF0000549855700010//025498557/000001
+:61:1401041229DR000000000001,62NTRF0000549855700010//025498557/000001

data/spec/statement_spec.rb

@@ -90,6 +90,18 @@ describe Cmxl do
     end
   end
 
+  describe 'statement issued over a years boudary' do
+    subject { Cmxl.parse( mt940_file('statement-mt940') ).first.transactions.last }
+
+    it 'includes correct entry date' do
+      expect(subject.entry_date).to eq(Date.new(2013,12,29))
+    end
+
+    it 'includes correct date' do
+      expect(subject.date).to eq(Date.new(2014,01,04))
+    end
+  end
+
   describe 'statement with detailed end balance' do
     subject { Cmxl.parse( mt940_file('mt940-with-detailed-end-balance') ).first.transactions.first }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ files:
 - lib/cmxl/fields/account_identification.rb
 - lib/cmxl/fields/available_balance.rb
 - lib/cmxl/fields/closing_balance.rb
+- lib/cmxl/fields/entry_date.rb
 - lib/cmxl/fields/reference.rb
 - lib/cmxl/fields/statement_details.rb
 - lib/cmxl/fields/statement_number.rb
@@ -114,6 +115,7 @@ files:
 - spec/fields/account_identification_spec.rb
 - spec/fields/available_balance_spec.rb
 - spec/fields/closing_balance_spec.rb
+- spec/fields/entry_date_spec.rb
 - spec/fields/reference_spec.rb
 - spec/fields/statement_details_spec.rb
 - spec/fields/statement_number_spec.rb
@@ -125,8 +127,10 @@ files:
 - spec/fixtures/lines/account_identification_legacy.txt
 - spec/fixtures/lines/available_balance.txt
 - spec/fixtures/lines/closing_balance.txt
+- spec/fixtures/lines/entry_date.txt
 - spec/fixtures/lines/reference.txt
 - spec/fixtures/lines/statement_details.txt
+- spec/fixtures/lines/statement_details_empty_fields.txt
 - spec/fixtures/lines/statement_line.txt
 - spec/fixtures/lines/statement_number.txt
 - spec/fixtures/mt940-deutsche_bank.txt
@@ -161,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser
@@ -171,6 +175,7 @@ test_files:
 - spec/fields/account_identification_spec.rb
 - spec/fields/available_balance_spec.rb
 - spec/fields/closing_balance_spec.rb
+- spec/fields/entry_date_spec.rb
 - spec/fields/reference_spec.rb
 - spec/fields/statement_details_spec.rb
 - spec/fields/statement_number_spec.rb
@@ -182,8 +187,10 @@ test_files:
 - spec/fixtures/lines/account_identification_legacy.txt
 - spec/fixtures/lines/available_balance.txt
 - spec/fixtures/lines/closing_balance.txt
+- spec/fixtures/lines/entry_date.txt
 - spec/fixtures/lines/reference.txt
 - spec/fixtures/lines/statement_details.txt
+- spec/fixtures/lines/statement_details_empty_fields.txt
 - spec/fixtures/lines/statement_line.txt
 - spec/fixtures/lines/statement_number.txt
 - spec/fixtures/mt940-deutsche_bank.txt