cmxl 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 82b72d8655b552c6a10bae7df6882bf313ea472b
-  data.tar.gz: 630a7f8c31eee13bec9ca238ea492f0bad384515
+SHA256:
+  metadata.gz: 037ec6226374da8a4c7f2f32109056c2bdf7219e8a1ef4d2cca79c5e644a0f77
+  data.tar.gz: 8d0f83fe9c414c0416f28383910b91d3d12dcd678664546596266c0e612084e6
 SHA512:
-  metadata.gz: dcfab68cd74b8c40ccd21799693f20be692ae3a38c2edfc02c06972ebd0148e06a91c3031d715fb5f97b6d8d923d7802db2763ee01d91e5ba34f3b201f678438
-  data.tar.gz: f7936f2ba25cd820f81241a46588ff03dd66f8cf9b3dd4165e9eb5c372eec020a0f82b0053d5a39756e1c554471299fd6879501663ff2e4343de115191374a2c
+  metadata.gz: de2ec010f0e1602366ac9149884b70feb00781a885bd9aee72adecfeeca3e5088f6943752aa9f1b29cf064f8323e55189295c37f82df427b6450ec67e349baf1
+  data.tar.gz: da503e542f541503bc43ea3b25e7e9bf3ef018f4fc34084b1272d1f3d55ad1ff0108d21079cb9819b1c19c853e1ad1ef84aa6af7bd092ecbff1946f3c535046c

data/CHANGELOG.mdown

@@ -1,3 +1,6 @@
+# 1.1.1
+  * [BUGFIX] prevents short bank references from swallowing supplementary details delimiter
+
 # 1.1.0
   * [FEATURE] adds support for supplementary details in transactions (Field 61, Subfield 9) (#18)
 

data/lib/cmxl/field.rb

@@ -45,7 +45,7 @@ module Cmxl
     #
     def self.parse(line)
       if line.match(/\A:(\d{2,2})(\w)?:(.*)\z/m)
-        tag, modifier, content = $1, $2, $3.gsub(/\r?\n\z/, '') # remove trailing line break to prevent empty field parsing
+        tag, modifier, content = $1, $2, $3.gsub(/\r/, '').gsub(/\n\z/, '') # remove trailing line break to prevent empty field parsing
         Field.parsers[tag.to_s].new(content, modifier, tag)
       else
         raise LineFormatError, "Wrong line format: #{line.dump}" if Cmxl.config[:raise_line_format_errors]

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|.{0,16})((?:\/\/)(?<bank_reference>[^\n]*))?((?:[\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).{3})(?<reference>NONREF|(.(?!\/\/)){,16}([^\/]){,1})((?:\/\/)(?<bank_reference>[^\n]{,16}))?((?:\n)(?<supplementary>.{,34}))?$}
 
       attr_accessor :details
 
@@ -129,7 +129,7 @@ module Cmxl
           'currency_letter' => currency_letter,
         }.tap do |h|
           h.merge!(details.to_h) if details
-          h.merge!(supplementary.to_h) unless supplementary.source.empty?
+          h.merge!(supplementary.to_h) if supplementary.source
         end
       end
 

data/lib/cmxl/fields/transaction_supplementary.rb

@@ -6,8 +6,8 @@ module Cmxl
 
       class << self
         def parse(line)
-          initial = $1 if line.match(initial_parser)
-          charges = $1 if line.match(charges_parser)
+          initial = $1 if line && line.match(initial_parser)
+          charges = $1 if line && line.match(charges_parser)
           new(line, initial, charges)
         end
 

data/lib/cmxl/version.rb

@@ -1,3 +1,3 @@
 module Cmxl
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/fields/transaction_spec.rb

@@ -6,6 +6,7 @@ describe Cmxl::Fields::Transaction do
   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)) }
 
   let(:fixture) { fixture_line(:statement_line).split(/\n/) }
 
@@ -64,4 +65,16 @@ describe Cmxl::Fields::Transaction do
 
     it { expect(supplementary_transaction.supplementary.source).to eql('Card Transaction') }
   end
+
+  context 'statement with complex supplementary' do
+    it { expect(complex_supplementary_transaction.initial_amount_in_cents).to eql(nil) }
+    it { expect(complex_supplementary_transaction.initial_currency).to eql(nil) }
+
+    it { expect(complex_supplementary_transaction.charges_in_cents).to eql(nil) }
+    it { expect(complex_supplementary_transaction.charges_currency).to eql(nil) }
+
+    it { expect(complex_supplementary_transaction.reference).to eql('FOOBAR/123') }
+    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
 end

data/spec/fixtures/lines/statement_supplementary_complex.txt

@@ -0,0 +1,2 @@
+:61:180627D79,NMSCFOOBAR/123//HERP-DERP-REF
+random text / and stuff

data/spec/fixtures/lines/statement_supplementary_plain.txt

@@ -1,2 +1,2 @@
-:61:0306280628D21,00FMSCNONREF//98327000090031789
+:61:0306280628D21,00FMSCNONREF//983270000900317
 Card Transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmxl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michael Bumann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -151,6 +151,7 @@ files:
 - spec/fixtures/lines/statement_number.txt
 - spec/fixtures/lines/statement_ocmt.txt
 - spec/fixtures/lines/statement_ocmt_chgs.txt
+- spec/fixtures/lines/statement_supplementary_complex.txt
 - spec/fixtures/lines/statement_supplementary_plain.txt
 - spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-iso8859-1.txt
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Cmxl is your friendly MT940 bank statement parser
@@ -215,6 +216,7 @@ test_files:
 - spec/fixtures/lines/statement_number.txt
 - spec/fixtures/lines/statement_ocmt.txt
 - spec/fixtures/lines/statement_ocmt_chgs.txt
+- spec/fixtures/lines/statement_supplementary_complex.txt
 - spec/fixtures/lines/statement_supplementary_plain.txt
 - spec/fixtures/mt940-deutsche_bank.txt
 - spec/fixtures/mt940-iso8859-1.txt