baldr 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b548c93e742ee6bd486ef79470d4a34936af2978
-  data.tar.gz: b0f55945aaaeedacb4dd8b37a75fdb72dead4837
+  metadata.gz: 9c26c11785b0b55caeee6ed6ff6cdb36d74c3760
+  data.tar.gz: 6b51462b8ab2585827b32835a5a57ac4b2028714
 SHA512:
-  metadata.gz: 297a42812b59a8bbdae1f65e35cd630d2b899fea18aa36b00ef2ecd3be597345c46674be0de654b2677a132d0df1a1bfd46f56562a106de169d7e1a692ee44f6
-  data.tar.gz: cadcba49c7eb0246b76ec12db50f4f20eb9080648b2ae36e2dd76b8a8d40411662f3f72f336a7c7f14c08ea78b7c8133de2cc23272ca9378583daeb8822abdbf
+  metadata.gz: 445a6079b0d3c44bd39c5a1a0f25987d673f913f8d5f98645370d1888ca6ecc2c0277e3a21c26b85c695c29996692776949337d3fb880b3394265efd1db04dc2
+  data.tar.gz: 172a1e6f0a406865f846aa13d1b6dcdd0d8def5aa89e6f701567f03d2fc79a64de5cc000feca4c7f1b5850bb4555646b30386f4340fa6257e199c2ba0b766b9d

data/lib/baldr/functional_group.rb

@@ -30,8 +30,8 @@ class Baldr::FunctionalGroup < Baldr::Segment
     trailer['GE02'] = group_control_number
   end
 
-  def sub_version
-    Baldr::Grammar.for_standard_version(version_release_industry_code)
+  def sub_version(grammar)
+    grammar.for_standard_version(version_release_industry_code)
   end
 
   def transactions

data/lib/baldr/grammar/envelope.rb

@@ -10,6 +10,12 @@ module Baldr::Grammar::Envelope
     RECORD_DEFS
   end
 
+  def sub_grammar(segment)
+    if segment.id == 'GS'
+      Baldr::Grammar.for_standard_version(segment.version_release_industry_code)
+    end
+  end
+
   def validate_st!(segment)
     trailer = segment.children.last.segments.first
     total_number = segment.number_of_segments
@@ -40,20 +46,17 @@ module Baldr::Grammar::Envelope
   def validate_isa!(segment)
     trailer = segment.children.last.segments.first
     if trailer['IEA01'].to_i != segment.func_group_loop.segments.count
-      raise "wrong functional groups number: #{trailer['IEA01']} in IEA01, but real number is #{segment.func_group_loop.segments.count}"
+      raise Baldr::Error, "wrong functional groups number: #{trailer['IEA01']} in IEA01, but real number is #{segment.func_group_loop.segments.count}"
     end
     if trailer['IEA02'] != segment.interchange_control_number
-      raise "interchange control numbers don't match: #{trailer['IEA02']} in IEA02 and #{segment.interchange_control_number} in ISA13"
+      raise Baldr::Error, "interchange control numbers don't match: #{trailer['IEA02']} in IEA02 and #{segment.interchange_control_number} in ISA13"
     end
   end
 
   STRUCTURE = {
     id: 'ISA', min: 0, max: 99999, class: :envelope, level: [
       {id: 'TA1', min: 0, max: 99999},
-      {id: 'GS', min: 0, class: :functional_group, max: 99999, level: [
-        {id: 'ST', min: 0, class: :transaction, max: 99999},
-        {id: 'GE', min: 1, max: 1},
-      ]},
+      {id: 'GS', min: 0, class: :functional_group, max: 99999},
       {id: 'IEA', min: 1, max: 1}
     ]
   }.freeze
@@ -91,10 +94,10 @@ module Baldr::Grammar::Envelope
       {id: 'GE01', required: true, max: 6, type: :number, decimals: 0},
       {id: 'GE02', required: true, max: 9, type: :number, decimals: 0},
     ],
