openehr 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28564c1ae91970a32375da714bd53949824ea83f
-  data.tar.gz: fe7c87002da639f8216fd4fb3465718bc2102c62
+  metadata.gz: 310975a6381dda713a84b6ad8a2c41e66f1a2c28
+  data.tar.gz: f74b8b99f4fe23592b83002243d7bbd15e2037fe
 SHA512:
-  metadata.gz: 0986f32e43a4d18b6a323f0319fdc3962af9a6d09236d3643513e73398f78e33ed92d083d556d5248eead2ab6130ac3cadea38c95238aeacad1f416b8d50b1f4
-  data.tar.gz: eea1117fb74deebd63b7b16de3644305de46e1f68f85094022a23023062c89d18ca26bd5959c99750a8fd62eb80517638d43ff0659cdd9b18f7b613d288250a0
+  metadata.gz: 8d1e6936be86929a2b6e897cd42ca25a8d4b815aecb371d815c823fe8234bf3815c8df5d421904b94ab1d6cfbb428e5ce0e55ff73878a5532cbfbadca7e6ab09
+  data.tar.gz: 69e4c6d94b85576f23754590fdc3b0750ddf0fcaf5d81da56a4d702185aad718e59de9e259b7aed44f253470d21397be93dd5194308fecad8e8c334209f6fe84

data/lib/openehr.rb

@@ -1,14 +1,13 @@
-require 'openehr/version'
-require 'openehr/assumed_library_types'
-require 'openehr/rm'
-require 'openehr/am'
-require 'openehr/parser'
-require 'openehr/serializer'
+require_relative 'openehr/version'
 
-module OpenEHR
-  include AssumedLibraryTypes
-  include RM
-  include AM
-  include Parser
-  include Serializer
-end
+#Reference model
+require_relative 'openehr/rm'
+
+#Archetype model
+require_relative 'openehr/am'
+
+#Adl/xml parser/serializer
+require_relative 'openehr/parser'
+require_relative 'openehr/parser/adl_parser'
+# require_relative 'openehr/parser/xml_parser'
+require_relative 'openehr/serializer'

data/lib/openehr/am.rb

@@ -1,9 +1,11 @@
-require 'openehr/am/archetype'
-require 'openehr/am/openehr_profile'
+#Archetype Object Model
+require_relative 'am/archetype'
+require_relative 'am/archetype/assertion'
+require_relative 'am/archetype/constraint_model'
+require_relative 'am/archetype/constraint_model/primitive'
+require_relative 'am/archetype/ontology'
 
-module OpenEHR
-  module AM
-    include Archetype
-    include OpenEHRProfile
-  end
-end
+#openEHR Archetype Profile
+require_relative 'am/openehr_profile/data_types/basic'
+require_relative 'am/openehr_profile/data_types/text'
+require_relative 'am/openehr_profile/data_types/quantity'

data/lib/openehr/am/archetype.rb

@@ -1,8 +1,4 @@
-$:.unshift(File.dirname(__FILE__))
-include OpenEHR::RM::Common::Resource
-require 'archetype/assertion'
-require 'archetype/constraint_model'
-require 'archetype/ontology'
+require_relative '../rm/common/resource'
 
 module OpenEHR
   module AM
@@ -12,7 +8,7 @@ module OpenEHR
         CURRENT_ADL_VERSION = "1.4"
       end
 
-      class Archetype < AuthoredResource
+      class Archetype < OpenEHR::RM::Common::Resource::AuthoredResource
         include ADLDefinition
         attr_reader :archetype_id, :concept, :definition, :ontology
         attr_accessor :uid, :adl_version, :parent_archetype_id, :invariants
@@ -126,10 +122,6 @@ module OpenEHR
           @value = value
         end
       end
-
-      include Assertion
-      include ConstraintModel
-      include Ontology
     end # of Archetype
   end # of AM
 end # of OpenEHR

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

@@ -1,6 +1,3 @@
-$:.unshift(File.dirname(__FILE__))
-require 'constraint_model/primitive'
-
 module OpenEHR
   module AM
     module Archetype
@@ -335,8 +332,6 @@ module OpenEHR
             self.cardinality = args[:cardinality]
           end
         end
-
-        include Primitive
       end # of ConstraintModel
     end # of Archetype
   end # of AM

data/lib/openehr/am/openehr_profile/data_types/basic.rb

@@ -1,11 +1,11 @@
+require_relative '../../archetype/constraint_model'
+
 module OpenEHR
   module AM
     module OpenEHRProfile
       module DataTypes
         module Basic
-          include OpenEHR::AM::Archetype::ConstraintModel
-
-          class CDvState < CDomainType
+          class CDvState < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
             attr_reader :value
 
             def initialize(args = { })

data/lib/openehr/am/openehr_profile/data_types/quantity.rb

@@ -1,11 +1,11 @@
+require_relative '../../archetype/constraint_model'
+
 module OpenEHR
   module AM
     module OpenEHRProfile
       module DataTypes
         module Quantity
-          include OpenEHR::AM::Archetype::ConstraintModel
-
-          class CDvQuantity < CDomainType
+          class CDvQuantity < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
             attr_accessor :property, :list
 
             def initialize(args = { })
@@ -23,7 +23,7 @@ module OpenEHR
             end
           end
           
-          class CDvOrdinal < CDomainType
+          class CDvOrdinal < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
             attr_accessor :list
             def initialize(args = { })
               super

data/lib/openehr/am/openehr_profile/data_types/text.rb

@@ -1,11 +1,11 @@
-$:.unshift(File.dirname(__FILE__))
+require_relative '../../archetype/constraint_model'
+
 module OpenEHR
   module AM
     module OpenEHRProfile
       module DataTypes
         module Text
-          include OpenEHR::AM::Archetype::ConstraintModel
-          class CCodePhrase < CDomainType
+          class CCodePhrase < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
             attr_accessor :terminology_id, :code_list
 
             def initialize(args = { })

data/lib/openehr/parser.rb

@@ -11,8 +11,5 @@ module OpenEHR
         raise NotImplementedError
       end
     end
-
-    require 'openehr/parser/adl_parser'
-    # require 'parser/xml_perser'
   end
 end

data/lib/openehr/parser/adl_helper.rb

@@ -1,6 +1,8 @@
-require 'openehr/rm/data_types/text'
-include OpenEHR::RM::Support::Identification
-include OpenEHR::RM::Common::Resource
+require_relative '../rm/support/identification'
+require_relative '../rm/common/resource'
+require_relative '../rm/data_types/text'
+require_relative '../rm/data_types/quantity'
+require_relative '../assumed_library_types'
 
 module OpenEHR
   module Parser
@@ -16,7 +18,6 @@ module OpenEHR
       end
 
       class Language
-        include OpenEHR::RM::DataTypes::Text
         attr_reader :original_language, :translations
         
         def initialize(value)
@@ -34,7 +35,7 @@ module OpenEHR
           else
             tr = translations.inject({ }) do |trans, lang|
               code, details  = lang
-              td = TranslationDetails.new(
+              td = OpenEHR::RM::Common::Resource::TranslationDetails.new(
                      :language => details['language'],
                      :author => details['author'],
                      :accreditation => details['accreditation'],
@@ -48,8 +49,8 @@ module OpenEHR
         protected
         def code2lang(code)
           ti, la = code.split '::'
-          ti = TerminologyID.new(:value => ti)
-          CodePhrase.new(:code_string => la, :terminology_id => ti)
+          ti = OpenEHR::RM::Support::Identification::TerminologyID.new(:value => ti)
+          OpenEHR::RM::DataTypes::Text::CodePhrase.new(:code_string => la, :terminology_id => ti)
         end
       end
     end

data/lib/openehr/parser/adl_parser.rb

@@ -1,6 +1,7 @@
 require 'treetop'
 require 'polyglot'
-require 'openehr/parser'
+
+require_relative '../parser'
 
 module OpenEHR
   module Parser

data/lib/openehr/parser/validator.rb

@@ -1,5 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__))
-require 'parser.rb'
+require_relative '../parser'
 
 module OpenEHR
   module ADL

data/lib/openehr/rm.rb

@@ -1,24 +1,47 @@
-require 'openehr/rm/support'
-require 'openehr/rm/data_types'
-require 'openehr/rm/common'
-require 'openehr/rm/composition'
-require 'openehr/rm/data_structures'
-require 'openehr/rm/demographic'
-require 'openehr/rm/security'
-require 'openehr/rm/ehr'
-require 'openehr/rm/integration'
-require 'openehr/rm/factory'
-
-module OpenEHR
-  module RM
-    include Support
-    include DataTypes
-    include Common
-    include Composition
-    include DataStructures
-    include Demographic
-    include Security
-    include EHR
-    include Integration
-  end
-end
+#Support Informational Model
+require_relative 'assumed_library_types'
+require_relative 'rm/support/definition'
+require_relative 'rm/support/identification'
+require_relative 'rm/support/measurement'
+
+#Data Types Informational Model
+require_relative 'rm/data_types/basic'
+require_relative 'rm/data_types/text'
+require_relative 'rm/data_types/quantity'
+require_relative 'rm/data_types/quantity/date_time'
+require_relative 'rm/data_types/encapsulated'
+require_relative 'rm/data_types/time_specification'
+require_relative 'rm/data_types/uri'
+
+#Data Structures Informational Model
+require_relative 'rm/data_structures'
+require_relative 'rm/data_structures/item_structure'
+require_relative 'rm/data_structures/item_structure/representation'
+require_relative 'rm/data_structures/history'
+
+#Common Information Model
+require_relative 'rm/common/archetyped'
+require_relative 'rm/common/generic'
+require_relative 'rm/common/change_control'
+require_relative 'rm/common/directory'
+require_relative 'rm/common/resource'
+
+#Security Information Model
+require_relative 'rm/security'
+
+#EHR Information Model
+require_relative 'rm/composition'
+require_relative 'rm/composition/content'
+require_relative 'rm/composition/content/navigation'
+require_relative 'rm/composition/content/entry'
+require_relative 'rm/ehr'
+
+#Demographic Information Model
+require_relative 'rm/demographic'
+
+#Integration Information Model
+require_relative 'rm/integration'
+
+
+require_relative 'rm/factory'
+

data/lib/openehr/rm/common/change_control.rb

@@ -1,7 +1,7 @@
 # This module is based on the UML,
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109326589721_134411_997Report.html
 # Ticket refs #64
-include OpenEHR::RM::Common::Generic
+require_relative 'generic'
 
 module OpenEHR
   module RM
@@ -275,11 +275,11 @@ module OpenEHR
                 audits << ver.attestations
               end
               audits << ver.commit_audit
-              revision_history_items << RevisionHistoryItem.new(
+              revision_history_items << OpenEHR::RM::Common::Generic::RevisionHistoryItem.new(
                                           :audits => audits,
                                           :version_id => ver.uid)
             end
-            return RevisionHistory.new(:items => revision_history_items)
+            return OpenEHR::RM::Common::Generic::RevisionHistory.new(:items => revision_history_items)
           end
 
           def commit_original_version(args={ })

data/lib/openehr/rm/common/directory.rb

@@ -1,7 +1,9 @@
 # This module is based on the UML,
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140536622627_218703_7149Report.html
 # Ticket refs #63
-include OpenEHR::RM::DataTypes::Text
+require_relative 'archetyped'
+require_relative 'change_control'
+
 module OpenEHR
   module RM
     module Common
@@ -20,7 +22,8 @@ module OpenEHR
             raise ArgumentError, "empty subfolder" if !folders.nil? and folders.empty?
             @folders = folders
           end
-        end        
+        end
+
         class VersionedFolder < OpenEHR::RM::Common::ChangeControl::VersionedObject
         end
       end # of Directory

data/lib/openehr/rm/common/generic.rb

@@ -1,8 +1,6 @@
 # This module is a implementation of the bellow UML
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140169202660_257304_813Report.html
 # Related to the ticket #62
-include OpenEHR::RM::Support::Identification
-include OpenEHR::RM::DataTypes::Basic
 module OpenEHR
   module RM
     module Common

data/lib/openehr/rm/common/resource.rb

@@ -1,4 +1,5 @@
 require 'set'
+
 module OpenEHR
   module RM
     module Common

data/lib/openehr/rm/composition.rb

@@ -2,14 +2,11 @@
 # composition module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109005072243_448526_217Report.html
 # refs #79
-$:.unshift(File.dirname(__FILE__))
-require 'composition/content'
+require_relative 'common/archetyped'
 
 module OpenEHR
   module RM
     module Composition
-      include OpenEHR::RM::Composition::Content
-
       class Composition < OpenEHR::RM::Common::Archetyped::Locatable
         attr_reader :language, :category, :territory, :composer
         attr_accessor :content, :context

data/lib/openehr/rm/composition/content.rb

@@ -1,8 +1,8 @@
-$:.unshift(File.dirname(__FILE__))
 # rm::composition::content
 # content module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140524925046_706492_3290Report.html
 # refs #58
+require_relative '../common/archetyped'
 
 module OpenEHR
   module RM
@@ -11,12 +11,6 @@ module OpenEHR
         class ContentItem < OpenEHR::RM::Common::Archetyped::Locatable
 
         end
-
-        require 'content/navigation'
-        require 'content/entry'
-
-        include Navigation
-        include Entry
       end # end of Content
     end # end of Composition
   end # end of RM

data/lib/openehr/rm/composition/content/entry.rb

@@ -4,6 +4,9 @@
 # refs #56
 require 'locale/info'
 
+require_relative '../../common/archetyped'
+require_relative '../content'
+
 module OpenEHR
   module RM
     module Composition

data/lib/openehr/rm/composition/content/navigation.rb

@@ -2,8 +2,7 @@
 # navigation module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109264528523_312165_346Report.html
 # refs #56
-
-require 'openehr/rm/composition/content'
+require_relative '../content'
 
 module OpenEHR
   module RM

data/lib/openehr/rm/data_structures.rb

@@ -2,11 +2,12 @@
 # class DATA_STRUCTURE
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140447518205_872539_864Report.html
 # refs #59
+require_relative 'common/archetyped'
 
 module OpenEHR
   module RM
     module DataStructures
-      class DataStructure < ::OpenEHR::RM::Common::Archetyped::Locatable
+      class DataStructure < OpenEHR::RM::Common::Archetyped::Locatable
         def initialize(args = { })
           super(args)
         end
@@ -15,12 +16,6 @@ module OpenEHR
           raise NotImplementedError, "as_hirarchy must be implemented"
         end
       end
-
-      require 'openehr/rm/data_structures/item_structure'
-      include OpenEHR::RM::DataStructures::ItemStructure
-
-      require 'openehr/rm/data_structures/history'
-      include History
     end # of Data_Structures
   end # of RM
 end # of OpenEHR