openehr 1.2.99999 → 1.2.999999

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cb803ae534a0b21a6f32f49a6ab67f23e9a2310
-  data.tar.gz: 83f4c97ef8df85d96c2e9a21a19ec75e11e45f78
+SHA256:
+  metadata.gz: 0b1262bf46aa8257e7bb3aded5078ca794a14febe4b60f258ad515f7b63fb372
+  data.tar.gz: 073635b1014bb231c543566532b6327b9e2c211a95eb0d8f85502e03530b5107
 SHA512:
-  metadata.gz: 2c4ec78adc29711593e9bec0adebffca790c18f5b3dcd9b80dc878347ae5466a841aa0b24df3b6c4f34f9f58ff410477a8df9cfdd1311ca25cbb027d2572054f
-  data.tar.gz: 143ca8d16048c7865ece5de9c8a9d75bebbce386619ac0e3e324ad84b39a2608d6f7726f1e6985ca78a1dcabceb208167aadb47e87afe6ed6a6a90e0821584a7
+  metadata.gz: cd81e9d640e206637b9cc742294f079627699eb9d93abf243efc9e93141c16db987c5d5ebb7068a5f87cb56f378268ab5606f183646b98e6374f89f5f128e541
+  data.tar.gz: 3505875a5655d03b0657521dae3c657c33db22c0d61db91be7d559de6106d2f24429daa1b1ec9a54292e2d10922ec9d393052e5d5ff7bfcf8bf77d490ac99396

data/README.rdoc

@@ -7,9 +7,9 @@ A Ruby implementation of the openEHR specifications
 
 = Requirements
 
-* Supports Ruby 1.9.3, 2.0.0, 2.1.0, 2.2.3 or equivalents.
-* Developed with CRuby 2.2.3, 2.0.0, 1.9.3 on FreeBSD and Linux.
-* Ruby 1.8 or earlier are no longer supported.
+* Supports CRuby 2.3.6, 2.4.3, 2.5.0  or equivalents.
+* Developed with CRuby 2.5.0 on FreeBSD and Linux.
+* Ruby 2.2 or earlier are no longer supported.
 
 =Description
 
@@ -66,7 +66,7 @@ All Rights Reserved.
 
 This product is released under Apache 2.0 license
 
-   Copyright [2012-2014] openEHR Ruby implementation project.
+   Copyright [2012-2018] openEHR Ruby implementation project.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/lib/openehr/am/archetype.rb

@@ -100,6 +100,12 @@ module OpenEHR
           return archetype
         end
 
+        def to_rm
+          ::OpenEHR::RM::Factory.create(definition.rm_type_name,
+                                        archetype_node_id: definition.archetype_node_id,
+                                        name: definition
+                                        )
+        end
       end # end of Archetype
       # original file:
       # ref_imple_eiffel/components/adl_parser/src/interface/adl_definition.e

data/lib/openehr/parser/adl_grammar.tt

@@ -25,6 +25,10 @@ module OpenEHR
             arch_identification.adl_version
           end
 
+          def uid
+            arch_identification.uid
+          end
+
 	  def concept
 	    arch_concept.value
 	  end
@@ -61,6 +65,10 @@ module OpenEHR
 	    head.value[:adl_version]
 	  end
 
+          def uid
+            head.value[:uid]
+          end
+
           def is_controlled?
             head.value[:is_controlled?]
           end
@@ -89,11 +97,10 @@ module OpenEHR
       end
 
       rule arch_meta_data_items
-        item:arch_meta_data_item other_item:(';' arch_meta_data_item)* {
+        item:arch_meta_data_item other_items:(';' white_space arch_meta_data_item)* {
           def value
 	    v = item.value
-            other_item.elements.map {|i| i.arch_meta_data_item.value}
-            v
+            other_items.elements.map {|m| m.arch_meta_data_item.value }.inject(v, :update)
 	  end
         }
       end
@@ -104,9 +111,14 @@ module OpenEHR
             {:adl_version => ver.value}
           end
         }
