open_ehr 0.9.3 → 0.9.4

data/lib/open_ehr/parser/cadl_grammar.tt

@@ -28,10 +28,10 @@ module OpenEHR
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
               :lower => 1, :upper => 1)
             node.id = args[:node_id]
-            if node.root?
-              args[:path] = '/'
+            if node.root? or node.id.nil?
+              args[:path] = node.path
             else
-              args[:path] = node.path + '[' + args[:node_id] + ']'
+              args[:path] = node.path + '[' + node.id + ']'
             end
             args.update body.value(node)
             OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(args)
@@ -42,13 +42,8 @@ module OpenEHR
             args = c_complex_object_head.value
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
               :lower => 1, :upper => 1)
-            if node.root?
-              node.path = '/'
-            else
-              node.id = args[:node_id]
-p args[:rm_type_name]
-              node.path +=  '[' + args[:node_id] + ']'
-            end
+            node.id = args[:node_id]
+            args[:path] = node.path
             OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(args)
           end
         }
@@ -57,7 +52,7 @@ p args[:rm_type_name]
       rule c_complex_object_head
         c_complex_object_id c_occurrences {
           def value
-            c_complex_object_id.value.update c_occurrences.value
+            c_complex_object_id.value[:occurrences] = c_occurrences.value
             c_complex_object_id.value
           end
         }
@@ -85,31 +80,25 @@ p args[:rm_type_name]
       rule c_complex_object_body
         c_any '' {
           def value(node)
-            {:any_allowed? => true}
+            Hash[:attributes => c_any.value(node)]
           end
         }
       / c_attributes '' {
-          def value(node = nil)
-            {:attributes => c_attributes.value(node),
-             :any_allowed? => false}
+          def value(node)
+            Hash[:attributes => c_attributes.value(node)]
           end
         }
       end
 
       rule c_object