-    'ST' => [
-      {id: 'ST01', required: true, max: 3, type: :id},
-      {id: 'ST02', required: true, min: 4, max: 9, type: :string},
-    ],
+    # 'ST' => [
+    #   {id: 'ST01', required: true, max: 3, type: :id},
+    #   {id: 'ST02', required: true, min: 4, max: 9, type: :string},
+    # ],
     'IEA' => [
       {id: 'IEA01', required: true, max: 5, type: :number, decimals: 0},
       {id: 'IEA02', required: true, max: 9, type: :number, decimals: 0},

data/lib/baldr/grammar/version4010.rb

@@ -1,6 +1,14 @@
 module Baldr::Grammar::Version4010
 
-  def self.for_transaction_set(id)
+  extend self
+
+  def sub_grammar(segment)
+    if segment.id == 'ST'
+      for_transaction_set(segment.transaction_set_code)
+    end
+  end
+
+  def for_transaction_set(id)
     const_name = "Set#{id}"
     if self.const_defined?(const_name)
       self.const_get(const_name)
@@ -9,6 +17,21 @@ module Baldr::Grammar::Version4010
     end
   end
 
+  def record_defs
+    RECORD_DEFS
+  end
+
+  def structure
+    STRUCTURE
+  end
+
+  STRUCTURE = {
+    id: 'GS', min: 0, class: :functional_group, max: 99999, level: [
+      {id: 'ST', min: 0, class: :transaction, max: 99999},
+      {id: 'GE', min: 1, max: 1},
+    ]
+  }.freeze
+
   RECORD_DEFS = {
     'AAA' => [
       {id: 'AAA01', required: true, max: 1, type: :id},

data/lib/baldr/parser.rb

@@ -1,14 +1,15 @@
 class Baldr::Parser
 
-  attr_reader :error, :separators, :input, :root_type
+  attr_reader :error, :separators, :input, :root_type, :grammar
 
   def initialize(input, params = {})
-    @params = params
     @input = input
-
+    @grammar = params[:grammar]
+    @separators = params[:separators]
+    
     parse
 
-    if @params[:skip_validation] != true && successful?
+    if params[:skip_validation] != true && successful?
       validate
     end
   end
@@ -35,8 +36,8 @@ class Baldr::Parser
 
   def validate
     if @roots
-      @roots.each { |e| Baldr::Validator.validate!(e, @grammar, @version) }
-      @roots.each { |e| Baldr::Types.convert_after_parse!(e, @grammar, @version) }
+      @roots.each { |e| Baldr::Validator.validate!(e, @grammar) }
+      @roots.each { |e| Baldr::Types.convert_after_parse!(e, @grammar) }
     end
   rescue Baldr::Error => e
     @error = e.message
@@ -45,30 +46,26 @@ class Baldr::Parser
   protected
 
   def parse
-    detect_first_segment
+    @root_type = detect_first_segment
     if @root_type == :transaction
-      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::ParsingError, "grammar version must be manually defined for parsing transactions" unless @params[:version]
-      @version = @params[:version]
+      raise Baldr::Error::ParsingError, "separators must be manually defined for parsing transactions" unless @separators
+      @grammar ||= Baldr::Grammar::Transaction
+    elsif @root_type == :envelope
+      @separators ||= detect_separators
+      @grammar ||= Baldr::Grammar::Envelope
     else
-      detect_separators
-      @grammar = @params[:grammar] || Baldr::Grammar::Envelope
-      @version = nil
+      raise Baldr::Error::ParsingError, "doesn't begin with ISA or ST..."
     end
-    @roots = build_tree(split_segments, @grammar, @version)
+    @roots = build_tree(split_segments(@separators), @grammar)
   rescue Baldr::Error => e
     @error = e.message
   end
 
   def detect_first_segment
     if @input[0..2] == 'ISA'
-      @root_type = :envelope
+      :envelope
     elsif @input[0..1] == 'ST'
-      @root_type = :transaction
-    else
-      raise Baldr::Error::ParsingError, "doesn't begin with ISA or ST..."
+      :transaction
     end
   end
 
@@ -87,14 +84,14 @@ class Baldr::Parser
       segment << b
     end
 
-    @separators = {
+    {
       element: element.chr,
       segment: segment,
       component: component.chr
     }
   end
 
-  def split_segments
+  def split_segments(separators)
     segments = []
     buffer = []
     skip = 0
@@ -104,9 +101,9 @@ class Baldr::Parser
       if skip > 0
         skip -= 1
       else
-        if b == @separators[:segment].first
-          segments << buffer.pack('c*').split(@separators[:element])
-          skip = @separators[:segment].length - 1
+        if b == separators[:segment].first
+          segments << buffer.pack('c*').split(separators[:element])
+          skip = separators[:segment].length - 1
           buffer = []
         else
           buffer << b
@@ -119,12 +116,12 @@ class Baldr::Parser
     segments
   end
 
-  def build_tree(source, grammar, version = nil)
-    loop = build_segment(source.to_enum, grammar.structure, version)
+  def build_tree(source, grammar)
+    loop = build_segment(source.to_enum, grammar, grammar.structure)
     loop.segments
   end
 
-  def build_segment(enumerator, structure, version)
+  def build_segment(enumerator, grammar, structure)
     current = enumerator.peek
 
     while structure[:id] == current[0]
@@ -135,17 +132,16 @@ class Baldr::Parser
 
       enumerator.next
 
-      version ||= segment.sub_version
-      sub_grammar = segment.sub_grammar(version)
+      sub_grammar = grammar.sub_grammar(segment) if grammar.respond_to?(:sub_grammar)
 
       if sub_grammar
         sub_grammar.structure.fetch(:level, []).each do |s|
-          child = build_segment(enumerator, s, version)
+          child = build_segment(enumerator, sub_grammar, s)
           segment.children << child if child
         end
       else
         structure.fetch(:level, []).each do |s|
-          child = build_segment(enumerator, s, version)
+          child = build_segment(enumerator, grammar, s)
           segment.children << child if child
         end
       end

data/lib/baldr/segment.rb

@@ -102,11 +102,11 @@ class Baldr::Segment
     end
   end
 
-  def sub_version
+  def sub_version(grammar)
 
   end
 
-  def sub_grammar(version)
+  def sub_grammar(grammar, version)
 
   end
 

data/lib/baldr/transaction.rb

@@ -18,8 +18,8 @@ class Baldr::Transaction < Baldr::Segment
     trailer['SE02'] = transaction_control_number
   end
 
-  def sub_grammar(version)
-    version.for_transaction_set(transaction_set_code)
+  def sub_grammar(grammar, version)
+    grammar.for_transaction_set(transaction_set_code)
   end
 
   def functional_group(version)

data/lib/baldr/types.rb

@@ -2,9 +2,8 @@ module Baldr::Types
 
   extend self
 
-  def convert_after_load!(envelope, grammar = nil, version = nil)
-    grammar ||= Baldr::Grammar::Envelope
-    convert_tree!(envelope, grammar, version) do |record_def, element|
+  def convert_after_load!(envelope, grammar)
+    convert_tree!(envelope, grammar) do |record_def, element|
       case record_def[:type]
         when :number
           if element.is_a? String
@@ -22,9 +21,8 @@ module Baldr::Types
     end
   end
 
-  def convert_after_parse!(envelope, grammar = nil, version = nil)
-    grammar ||= Baldr::Grammar::Envelope
-    convert_tree!(envelope, grammar, version) do |record_def, element|
+  def convert_after_parse!(envelope, grammar)
+    convert_tree!(envelope, grammar) do |record_def, element|
       case record_def[:type]
         when :number
           if element.is_a? String
@@ -42,9 +40,8 @@ module Baldr::Types
     end
   end
 
-  def convert_before_render!(envelope, grammar = nil, version = nil)
-    grammar ||= Baldr::Grammar::Envelope
-    convert_tree!(envelope, grammar, version) do |record_def, element|
+  def convert_before_render!(envelope, grammar)
+    convert_tree!(envelope, grammar) do |record_def, element|
       case record_def[:type]
         when :number
           if element.is_a? String
@@ -64,7 +61,7 @@ module Baldr::Types
 
   protected
 
-  def convert_tree!(segment, grammar, version, &block)
+  def convert_tree!(segment, grammar, &block)
     record_defs = grammar.record_defs
 
     record_defs[segment.id].each.with_index do |r, i|
@@ -73,12 +70,11 @@ module Baldr::Types
       end
     end
 
-    version ||= segment.sub_version
-    sub_grammar = segment.sub_grammar(version)
+    sub_grammar = grammar.sub_grammar(segment) if grammar.respond_to?(:sub_grammar)
 
     segment.children.each do |loop|
       loop.segments.each do |child|
-        convert_tree!(child, sub_grammar || grammar, version, &block)
+        convert_tree!(child, sub_grammar || grammar, &block)
       end
     end
   end

data/lib/baldr/validator.rb

@@ -2,14 +2,13 @@ module Baldr::Validator
 
   extend self
 
-  def validate!(envelope, grammar = nil, version = nil)
-    grammar ||= Baldr::Grammar::Envelope
-    validate_tree!(envelope, grammar, grammar.structure, version)
+  def validate!(envelope, grammar)
+    validate_tree!(envelope, grammar, grammar.structure)
   end
 
   protected
 
-  def validate_tree!(segment, grammar, structure, version)
+  def validate_tree!(segment, grammar, structure)
     record_defs = grammar.record_defs
     raise Baldr::Error::ValidationError, "unknown segment #{segment.id}" unless record_defs[segment.id]
 
@@ -19,8 +18,7 @@ module Baldr::Validator
       self.send("check_#{r[:type]}", r, element) unless element.nil?
     end
 
-    version ||= segment.sub_version
-    sub_grammar = segment.sub_grammar(version)
+    sub_grammar = grammar.sub_grammar(segment) if grammar.respond_to?(:sub_grammar)
     structure = sub_grammar.structure if sub_grammar
 
     l = 0
@@ -29,7 +27,7 @@ module Baldr::Validator
       if loop && loop.id.to_s == s[:id]
         check_loop_count(loop, s)
 
-        loop.segments.each { |child| validate_tree!(child, sub_grammar || grammar, s, version) }
+        loop.segments.each { |child| validate_tree!(child, sub_grammar || grammar, s) }
 
         l += 1
       elsif loop
@@ -49,9 +47,9 @@ module Baldr::Validator
     end
   end
 
-  def check_loop_count(loop, grammar)
-    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]
+  def check_loop_count(loop, s)
+    raise Baldr::Error::ValidationError, "#{loop.id} loop is too long: #{loop.count} segments, maximum #{s[:max]}" if loop.count > s[:max]
+    raise Baldr::Error::ValidationError, "#{loop.id} loop is too short: #{loop.count} segments, minimum #{s[:min]}" if loop.count < s[:min]
   end
 
   def check_required(r, element)

data/lib/baldr/version.rb

@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.3.17'
+  VERSION = '0.3.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baldr
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Stanislav Spiridonov