open_ehr 0.9.1 → 0.9.2

data/Gemfile.lock

@@ -1,44 +1,46 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     builder (3.0.0)
     columnize (0.3.4)
     diff-lcs (1.1.3)
-    ffi (1.0.9)
+    ffi (1.0.10)
     git (1.2.5)
-    guard (0.8.4)
+    guard (0.8.8)
       thor (~> 0.14.6)
-    guard-rspec (0.4.5)
-      guard (>= 0.4.0)
-    guard-spork (0.3.0)
-      guard (>= 0.8.2)
+    guard-rspec (0.5.2)
+      guard (>= 0.8.4)
+    guard-spork (0.3.1)
+      guard (>= 0.8.4)
       spork (>= 0.8.4)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    libnotify (0.5.7)
+    json (1.6.1)
+    libnotify (0.5.9)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     locale (2.0.5)
     multi_json (1.0.3)
-    polyglot (0.3.2)
-    rake (0.9.2)
+    polyglot (0.3.3)
+    rake (0.9.2.2)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.7.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -49,7 +51,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.3)
+    simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
@@ -58,7 +60,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    xml-simple (1.1.0)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -40,10 +40,12 @@ Terminology and Demographic server will be implemented in other
 project.
 
 = Authors
+* Main codes
 Akimichi Tatsukawa, Shinji Kobayashi
-
 openEHR.jp, <http://openehr.jp>
 
+* ADL parser test cases are derived from Java and Eiffel.
+
 = Copyright
 The software, including all files in this directory and
 subdirectories is copyrighted to the original authors and
@@ -66,5 +68,4 @@ Public licence (MPL), and the Free Software Foundation GNU General
 Public Licence (GPL) and Lesser GNU General Public Licence (LGPL). See
 the Mozilla relicensing FAQ for details of this license. This in no
 way constrains the way in which software created by other
-organisations is licenced.
-
+organisations is licenced.

data/Rakefile

@@ -31,11 +31,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :default => :spec
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/open_ehr/parser/adl_grammar.tt

@@ -13,10 +13,10 @@ module OpenEHR
 
       rule archetype 
         arch_identification 
-        arch_specialisation?
+        spec:(arch_specialisation)?
         arch_concept
-        arch_language?
-        arch_description?
+        lang:(arch_language)?
+        desc:(arch_description)?
         arch_definition
         arch_invariant?
         arch_ontology {
@@ -33,15 +33,15 @@ module OpenEHR
 	  end
 
 	  def original_language
-            elements[3].original_language
+            lang.original_language
           end
 
           def translations
-            elements[3].translations
+            lang.translations
           end
 
           def description
-            elements[4].values
+            desc.values unless desc.empty?
           end
 
           def definition
@@ -61,48 +61,55 @@ module OpenEHR
 	  end
 
 	  def adl_version
-	    head.adl_version
+	    head.value[:adl_version]
 	  end
+
+          def is_controlled?
+            head.value[:is_controlled?]
+          end
         }
       end
 
       rule arch_head
-        SYM_ARCHETYPE m:arch_meta_data? {
-	  def adl_version
-            m.adl_version
+        SYM_ARCHETYPE m:arch_meta_data {
+	  def value
+            m.value
 	  end
 	}
+      / SYM_ARCHETYPE {
+          def value
+            Hash.new
+          end
+        }
       end
 
       rule arch_meta_data
         '(' arch_meta_data_items ')' space {
-	   def adl_version
-             arch_meta_data_items.adl_version
+	   def value
+             arch_meta_data_items.value
            end
          }
       end
 
       rule arch_meta_data_items
-        item:arch_meta_data_item (';' other_item:arch_meta_data_item)* {
-          def adl_version
-  	    item.adl_version
-          end
-
-	  def is_controled?
-	    item.is_controled? or other_item.map {|i| i.is_controled}
+        item:arch_meta_data_item other_item:(';' arch_meta_data_item)* {
+          def value
+	    v = item.value
+            other_item.elements.map {|i| i.arch_meta_data_item.value}
+            v
 	  end
         }
       end
 
       rule arch_meta_data_item
         SYM_ADL_VERSION SYM_EQ V_VERSION_STRING space {
-	  def adl_version
-	    elements[2].text_value
+	  def value
+            {:adl_version => elements[2].text_value}
           end
         }
       / SYM_IS_CONTROLED space {
-          def is_controled?
-	    true if elements[0]
+          def value
+	    {:is_controled? => true} # if elements[0]
           end
         }
       end

data/lib/open_ehr/parser/cadl_grammar.tt

@@ -1,17 +1,16 @@
 require 'shared_token_grammar'
 require 'open_ehr/assumed_library_types'
 require 'open_ehr/am/archetype/constraint_model'
+require 'cadl_node'
 
 module OpenEHR
   module Parser
     grammar CADL
-#      include SharedToken
-#      include OpenEHR::AssumedLibraryTypes
-#      include OpenEHR::AM::Archetype::ConstraintModel
+#      include OpenEHR::Parser::CADL
 
       rule V_CADL_TEXT
         c_complex_object '' {
-          def value	    
+          def value
             c_complex_object.value
           end
         }
@@ -24,23 +23,33 @@ module OpenEHR
 
       rule c_complex_object
         head:c_complex_object_head SYM_MATCHES SYM_START_CBLOCK body:c_complex_object_body SYM_END_CBLOCK {
-          def value
+          def value(node = ArchetypeNode.new)
             args = head.value
-            args[:path] ||= '/'
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
               :lower => 1, :upper => 1)
-            args.update body.value
+            node.id = args[:node_id]
+            if node.root?
+              args[:path] = '/'
+            else
+              args[:path] = node.path + '[' + args[:node_id] + ']'
+            end
+            args.update body.value(node)
             OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(args)
           end
         }
       / c_complex_object_head '' {
-          def value
+          def value(node = ArchetypeNode.new)
             args = c_complex_object_head.value
-            args[:path] ||= '/'
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
               :lower => 1, :upper => 1)
-            OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(
-              c_complex_object_head.value)
+            if node.root?
+              node.path = '/'
+            else
+              node.id = args[:node_id]
+p args[:rm_type_name]
+              node.path +=  '[' + args[:node_id] + ']'
+            end
+            OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(args)
           end
         }
       end