-        c_complex_object '' {
+        c_primitive_object '' {
           def value(node)
-            c_complex_object.value(node)
+            c_primitive_object.value
           end
         }
-      / archetype_slot '' {
+      /  c_complex_object '' {
           def value(node)
-            archetype_slot.value(node)
-          end
-        }
-      / archetype_internal_ref '' {
-          def value(node = nil)
-            archetype_internal_ref.value(node)
+            c_complex_object.value(node)
           end
         }
       / constraint_ref '' {
@@ -117,9 +106,14 @@ p args[:rm_type_name]
             constraint_ref.value
           end
         }
-      / c_primitive_object '' {
+      / archetype_slot '' {
+          def value(node)
+            archetype_slot.value(node)
+          end
+        }
+      / archetype_internal_ref '' {
           def value(node = nil)
-            c_primitive_object.value
+            archetype_internal_ref.value(node)
           end
         }
       / V_C_DOMAIN_TYPE '' {
@@ -261,7 +255,14 @@ p args[:rm_type_name]
       end
 
       rule c_any
-        '*' space
+        '*' space {
+          def value(node)
+            OpenEHR::AM::Archetype::ConstraintModel::CAttribute.new(
+              :path => node.path, :rm_attribute_name => node.id,
+              :exsitence => OpenEHR::AssumedLibraryTypes::Interval.new(
+                :lower => 1, :upper => 1))
+          end
+        }
       end
 
       rule c_attributes
@@ -291,7 +292,13 @@ p args[:rm_type_name]
       rule c_attr_head
         id:(V_ATTRIBUTE_IDENTIFIER) white_space c_existence c_cardinality {
           def value(node)
-            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
+            if node.root?
+              path = node.path + id.value
+            elsif node.id
+              path = node.path + "[#{node.id}]/" + id.value
+            elsif
+              path = node.path + '/' + id.value
+            end
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
              :rm_attribute_name => id.value,
              :path => path,
@@ -301,7 +308,13 @@ p args[:rm_type_name]
         }
       / id:V_ATTRIBUTE_IDENTIFIER white_space c_existence {
           def value(node)
-            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
+            if node.root?
+              path = node.path + id.value
+            elsif node.id
+              path = node.path + "[#{node.id}]/" + id.value
+            elsif
+              path = node.path + '/' + id.value
+            end
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
              :rm_attribute_name => id.value,
              :path => path,
@@ -310,7 +323,13 @@ p args[:rm_type_name]
         }
       / id:(V_ATTRIBUTE_IDENTIFIER) white_space c_cardinality {
           def value(node)
-            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
+            if node.root?
+              path = node.path + id.value
+            elsif node.id
+              path = node.path + "[#{node.id}]/" + id.value
+            elsif
+              path = node.path + '/' + id.value
+            end
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
              :rm_attribute_name => id.value,
              :path => path,
@@ -319,7 +338,13 @@ p args[:rm_type_name]
         }
       / id:(V_ATTRIBUTE_IDENTIFIER) white_space {
           def value(node)
-            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
+            if node.root?
+              path = node.path + id.value
+            elsif node.id
+              path = node.path + "[#{node.id}]/" + id.value
+            elsif
+              path = node.path + '/' + id.value
+            end
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
              :rm_attribute_name => id.value, :path => path)
           end
@@ -512,7 +537,7 @@ p args[:rm_type_name]
             integer_interval_value.value
           end
         }
-      / occurrence_spec {
+      / occurrence_spec '' {
           def value
             occurrence_spec.value
           end
@@ -520,62 +545,184 @@ p args[:rm_type_name]
       end
 
       rule c_integer
-        c_integer_spec (';' integer_value)?
+        c_integer_spec '' {
+          def value
+            c_integer_spec.value
+          end
+        }
+      / c_integer_spec ';' integer_value {
+          def value
+            c_integer_spec.value
+          end
+        }
       end
 
       rule c_real_spec
-        real_value
-      / real_list_value
-      / real_interval_value
+        real_value '' {
+          def value
+            real_value.value
+          end
+        }
+      / real_list_value '' {
+          def value
+            real_list_value.value
+          end
+        }
+      / real_interval_value '' {
+          def value
+            real_interval_value.value
+          end
+        }
       end
 
       rule c_real
-        c_real_spec (';' real_value)?
+        c_real_spec '' {
+          def value
+            c_real_spec.value
+          end
+        }
+      / c_real_spec ';' real_value {
+          def value
+           c_real_spec.assumed_value = real_value.value
+          end
+        }
       end
 
       rule c_date_constraint
-        V_ISO8601_DATE_CONSTRAINT_PATTERN
-      / date_value
-      / date_interval_value
+        V_ISO8601_DATE_CONSTRAINT_PATTERN '' {
+          def value
+            V_ISO8601_DATE_CONSTRAINT_PATTERN.value
+          end
+        }
+      / date_value '' {
+          def value
+            date_value.value
+          end
+        }
+      / date_interval_value '' {
+          def value
+            date_interval_value.value
+          end
+        }
       end
 
       rule c_date
-        c_date_constraint (';' date_value)?
+        c_date_constraint '' {
+          def value
+            c_date_constraint.value
+          end
+        }
+      / c_date_constraint ';' date_value {
+          def value
+            c_date_constraint.value
+          end
+        }
       end
 
       rule c_time_constraint
-        V_ISO8601_TIME_CONSTRAINT_PATTERN
-      / time_value
-      / time_interval_value
+        V_ISO8601_TIME_CONSTRAINT_PATTERN '' {
+          def value
+            V_ISO8601_TIME_CONSTRAINT_PATTERN.value
+          end
+        }
+      / time_value '' {
+          def value
+            time_value.value
+          end
+        }
+      / time_interval_value {
+          def value
+            time_interval_value.value
+          end
+        }
       end
 
       rule c_time
-        c_time_constraint (';' time_value)?
+        c_time_constraint '' {
+          def value
+            c_time_constraint.value
+          end
+        }
+      / c_time_constraint ';' time_value {
+          def value
+            c_time_constraint.value
+          end
+        }    
       end
 
       rule c_date_time_constraint
-        V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN
-      / date_time_value
-      / date_time_interval_value
+        V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN '' {
+          def value
+            V_ISO8601_DATE_TIME_CONSTRAINT_PATTERN.value
+          end
+        }
+      / date_time_value '' {
+          def value
+            date_time_value.value
+          end
+        }
+      / date_time_interval_value '' {
+          def value
+            date_time_interval_value.value
+          end
+        }
       end
 
       rule c_date_time
-        c_date_time_constraint
-      / c_date_time_constraint ';' date_time_value
+        c_date_time_constraint '' {
+          def value
+            c_date_time_constraint.value
+          end
+        }
+      / c_date_time_constraint ';' date_time_value {
+          def value
+            c_date_time_constraint.value
+          end
+        }
       end
 
       rule c_duration_constraint
-        duration_pattern ('/' duration_interval_pattern)?
-      / duration_value
-      / duration_interval_value
+        duration_pattern '' {
+          def value
+            duration_pattern.value
+          end
+        }
+      / duration_pattern '/' duration_interval_pattern {
+          def value
+            duration_interval_patternl.value
+          end
+        }
+      / duration_value {
+          def value
+            duration_value.value
+          end
+        }
+      / duration_interval_value {
+          def value
+            duration_interval_value.value
+          end
+        }
       end
 
       rule duration_pattern
-        V_ISO8601_TIME_CONSTRAINT_PATTERN
+        V_ISO8601_TIME_CONSTRAINT_PATTERN '' {
+          def value
+            V_ISO8601_TIME_CONSTRAINT_PATTERN.value
+          end
+        }
       end
 
       rule c_duration
-        c_duration_constraint (';' duration_value)?
+        c_duration_constraint '' {
+          def value
+            c_duration_constraint.value
+          end
+        }
+      / c_duration_constraint ';' duration_value {
+          def value
+            c_duration_constraint.value
+          end
+        }
       end
 
       rule c_string_spec
@@ -614,20 +761,40 @@ p args[:rm_type_name]
       end
 
       rule c_boolean_spec
-        SYM_TRUE (',' SYM_FALSE)? {
+        SYM_TRUE '' {
+          def value
+            {:true_valid => true, :false_valid => false}
+          end
+        }
+      / SYM_TRUE ',' SYM_FALSE {
+          def value
+            {:true_valid => true, :false_valid => true}
+          end
+        }
+      / SYM_FALSE '' {
+          def value
+            {:true_valid => false, :false_valid => true}
+          end
+        }
+      / SYM_FALSE ',' SYM_TRUE {
+          def value
+            {:true_valid => true, :false_valid => true}
+          end
         }
-      / SYM_FALSE (',' SYM_TRUE)?
       end
 
       rule c_boolean
         c_boolean_spec ';' boolean_value {
           def value
-            c_boolean_spec.value
+            c_boolean_spec.value[:assumed_value] = boolean_value.value
+            OpenEHR::AM::Archetype::ConstraintModel::Primitive::CBoolean.new(
+              c_boolean_spec.value)
           end
         }
       / c_boolean_spec '' {
           def value
-            c_boolean_spec.value
+            OpenEHR::AM::Archetype::ConstraintModel::Primitive::CBoolean.new(
+              c_boolean_spec.value)
           end
         }
       end
@@ -717,8 +884,7 @@ p args[:rm_type_name]
             boolean_leaf.value
           end
         }
-      / arithmetic_expression (SYM_EQ / SYM_NE / SYM_LT / SYM_GT / SYM_LE / SYM_GE) arithmetic_expression {
-          def value
+      / arithmetic_expression (SYM_EQ / SYM_NE / SYM_LT / SYM_GT / SYM_LE / SYM_GE) arithmetic_expression {          def value
             p elements
           end
         }

data/lib/open_ehr/parser/cadl_node.rb

@@ -7,6 +7,7 @@ module OpenEHR
 
         def initialize(parent = nil)
           @parent = parent
+          @path = '/' if parent.nil?
         end
 
         def root?

data/lib/open_ehr/parser/dadl_grammar.tt

@@ -35,7 +35,7 @@ module OpenEHR
       rule attr_val
         attr_id SYM_EQ object_block {
           def value
-            {attr_id.value.to_sym =>  object_block.value}
+            {attr_id.value =>  object_block.value}
           end
         }
       end
@@ -105,7 +105,7 @@ module OpenEHR
       rule keyed_object
         object_key SYM_EQ object_block {
           def value
-            {object_key.value.to_sym => object_block.value}
+            {object_key.value => object_block.value}
           end
         }
       end
@@ -203,9 +203,9 @@ module OpenEHR
             boolean_value.value
           end
         }
-      / character_value '' {
+      / uri_value '' {
           def value
-            character_value.value
+            uri_value.value
           end
         }
       / date_value '' {
@@ -228,14 +228,14 @@ module OpenEHR
             duration_value.value
           end
         }
-      / uri_value '' {
+      / string_value '' {
           def value
-            uri_value.value
+            string_value.value
           end
         }
-      / string_value '' {
+      / character_value '' {
           def value
-            string_value.value
+            character_value.value
           end
         }
       end
@@ -347,9 +347,9 @@ module OpenEHR
       end
 
       rule uri_value
-        V_URI '' {
+        uri:V_URI '' {
           def value
-            V_URI.value
+            uri.value
           end
         }
       end

data/lib/open_ehr/parser/shared_token_grammar.tt

@@ -18,22 +18,22 @@ module OpenEHR
       end
 
       rule type_identifier
-        '(' id:V_TYPE_IDENTIFIER ')' white_space {
+        '(' id:V_GENERIC_TYPE_IDENTIFIER ')' white_space {
           def value
             id.value
           end
         }
-      / '(' id:V_GENERIC_TYPE_IDENTIFIER ')' white_space {
+      / id:V_GENERIC_TYPE_IDENTIFIER white_space {
           def value
             id.value
           end
         }
-      / id:V_TYPE_IDENTIFIER white_space {
+      / '(' id:V_TYPE_IDENTIFIER ')' white_space {
           def value
             id.value
           end
         }
-      / id:V_GENERIC_TYPE_IDENTIFIER space {
+      / id:V_TYPE_IDENTIFIER white_space {
           def value
             id.value
           end
@@ -172,7 +172,7 @@ module OpenEHR
       end
 
       rule real_value
-        ('+' / '-') V_REAL {
+        ('+' / '-')? V_REAL {
           def value
             text_value.to_f
           end
@@ -253,10 +253,10 @@ module OpenEHR
                   :lower_included => false)
           end
         }
-      / SYM_INTERVAL_DELIM SYM_GE real_value SYM_INTERVAL_DELIM {
+      / SYM_INTERVAL_DELIM SYM_GE lo:real_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
-                  :lower => up.value,
+                  :lower => lo.value,
                   :upper_unbounded => true,
                   :lower_included => true)
           end
@@ -839,19 +839,19 @@ module OpenEHR
       end
 
       rule SYM_GE
-        '=>'
+        '=>' / '>=' white_space
       end
 
       rule SYM_LE
-        '<='
+        '<=' / '=>' white_space
       end
 
       rule SYM_LT
-        '<'
+        '<' white_space
       end
 
       rule SYM_GT
-        '>'
+        '>' white_space
       end
 
       rule SYM_START_DBLOCK
@@ -1059,7 +1059,7 @@ module OpenEHR
       end
 
       rule V_URI
-        [a-z]+ '://' [^<>|\\{}^~"\[\] ]* {
+        [a-z]+ '://' [^<>|\\{}^~"\[\] ]* { 
           def value
             text_value
           end
@@ -1139,7 +1139,7 @@ module OpenEHR
       end
 
       rule V_GENERIC_TYPE_IDENTIFIER
-        [A-Z] IDCHAR* '<' [a-zA-Z0-9,_<>]+ '>' {
+        [A-Z] IDCHAR* '<' [a-zA-Z0-9,_]+ '>' {  # <>
           def value
             text_value
           end

data/open_ehr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "open_ehr"
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shinji KOBAYASHI", "Akimichi Tatsukawa"]
-  s.date = "2011-11-19"
+  s.date = "2011-11-22"
   s.description = "This project is an implementation of the openEHR specification on Ruby."
   s.email = "skoba@moss.gr.jp"
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     "Gemfile",
-    "Gemfile.lock",
     "Guardfile",
     "History.txt",
     "PostInstall.txt",
@@ -223,11 +222,22 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.reason_for_encounter.v1.adl",
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.summary.v1.adl",
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.vital_signs.v1.adl",
+    "spec/lib/open_ehr/parser/adl_archetype_internal_ref2_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_internal_ref_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_internal_ref_with_generics_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_ontology_binding_spec.rb",
+    "spec/lib/open_ehr/parser/adl_archetype_ontology_spec.rb",
     "spec/lib/open_ehr/parser/adl_description_spec.rb",
     "spec/lib/open_ehr/parser/adl_identification_spec.rb",
+    "spec/lib/open_ehr/parser/adl_language_no_accreditation_spec.rb",
+    "spec/lib/open_ehr/parser/adl_language_order_spec.rb",
+    "spec/lib/open_ehr/parser/adl_language_spec.rb",
+    "spec/lib/open_ehr/parser/adl_language_translation_author_language_spec.rb",
+    "spec/lib/open_ehr/parser/adl_language_translation_language_author_spec.rb",
     "spec/lib/open_ehr/parser/adl_parser_spec.rb",
     "spec/lib/open_ehr/parser/adl_path_spec.rb",
     "spec/lib/open_ehr/parser/base_spec.rb",
+    "spec/lib/open_ehr/parser/parser_spec_helper.rb",
     "spec/lib/open_ehr/rm/common/archetyped/archetyped_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/feeder_audit_details_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/feeder_audit_spec.rb",
@@ -348,7 +358,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/skoba/ruby-impl-openehr"
   s.licenses = ["The openEHR Open Source Software license(mozilla tri-license)"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Ruby implementation of the openEHR specification"
 
   if s.respond_to? :specification_version then

data/spec/lib/open_ehr/am/archetype/archetype_spec.rb

@@ -14,7 +14,7 @@ describe Archetype do
     definition = stub(CComplexObject, :rm_type_name => 'SECTION')
     items = {:text => 'Physical examination'}
     term1 = ArchetypeTerm.new(:code => 'at0000', :items => items)
-    ontology = ArchetypeOntology.new(:specialisation_depth => 1, :term_definitions => {'ja' => [term1]})
+    ontology = ArchetypeOntology.new(:specialisation_depth => 1, :term_definitions => {'ja' => {'at0000' =>term1}})
     uid = HierObjectID.new(:value => 'ABCD::1')
     parent_archetype_id = ArchetypeID.new(:value => 'openEHR-EHR-SECTION.physical_examination.v1')
     invariants = stub(Set, :size => 2)