baldr 0.3.1 → 0.3.2

data/lib/baldr/builder.rb

@@ -56,7 +56,7 @@ class Baldr::Builder
   protected
 
   def version
-    @version ||= Baldr::Grammar.for_version(@standard_version_number)
+    @version ||= Baldr::Grammar.for_standard_version(@standard_version_number)
   end
 
 end

data/lib/baldr/envelope.rb

@@ -48,7 +48,7 @@ class Baldr::Envelope < Baldr::Segment
   end
 
   def transactions
-    @transactions ||= func_group_loop.segments.map{ |f| f.transactions }.flatten
+    @transactions ||= func_group_loop.segments.map(&:transactions).flatten
   end
 
   def GS(&block)
@@ -104,18 +104,6 @@ class Baldr::Envelope < Baldr::Segment
     self.time = value.strftime('%H%M')
   end
 
-  def custom_validate!(version)
-    trailer = @children.last.segments.first
-    if trailer['IEA01'].to_i != func_group_loop.segments.count
-      raise "wrong functional groups number: #{trailer['IEA01']} in IEA01, but real number is #{func_group_loop.segments.count}"
-    end
-    if trailer['IEA02'] != interchange_control_number
-      raise "interchange control numbers don't match: #{trailer['IEA02']} in IEA02 and #{interchange_control_number} in ISA13"
-    end
-  end
-
-  protected
-
   def func_group_loop
     @func_group_loop ||= @children.select{ |c| c.id == 'GS' }.first
   end

data/lib/baldr/functional_group.rb

@@ -31,7 +31,7 @@ class Baldr::FunctionalGroup < Baldr::Segment
   end
 
   def sub_version
-    Baldr::Grammar.for_version(version_release_industry_code)
+    Baldr::Grammar.for_standard_version(version_release_industry_code)
   end
 
   def transactions
@@ -47,24 +47,6 @@ class Baldr::FunctionalGroup < Baldr::Segment
     self.time = value.strftime('%H%M')
   end
 
-  def custom_validate!(version)
-    transaction_loop.segments.each do |transaction|
-      if version.for_transaction_set(transaction.transaction_set_code)::FUNCTIONAL_GROUP != functional_identifier_code
-        raise "wrong transaction #{transaction.transaction_set_code} in functional group #{functional_identifier_code}"
-      end
-    end
-
-    trailer = @children.second.segments.first
-    if trailer['GE01'].to_i != transaction_loop.segments.count
-      raise "wrong transactions number: #{trailer['GE01']} in GE01, but real number is #{transaction_loop.segments.count}"
-    end
-    if trailer['GE02'] != group_control_number
-      raise "group control numbers don't match: #{trailer['GE02']} in GE02 and #{group_control_number} in GS06"
-    end
-  end
-
-  protected
-
   def transaction_loop
     @children.first
   end

data/lib/baldr/grammar/envelope.rb

@@ -1,5 +1,52 @@
 module Baldr::Grammar::Envelope
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    RECORD_DEFS
+  end
+
+  def validate_st!(segment)
+    trailer = segment.children.last.segments.first
+    total_number = segment.number_of_segments
+    if trailer['SE01'].to_i != total_number
+      raise Baldr::Error, "wrong segments number: #{trailer['SE01']} in SE01, but real number is #{total_number}"
+    end
+    if trailer['SE02'] != segment.transaction_control_number
+      raise Baldr::Error, "transaction set control numbers don't match: #{trailer['SE02']} in SE02 and #{segment.transaction_control_number} in ST02"
+    end
+  end
+
+  def validate_gs!(segment)
+    #segment.transaction_loop.segments.each do |transaction|
+    #  if version.for_transaction_set(transaction.transaction_set_code)::FUNCTIONAL_GROUP != segment.functional_identifier_code
+    #    raise Baldr::Error, "wrong transaction #{transaction.transaction_set_code} in functional group #{segment.functional_identifier_code}"
+    #  end
+    #end
+
+    trailer = segment.children.second.segments.first
+    if trailer['GE01'].to_i != segment.transaction_loop.segments.count
+      raise Baldr::Error, "wrong transactions number: #{trailer['GE01']} in GE01, but real number is #{segment.transaction_loop.segments.count}"
+    end
+    if trailer['GE02'] != segment.group_control_number
+      raise Baldr::Error, "group control numbers don't match: #{trailer['GE02']} in GE02 and #{segment.group_control_number} in GS06"
+    end
+  end
+
+  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}"
+    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"
+    end
+  end
+
   STRUCTURE = {
     id: 'ISA', min: 0, max: 99999, class: :envelope, level: [
       {id: 'TA1', min: 0, max: 99999},
@@ -40,19 +87,14 @@ module Baldr::Grammar::Envelope
       {id: 'GS07', required: true, max: 2, type: :id},
       {id: 'GS08', required: true, max: 12, type: :string},
     ],
-    'ST' => [
-      {id: 'ST01', required: true, max: 3, type: :id},
-      {id: 'ST02', required: true, min: 4, max: 9, type: :string},
-      {id: 'ST03', required: false, max: 35, type: :string},
-    ],
-    'SE' => [
-      {id: 'SE01', required: true, max: 10, type: :number, decimals: 0},
-      {id: 'SE02', required: true, min: 4, max: 9, type: :string},
-    ],
     'GE' => [
       {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},
+    ],
     '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/transaction.rb

@@ -0,0 +1,35 @@
+module Baldr::Grammar::Transaction
+
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    RECORD_DEFS
+  end
+
+  def validate_st!(segment)
+    trailer = segment.children.last.segments.first
+    total_number = segment.number_of_segments
+    if trailer['SE01'].to_i != total_number
+      raise Baldr::Error, "wrong segments number: #{trailer['SE01']} in SE01, but real number is #{total_number}"
+    end
+    if trailer['SE02'] != segment.transaction_control_number
+      raise Baldr::Error, "transaction set control numbers don't match: #{trailer['SE02']} in SE02 and #{segment.transaction_control_number} in ST02"
+    end
+  end
+
+  STRUCTURE = {
+    id: 'ST', min: 0, class: :transaction, max: 99999
+  }.freeze
+
+  RECORD_DEFS = {
+    'ST' => [
+      {id: 'ST01', required: true, max: 3, type: :id},
+      {id: 'ST02', required: true, min: 4, max: 9, type: :string},
+    ],
+  }
+
+end

data/lib/baldr/grammar/version4010/set204.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set204
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'SM'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set210.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set210
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'IM'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set214.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set214
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'QM'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set810.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set810
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'IN'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set850.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set850
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'PO'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set855.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set855
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'PR'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set856.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set856
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'SH'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set990.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set990
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'GF'
 
   STRUCTURE = {

data/lib/baldr/grammar/version4010/set997.rb

@@ -1,5 +1,15 @@
 module Baldr::Grammar::Version4010::Set997
 
+  extend self
+
+  def structure
+    STRUCTURE
+  end
+
+  def record_defs
+    Baldr::Grammar::Version4010::RECORD_DEFS
+  end
+
   FUNCTIONAL_GROUP = 'FA'
 
   STRUCTURE = {

data/lib/baldr/grammar.rb

@@ -1,6 +1,6 @@
 module Baldr::Grammar
 
-  def self.for_version(version)
+  def self.for_standard_version(version)
     case version.length
       when 4
         self.const_get("Version#{version}")

data/lib/baldr/parser.rb

@@ -1,33 +1,70 @@
 class Baldr::Parser
 
-  attr_reader :error, :envelopes, :separators, :input
+  attr_reader :error, :separators, :input, :root_type
 
-  def initialize(input)
-    parse(input)
+  def initialize(input, params = {})
+    @params = params
+    @input = input
+    parse
   end
 
   def successful?
     @error.nil?
   end
 
+  def envelopes
+    if @root_type == :envelope
+      @roots
+    else
+      raise Baldr::Error, "interchange doesn't have envelopes"
+    end
+  end
+
+  def transactions
+    if @root_type == :transaction
+      @roots
+    else
+      @roots.map(&:transactions).flatten
+    end
+  end
+
   protected
 
-  def parse(input)
-    @input = input
-    @separators = detect_separators(input)
-    @envelopes = build_tree(split_segments(input, separators))
-    @envelopes.each { |e| Baldr::Validator.validate! e }
+  def parse
+    detect_first_segment
+    if @root_type == :transaction
+      raise Baldr::Error, "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]
+    else
+      detect_separators
+      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
   rescue Baldr::Error => e
     @error = e.message
   end
 
-  def detect_separators(input)
-    io = StringIO.new(input)
+  def detect_first_segment
+    if @input[0..2] == 'ISA'
+      @root_type = :envelope
+    elsif @input[0..1] == 'ST'
+      @root_type = :transaction
+    else
+      raise Baldr::Error, "doesn't begin with ISA or ST..."
+    end
+  end
 
-    isa = io.gets(3)
-    raise Baldr::Error, "doesn't begin with ISA..." unless isa == 'ISA'
+  def detect_separators
+    io = StringIO.new(input)
 
+    io.seek(3, IO::SEEK_SET)
     element = io.getbyte
 
     15.times { io.bytes { |b| break if b == element } }
@@ -39,14 +76,14 @@ class Baldr::Parser
       segment << b
     end
 
-    {
+    @separators = {
       element: element.chr,
       segment: segment,
       component: component.chr
     }
   end
 
-  def split_segments(input, separators)
+  def split_segments
     segments = []
     buffer = []
     skip = 0
@@ -56,9 +93,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
@@ -71,28 +108,35 @@ class Baldr::Parser
     segments
   end
 
-  def build_tree(source)
-    grammar = Baldr::Grammar::Envelope::STRUCTURE
-    loop = build_segment(source.to_enum, grammar, nil)
+  def build_tree(source, grammar, version = nil)
+    loop = build_segment(source.to_enum, grammar, grammar.structure, version)
     loop.segments
   end
 
-  def build_segment(enumerator, grammar, version)
+  def build_segment(enumerator, grammar, structure, version)
     current = enumerator.peek
 
-    while grammar[:id] == current[0]
+    while structure[:id] == current[0]
       loop ||= Baldr::Loop.new(current[0])
-      segment = Baldr.const_get((grammar[:class] || :segment).to_s.camelize).new(current[0])
+      segment = Baldr.const_get((structure[:class] || :segment).to_s.camelize).new(current[0])
       segment.elements = current[1..-1]
       loop.add segment
 
       enumerator.next
 
       version ||= segment.sub_version
-      sub_grammar = segment.sub_grammar(version) || grammar
-      sub_grammar.fetch(:level, []).each do |g|
-        child = build_segment(enumerator, g, version)
-        segment.children << child if child
+      sub_grammar = segment.sub_grammar(version)
+
+      if sub_grammar
+        sub_grammar.structure.fetch(:level, []).each do |s|
+          child = build_segment(enumerator, sub_grammar, s, version)
+          segment.children << child if child
+        end
+      else
+        structure.fetch(:level, []).each do |s|
+          child = build_segment(enumerator, grammar, s, version)
+          segment.children << child if child
+        end
       end
 
       current = enumerator.peek

data/lib/baldr/renderer/compact_json.rb

@@ -0,0 +1,19 @@
+module Baldr::Renderer::CompactJson
+
+  extend self
+
+  def draw(segments, params = {})
+    segments = Array.wrap(segments)
+    segments.map{ |s| draw_segment(s) }.to_json
+  end
+
+  def draw_segment(segment)
+    {
+      class: segment.class.name.demodulize.underscore,
+      id: segment.id,
+      elements: segment.elements.map(&:to_s),
+      children: segment.children.map{ |l| l.segments.map{ |s| draw_segment(s) } }.flatten
+    }
+  end
+
+end

data/lib/baldr/renderer/{json.rb → edi_like_json.rb}

@@ -1,9 +1,10 @@
-module Baldr::Renderer::Json
+module Baldr::Renderer::EdiLikeJson
 
   extend self
 
-  def draw(segment, params = {})
-    draw_segment(segment).to_json
+  def draw(segments, params = {})
+    segments = Array.wrap(segments)
+    segments.map{ |s| draw_segment(s) }.to_json
   end
 
   def draw_segment(segment)

data/lib/baldr/renderer/x12.rb

@@ -8,10 +8,11 @@ module Baldr::Renderer::X12
     component: '>',
   }.freeze
 
-  def draw(segment, params = {})
+  def draw(segments, params = {})
+    segments = Array.wrap(segments)
     separators = params[:separators] || DEFAULT_SEPARATORS
     separators[:segment] = separators[:segment].pack('c*') if separators[:segment].is_a?(Array)
-    draw_segment(segment, separators).join
+    segments.map{ |s| draw_segment(s, separators).join }.join
   end
 
   def draw_segment(segment, separators)

data/lib/baldr/segment.rb

@@ -95,10 +95,6 @@ class Baldr::Segment
 
   end
 
-  def custom_validate!(version)
-
-  end
-
   def number_of_segments
     1 + @children.map(&:number_of_segments).sum
   end

data/lib/baldr/transaction.rb

@@ -19,22 +19,11 @@ class Baldr::Transaction < Baldr::Segment
   end
 
   def sub_grammar(version)
-    version.for_transaction_set(transaction_set_code)::STRUCTURE
+    version.for_transaction_set(transaction_set_code)
   end
 
   def functional_group(version)
     version.for_transaction_set(transaction_set_code)::FUNCTIONAL_GROUP
   end
 
-  def custom_validate!(version)
-    trailer = @children.last.segments.first
-    total_number = number_of_segments
-    if trailer['SE01'].to_i != total_number
-      raise "wrong segments number: #{trailer['SE01']} in SE01, but real number is #{total_number}"
-    end
-    if trailer['SE02'] != transaction_control_number
-      raise "transaction set control numbers don't match: #{trailer['SE02']} in SE02 and #{transaction_control_number} in ST02"
-    end
-  end
-
 end

data/lib/baldr/utils.rb

@@ -0,0 +1,25 @@
+module Baldr::Utils
+
+  extend self
+
+  def dump(segment)
+    Baldr::Renderer::CompactJson.draw(segment)
+  end
+
+  def load(string)
+    data = JSON.parse(string)
+    data.map{ |s| load_segment(s) } if data.is_a? Array
+  end
+  
+  protected
+
+  def load_segment(hash)
+    segment = Baldr.const_get(hash['class'].camelize).new(hash['id'])
+    segment.elements = hash['elements']
+    hash['children'].each do |c|
+      segment.add(load_segment(c))
+    end
+    segment
+  end
+
+end

data/lib/baldr/validator.rb

@@ -2,15 +2,15 @@ module Baldr::Validator
 
   extend self
 
-  def validate!(envelope)
-    grammar = Baldr::Grammar::Envelope::STRUCTURE
-    record_defs = Baldr::Grammar::Envelope::RECORD_DEFS
-    validate_tree!(envelope, grammar, record_defs, nil)
+  def validate!(envelope, grammar = nil, version = nil)
+    grammar ||= Baldr::Grammar::Envelope
+    validate_tree!(envelope, grammar, grammar.structure, version)
   end
 
   protected
 
-  def validate_tree!(segment, grammar, record_defs, version)
+  def validate_tree!(segment, grammar, structure, version)
+    record_defs = grammar.record_defs
     raise Baldr::Error, "unknown segment #{segment.id}" unless record_defs[segment.id]
 
     record_defs[segment.id].each.with_index do |r, i|
@@ -20,24 +20,29 @@ module Baldr::Validator
     end
 
     version ||= segment.sub_version
-    record_defs = version::RECORD_DEFS if version
-    sub_grammar = segment.sub_grammar(version) || grammar
+    sub_grammar = segment.sub_grammar(version)
+    structure = sub_grammar.structure if sub_grammar
 
     l = 0
-    sub_grammar.fetch(:level, []).each do |g|
+    structure.fetch(:level, []).each do |s|
       loop = segment.children[l]
-      if loop && loop.id.to_s == g[:id]
-        check_loop_count(loop, g)
+      if loop && loop.id.to_s == s[:id]
+        check_loop_count(loop, s)
 
-        loop.segments.each { |child| validate_tree!(child, g, record_defs, version) }
+        loop.segments.each { |child| validate_tree!(child, sub_grammar || grammar, s, version) }
 
         l += 1
+      elsif loop
+        raise Baldr::Error, "segment #{s[:id]} is required, but #{loop.id} was found" if s[:min] > 0
       else
-        raise Baldr::Error, "segment #{g[:id]} is required, but #{loop.id} was found" if g[:min] > 0
+        raise Baldr::Error, "segment #{s[:id]} is required, but nothing was found" if s[:min] > 0
       end
     end
 
-    segment.custom_validate!(version)
+    method = "validate_#{segment.id.downcase}!"
+    if grammar.respond_to?(method)
+      grammar.send(method, segment)
+    end
   end
 
   def check_loop_count(loop, grammar)

data/lib/baldr/version.rb

@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/baldr.rb

@@ -11,12 +11,16 @@ require 'baldr/validator'
 
 require 'baldr/error'
 
+require 'baldr/utils'
+
 require 'baldr/renderer'
 require 'baldr/renderer/x12'
-require 'baldr/renderer/json'
+require 'baldr/renderer/edi_like_json'
+require 'baldr/renderer/compact_json'
 
 require 'baldr/grammar'
 require 'baldr/grammar/envelope'
+require 'baldr/grammar/transaction'
 require 'baldr/grammar/version4010'
 require 'baldr/grammar/version4010/set204'
 require 'baldr/grammar/version4010/set210'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baldr
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -40,6 +40,7 @@ files:
 - lib/baldr/functional_group.rb
 - lib/baldr/grammar.rb
 - lib/baldr/grammar/envelope.rb
+- lib/baldr/grammar/transaction.rb
 - lib/baldr/grammar/version4010.rb
 - lib/baldr/grammar/version4010/set204.rb
 - lib/baldr/grammar/version4010/set210.rb
@@ -53,10 +54,12 @@ files:
 - lib/baldr/loop.rb
 - lib/baldr/parser.rb
 - lib/baldr/renderer.rb
-- lib/baldr/renderer/json.rb
+- lib/baldr/renderer/compact_json.rb
+- lib/baldr/renderer/edi_like_json.rb
 - lib/baldr/renderer/x12.rb
 - lib/baldr/segment.rb
 - lib/baldr/transaction.rb
+- lib/baldr/utils.rb
 - lib/baldr/validator.rb
 - lib/baldr/version.rb
 homepage: https://github.com/spiridonov/baldr