cremul-parser 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7825dfa6f85b710b139911059377276d2ecde921
-  data.tar.gz: 6415ab1b5fe953431f2850f5255b79dfd8ed74ec
+  metadata.gz: f7d37e7ea9a0f2a71f205a8626cd1a3e3b40e0c2
+  data.tar.gz: 223f59f9bad82d84c45707f52bcba71e467d3664
 SHA512:
-  metadata.gz: a5694b537a28413741e6f5882a62fc66b9add15782291be927f1945f763d2f0c022334fd22447f24a8486ad28626b67ec70f8058cfb4e274eb56c5a008c3df53
-  data.tar.gz: 8cba193e51669dfb1da891f86259b307fb461defa7ec5e99eb87d31001a0f287da9f73b239b4cbb31addbe42a4d67a7dd568598a8a28d5caffee0ea60eee2963
+  metadata.gz: 559c0548efc556273b498b5501ebe69892ae6e664d1cce8cd617e254de65482b426d91760b703306029a2a25db34fa9437d2d6517969d1daf5d28742979e6a95
+  data.tar.gz: 9576276c7c842514c3988dc92c909d948aab3ac00f93137059e34725236ff415a5b7d7b1087bcb5516b6335c355278bf35fb2a035e538615ab46cc5c922571fc

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+CREMUL0002_23-05-14.DAT

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.0.5
+
+- Refactored the ParserHelper to make it more DRY, and fixed a bug in CremulHeader regarding the parsing the 
+optional NAD-element in the header. 
+- Fixed a bug in CremulMoney which caused amounts with decimal mark to be parsed without the fractional part.
+- Fixed a bug in CremulPaymentTx related to parsing the FII+OR segment when it contains a payer 
+account holder name in addition to the account number.
+
 ## 0.0.4
 
 Added support for files using a CNT:LIN symbol instead of CNT:LI as the standard says.

data/README.md

@@ -46,8 +46,6 @@ f.close
 
 See the `parser_test.rb` file for more details.
 
-## Version
-
 ## Copyright
 
 Copyright (c) 2014 Per Spilling (per@kodemaker.no). See LICENSE.txt for details.

data/lib/cremul/cremul_header.rb

@@ -6,22 +6,20 @@ class CremulHeader
   # bf_id : Beneficiary ID. When the beneficiary is an organization this will be the organzation-number,
   #         and when the beneficiary is a person this will be the SSN, aka personnummer (NO).
 
-  #attr_reader :header_segments, :msg_id, :created_date, :bf_id
   attr_reader :msg_id, :created_date, :bf_id
 
   # Expects an array with all segments in the CREMUL file
   def initialize(segments)
-    #i = next_line_segment_index(segments, 0)
-    #@header_segments = {}
-    #segments[0,i].each {|s| @header_segments[s[0,3]] = s[3,s.size] }
-
     @msg_id = segments[msg_id_segment_index(segments)]
 
     d = segments[next_date_segment_index(segments, 0)].split(':')
     @created_date = Date.parse(d[1])
 
-    nad = segments[next_nad_segment_index(segments, 0)]
-    @bf_id = nad.split('+')[2].to_i
+    bf_nad_index = next_nad_segment_index(segments, 0) # may not be present in the header
+    unless bf_nad_index.nil?
+      nad = segments[bf_nad_index]
+      @bf_id = nad.split('+')[2].to_i
+    end
   end
 
 end

data/lib/cremul/cremul_money.rb

@@ -9,8 +9,8 @@ class CremulMoney
 
   def initialize(money_segment)
     m = money_segment.split(':')
-
-    @amount = m[1].to_f
+    a = m[1].gsub(',', '.') # , is used as decimal mark
+    @amount = a.to_f
     if m.size == 3
       @currency = m[2].to_sym
     else

data/lib/cremul/cremul_payment_tx.rb

@@ -18,7 +18,11 @@ class CremulPaymentTx
     @posting_date = Date.parse(s[1])
 
     s = segments[next_fii_or_segment_index(segments, tx_segment_pos)].split('+')
-    @payer_account_number = s[2]
+    if s[2].include? ':'
+      @payer_account_number = s[2].split(':')[0]  # the part after the : is the payer account holder name
+    else
+      @payer_account_number = s[2]
+    end
 
     init_invoice_ref(segments, tx_segment_pos)
     init_free_text(segments, tx_segment_pos)

data/lib/cremul/parser_helper.rb

@@ -72,71 +72,66 @@ module Cremul
       segments.index { |x| /UNH.*/.match(x) }
     end
 
-    def next_date_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /DTM.*/.match(x) }
-      index += start_pos unless index.nil?
+    def find_index_by_regex(segments, start_pos, end_pos=nil, regex)
+      if end_pos.nil?
+        end_pos = next_tx_sequence_segment_index(segments, start_pos+1)
+        if end_pos.nil? # no more segments
+          end_pos = segments.size
+        end
+      end
+      index = nil
+      unless end_pos.nil?
+        index = segments[start_pos, end_pos-start_pos].index { |x| regex.match(x) }
+        index += start_pos unless index.nil?
+      end
       index
     end
 
-    def next_amount_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /MOA.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def next_date_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /DTM.*/)
+    end
+
+    def next_amount_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /MOA.*/)
     end
 
     def next_line_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /LIN\+\d/.match(x) }
-      index += start_pos unless index.nil?
-      index
+      find_index_by_regex(segments, start_pos, segments.size, /LIN\+\d/)
     end
 
     def next_tx_sequence_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /SEQ\+\+\d/.match(x) }
-      index += start_pos unless index.nil?
-      index
+      find_index_by_regex(segments, start_pos, segments.size, /SEQ\+\+\d/)
     end
 
-    def doc_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /DOC.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def doc_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /DOC.*/)
     end
 
-    def payment_details_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /FTX\+PMD.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def payment_details_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /FTX\+PMD.*/)
     end
 
     # Optional segment with free text info regarding the payment
-    def payment_advice_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /FTX\+AAG.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def payment_advice_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /FTX\+AAG.*/)
     end
 
-    def next_ref_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /RFF.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def next_ref_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /RFF.*/)
     end
 
-    def next_fii_bf_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /FII\+BF.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    # Bank account of beneficiary
+    def next_fii_bf_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /FII\+BF.*/)
     end
 
-    def next_fii_or_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /FII\+OR.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    # Bank account of payer
+    def next_fii_or_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /FII\+OR.*/)
     end
 
-    def next_nad_segment_index(segments, start_pos)
-      index = segments[start_pos, segments.size].index { |x| /NAD.*/.match(x) }
-      index += start_pos unless index.nil?
-      index
+    def next_nad_segment_index(segments, start_pos, end_pos=nil)
+      find_index_by_regex(segments, start_pos, end_pos, /NAD.*/)
     end
 
     def line_count_segment_index(segments)

data/lib/cremul/version.rb

@@ -1,3 +1,3 @@
 module Cremul
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/unit/files/CREMUL0001-utf-8.txt

@@ -2,7 +2,7 @@ UNA:+,? 'UNB+UNOC:3+00810506482+00975945065+140312:1546+01001386'UNH+1+CREMUL:D:
 96A:UN'BGM+435+2014031215350976'DTM+137:20140312:102'NAD+MR+00975945065'LIN+1'DT
 M+209:20140312:102'BUS++DO++233:25:124'MOA+349:1394:NOK'RFF+ACK:08012992096'DTM+
 171:20140312:102'FII+BF+12121212121'SEQ++1'DTM+203:20140312:102'FII+OR+123123123
-12'RFF+AEK:12072200001'RFF+ACD:180229451'MOA+143:1394'NAD+PL+++Tømrer Morten Rog
+12:Tømrer Morten Rognebær AS'RFF+AEK:12072200001'RFF+ACD:180229451'MOA+143:1394'NAD+PL+++Tømrer Morten Rog
 nebær AS+Skjerpåkeren 17+STANGE++2335'NAD+BE+++FOND.FOR REGIONALE VERNEOMBUD++++
 0000'PRC+11'FTX+PMD+++Tømrer Morten Rognebær AS'CNT+LI:1'UNT+23+1'UNZ+1+01001386
 '                                                                               