@@ -75,13 +84,13 @@ module OpenEHR
 
       rule c_complex_object_body
         c_any '' {
-          def value
+          def value(node)
             {:any_allowed? => true}
           end
         }
       / c_attributes '' {
-          def value
-            {:attributes => c_attributes.value,
+          def value(node = nil)
+            {:attributes => c_attributes.value(node),
              :any_allowed? => false}
           end
         }
@@ -89,32 +98,32 @@ module OpenEHR
 
       rule c_object
         c_complex_object '' {
-          def value
-            c_complex_object.value
+          def value(node)
+            c_complex_object.value(node)
           end
         }
       / archetype_slot '' {
-          def value
-            archetype_slot.value
+          def value(node)
+            archetype_slot.value(node)
           end
         }
       / archetype_internal_ref '' {
-          def value
-            archetype_internal_ref.value
+          def value(node = nil)
+            archetype_internal_ref.value(node)
           end
         }
       / constraint_ref '' {
-          def value
+          def value(node = nil)
             constraint_ref.value
           end
         }
       / c_primitive_object '' {
-          def value
+          def value(node = nil)
             c_primitive_object.value
           end
         }
       / V_C_DOMAIN_TYPE '' {
-          def value
+          def value(node = nil)
             p elemetns
           end
         }
@@ -122,45 +131,50 @@ module OpenEHR
       end
 
       rule archetype_internal_ref
-        SYM_USE_NODE type_identifier c_occurrences object_path {
-          def value
-            OpenEHR::AM::Archetype::ConstraintModel::ArchetypeInternalRef(
+        SYM_USE_NODE type_identifier c_occurrences object_path space {
+          def value(node)
+            OpenEHR::AM::Archetype::ConstraintModel::ArchetypeInternalRef.new(
               :rm_type_name => type_identifier.value,
               :occurrences => c_occurrences.value,
-              :path => object_path.value)
+              :path => node.path,
+              :target_path => object_path.value)
           end
         }
-      / SYM_USE_NODE type_identifier object_path {
-          def value
-            OpenEHR::AM::Archetype::ConstraintModel::ArchetypeInternalRef(
-              :rm_type_name => type_identifier.value, :path => object_path)
+      / SYM_USE_NODE type_identifier object_path space {
+          def value(node = nil)
+            OpenEHR::AM::Archetype::ConstraintModel::ArchetypeInternalRef.new(
+              :rm_type_name => type_identifier.value,
+              :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
+                :lower => 1, :upper => 1),
+              :path => node.path,
+              :target_path => object_path.value)
            end
         }
       end
 
       rule archetype_slot
         c_archetype_slot_head SYM_MATCHES SYM_START_CBLOCK c_includes c_excludes SYM_END_CBLOCK {
-          def value
+          def value(node = nil)
             args = c_archetype_slot_head.value
             args[:includes] = c_includes.value
             args[:excludes] = c_excludes.value
-            args[:path] ||= '/'
+            args[:path] = node.path
             OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot.new(args)
           end
         }
       / c_archetype_slot_head SYM_MATCHES SYM_START_CBLOCK c_includes SYM_END_CBLOCK {
-          def value
+          def value(node = nil)
             args = c_archetype_slot_head.value
             args[:includes] = c_includes.value
-            args[:path] ||= '/'
+            args[:path] = node.path
             OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot.new(args)
           end
         }
       / c_archetype_slot_head SYM_MATCHES SYM_START_CBLOCK c_excludes SYM_END_CBLOCK {
-          def value
+          def value(node = nil)
             args = c_archetype_slot_head.value
             args[:excludes] = c_excludes.value
-            args[:path] ||= '/'
+            args[:path] = node.path
             OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot.new(args)
           end
         }
@@ -251,22 +265,24 @@ module OpenEHR
       end
 
       rule c_attributes
-        c_attribute more_attr:(c_attribute)* {
-          def value
-            attributes.map {|c| c.value}
+        c_attribute more_attr:(c_attribute white_space)* {
+          def value(node)
+            attributes.map {|c| c.value(node)}
           end
 
           def attributes
-            [c_attribute] + more_attr.elements.map {|e| e.attribute}
+            [c_attribute] + more_attr.elements.map {|e| e.c_attribute}
           end
         }
       end
 
       rule c_attribute
         c_attr_head c_attr_body {
-          def value
-            val = c_attr_head.value
-            val.children = c_attr_body.value
+          def value(node)
+            val = c_attr_head.value(node)
+            child_node = ArchetypeNode.new(node)
+            child_node.path = val.path
+            val.children = c_attr_body.value(child_node)
             val
           end
         }
@@ -274,55 +290,59 @@ module OpenEHR
 
       rule c_attr_head
         id:(V_ATTRIBUTE_IDENTIFIER) white_space c_existence c_cardinality {
-          def value
+          def value(node)
+            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
              :rm_attribute_name => id.value,
-             :path => '/' + id.value,
+             :path => path,
              :existence => c_existence.value,
              :cardinality => c_cardinality.value)
           end
         }
       / id:V_ATTRIBUTE_IDENTIFIER white_space c_existence {
-          def value
+          def value(node)
+            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
              :rm_attribute_name => id.value,
-             :path => '/' + id.value,
+             :path => path,
              :existence => c_existence.value)
           end
         }
       / id:(V_ATTRIBUTE_IDENTIFIER) white_space c_cardinality {
-          def value
+          def value(node)
+            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
              :rm_attribute_name => id.value,
-             :path => '/' + id.value,
+             :path => path,
              :cardinality => c_cardinality.value)
           end
         }
       / id:(V_ATTRIBUTE_IDENTIFIER) white_space {
-          def value
+          def value(node)
+            path = (node.root? ? '/' : (node.path + "[#{node.id}]" + '/')) + id.value
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
-             :rm_attribute_name => id.value, :path => '/' + id.value)
+             :rm_attribute_name => id.value, :path => path)
           end
         }
       end
 
       rule c_attr_body
         SYM_MATCHES SYM_START_CBLOCK c_attr_values SYM_END_CBLOCK {
-          def value
-            c_attr_values.value
+          def value(node)
+            c_attr_values.value(node)
           end
         }
       end
 
       rule c_attr_values
         c_any '' {
-          def value
+          def value(node)
             c_any.value
           end
         }
       / c_object more_co:(c_object '')* {
-          def value
-            c_objects.map {|c| c.value}
+          def value(node)
+            c_objects.map {|c| c.value(node)}
           end
 
           def c_objects
@@ -577,10 +597,10 @@ module OpenEHR
               :pattern => pat.value, :type => 'Boolean')
           end
         }