+      / SYM_UID SYM_EQ uid:V_HIER_OBJECT space {
+          def value
+            { :uid => uid.value }
+          end
+        }
       / SYM_IS_CONTROLED space {
           def value
-	    {:is_controled? => true} # if elements[0]
+	    { :is_controled? => true } # If elements[0]
           end
         }
       end
@@ -562,7 +574,7 @@ module OpenEHR
               path = node.path + id.value
             elsif node.id
               path = node.path + "[#{node.id}]/" + id.value
-            elsif
+            else
               path = node.path + '/' + id.value
             end
             OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(
@@ -578,7 +590,7 @@ module OpenEHR
               path = node.path + id.value
             elsif node.id
               path = node.path + "[#{node.id}]/" + id.value
-            elsif
+            else
               path = node.path + '/' + id.value
             end
             OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(
@@ -2880,6 +2892,10 @@ module OpenEHR
         [a-zA-Z0-9]
       end
 
+      rule HEXADECIMAL
+        [a-fA-F0-9]
+      end
+
       rule IDCHAR
         [a-zA-Z0-9_]
       end
@@ -3144,6 +3160,10 @@ module OpenEHR
         [Aa] [Dd] [Ll] '_' [Vv] [Ee] [Rr] [Ss] [Ii] [Oo] [Nn] space
       end
 
+      rule SYM_UID
+        [Uu] [Ii] [Dd] space
+      end
+
       rule SYM_IS_CONTROLLED
         [Cc] [Oo] [Nn] [Tt] [Rr] [Oo] [Ll] [Ll] [Ee] [Dd] space
       end
@@ -3208,6 +3228,14 @@ module OpenEHR
         }
       end
 
+      rule V_HIER_OBJECT
+        HEXADECIMAL 8..8 '-' (HEXADECIMAL 4..4 '-') 3..3 HEXADECIMAL 12..12 {
+          def value
+            text_value
+          end
+        }
+      end   
+
       rule V_URI
         [a-z]+ '://' [^<>|\\{}^~"\[\] ]* { 
           def value
@@ -3353,7 +3381,7 @@ module OpenEHR
           end
         }
       end
-
+                                                             
       rule V_CHAR
         [^\\\n\"] {
           def value

data/lib/openehr/parser/adl_parser.rb

@@ -25,7 +25,7 @@ module OpenEHR
 
       def parsed_data
         filestream = File.open(@filename, 'rb:bom|utf-8')
-        @parsed_data ||= adl_grammar_parser.parse(filestream.read)
+        @parsed_data ||= adl_grammar_parser.parse(filestream.read.scrub)
         filestream.close
         unless @parsed_data
           puts adl_grammar_parser.failure_reason
@@ -59,6 +59,10 @@ module OpenEHR
         parsed_data.adl_version
       end
 
+      def uid
+        OpenEHR::RM::Support::Identification::HierObjectID.new(value: parsed_data.uid) if parsed_data.uid
+      end
+
       def concept
         parsed_data.concept
       end
@@ -78,6 +82,7 @@ module OpenEHR
       def archetype
         OpenEHR::AM::Archetype::Archetype.new(:archetype_id => archetype_id,
                                   :adl_version => adl_version,
+                                  :uid => uid,            
                                   :concept => concept,
                                   :original_language => original_language,
                                   :translations => translations,

data/lib/openehr/parser/opt_parser.rb

@@ -27,6 +27,8 @@ module OpenEHR
         '/template/description/details/misuse'
       DESC_DETAILS_COPYRIGHT_PATH =
         '/template/description/details/copyright'
+      DESC_OTHER_DETAILS_PATH =
+        '/template/description/other_details'
       DEFINITION_PATH = '/template/definition'
       OCCURRENCE_PATH = '/occurrences'
       
@@ -59,7 +61,7 @@ module OpenEHR
       def description
         original_author = text_on_path(@opt, DESC_ORIGINAL_AUTHOR_PATH)
         lifecycle_state = text_on_path(@opt, DESC_LIFECYCLE_STATE_PATH)
-        OpenEHR::RM::Common::Resource::ResourceDescription.new(original_author: original_author, lifecycle_state: lifecycle_state, details: [description_details])
+        OpenEHR::RM::Common::Resource::ResourceDescription.new(original_author: original_author, lifecycle_state: lifecycle_state, details: [description_details], other_details: description_other_details)
       end
 
       def description_details
@@ -73,15 +75,15 @@ module OpenEHR
         OpenEHR::RM::Common::Resource::ResourceDescriptionItem.new(language: language, purpose: purpose, keywords: keywords, use: use, misuse: misuse, copyright: copyright)
       end
 
+      def description_other_details
+        @opt.xpath(DESC_OTHER_DETAILS_PATH).inject({}) do |hash, detail|
+          hash[detail.attributes['id'].value] = detail.text
+          hash
+        end
+      end
+
       def definition
-        root_rm_type = text_on_path(@opt, DEFINITION_PATH + '/rm_type_name')
-        root_node = Node.new
-        root_node.id = text_on_path(@opt, DEFINITION_PATH + '/node_id')
-        root_occurrences = occurrences(@opt.xpath(DEFINITION_PATH + OCCURRENCE_PATH))
-        root_archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(value: text_on_path(@opt, DEFINITION_PATH+'/archetype_id/value'))
-        root_node.path = "/[#{root_archetype_id.value}]"
-        component_terminologies(root_archetype_id, @opt.xpath(DEFINITION_PATH))
-        OpenEHR::AM::Archetype::ConstraintModel::CArchetypeRoot.new(rm_type_name: root_rm_type, node_id: root_node.id, path: root_node.path, occurrences: root_occurrences, archetype_id: root_archetype_id, attributes: attributes(@opt.xpath(DEFINITION_PATH+'/attributes'), root_node))
+        c_archetype_root @opt.xpath(DEFINITION_PATH)
       end
 
       def component_terminologies(archetype_id, nodes)
@@ -111,12 +113,6 @@ module OpenEHR
         { language.code_string => term_items }
       end
 
-      def children(children_xml, node)
-        children_xml.map do |child|
-          send child.attributes['type'].text.downcase, child, node
-        end
-      end
-
       def c_archetype_root(xml, node = Node.new)
         rm_type_name = text_on_path(xml, './rm_type_name') 
         id = text_on_path(xml, './node_id')
@@ -124,9 +120,9 @@ module OpenEHR
         occurrences = occurrences(xml.xpath('./occurrences'))
         archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(value: text_on_path(xml, './archetype_id/value'))
         if node.root? or node.id.nil?
-          node.path = "/[#{archetype_id.value}]"
-        else
-          node.path += "/[#{archetype_id.value}]"
+          node.path = "/"
+        # else
+        #   node.path += "/"  #"/[#{archetype_id.value}]"
         end
         component_terminologies(archetype_id, xml)
         OpenEHR::AM::Archetype::ConstraintModel::CArchetypeRoot.new(rm_type_name: rm_type_name, node_id: node.id, path: node.path, occurrences: occurrences, archetype_id: archetype_id, attributes: attributes(xml.xpath('./attributes'), node))
@@ -137,55 +133,51 @@ module OpenEHR
         node_id = xml.xpath('./node_id').text
         unless node_id.nil? or node_id.empty?
           node.id = node_id
-          node.path += "[#{node_id}]"
+          node.path = "#{node.path}[#{node.id}]"
         end
         OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(rm_type_name: rm_type_name, node_id: node.id, path: node.path, occurrences: occurrences(xml.xpath('./occurrences')), attributes: attributes(xml.xpath('./attributes'), node))
       end
 
       def attributes(attributes_xml, node)
         attributes_xml.map do |attr|
-          send attr.attributes['type'].text.downcase, attr, node
+          rm_attribute_name = attr.at('rm_attribute_name').text
+          if node.root?
+            path = "/#{rm_attribute_name}"
+          # elsif node.id
+          #   path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
+          else
+            path = "#{node.path}/#{rm_attribute_name}"
+          end
+          child_node = Node.new(node)
+          child_node.path = path
+          child_node.id = node.id
+          send attr.attributes['type'].text.downcase, attr, child_node
+        end
+      end
+
+      def children(children_xml, node)
+        children_xml.map do |child|
+          send child.attributes['type'].text.downcase, child, node
         end
       end
 
       def c_single_attribute(attr_xml, node)
         rm_attribute_name = attr_xml.at('rm_attribute_name').text
         existence = occurrences(attr_xml.at('existence'))
-        if node.root?
-          path = "/#{rm_attribute_name}"
-        elsif node.id
-          path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
-        else
-          path = "#{node.path}/#{rm_attribute_name}"
-        end
-        child_node = Node.new(node)
-        child_node.path = node.path
-        child_node.id = node.id
-        OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: path, children: children(attr_xml.xpath('./children'), child_node))
+        OpenEHR::AM::Archetype::ConstraintModel::CSingleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: node.path, children: children(attr_xml.xpath('./children'), node))
       end
 
       def c_multiple_attribute(attr_xml, node)
         rm_attribute_name = attr_xml.at('rm_attribute_name').text
         existence = occurrences(attr_xml.at('existence'))
-        if node.root?
-          path = "/#{rm_attribute_name}"
-        elsif node.id
-          path = "#{node.path}[#{node.id}]/#{rm_attribute_name}"
-        else
-          path = "#{node.path}/#{rm_attribute_name}"
-        end
-        child_node = Node.new(node)
-        child_node.path = node.path
-        child_node.id = node.id
-        OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: path, children: children(attr_xml.xpath('./children'), child_node))
+        OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute.new(rm_attribute_name: rm_attribute_name, existence: existence, path: node.path, cardinality: cardinality(attr_xml), children: children(attr_xml.xpath('./children'), node))
       end
 
       def c_code_phrase(attr_xml, node)
         terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(value: attr_xml.at('terminology_id/value').text.strip)
