cremul-parser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d37e7ea9a0f2a71f205a8626cd1a3e3b40e0c2
-  data.tar.gz: 223f59f9bad82d84c45707f52bcba71e467d3664
+  metadata.gz: f2c04ee6768afa1d21f139da326fb010b854930b
+  data.tar.gz: 9db6a55b1157b60a5c1152f1c160094480d752a3
 SHA512:
-  metadata.gz: 559c0548efc556273b498b5501ebe69892ae6e664d1cce8cd617e254de65482b426d91760b703306029a2a25db34fa9437d2d6517969d1daf5d28742979e6a95
-  data.tar.gz: 9576276c7c842514c3988dc92c909d948aab3ac00f93137059e34725236ff415a5b7d7b1087bcb5516b6335c355278bf35fb2a035e538615ab46cc5c922571fc
+  metadata.gz: bfc36832e27bd0ea30bf86f89a31dff2aeddbc107153a7ab24b883c2bb99e43fbc34930b8c2fc72c324c34e3751655ac798ade2b304d1d970449941ab84537c9
+  data.tar.gz: 2c0365b3dab99454e5ec557d71d7c2a1e3bcf865935abb689e04b24feaa415c179aaad66231f481807d7b8e5b070380695847c37a45e71e6416698bb522d4c19

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.6
+
+- Corrected a bug in CremulPaymentTx so that it is now able to handle empty FII segments.
+- Corrected a bug in CremulNameAndAddress so that it is now also able to handle addresses in structured form.
+
 ## 0.0.5
 
 - Refactored the ParserHelper to make it more DRY, and fixed a bug in CremulHeader regarding the parsing the 

data/README.md

@@ -1,8 +1,10 @@
 # cremul-parser gem
 
 This is a simple parser for CREMUL payment transaction files written in Ruby. It parses
-the CREMUL file (which should be in UTF-8 encoding) and creates a Ruby object structure
-corresponding to the elements in the file.
+the CREMUL file and creates a Ruby object structure corresponding to the elements in the file.
+
+The parser is currently not a complete parser for all kinds of CREMUl files, but is 
+being developed further as needed in an ongoing project for a Norwegian customer. 
 
 ## References
 

data/lib/cremul/cremul_name_and_address.rb

@@ -3,7 +3,20 @@ require_relative 'parser_helper'
 class CremulNameAndAddress
   include Cremul::ParserHelper
 
+  # NAD segment in unstructured form:
   # NAD+party-id+code+code+nad-line1+nad-line2+nad-line3+nad-line4+nad-line5
+  #
+  # NAD segment in structured form (3 variants):
+  # NAD+party-id+code+code+nad-line OR
+  # NAD+party-id+code+nad-line OR
+  # NAD+party-id+nad-line
+  #
+  # In the structured form the nad-line will have colon (:) as separator between the address parts
+  #
+  # Party-IDs:
+  # MR - Beneficiary bank
+  # BE - Beneficiary, the ultimate recipient of the funds
+  # PL - Payor
 
   attr_reader :type, :nad_lines
 
@@ -12,9 +25,15 @@ class CremulNameAndAddress
     @type = s[1].to_sym
 
     @nad_lines = []
-    5.times do |i|
-      @nad_lines << s[i+4]
+    if s.size <= 5 # structured form
+      addr = s[s.size-1].split(':')
+      addr.size.times do |i|
+        @nad_lines << addr[i]
+      end
+    else
+      5.times do |i|
+        @nad_lines << s[i+4]
+      end
     end
-
   end
 end

data/lib/cremul/cremul_payment_tx.rb

@@ -6,6 +6,16 @@ require_relative 'cremul_name_and_address'
 class CremulPaymentTx
   include Cremul::ParserHelper
 
+  # Normal format:
+  # FII+<party-id>+<account identification>
+  #
+  # Emtpy format (no bank account info given):
+  # FII+<party-id>
+  #
+  # Party-id:
+  # OR - Payor's bank account
+  # I2 - Beneficiary's bank account
+
   REF_TYPE_KID = 999 # Norwegian customer invoice reference
   REF_TYPE_INVOICE_NUMBER = 380
 
@@ -18,10 +28,12 @@ class CremulPaymentTx
     @posting_date = Date.parse(s[1])
 
     s = segments[next_fii_or_segment_index(segments, tx_segment_pos)].split('+')
-    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]
+    if s.size == 3 # bank account number is provided
+      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
     end
 
     init_invoice_ref(segments, tx_segment_pos)

data/lib/cremul/version.rb

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

data/test/unit/files/CREMUL0001-27.05.14.DAT

