ensured that psych parser is used

dc7kr · Apr 20, 2012 · 216eb0e · 216eb0e
1 parent 3231b04
commit 216eb0e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/lib/mt940.rb b/lib/mt940.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'mt940/customer_statement_message'
 
 class MT940
@@ -221,7 +220,7 @@ def parse_content(content)
           else
             @not_implemented_fields ||= []
             @not_implemented_fields << [code, content]
-            $stderr << "code not implemented: code:#{code} content:»#{content}«\n" if $DEBUG
+            $stderr << "code not implemented: code:#{code} content:\"#{content}\"\n" if $DEBUG
           end
         end
       end
@@ -231,22 +230,23 @@ def parse_content(content)
     end
   end
 
+
   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?"
+            raise "Your data could not be encoded in binary format"
           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(?!:)/, '') }
+      new_text << "\r\n" if new_text[-1,1] == '-'
+      raw_sheets = new_text.split(/^-\r\n/).map { |sheet| sheet.gsub(/\r\n(?!:)/, '') }
       sheets = raw_sheets.map { |raw_sheet| parse_sheet(raw_sheet) }
     end
-
+
+
     private
       def parse_sheet(sheet)
         lines = sheet.split("\r\n")

diff --git a/test/test_customer_statement_message.rb b/test/test_customer_statement_message.rb
@@ -1,5 +1,7 @@
-require 'helper'
+require_relative 'helper'
 require 'yaml'
+YAML::ENGINE.yamler = 'psych'
+
 
 # $DEBUG = true
 class TestCustomerStatementMessage < Test::Unit::TestCase

diff --git a/test/test_mt940.rb b/test/test_mt940.rb
@@ -1,5 +1,7 @@
-require 'helper'
+require_relative 'helper'
 require 'yaml'
+YAML::ENGINE.yamler = 'psych'
+
 
 # $DEBUG = true
 class TestMt940 < Test::Unit::TestCase