baldr 0.3.6 → 0.3.7

data/lib/baldr/error/parsing_error.rb

@@ -0,0 +1,3 @@
+class Baldr::Error::ParsingError < Baldr::Error
+
+end

data/lib/baldr/error/validation_error.rb

@@ -0,0 +1,3 @@
+class Baldr::Error::ValidationError < Baldr::Error
+
+end

data/lib/baldr/parser.rb

@@ -5,7 +5,12 @@ class Baldr::Parser
   def initialize(input, params = {})
     @params = params
     @input = input
+
     parse
+
+    if @params[:skip_validation] != true && successful?
+      validate
+    end
   end
 
   def successful?
@@ -28,25 +33,30 @@ class Baldr::Parser
     end
   end
 
+  def validate
+    if @roots
+      @roots.each { |e| Baldr::Validator.validate!(e, @grammar, @version) }
+    end
+  rescue Baldr::Error => e
+    @error = e.message
+  end
+
   protected
 
   def parse
     detect_first_segment
     if @root_type == :transaction
-      raise Baldr::Error, "separators must be manually defined for parsing transactions" unless @params[:separators]
+      raise Baldr::Error::ParsingError, "separators must be manually defined for parsing transactions" unless @params[:separators]
       @separators = @params[:separators]
-      grammar = @params[:grammar] || Baldr::Grammar::Transaction
-      raise Baldr::Error, "grammar version must be manually defined for parsing transactions" unless @params[:version]
-      version = @params[:version]
+      @grammar = @params[:grammar] || Baldr::Grammar::Transaction
+      raise Baldr::Error::ParsingError, "grammar version must be manually defined for parsing transactions" unless @params[:version]
+      @version = @params[:version]
     else
       detect_separators
-      grammar = @params[:grammar] || Baldr::Grammar::Envelope
-      version = nil
+      @grammar = @params[:grammar] || Baldr::Grammar::Envelope
+      @version = nil
     end
-    @roots = build_tree(split_segments, grammar, version)
-    @roots.each { |e| Baldr::Validator.validate!(e, grammar, version) }
-
-    self
+    @roots = build_tree(split_segments, @grammar, @version)
   rescue Baldr::Error => e
     @error = e.message
   end
@@ -57,7 +67,7 @@ class Baldr::Parser
     elsif @input[0..1] == 'ST'
       @root_type = :transaction
     else
-      raise Baldr::Error, "doesn't begin with ISA or ST..."
+      raise Baldr::Error::ParsingError, "doesn't begin with ISA or ST..."
     end
   end
 
@@ -103,7 +113,7 @@ class Baldr::Parser
       end
     end
 
-    raise Baldr::Error, 'invalid characters in the end of interchange' if skip > 0
+    raise Baldr::Error::ParsingError, 'invalid characters in the end of interchange' if skip > 0
 
     segments
   end

data/lib/baldr/validator.rb

@@ -11,7 +11,7 @@ module Baldr::Validator
 
   def validate_tree!(segment, grammar, structure, version)
     record_defs = grammar.record_defs
-    raise Baldr::Error, "unknown segment #{segment.id}" unless record_defs[segment.id]
+    raise Baldr::Error::ValidationError, "unknown segment #{segment.id}" unless record_defs[segment.id]
 
     record_defs[segment.id].each.with_index do |r, i|
       element = segment.elements[i]
@@ -33,9 +33,9 @@ module Baldr::Validator
 
         l += 1
       elsif loop
-        raise Baldr::Error, "segment #{s[:id]} is required, but #{loop.id} was found" if s[:min] > 0
+        raise Baldr::Error::ValidationError, "segment #{s[:id]} is required, but #{loop.id} was found" if s[:min] > 0
       else
-        raise Baldr::Error, "segment #{s[:id]} is required, but nothing was found" if s[:min] > 0
+        raise Baldr::Error::ValidationError, "segment #{s[:id]} is required, but nothing was found" if s[:min] > 0
       end
     end
 
@@ -46,13 +46,13 @@ module Baldr::Validator
   end
 
   def check_loop_count(loop, grammar)
-    raise Baldr::Error, "#{loop.id} loop is too long: #{loop.count} segments, maximum #{grammar[:max]}" if loop.count > grammar[:max]
-    raise Baldr::Error, "#{loop.id} loop is too short: #{loop.count} segments, minimum #{grammar[:min]}" if loop.count < grammar[:min]
+    raise Baldr::Error::ValidationError, "#{loop.id} loop is too long: #{loop.count} segments, maximum #{grammar[:max]}" if loop.count > grammar[:max]
+    raise Baldr::Error::ValidationError, "#{loop.id} loop is too short: #{loop.count} segments, minimum #{grammar[:min]}" if loop.count < grammar[:min]
   end
 
   def check_required(r, element)
     if r[:required] && (element.nil? || element.size == 0)
-      raise Baldr::Error, "element #{r[:id]} is required"
+      raise Baldr::Error::ValidationError, "element #{r[:id]} is required"
     end
   end
 
@@ -67,11 +67,11 @@ module Baldr::Validator
 
   def check_max_and_min_for_string(r, element)
     if r[:max] && element.length > r[:max]
-      raise Baldr::Error, "#{r[:id]} is too long: #{element.length} characters, maximum #{r[:max]}"
+      raise Baldr::Error::ValidationError, "#{r[:id]} is too long: #{element.length} characters, maximum #{r[:max]}"
     end
 
     if r[:min] && element.length < r[:min]
-      raise Baldr::Error, "#{r[:id]} is too short: #{element.length} characters, minimum #{r[:min]}"
+      raise Baldr::Error::ValidationError, "#{r[:id]} is too short: #{element.length} characters, minimum #{r[:min]}"
     end
   end
 

data/lib/baldr/version.rb

@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/lib/baldr.rb

@@ -10,6 +10,8 @@ require 'baldr/loop'
 require 'baldr/validator'
 
 require 'baldr/error'
+require 'baldr/error/parsing_error'
+require 'baldr/error/validation_error'
 
 require 'baldr/utils'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baldr
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -37,6 +37,8 @@ files:
 - lib/baldr/builder.rb
 - lib/baldr/envelope.rb
 - lib/baldr/error.rb
+- lib/baldr/error/parsing_error.rb
+- lib/baldr/error/validation_error.rb
 - lib/baldr/functional_group.rb
 - lib/baldr/grammar.rb
 - lib/baldr/grammar/envelope.rb