@@ -0,0 +1,21 @@
+UNA:+,? 'UNB+UNOC:3+00810506482+00975945065+140526:1430+01001500'UNH+1+CREMUL:D:
+96A:UN'BGM+455+1405261430'DTM+137:20140526:102'LIN+1'DTM+209:20140526:102'BUS++I
+N'MOA+346:264:NOK'RFF+AII'FII+BF+12345678901'SEQ++1'DTM+193:20140526:102'DTM+209
+:20140526:102'FII+OR'RFF+ACK:804574'MOA+60:264:NOK'MOA+98:314:NOK'CUX+2:NOK+3:NO
+K+1'NAD+BE++RVO:REGIONALE VERNEOMBUD:OSLO'NAD+PL++BBR - BAUDIS BERGMANN ROESCH V
+ERKEH:RSTECHNIK GMBH:PILLAUSTR. 1 E:38126  BRAUNSCHWEIG'FCA+14'MOA+23:50'PRC+11'
+FTX+PMD+++KID 12121212121'LIN+2'DTM+209:20140526:102'BUS++IN'MOA+346:200:NOK'RFF
++AII'FII+BF+12345678901'SEQ++1'DTM+193:20140526:102'DTM+209:20140526:102'FII+OR'
+RFF+ACK:812416'MOA+60:200:NOK'MOA+98:250:NOK'CUX+2:NOK+3:NOK+1'NAD+BE++RVO:BYGG 
+OG ANLEGG:PB 22 SENTRUM:0101 OSLO'NAD+PL++COLT NORDIC APS:LYNGBY HOVEDGADE 10:28
+00 KGS.LYNGBY'FCA+14'MOA+23:50'PRC+11'FTX+PMD+++REG NR 127763'LIN+3'DTM+209:2014
+0526:102'BUS++IN'MOA+346:200:NOK'RFF+AII'FII+BF+12345678901'SEQ++1'DTM+193:20140
+526:102'DTM+209:20140526:102'FII+OR'RFF+ACK:824584'MOA+60:200:NOK'MOA+98:250:NOK
+'CUX+2:NOK+3:NOK+1'NAD+BE++REGIONALE VERNEOMBUD BYGG OG ANLEGG:PB 22 SENTRUM 010
+1 OSLO'NAD+PL++UAB SUNRISA:TAIKOS 24:KLAIPEDA 11111 LT'FCA+14'MOA+23:50'PRC+11'F
+TX+PMD+++KUNDEIDENTIFIKASJON (KID) 121212121:39'LIN+4'DTM+209:20140526:102'BUS++
+IN'MOA+346:316,21:NOK'RFF+AII'FII+BF+12345678901'SEQ++1'DTM+193:20140526:102'DTM
++209:20140526:102'FII+OR'RFF+ACK:987226'RFF+AGN:UF0J02ID2MGGU001'MOA+60:316,21:N
+OK'MOA+98:316,21:NOK'CUX+2:NOK+3:NOK+1'NAD+BE++Fondet for Regionale Verneom:Post
+boks 22 Sentrum:0101  OSLO'NAD+PL++MONT??ZE PREROV A.S.'FCA+14'PRC+11'FTX+PMD+++
+22914324MONTAZE PREROV'CNT+LIN:4'UNT+85+1'UNZ+1+01001500'                       

data/test/unit/files/CREMUL0002-27.05.14.DAT

@@ -0,0 +1,7 @@
+UNA:+,? 'UNB+UNOC:3+00810506482+00975945065+140526:1455+01001501'UNH+1+CREMUL:D:
+96A:UN'BGM+455+1405261455'DTM+137:20140526:102'LIN+1'DTM+209:20140526:102'BUS++D
+O'MOA+60:314:NOK'RFF+AII'FII+BF+12345678901'SEQ++1'DTM+193:20140526:102'FII+OR+1
+2345678901'RFF+ACK:837175'RFF+AEK:00000000237'RFF+ACD:797630907'MOA+119:314'NAD+
+BE++FOND.FOR REGIONALE VERNEOMBUD'NAD+PL++Ole Thomessen:St. Nikolas-Gat
+e 7::1706 SARPSBORG'PRC+8'DOC+380'MOA+12:314'FTX+PMD+++rvo'GIS+37'CNT+LIN:1'UNT+
+25+1'UNZ+1+01001501'                                                            

data/test/unit/parser_test.rb

@@ -162,6 +162,35 @@ describe CremulParser do
 
     end
 
+    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
+
+      msg = @parser.msg
+
+      tx = msg.lines[0].transactions[0]
+      tx.must_be_instance_of CremulPaymentTx
+      tx_payer = tx.payer_nad
+      tx_payer.must_be_instance_of CremulNameAndAddress
+      tx_payer.type.must_equal :PL
+      tx_payer.nad_lines[0].must_equal 'Ole Thomessen'
+      tx_payer.nad_lines[1].must_equal 'St. Nikolas-Gate 7'
+      tx_payer.nad_lines[3].must_equal '1706 SARPSBORG'
+    end
+
+    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
+
+      msg = @parser.msg
+      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
 =begin
     it 'should parse a long file with multiple payment transactions' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cremul-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Per Spilling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,9 +64,11 @@ files:
 - lib/cremul/version.rb
 - lib/cremul_parser.rb
 - test/test_helper.rb
+- test/unit/files/CREMUL0001-27.05.14.DAT
 - test/unit/files/CREMUL0001-utf-8.txt
 - test/unit/files/CREMUL0001.DAT
 - test/unit/files/CREMUL0001_1.DAT
+- test/unit/files/CREMUL0002-27.05.14.DAT
 - test/unit/files/CREMUL0002-utf-8.txt
 - test/unit/files/CREMUL0002.DAT
 - test/unit/files/CREMUL0003-utf-8.txt
@@ -101,9 +103,11 @@ specification_version: 4
 summary: A parser for CREMUL payment transaction files
 test_files:
 - test/test_helper.rb
+- test/unit/files/CREMUL0001-27.05.14.DAT
 - test/unit/files/CREMUL0001-utf-8.txt
 - test/unit/files/CREMUL0001.DAT
 - test/unit/files/CREMUL0001_1.DAT
+- test/unit/files/CREMUL0002-27.05.14.DAT
 - test/unit/files/CREMUL0002-utf-8.txt
 - test/unit/files/CREMUL0002.DAT
 - test/unit/files/CREMUL0003-utf-8.txt