data/test/unit/files/CREMUL0001.DAT

@@ -2,7 +2,7 @@ UNA:+,? 'UNB+UNOC:3+00810506482+00975945065+140312:1546+01001386'UNH+1+CREMUL:D:
 96A:UN'BGM+435+2014031215350976'DTM+137:20140312:102'NAD+MR+00975945065'LIN+1'DT
 M+209:20140312:102'BUS++DO++233:25:124'MOA+349:1394:NOK'RFF+ACK:08012992096'DTM+
 171:20140312:102'FII+BF+12121212121'SEQ++1'DTM+203:20140312:102'FII+OR+123123123
-12'RFF+AEK:12072200001'RFF+ACD:180229451'MOA+143:1394'NAD+PL+++T�mrer Morten Rog
+12:T�mrer Morten Rogneb�r AS'RFF+AEK:12072200001'RFF+ACD:180229451'MOA+143:1394'NAD+PL+++T�mrer Morten Rog
 neb�r AS+Skjerp�keren 17+STANGE++2335'NAD+BE+++THE BENEFICIARY COMPANY++++
 0000'PRC+11'FTX+PMD+++T�mrer Morten Rogneb�r AS'CNT+LI:1'UNT+23+1'UNZ+1+01001386
 '                                                                               

data/test/unit/parser_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 
 describe CremulParser do
 
-  describe 'parsing valid cremul files' do
+  describe 'parsing cremul files' do
     before do
       @parser = CremulParser.new
     end
@@ -41,6 +41,7 @@ describe CremulParser do
       tx.posting_date.must_equal d2014_03_12
       tx.money.amount.must_equal 1394.to_f
       tx.money.currency.must_equal :NOK
+      tx.payer_account_number.must_equal '12312312312'
       tx.references.size.must_equal 2
       tx.free_text.must_equal 'Tømrer Morten Rognebær AS'
 
@@ -107,7 +108,7 @@ describe CremulParser do
       line3.must_be_instance_of CremulLine
       line3.posting_date.must_equal d2011_01_11
       line3.money.must_be_instance_of CremulMoney
-      line3.money.amount.must_equal '6740,40'.to_f
+      line3.money.amount.must_equal '6740.40'.to_f
       line3.money.currency.must_equal :NOK
       line3.transactions.size.must_equal 2
 
@@ -161,6 +162,29 @@ describe CremulParser do
 
     end
 
+    # the following test is commented out as the corresponding cremul test file is not included in the Git repo
+=begin
+    it 'should parse a long file with multiple payment transactions' do
+      @parser.parse(File.open('files/CREMUL0002_23-05-14.dat'), 'ISO-8859-1')
+      @parser.segments.must_be_instance_of Array
+      @parser.msg.must_be_instance_of CremulMessage
+
+      msg = @parser.msg
+
+      froland_tx = msg.lines[1].transactions[1]
+      froland_tx.must_be_instance_of CremulPaymentTx
+      froland_tx.free_text.must_include 'kr 3.384.686,- Fradrag kr.106:.408,- Beregn.g.lag kr.3.278.2          78,-'
+
+      braekstad_tx = msg.lines[2].transactions[0]
+      braekstad_tx.invoice_ref.must_equal '20140453869'
+    end
+=end
+
+
+    # ----------------------------------------------------------------------
+    # Some tests to handle file format errors (?) that we have encountered
+    # ----------------------------------------------------------------------
+
     it 'should parse a file with a CNT:LIN symbol instead of CNT:LI as the standard says' do
       @parser.parse(File.open('files/CREMUL0001_1.dat'), 'ISO-8859-1')
       @parser.segments.must_be_instance_of Array

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cremul-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Per Spilling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler