health_seven 0.0.2 → 0.0.3

data/health_seven.gemspec

@@ -1,9 +1,6 @@
-# Version numbering: http://wiki.github.com/sandal/prawn/development-roadmap
-HEALTH_SEVEN_VERSION = "0.0.2"
-
 Gem::Specification.new do |spec|
   spec.name = "health_seven"
-  spec.version = HEALTH_SEVEN_VERSION
+  spec.version = "0.0.3"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "Ruby library for hl7 2.x"
   spec.files =  Dir.glob("{lib,spec}/**/**/*") +

data/lib/health_seven/message.rb

@@ -48,7 +48,7 @@ module HealthSeven
         gramar.push <<-RULE
 
        rule #{self.rule_name}
-       #{seg_name} payload delim #{_children_enum.join(" ")} <HealthSeven::SegmentLiteral>
+         #{seg_name} payload delim #{_children_enum.join(" ")} <HealthSeven::SegmentLiteral>
        end
        RULE
 
@@ -75,24 +75,52 @@ module HealthSeven
         end
       end
     end
+
     class MessageDef < SegmentDef
+      def _children_enum
+        @segments.map do |s|
+          s.dsl_off!
+          s.rule_name
+        end
+      end
+
+      def optional
+        @optional ||= @segments.map do |s|
+          s.rule_name if s.optional?
+        end.compact
+      end
+
+      def required
+        @reqired ||= @segments.map do |s|
+          s.rule_name unless s.optional?
+        end.compact
+      end
+
       def to_gramar(gramar)
         gramar.push <<-RULE
 
        rule message
-        #{_children_enum.join(" ")} "\\n" <HealthSeven::SegmentLiteral>
+         msh segment* "\\n" <HealthSeven::SegmentLiteral>
+       end
+
+       rule segment
+         #{_children_enum.join(" / ")}
        end
 
        rule delim
-         "#{13.chr}" 
+         "#{13.chr}"
        end
 
        rule not_delim
-   [^#{13.chr}]
+         [^#{13.chr}]
        end
 
        rule payload
-   not_delim+ <HealthSeven::FieldsLiteral>
+         not_delim+ <HealthSeven::FieldsLiteral>
+       end
+
+       rule msh
+         'MSH' payload delim  <HealthSeven::SegmentLiteral>
        end
         RULE
 
@@ -181,7 +209,9 @@ module HealthSeven
         raise HealthSeven::BadGrammarException, message
       end
       msg = Message.new
+      @required_segments = Object.const_get("#{self.name}").message_def.required
       self.clean_tree(ast_tree, msg)
+      raise "No required segment(s) found: #{@required_segments.join(', ')}" unless @required_segments.empty?
 
       msg
     end
@@ -193,6 +223,7 @@ module HealthSeven
 
       segment.name = node.name
       segment.fields = node.fields
+      @required_segments.delete(node.name.downcase)
 
       return true unless node.elements
       node.elements.each do |e|

data/spec/admit_message_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe HealthSeven::Message do
   class AdmitMessage < HealthSeven::Message
     define_message do
-      msh
       evn
       pid
       nk1
@@ -38,4 +37,11 @@ describe HealthSeven::Message do
       error.message.should =~ 'IN2'
     end
   end
+
+  it 'should not raise an exception in case of incorrect order of top level segments' do
+    -> {
+      msg = AdmitMessage.parse(load_message('disordered_admit'))
+    }.should_not raise_error
+
+  end
 end

data/spec/diagnoses_message_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe HealthSeven::Message do
   class DiagnosesMessage < HealthSeven::Message
     define_message do
-      msh
       evn
       pid
       pv1?

data/spec/messages/disordered_admit.hl7

@@ -0,0 +1,12 @@
+MSH|^~\&|MS4ADT|001|UST|001|20090123204848||ADT^A04|00000000008186657|P|2.3
+PID|1|111111122^^^MS4^PN^|11-22-33^^^MS4^MR^001|11-22-33^^^MS4^MR^001|SMITH^LIDA^^^||19670101|F||P|9166 NEW-YORK CANYON^(OAKVIEW CONV)^NEW-YORK^CA^91042^^^||(111)111-2222|| 31|W|OTH|00016604787^^^MS4001^AN^001|000-00-0000
+EVN|A04|20090123204846|||NURSE
+NK1|1|IVANOV^JOHN^^^|J|7903 HELLSTREET^^NEW-YORK^CA^91040^^|(222)222-3333||S||||||UNKNOWN|S|F||||||||||NON||||||||202244189^^^MS4^PN^||C||          1
+PV1||I|ICU5^T589^ A^001^OCCPD|1|||20131^PARTAMIAN^LEON^N^^^MD^^^^^^^|||MED||||7||||I||0401|3||||||||||||||||||001|OCCPD||||200901192300||46141.20|46141.20
+AL1|1|FA|NONE^NONE^^^^|||
+GT1|1|111111122^^^MS4^PN^|SMITH^LIDA^^^|IVANOV^JOHN^^^|9166 NEW-YORK CANYON^(OAKVIEW CONV)^NEW-YORK^CA^91042^^|(111)111-2222||19670101|F||A|000-00-0000||||RETIRED|^^^^00000||||||||||||07496|W||||||||Y|||OTH||||||||RETIRED||||||P
+IN1|1||0401|MEDICARE I/P|^^^^     |||||||19990201|||MCR|SMITH^LIDA^^^|A|19670101|9166 NEW-YORK CANYON^(OAKVIEW CONV)^NEW-YORK^CA^91042^^^^|||1||||||||||||||000000008M|||||||F|^^^^00000|Y||||111111122
+IN2||000000008|07496^RETIRED|||000000008M||||||||||||||||||||||||||||||Y|||OTH||||W|||RETIRED|||||||||||||||||(111)111-2222||||||||P
+IN1|2||0304|MEDI-CAL SECONDARY|P.O. BOX 15600^^NEW-YORK^CA^95891-1600|||||||19940501|||MCD|SMITH^LIDA^^^|A|19670101|9166 NEW-YORK CANYON^(OAKVIEW CONV)^NEW-YORK^CA^91042^^^^|||2||||||||||||||00000000000000|||||||F|^^^^00000|N||||111111122
+IN2||000000000|07496^RETIRED|||||00000000000000||||||||||||||||||||||||||||Y|||OTH||||W|||RETIRED|||||||||||||||||(111)111-2222||||||||P
+ZBC|16000087|TELPC01   |TELLABEL

data/spec/oru_message_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe HealthSeven::Message do
   class OruMessage < HealthSeven::Message
     define_message do
-      msh
       pid
       pv1?
       orc {

metadata

@@ -2,7 +2,7 @@
 name: health_seven
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nikolay Ryzhikov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -40,6 +40,7 @@ files:
 - lib/health_seven.rb
 - spec/messages/corrupt_admit.hl7
 - spec/messages/admit.hl7
+- spec/messages/disordered_admit.hl7
 - spec/messages/diagnoses.hl7
 - spec/messages/oru_r01.hl7
 - spec/diagnoses_message_spec.rb