baldr 0.3.5 → 0.3.6

data/lib/baldr/builder.rb

@@ -5,15 +5,12 @@ class Baldr::Builder
   def initialize(params = {})
     @envelope = Baldr::Envelope.new
     @transactions = []
-    @sender_id = params[:sender_id]
-    @receiver_id = params[:receiver_id]
-    @sender_id_qualifier = params[:sender_id_qualifier]
-    @receiver_id_qualifier = params[:receiver_id_qualifier]
-    @standard_version_number = params[:standard_version_number] || '00401'
-    @interchange_control_number = params[:interchange_control_number]
-    @date_time = params[:date_time] || DateTime.now
+
+    Baldr::Envelope.helpers.each do |f|
+      @envelope.send("#{f}=", params[f]) if params.has_key?(f)
+    end
+
     @functional_groups_control_numbers = params[:functional_groups_control_numbers] || {}
-    @acknowledgment_requested = params[:acknowledgment_requested] || '0'
   end
 
   def ST(&block)
@@ -30,39 +27,34 @@ class Baldr::Builder
   end
 
   def prepare!
-    @envelope.sender_id = @sender_id if @sender_id
-    @envelope.receiver_id = @receiver_id if @receiver_id
-    @envelope.sender_id_qualifier = @sender_id_qualifier if @sender_id_qualifier
-    @envelope.receiver_id_qualifier = @receiver_id_qualifier if @receiver_id_qualifier
-    @envelope.standard_version_number = @standard_version_number if @standard_version_number
-    @envelope.interchange_control_number = @interchange_control_number if @interchange_control_number
-    @envelope.date_time = @date_time
-    @envelope.acknowledgment_requested = @acknowledgment_requested
+    @envelope.func_group_loop.segments.each do |group|
+      group.transactions.each do |t|
+        t.prepare!
+      end
+      group.prepare!
+    end
+    @envelope.prepare!
+  end
 
+  def build_functional_groups
     functional_groups = @transactions.group_by { |t| t.functional_group(version) }
     functional_groups.each do |group_id, transactions|
       group = Baldr::FunctionalGroup.new
       group.functional_identifier_code = group_id
-      group.application_senders_code = @sender_id
-      group.application_receivers_code = @receiver_id
-      group.version_release_industry_code = "#{@standard_version_number}0"
-      group.date_time = @date_time
+      group.application_senders_code = @envelope.sender_id
+      group.application_receivers_code = @envelope.receiver_id
+      group.version_release_industry_code = "#{@envelope.standard_version_number}0"
+      group.date_time = @envelope.date_time
       group.group_control_number = @functional_groups_control_numbers[group_id]
       @envelope.add group
-      transactions.each do |t|
-        group.add t
-        t.prepare!
-      end
-      group.prepare!
+      transactions.each { |t| group.add t }
     end
-
-    @envelope.prepare!
   end
 
   protected
 
   def version
-    @version ||= Baldr::Grammar.for_standard_version(@standard_version_number)
+    @version ||= Baldr::Grammar.for_standard_version(@envelope.standard_version_number)
   end
 
 end

data/lib/baldr/envelope.rb

@@ -19,6 +19,10 @@ class Baldr::Envelope < Baldr::Segment
     'ISA16' => :component_separator,
   )
 
+  def self.helpers
+    @helpers + [:receiver_id, :sender_id, :security_info, :authorization_info, :date_time]
+  end
+
   def initialize(id = 'ISA')
     super(id)
 

data/lib/baldr/segment.rb

@@ -3,6 +3,7 @@ class Baldr::Segment
   attr_accessor :id, :children, :elements
 
   def self.helpers_for_elements(hash)
+    @helpers = hash.values
     hash.each do |element, method|
       self.class_eval <<-RUBY
         def #{method}
@@ -16,6 +17,10 @@ class Baldr::Segment
     end
   end
 
+  def self.helpers
+    @helpers || []
+  end
+
   def initialize(id)
     @elements = []
     @children = []

data/lib/baldr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baldr
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors: