mt940parser 0.2.0 → 0.3.0

data/lib/mt940parser/document.treetop

@@ -6,7 +6,7 @@ grammar Document
   end
 
   rule record
-    date account_iban statement_number initial_balance transactions final_balance wololo? <Record>
+    date account_iban statement_number initial_balance transactions closing_balance closing_available_balance? <Record>
   end
 
   rule date
@@ -26,16 +26,16 @@ grammar Document
   end
 
   # Create captures for those if needed (not for now)
-  rule final_balance
-    ":62F:" (!(nl) .)*  nl
+  rule closing_balance
+    codess (!(nl) .)*  nl
   end
 
-  rule wololo
-    ":64:" (!('-' / nl) .)*
+  rule closing_available_balance
+    ":64:" (!(nl) .)* nl
   end
 
   rule codess
-    (':61:' <Cods> / ":20:" <Cods> / ":28:" <Cods> / ":28C:" <Cods> / ":25:" <Cods> / ":60F:" <Cods> ) 
+    (':61:' <Cods> / ":20:" <Cods> / ":28:" <Cods> / ":28C:" <Cods> / ":25:" <Cods> / ":60F:" <Cods> /":62F:" <Cods> ) 
   end
 
   rule eof
@@ -51,8 +51,7 @@ grammar Document
   end
 
   rule base
-    # ":61:" valor date debit amount swift '//' reference (.)*
-    codess valor account_date type amount swift (!(nl) .)*  nl <Base>
+    codess valor account_date type amount swift (!(nl) .)*  nl <Base> # ":61:" 
   end
 # ========= Base ======== #
   rule valor

data/lib/mt940parser/parser.rb

@@ -1,4 +1,5 @@
 module MT940
+  class ParseError < StandardError; end
   class Parser
 
     base_path = File.dirname(__FILE__)
@@ -11,7 +12,10 @@ module MT940
     def self.parse(data)
       tree = @@parser.parse(data)
 
-      self.show_error(data) if tree.nil?
+      if tree.nil?
+        self.show_error(data)
+        raise ParseError, "Failed to parse file. See log for more information"
+      end
 
       # clean up the tree by removing all nodes of default type 'SyntaxNode'
       self.clean_tree(tree)

data/lib/mt940parser/version.rb

@@ -1,3 +1,3 @@
 module MT940
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mt940parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop