openehr 1.2.16 → 1.2.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809f7e0499dba61d1d2997ab207c65cb4c505468
-  data.tar.gz: b7d046f29a8fd2ebff8bb738621f291ef3d2c1d6
+  metadata.gz: 33791dffbc3bf04dff5496cc64ca0e757eb38599
+  data.tar.gz: f2f2e8a93f14cff344a74caecf233858bd6aa598
 SHA512:
-  metadata.gz: db24ac16e6bdf90fc67480ae6bbb5e1e62d77ae22ffa4b8dfb397b16389cdb35d30a3855e26e629cad6a4c8c91ac8334b4ed1126c8d5ed12ebbdea0aa45ffc91
-  data.tar.gz: 7f8a0cc6cee140e9edebf24a4bb45e5928752dd53835a26a9dad5a4cab642a297947f6498137bfa6913a3343414507d578d3c62922f77f1964680bea5c5ceb5c
+  metadata.gz: b96f14727386ccec7cbf358bae0762121a62d9f51a4f25b589928e205711784f0ab9c9c9353082571fad5d8bb27cfbecd482fa28af5f6926696e918c1514b58e
+  data.tar.gz: 58eaec7774dafb9635ab5b79f28c32ec27b1456d4d858a9c8b20d85d122d167e10ef6ca75ee676a345b99a8b9192738244dfc7c6b2b996df55818f53bd3c5cae

data/README.rdoc

@@ -8,7 +8,7 @@ A Ruby implementation of the openEHR specifications
 = Requirements
 
 * Supports Ruby 1.9.3, 2.0.0, 2.1.0 or equivalents.
-* Developed with CRuby 2.1.0, 2.0.0, 1.9.3 on FreeBSD and Linux.
+* Developed with CRuby 2.1.1, 2.0.0, 1.9.3 on FreeBSD and Linux.
 * Ruby 1.8 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,2013] openEHR Ruby implementation project.
+   Copyright [2012-2014] 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.rb

@@ -3,8 +3,11 @@ require_relative 'am/archetype'
 require_relative 'am/archetype/assertion'
 require_relative 'am/archetype/constraint_model'
 require_relative 'am/archetype/constraint_model/primitive'
+# Archetype ontology module was renamed to terminology module
+require_relative 'am/archetype/terminology'
 require_relative 'am/archetype/ontology'
 
+
 #openEHR Archetype Profile
 require_relative 'am/openehr_profile/data_types/basic'
 require_relative 'am/openehr_profile/data_types/text'

data/lib/openehr/am/archetype/ontology.rb

@@ -1,6 +1,7 @@
 module OpenEHR
   module AM
     module Archetype
+# Ontology module was renamed to Terminology at spec 1.1.0.
       module Ontology
         class ArchetypeOntology
           attr_accessor :specialisation_depth, :primary_language

data/lib/openehr/am/archetype/terminology.rb

@@ -0,0 +1,15 @@
+require_relative './ontology'
+# Archetype Ontology module was renamed to Terminology at spec 1.1.0
+module OpenEHR
+  module AM
+    module Archetype
+      module Terminology
+        class ArchetypeTerminology < OpenEHR::AM::Archetype::Ontology::ArchetypeOntology
+        end
+
+        class ArchetypeTerm < OpenEHR::AM::Archetype::Ontology::ArchetypeTerm
+        end
+      end
+    end
+  end
+end

data/lib/openehr/am/template.rb

@@ -2,14 +2,20 @@ module OpenEHR
   module AM
     module Template
       class OperationalTemplate
-        attr_reader :concept, :language, :description, :template_id, :definition
+        attr_reader :uid, :concept, :language, :description, :template_id, :definition, :component_terminologies
 
         def initialize(args = {})
+          self.uid = args[:uid]
           self.concept = args[:concept]
           self.template_id = args[:template_id]
           self.language = args[:language]
           self.description = args[:description]
           self.definition = args[:definition]
+          self.component_terminologies = args[:component_terminologies]
+        end
+
+        def uid=(uid)
+          @uid = uid
         end
 
         def concept=(concept)
@@ -35,6 +41,10 @@ module OpenEHR
           raise ArgumentError if definition.nil?
           @definition = definition
         end
+
+        def component_terminologies=(component_terminologies)
+          @component_terminologies = component_terminologies
+        end
       end
     end
   end

data/lib/openehr/parser/opt_parser.rb

@@ -3,19 +3,30 @@ require 'nokogiri'
 module OpenEHR
   module Parser
     class OPTParser < ::OpenEHR::Parser::Base
-      TEMPLATE_LANGUAGE_CODE_PATH = '/template/language/code_string'
-      TEMPLATE_LANGUAGE_TERM_ID_PATH = '/template/language/terminology_id/value'
+      TEMPLATE_LANGUAGE_CODE_PATH =
+        '/template/language/code_string'
+      TEMPLATE_LANGUAGE_TERM_ID_PATH =
+        '/template/language/terminology_id/value'      
       TEMPLATE_ID_PATH = '/template/template_id/value'
+      UID_PATH = '/template/uid/value'
       CONCEPT_PATH = '/template/concept'
