mt940_parser 1.0.1 → 1.0.2

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
-:patch: 1
-:build: 
+---
 :major: 1
 :minor: 0
+:patch: 2
+:build: 

data/lib/mt940.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'mt940/customer_statement_message'
 
 class MT940
@@ -76,9 +77,11 @@ class MT940
   # 25
   class Account < Field
     attr_reader :bank_code, :account_number, :account_currency
-    
+
+    CONTENT = /^(.{8,11})\/(\d{0,23})([A-Z]{3})?$/
+
     def parse_content(content)
-      content.match(/^(.{8,11})\/(\d{0,23})([A-Z]{3})?$/)
+      content.match(CONTENT)
       @bank_code, @account_number, @account_currency = $1, $2, $3
     end
   end
@@ -86,9 +89,11 @@ class MT940
   # 28
   class Statement < Field
     attr_reader :number, :sheet
+
+    CONTENT = /^(0|(\d{5,5})\/(\d{2,5}))$/
     
     def parse_content(content)
-      content.match(/^(0|(\d{5,5})\/(\d{2,5}))$/)
+      content.match(CONTENT)
       if $1 == '0'
         @number = @sheet = 0
       else
@@ -100,9 +105,11 @@ class MT940
   # 60
   class AccountBalance < Field
     attr_reader :balance_type, :sign, :currency, :amount, :date
+
+    CONTENT = /^(C|D)(\w{6})(\w{3})(\d{1,12},\d{0,2})$/
     
     def parse_content(content)
-      content.match(/^(C|D)(\w{6})(\w{3})(\d{1,12},\d{0,2})$/)
+      content.match(CONTENT)
 
       @balance_type = case @modifier
         when 'F'
@@ -135,8 +142,10 @@ class MT940
   class StatementLine < Field
     attr_reader :date, :entry_date, :funds_code, :amount, :swift_code, :reference, :transaction_description
 
+    CONTENT = /^(\d{6})(\d{4})?(C|D|RC|RD)\D?(\d{1,12},\d{0,2})((?:N|F).{3})(NONREF|.{0,16})(?:$|\/\/)(.*)/
+
     def parse_content(content)
-      content.match(/^(\d{6})(\d{4})?(C|D|RC|RD)\D?(\d{1,12},\d{0,2})((?:N|F).{3})(NONREF|.{0,16})(?:$|\/\/)(.*)/).to_a
+      content.match(CONTENT)
       
       raw_date = $1
       raw_entry_date = $2
@@ -157,7 +166,7 @@ class MT940
       @transaction_description = $7
       
       @date = parse_date(raw_date)
-      @entry_date = parse_entry_date(raw_entry_date, @date)
+      @entry_date = parse_entry_date(raw_entry_date, @date) if raw_entry_date
     end
     
     def value_date
@@ -224,6 +233,15 @@ class MT940
   
   class << self
     def parse(text)
+      new_text = text.clone.force_encoding("ISO-8859-1") 
+      if !new_text.valid_encoding?
+        warn "Your data is not in binary format"
+        new_text = text.clone.encode("ISO-8859-1")
+          if !new_text.valid_encoding?
+            puts "WOOOOT WHAT IS THE RIGHT ENCODING?"
+          end
+      end
+      text = new_text # WOOOT refactor?
       text << "\r\n" if text[-1,1] == '-'
       raw_sheets = text.split(/^-\r\n/).map { |sheet| sheet.gsub(/\r\n(?!:)/, '') }
       sheets = raw_sheets.map { |raw_sheet| parse_sheet(raw_sheet) }

data/mt940_parser.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mt940_parser}
-  s.version = "1.0.1"
+  s.name = "mt940_parser"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thies C. Arntzen", "Phillip Oertel"]
-  s.date = %q{2011-02-28}
-  s.email = %q{developers@betterplace.org}
+  s.date = "2012-04-18"
+  s.email = "developers@betterplace.org"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -39,6 +39,8 @@ Gem::Specification.new do |s|
     "test/fixtures/currency_in_25.yml",
     "test/fixtures/empty_86.txt",
     "test/fixtures/empty_86.yml",
+    "test/fixtures/empty_entry_date.txt",
+    "test/fixtures/empty_entry_date.yml",
     "test/fixtures/empty_line.txt",
     "test/fixtures/empty_line.yml",
     "test/fixtures/missing_crlf_at_end.txt",
@@ -47,15 +49,17 @@ Gem::Specification.new do |s|
     "test/fixtures/sepa_mt9401.yml",
     "test/fixtures/sepa_snippet.txt",
     "test/fixtures/sepa_snippet_broken.txt",
+    "test/fixtures/with_binary_character.txt",
+    "test/fixtures/with_binary_character.yml",
     "test/helper.rb",
     "test/test_customer_statement_message.rb",
     "test/test_mt940.rb"
   ]
-  s.homepage = %q{http://github.com/betterplace/mt940_parser}
+  s.homepage = "http://github.com/betterplace/mt940_parser"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{MT940 parses account statements in the SWIFT MT940 format.}
+  s.rubygems_version = "1.8.21"
+  s.summary = "MT940 parses account statements in the SWIFT MT940 format."
   s.test_files = [
     "test/helper.rb",
     "test/test_customer_statement_message.rb",
@@ -63,7 +67,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/fixtures/empty_entry_date.txt

@@ -0,0 +1,2 @@
+:61:110701CN50,00NZ10NONREF
+-

data/test/fixtures/empty_entry_date.yml

@@ -0,0 +1,9 @@
+--- 
+- - !ruby/object:MT940::StatementLine 
+    amount: 5000
+    date: 2011-07-01
+    funds_code: :credit
+    modifier: 
+    reference: NONREF
+    swift_code: NZ10
+    transaction_description: ""