-        path = node.path
         code_list = attr_xml.xpath('code_list').text.strip
         occurrences = occurrences(attr_xml.at('occurrences'))
-        OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(terminology_id: terminology_id, code_list: [code_list], path: path, occurrences: occurrences, rm_type_name: 'CodePhrase')
+        OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(terminology_id: terminology_id, code_list: [code_list], path: node.path, occurrences: occurrences, rm_type_name: 'CodePhrase')
       end
 
       def archetype_slot(attr_xml,node)
@@ -210,6 +202,13 @@ module OpenEHR
         OpenEHR::AssumedLibraryTypes::Interval.new(lower: lower, upper: upper, lower_included: lower_included, upper_included: upper_included)
       end
 
+      def cardinality(xml)
+        order = to_bool(xml.at('is_ordered').text)
+        unique = to_bool(xml.at('is_unique').text)
+        interval = occurrences(xml)
+        OpenEHR::AM::Archetype::ConstraintModel::Cardinality.new(is_ordered: order, is_unique: unique, interval: interval)
+      end        
+
       def constraint_ref(attr_xml, node)
         rm_type_name = attr_xml.at('rm_type_name').text
         reference = attr_xml.at('reference').text
@@ -248,12 +247,19 @@ module OpenEHR
       def c_primitive_object(attr_xml, node)
         rm_type_name = attr_xml.at('rm_type_name').text
         occurrences = occurrences(attr_xml.at('occurrences'))
