cremul-parser 0.0.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c04ee6768afa1d21f139da326fb010b854930b
-  data.tar.gz: 9db6a55b1157b60a5c1152f1c160094480d752a3
+  metadata.gz: 6f5e18fc594f98b2ceb5cb96264dfe9108b0e25f
+  data.tar.gz: da574cd070d87a669b0cb77718bcdcf976c7bf66
 SHA512:
-  metadata.gz: bfc36832e27bd0ea30bf86f89a31dff2aeddbc107153a7ab24b883c2bb99e43fbc34930b8c2fc72c324c34e3751655ac798ade2b304d1d970449941ab84537c9
-  data.tar.gz: 2c0365b3dab99454e5ec557d71d7c2a1e3bcf865935abb689e04b24feaa415c179aaad66231f481807d7b8e5b070380695847c37a45e71e6416698bb522d4c19
+  metadata.gz: 539817f1790d87fb42e0f6457aca4854e1dbb2f4380c70a9206ec01f35f4ac1a2289d12ee0f873f47699f386fd7739132460254d606ea6c0d2cd58fb9b7affc7
+  data.tar.gz: c58ae3f7e2ca77b2ed3312d298595e22387877b9037dd72331b5fe4914869a6d091d6e06f774e89ef420becae5170ced80df975bc6b33797f206e7204252ca69

data/.gitignore

@@ -16,4 +16,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store
 CREMUL0002_23-05-14.DAT
+CREMUL_multi_message.DAT
+CREMUL_multi_message_segments.txt

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.8.0
+
+Bumped to version 0.8.0 to indicate that it is getting close to finished as a 1.0 version.
+ 
+- Corrected a bug in the regular expressions
+- Added support for multiple CREMUL messages in a single file
+- Changed CremulParser.msg attr to CremulParser.messages (an array) 
+
 ## 0.0.6
 
 - Corrected a bug in CremulPaymentTx so that it is now able to handle empty FII segments.

data/lib/cremul/parser_helper.rb

@@ -69,7 +69,7 @@ module Cremul
     end
 
     def msg_id_segment_index(segments)
-      segments.index { |x| /UNH.*/.match(x) }
+      segments.index { |x| /^UNH.*/.match(x) }
     end
 
     def find_index_by_regex(segments, start_pos, end_pos=nil, regex)
@@ -88,54 +88,54 @@ module Cremul
     end
 
     def next_date_segment_index(segments, start_pos, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /DTM.*/)
+      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.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^MOA.*/)
     end
 
     def next_line_segment_index(segments, start_pos)
-      find_index_by_regex(segments, start_pos, segments.size, /LIN\+\d/)
+      find_index_by_regex(segments, start_pos, segments.size, /^LIN\+\d/)
     end
 
     def next_tx_sequence_segment_index(segments, start_pos)
-      find_index_by_regex(segments, start_pos, segments.size, /SEQ\+\+\d/)
+      find_index_by_regex(segments, start_pos, segments.size, /^SEQ\+\+\d/)
     end
 
     def doc_segment_index(segments, start_pos, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /DOC.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^DOC.*/)
     end
 
     def payment_details_segment_index(segments, start_pos, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /FTX\+PMD.*/)
+      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, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /FTX\+AAG.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^FTX\+AAG.*/)
     end
 
     def next_ref_segment_index(segments, start_pos, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /RFF.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^RFF.*/)
     end
 
     # 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.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^FII\+BF.*/)
     end
 
     # 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.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^FII\+OR.*/)
     end
 
     def next_nad_segment_index(segments, start_pos, end_pos=nil)
-      find_index_by_regex(segments, start_pos, end_pos, /NAD.*/)
+      find_index_by_regex(segments, start_pos, end_pos, /^NAD.*/)
     end
 
     def line_count_segment_index(segments)
-      segments.index { |x| /CNT\+LIN?:\d/.match(x) }
+      segments.index { |x| /^CNT\+LIN?:\d/.match(x) }
     end
 
     def number_of_lines_in_message(segments)
@@ -183,6 +183,19 @@ module Cremul
       n
     end
 
+    def number_of_messages_in_file(segments)
+      m = {}
+      n = 0
+      segments.each_index do |i|
+        if /^UNA.*/.match(segments[i])
+          n += 1
+          m[n] = i
+        end
+      end
+      m
+    end
+
+
     def last_segment_index_in_tx(segments, tx_segment_pos)
       next_tx_index = next_tx_sequence_segment_index(segments, tx_segment_pos+1)
       next_line_index = next_line_segment_index(segments, tx_segment_pos)

data/lib/cremul/version.rb

@@ -1,3 +1,3 @@
 module Cremul
-  VERSION = '0.0.6'
+  VERSION = '0.8.0'
 end

data/lib/cremul_parser.rb

@@ -6,9 +6,10 @@ require_relative 'cremul/cremul_message'
 class CremulParser
   include Cremul::ParserHelper
 
-  attr_reader :segments, :msg
+  attr_reader :segments, :messages
 
   def initialize
+    @messages = []
   end
 
   def parse(file, file_encoding='utf-8')
@@ -20,10 +21,24 @@ class CremulParser
       file_as_a_string += line.chomp # remove \n and \r from the end of the line
     end
     @segments = file_as_a_string.split("'")