-      DESC_ORIGINAL_AUTHOR_PATH = '/template/description/original_author'
-      DESC_LIFECYCLE_STATE_PATH = '/template/description/lifecycle_state'
-      DESC_DETAILS_LANGUAGE_TERM_ID_PATH = '/template/description/details/language/terminology_id/value'
-      DESC_DETAILS_LANGUAGE_CODE_PATH = '/template/description/details/language/code_string'
-      DESC_DETAILS_PURPOSE_PATH = '/template/description/details/purpose'
-      DESC_DETAILS_KEYWORDS_PATH = '/template/description/details/keywords'
+      DESC_ORIGINAL_AUTHOR_PATH =
+        '/template/description/original_author'
+      DESC_LIFECYCLE_STATE_PATH =
+        '/template/description/lifecycle_state'
+      DESC_DETAILS_LANGUAGE_TERM_ID_PATH =
+        '/template/description/details/language/terminology_id/value'
+      DESC_DETAILS_LANGUAGE_CODE_PATH =
+        '/template/description/details/language/code_string'
+      DESC_DETAILS_PURPOSE_PATH =
+        '/template/description/details/purpose'
+      DESC_DETAILS_KEYWORDS_PATH =
+        '/template/description/details/keywords'
       DESC_DETAILS_USE_PATH = '/template/description/details/use'
-      DESC_DETAILS_MISUSE_PATH = '/template/description/details/misuse'
-      DESC_DETAILS_COPYRIGHT_PATH = '/template/description/details/copyright'
+      DESC_DETAILS_MISUSE_PATH =
+        '/template/description/details/misuse'
+      DESC_DETAILS_COPYRIGHT_PATH =
+        '/template/description/details/copyright'
       DEFINITION_PATH = '/template/definition'
       OCCURRENCE_PATH = '/occurrences'
       
@@ -26,21 +37,25 @@ module OpenEHR
       def parse
         @opt = Nokogiri::XML::Document.parse(File.open(@filename))
         @opt.remove_namespaces!
-        terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(value: text_on_path(@opt,TEMPLATE_LANGUAGE_TERM_ID_PATH))
-        language = OpenEHR::RM::DataTypes::Text::CodePhrase.new(code_string: text_on_path(@opt, TEMPLATE_LANGUAGE_CODE_PATH), terminology_id: terminology_id)
-        OpenEHR::AM::Template::OperationalTemplate.new(concept: concept, language: language, description: description, template_id: template_id, definition: definition)
+        uid = OpenEHR::RM::Support::Identification::UIDBasedID.new(value: text_on_path(@opt, UID_PATH))
+        defs = definition
+        OpenEHR::AM::Template::OperationalTemplate.new(uid: uid, concept: concept, language: language, description: description, template_id: template_id, definition: defs, component_terminologies: @component_terminologies)
       end
 
       private
 
       def template_id
-        OpenEHR::RM::Support::Identification::TemplateID.new(value: text_on_path(@opt, TEMPLATE_ID_PATH))
+        @template_id ||= OpenEHR::RM::Support::Identification::TemplateID.new(value: text_on_path(@opt, TEMPLATE_ID_PATH))
       end
 
       def concept
         text_on_path(@opt, CONCEPT_PATH)
       end
 
+      def language
+        @language ||= OpenEHR::RM::DataTypes::Text::CodePhrase.new(code_string: text_on_path(@opt, TEMPLATE_LANGUAGE_CODE_PATH), terminology_id: OpenEHR::RM::Support::Identification::TerminologyID.new(value: text_on_path(@opt,TEMPLATE_LANGUAGE_TERM_ID_PATH)))
+      end
+
       def description
         original_author = text_on_path(@opt, DESC_ORIGINAL_AUTHOR_PATH)
         lifecycle_state = text_on_path(@opt, DESC_LIFECYCLE_STATE_PATH)
@@ -65,9 +80,37 @@ module OpenEHR
         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))
       end
 
+      def component_terminologies(archetype_id, nodes)
+        @component_terminologies ||= Hash.new
+        @component_terminologies[archetype_id.value] =
+          archetype_terminology(nodes)
+      end
+
+      def archetype_terminology(nodes)
+        td = term_definitions(nodes)
+        concept_code = td[language.code_string][0]
+        OpenEHR::AM::Archetype::Terminology::
+          ArchetypeTerminology.new(
+                concept_code: concept_code,
+                original_language: language,
+                term_definitions: td)
+      end
+
+      def term_definitions(nodes)
+        term_definitions = nodes.xpath 'term_definitions'
+        term_items = term_definitions.map do |term|
+          code = term.attributes['code'].value
+          text = term.at('items[@id="text"]').text
+          description = term.at('items[@id="description"]').text
+          OpenEHR::AM::Archetype::Terminology::ArchetypeTerm.new(code: code, items: {'text' => text, 'description' => description})
+        end
+        { language.code_string => term_items }
+      end
+
       def children(children_xml, node)
         children_xml.map do |child|
           send child.attributes['type'].text.downcase, child, node
@@ -85,6 +128,7 @@ module OpenEHR
         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))
       end
 
@@ -230,6 +274,7 @@ module OpenEHR
       def string(attr_xml)
         attr_xml.text
       end
+
       def empty_then_nil(val)
         if val.empty?
           return nil

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.16"
+  VERSION = "1.2.99"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.99
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,6 +168,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  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: rspec-collection_matchers
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +225,7 @@ files:
 - lib/openehr/am/archetype/constraint_model.rb
 - lib/openehr/am/archetype/constraint_model/primitive.rb
 - lib/openehr/am/archetype/ontology.rb
+- lib/openehr/am/archetype/terminology.rb
 - lib/openehr/am/openehr_profile/data_types/basic.rb
 - lib/openehr/am/openehr_profile/data_types/quantity.rb
 - lib/openehr/am/openehr_profile/data_types/text.rb