WatersOfOblivion-heychell7 0.0.1 → 0.0.2

data/lib/heychell7.rb

@@ -2,23 +2,41 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Heychell7
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
-  class << self
-    def message &block
-      Message.instance_eval &block
-    end
-  end
+  class ParseError < Exception; end
 
   class Parser
     def initialize
       @buffer = ""
-      @segments = []
-      @fields = []
-      @items = []
       @stack = []
     end
 
+    def parse_trigger &block
+      @trigger = block
+      Proc.new { |data|
+        parse data
+      }
+    end
+
+    def parse_io io
+      while (buf = io.read).length > 0 do
+        parse buf
+      end
+      message
+    end
+
+    def parse_string str
+      parse "\x0b#{str}\x1c\r" unless str =~ /^\x0b.*\x1c\r$/
+      message
+    end
+
+    def parse_file filename
+      parse_io File.open(filename, "r")
+    end
+
+    private
+
     def parse str
       @buffer += str.to_s
       parse_re = /\n|\||\^|^\x0b|\x1c\r$/
@@ -34,21 +52,8 @@ module Heychell7
 
         @buffer = $'
       end
-
-      reduce Segment, Message
-      @stack.pop
-    end
-
-    def parse_string str
-      parse "\x0b#{str}\x1c\r" unless str =~ /^\x0b.*\x1c\r$/
     end
 
-    def parse_file filename
-      parse_string File.open(filename, "r").read
-    end
-
-    private
-
     def emit_segment data
       emit_field data
       reduce Field, Segment
@@ -64,16 +69,17 @@ module Heychell7
     end
 
     def emit_start
-      @items, @fields, @segments = [], [], []
       @stack = []
     end
 
     def emit_end data
       emit_segment data unless data.empty?
+      reduce Segment, Message
+      @trigger.call message if @trigger
     end
 
     def emit_error
-      puts "Error!  Unexpected #{$&}"
+      raise ParseError.new("Unexpected #{$&}")
     end
 
     def reduce source, target
@@ -85,12 +91,16 @@ module Heychell7
       tmp.reverse.each { |src| target << src }
       @stack.push target
     end
+
+    def message
+      @stack.last.is_a?(Message) ? @stack.pop : nil
+    end
   end
 
   class Message
     attr_accessor :segments
 
-    def initialize segments = []
+    def initialize *segments
       @segments = segments
     end
 
@@ -110,7 +120,7 @@ module Heychell7
   class Segment
     attr_accessor :fields
 
-    def initialize fields = []
+    def initialize *fields
       @fields = fields
     end
 
@@ -126,7 +136,7 @@ module Heychell7
   class Field
     attr_accessor :items
 
-    def initialize items = []
+    def initialize *items
       @items = items
     end
 
@@ -154,99 +164,47 @@ module Heychell7
 =begin
   message do
     segment :evn do
-      field :type_code
-      field :recorded_date
-      field :planned_date
-      field :reason_code
-      field :operator_id
-      field :event_occurred
-      field :event_facility
+      fields :type_code, :recorded_date, :planned_date, :reason_code,
+             :operator_id, :event_occurred, :event_facility
     end
 
-    segment :msn do
-      field :ack_code
-      field :control_id
-      field :text
-      field :expected_seq
-      field :delayed_ack_type
-      field :error_cond
+    segment :msa do
+      fields :ack_code, :control_id, :text, :expected_seq, :delayed_ack_type,
+             :error_cond
     end
 
     segment :msh do
-      field :enc_chars
-      field :sending_app
-      field :sending_facility
-      field :recv_app
-      field :recv_facility
-      field :time
-      field :security
-      field :message_type
-      field :message_control_id
-      field :processing_id
-      field :version_id
-      field :seq
-      field :continue_ptr
-      field :accept_ack_type
-      field :app_ack_type
-      field :country_code
-      field :charset
+      fields :enc_chars, :sending_app, :sending_facility, :recv_app,
+             :recv_facility, :time, :security, :message_type,
+             :message_control_id, :processing_id, :version_id, :seq,
+             :continue_ptr, :accept_ack_type, :app_ack_type, :country_code,
+             :charset
     end
 
     segment :nte do
-      field :set_id
-      field :source
-      field :comment
-      field :comment_type
+      fields :set_id, :source, :comment, :comment_type
     end
 
     segment :obr do
-      field :set_id
-      field :placer_order_number
-      field :filler_order_number
-      field :universal_service_id
-      field :priority
-      field :requested_date
-      field :observation_date
-      field :observation_end_date
-      field :collection_volume
-      field :colletor_identifier
-      field :specimen_action_code
-      field :danger_code
-      field :relevant_clinical_info
-      field :specimen_received_date
-      field :speciment_source
-      field :ordering_provider
-      field :order_callback_phone_number
-      field :placer_field_1
-      field :placer_field_2
-      field :filer_field_1
-      field :filer_field_2
-      field :results_status_change_date
-      field :charge_to_practice
-      field :parent_result
-      field :quantity_timing
-      field :result_copies_to
-      field :parent
-      field :transport_mode
-      field :reason_for_study
-      field :principal_result_interpreter
-      field :assistant_result_interpreter
-      field :technician
-      field :transcriptionist
-      field :scheduled_date
-      field :number_of_sample_containers
-      field :transport_logistics_of_sample
-      field :collectors_comment
-      field :transport_arrangement_responsibility
-      field :transport_arranged
-      field :escort_required
-      field :planned_patient_transport_comment
-      field :procedure_code
-      field :procedure_code_modified
-      field :placer_supplemental_service_info
-      field :filler_supplemental_service_info
-      field :medically_necessary_dup_procedure_reason
-      field :result_handling
+      fields :set_id, :placer_order_number, :filler_order_number,
+             :universal_service_id, :priority, :requested_date,
+             :observation_date, :observation_end_date, :collection_volume,
+             :colletor_identifier, :specimen_action_code, :danger_code,
+             :relevant_clinical_info, :specimen_received_date, :specimen_source,
+             :ordering_provider, :order_callback_phone_number, :placer_field_1,
+             :placer_field_2, :filer_field_1, :filer_field_2,
+             :results_status_change_date, :charge_to_practice, :parent_result,
+             :quantity_timing, :result_copies_to, :parent, :transport_mode,
+             :reason_for_study, :principal_result_interpreter,
+             :assistant_result_interpreter, :technician, :transcriptionist,
+             :scheduled_date, :number_of_sample_containers,
+             :transport_logistics_of_sample, :collectors_comment,
+             :transport_arrangement_responsibility, :transport_arranged,
+             :escort_required, :planned_patient_transport_comment,
+             :procedure_code, :procedure_code_modified,
+             :placer_supplemental_service_info,
+             :filler_supplemental_service_info,
+             :medically_necessary_dup_procedure_reason, :result_handling
     end
 
     segment :obx do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: WatersOfOblivion-heychell7
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jonathan Bryant