-    if @segments[@segments.size-1].strip.empty?
+    @segments.each { |s| s.strip! }
+    # remove last segment if it is an empty string
+    if @segments[@segments.size-1].empty?
       @segments = @segments.slice(0, @segments.size-1)
     end
-    @msg = CremulMessage.new(@segments)
+
+    m = number_of_messages_in_file(@segments)
+    if m.size == 0
+      raise 'No CREMUL message found in file'
+    end
+    m.each do |n, start_index|
+      if n < m.size
+        @messages << CremulMessage.new(@segments[start_index, m[n+1] - start_index])
+      else
+        @messages << CremulMessage.new(@segments[start_index, @segments.size - start_index])
+      end
+    end
   end
 
 end
+

data/test/unit/parser_test.rb

@@ -1,4 +1,5 @@
 require_relative '../test_helper'
+require 'tempfile'
 
 describe CremulParser do
 
@@ -10,11 +11,12 @@ describe CremulParser do
     it 'should parse a valid cremul file with 1 line item' do
       @parser.parse(File.open('files/CREMUL0001-utf-8.txt'))
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages.size.must_equal 1
+      @parser.messages[0].must_be_instance_of CremulMessage
 
       d2014_03_12 = Date.new(2014,3,12)
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       msg.header.must_be_instance_of CremulHeader
       msg.header.msg_id.must_include 'CREMUL'
       msg.header.created_date.must_equal d2014_03_12
@@ -65,11 +67,11 @@ describe CremulParser do
     it 'should parse a valid cremul file with multiple line items' do
       @parser.parse(File.open('files/cremul_multi_lines.txt'))
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
       d2011_01_11 = Date.new(2011,1,11)
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       msg.header.must_be_instance_of CremulHeader
       msg.header.msg_id.must_include 'CREMUL'
       msg.header.created_date.must_equal d2011_01_11
@@ -117,11 +119,11 @@ describe CremulParser do
     it 'should parse a valid long cremul file' do
       @parser.parse(File.open('files/CREMUL0003-utf-8.txt'))
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
       d2013_04_11 = Date.new(2013,4,11)
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       msg.header.must_be_instance_of CremulHeader
       msg.header.msg_id.must_include 'CREMUL'
       msg.header.created_date.must_equal d2013_04_11
@@ -152,9 +154,9 @@ describe CremulParser do
     it 'should convert a non-utf-8 file to utf-8 on the fly' do
       @parser.parse(File.open('files/CREMUL0001.dat'), 'ISO-8859-1')
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       line = msg.lines[0]
       tx = line.transactions[0]
       tx.must_be_instance_of CremulPaymentTx
@@ -165,9 +167,9 @@ describe CremulParser do
     it 'should parse name and address correctly' do
       @parser.parse(File.open('files/CREMUL0002-27.05.14.DAT'), 'ISO-8859-1')
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
 
       tx = msg.lines[0].transactions[0]
       tx.must_be_instance_of CremulPaymentTx
@@ -182,23 +184,27 @@ describe CremulParser do
     it 'should be able to parse a file with empty FII elements' do
       @parser.parse(File.open('files/CREMUL0001-27.05.14.DAT'), 'ISO-8859-1')
       @parser.segments.must_be_instance_of Array
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       msg.header.must_be_instance_of CremulHeader
       msg.header.msg_id.must_include 'CREMUL'
       msg.lines[0].transactions[0].payer_account_number.must_be_nil
     end
 
 
-    # the following test is commented out as the corresponding cremul test file is not included in the Git repo
+    # ----------------------------------------------------------------------
+    # the following tests are 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
+      @parser.messages[0].must_be_instance_of CremulMessage
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
 
       froland_tx = msg.lines[1].transactions[1]
       froland_tx.must_be_instance_of CremulPaymentTx
@@ -207,8 +213,26 @@ describe CremulParser do
       braekstad_tx = msg.lines[2].transactions[0]
       braekstad_tx.invoice_ref.must_equal '20140453869'
     end
+
+
+    it 'should parse a multi-message file' do
+      @parser.parse(File.open('files/CREMUL_multi_message.dat'), 'ISO-8859-1')
+      @parser.segments.must_be_instance_of Array
+      @parser.messages.size.must_equal 3
+      @parser.messages[0].must_be_instance_of CremulMessage
+
+      #write_segments_to_file(@parser.segments, File.open('files/CREMUL_multi_message_segments.txt', 'w'))
+    end
 =end
 
+    def write_segments_to_file(msg, file)
+      begin
+        msg.each { |segment| file.puts segment }
+      ensure
+        file.close
+      end
+    end
+
 
     # ----------------------------------------------------------------------
     # Some tests to handle file format errors (?) that we have encountered
@@ -217,9 +241,9 @@ describe CremulParser do
     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
-      @parser.msg.must_be_instance_of CremulMessage
+      @parser.messages[0].must_be_instance_of CremulMessage
 
-      msg = @parser.msg
+      msg = @parser.messages[0]
       line = msg.lines[0]
       tx = line.transactions[0]
       tx.must_be_instance_of CremulPaymentTx

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cremul-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Per Spilling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler