lib/openehr/rm/composition.rb in openehr-1.2.7 vs lib/openehr/rm/composition.rb in openehr-1.2.8

@@ -1,14 +1,18 @@
 # rm::composition
 # composition module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109005072243_448526_217Report.html
 # refs #79
-include OpenEHR::RM::Common::Archetyped
+$:.unshift(File.dirname(__FILE__))
+require 'composition/content'
+
 module OpenEHR
   module RM
     module Composition
-      class Composition < Locatable
+      include OpenEHR::RM::Composition::Content
+
+      class Composition < OpenEHR::RM::Common::Archetyped::Locatable
         attr_reader :language, :category, :territory, :composer
         attr_accessor :content, :context
 
         def initialize(args = { })
           super(args)
@@ -51,11 +55,11 @@
         def is_persistent?
           return category.value == 'persistent'
         end
       end
 
-      class EventContext < Pathable
+      class EventContext < OpenEHR::RM::Common::Archetyped::Pathable
         attr_reader :start_time, :setting, :participations, :location
         attr_accessor :end_time, :other_context
 
         def initialize(args = { })
           super(args)
@@ -93,11 +97,8 @@
             raise ArgumentError, 'location should not be empty'
           end
           @location = location
         end
       end
-
-      require 'composition/content'
-
     end # end of Composition
   end # end of RM
 end # end of OpenEHR