-        OpenEHR::AM::Archetype::ConstraintModel::CPrimitiveObject.new(rm_type_name: rm_type_name, occurrences: occurrences, node_id: node.id)
+        item = send attr_xml.at('item')['type'].downcase, attr_xml.at('item')
+        OpenEHR::AM::Archetype::ConstraintModel::CPrimitiveObject.new(rm_type_name: rm_type_name, occurrences: occurrences, node_id: node.id, item: item)
       end
-      
+
       def c_string(attr_xml)
-        pattern = attr_xml.at('pattern').text
-        OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(pattern: pattern)
+        if attr_xml.at('pattern')
+          OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(pattern: attr_xml.at('pattern').text)
+        else
+          list = attr_xml.xpath('.//list').map do |str|
+            str.text
+          end
+          OpenEHR::AM::Archetype::ConstraintModel::Primitive::CString.new(list: list)
+        end
       end
 
       def c_dv_quantity(attr_xml, node)
@@ -271,6 +277,21 @@ module OpenEHR
         OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CDvQuantity.new(rm_type_name: rm_type_name, occurrences: occurrences, list: list, property: property)
       end
 
+      def c_date(xml)
+
+      end
+
+      def c_date_time(xml)
+        
+      end
+
+      def c_integer(xml)
+
+      end
+
+      def c_boolean(xml)
+      end
+
       def string(attr_xml)
         attr_xml.text
       end
@@ -288,9 +309,9 @@ module OpenEHR
       end
 
       def to_bool(str)
-        if str =~ /true/i
+        if /true/i =~ str
           return true
-        elsif str =~ /false/i
+        elsif /false/i =~ str
           return false
         end
         return nil

data/lib/openehr/rm.rb

@@ -42,6 +42,5 @@ require_relative 'rm/demographic'
 #Integration Information Model
 require_relative 'rm/integration'
 
-
+#factory and builder
 require_relative 'rm/factory'
-

data/lib/openehr/rm/data_types/basic.rb

@@ -31,9 +31,13 @@ module OpenEHR
 
           def value=(value)
             raise ArgumentError, "value must not be nil" if value.nil?
-            if value == true or value =~ /TRUE/i
+            if value == true
               @value = true
-            else
+            elsif  value == false
+              @value = false
+            elsif /TRUE/i =~ value
+              @value = true
+            elsif /FALSE/i =~ value
               @value = false
             end
           end

data/lib/openehr/rm/factory.rb

@@ -3,9 +3,40 @@ require 'active_support/inflector'
 module OpenEHR
   module RM
     class Factory
-      def self.create(type, *param)
-        type = type.downcase.camelize if type.include? '_'
-        class_eval("#{type}Factory").create(*param)
+      def initialize(cobject)
+        @cobject = cobject
+      end
+
+      class << self
+        def create(type, *param)
+          type = type.downcase.camelize if type.include? '_'
+          class_eval("#{type}Factory").create(*param)
+        end
+      end
+
+      def build
+        Factory.create(type, params)
+      end
+
+      private
+      def type
+        @cobject.rm_type_name
+      end
+
+      def name
+        OpenEHR::RM::DataTypes::Text::DvText.new(value: ' ')
+      end
+
+      def params
+        @cobject.attributes.inject({}) do |hash, attribute|
+          if attribute.children
+            hash[attribute.rm_attribute_name.to_sym] =
+              attribute.children.map { |child| Factory.new(child).build }
+          end
+          hash
+        end.merge(
+        { archetype_node_id: @cobject.node_id,
+          occurrences: @cobject.occurrences })
       end
     end
 
@@ -182,5 +213,17 @@ module OpenEHR
         Composition::Content::Entry::Observation.new(*param)
       end
     end
+
+    class SECTIONFactory
+      def self.create(*param)
+        Composition::Content::Navigation::Section.new(*param)
+      end
+    end
+
+    class CLUSTERFactory
+      def self.create(*param)
+        DataStructures::ItemStructure::Representation::Cluster.new(*param)
+      end
+    end
   end
 end

data/lib/openehr/serializer.rb

@@ -14,6 +14,10 @@ module OpenEHR
       def serialize
         return self.merge
       end
+
+      private
+      def merge
+      end
     end
 
     class ADLSerializer < BaseSerializer
@@ -249,6 +253,22 @@ module OpenEHR
         return archetype
       end
     end
+
+    class OPTSerializer < BaseSerializer
+      def initialize(opt, format:)
+        @opt = OpenEHR::Parser::OPTParser.new(opt).parse
+      end
+
+      def name
+        @opt.definition.archetype_id.concept_name
+      end
+
+      def header
+
+      end
+
+
+    end
   end
 end
 

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.99999"
+  VERSION = "1.2.999999"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.99999
+  version: 1.2.999999
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2020-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -211,7 +211,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-spork
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -225,7 +225,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: libnotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -239,7 +239,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: libnotify
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: meowcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -334,8 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of the openEHR specification