-      / V_STRING '' {
+      / str:V_STRING '' {
           def value
             OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(
-              :list => [V_STRING.value])
+              :list => [str.value])
           end
         }
       end
@@ -763,6 +783,12 @@ module OpenEHR
       end
 
 # path block
+      rule object_path
+        movable_path
+      / absolute_path
+      / relative_path
+      end
+
       rule movable_path
          SYM_MOVABLE_LEADER relative_path {
            def value

data/lib/open_ehr/parser/cadl_node.rb

@@ -0,0 +1,18 @@
+module OpenEHR
+  module Parser
+    module CADL
+      class ArchetypeNode
+        attr_reader :parent
+        attr_accessor :path, :id
+
+        def initialize(parent = nil)
+          @parent = parent
+        end
+
+        def root?
+          return parent.nil?
+        end
+      end
+    end
+  end
+end

data/lib/open_ehr/parser/dadl_grammar.tt

@@ -21,7 +21,7 @@ module OpenEHR
       end
 
       rule attr_vals
-        first:attr_val second:(';'? attr_val)* {
+        first:attr_val second:(';'? space attr_val space)* {
           def value
             val = {first.id.to_sym => first.value}
             second.elements.each do |e|

data/lib/open_ehr/parser/shared_token_grammar.tt

@@ -18,22 +18,22 @@ module OpenEHR
       end
 
       rule type_identifier
-        '(' id:V_TYPE_IDENTIFIER ')' {
+        '(' id:V_TYPE_IDENTIFIER ')' white_space {
           def value
             id.value
           end
         }
-      / '(' id:V_GENERIC_TYPE_IDENTIFIER ')' {
+      / '(' id:V_GENERIC_TYPE_IDENTIFIER ')' white_space {
           def value
             id.value
           end
         }
-      / id:V_TYPE_IDENTIFIER '' {
+      / id:V_TYPE_IDENTIFIER white_space {
           def value
             id.value
           end
         }
-      / id:V_GENERIC_TYPE_IDENTIFIER '' {
+      / id:V_GENERIC_TYPE_IDENTIFIER space {
           def value
             id.value
           end