openehr 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0265895a623e792df9f129c1b798fd016d5ae08
-  data.tar.gz: 68125b36326c408125436f12519416bde546aafb
+  metadata.gz: 28564c1ae91970a32375da714bd53949824ea83f
+  data.tar.gz: fe7c87002da639f8216fd4fb3465718bc2102c62
 SHA512:
-  metadata.gz: 46dd1fafd6cac5138d4dba8bb2e2abcd912d78d834034fed9e9455652647f4e90e229818f119a43a5fc7c87d41abf207a18314ed0d81481e0405f27914ab71e1
-  data.tar.gz: 4a622ef2a52a26c1fb73b47667bae8922ec97442425d81979fe0f96c4fc5ec37b434bf09fe644eff6f7d6f0acc0f25297d3d376698b8826ea374d2ff27838fa6
+  metadata.gz: 0986f32e43a4d18b6a323f0319fdc3962af9a6d09236d3643513e73398f78e33ed92d083d556d5248eead2ab6130ac3cadea38c95238aeacad1f416b8d50b1f4
+  data.tar.gz: eea1117fb74deebd63b7b16de3644305de46e1f68f85094022a23023062c89d18ca26bd5959c99750a8fd62eb80517638d43ff0659cdd9b18f7b613d288250a0

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

@@ -1,11 +1,10 @@
 $:.unshift(File.dirname(__FILE__))
+require 'constraint_model/primitive'
+
 module OpenEHR
   module AM
     module Archetype
       module ConstraintModel
-
-        require 'constraint_model/primitive'
-
         class ArchetypeConstraint
           attr_reader :path
           attr_accessor :parent
@@ -336,6 +335,8 @@ module OpenEHR
             self.cardinality = args[:cardinality]
           end
         end
+
+        include Primitive
       end # of ConstraintModel
     end # of Archetype
   end # of AM

data/lib/openehr/am/archetype.rb

@@ -1,12 +1,12 @@
 $:.unshift(File.dirname(__FILE__))
 include OpenEHR::RM::Common::Resource
+require 'archetype/assertion'
+require 'archetype/constraint_model'
+require 'archetype/ontology'
 
 module OpenEHR
   module AM
     module Archetype
-      require 'archetype/assertion'
-      require 'archetype/constraint_model'
-      require 'archetype/ontology'
 
       module ADLDefinition
         CURRENT_ADL_VERSION = "1.4"
@@ -126,6 +126,10 @@ 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.rb

@@ -1,8 +1,9 @@
-$:.unshift(File.dirname(__FILE__))
+require 'openehr/am/archetype'
+require 'openehr/am/openehr_profile'
 
 module OpenEHR
   module AM
-    require 'am/archetype'
-    require 'am/openehr_profile'
+    include Archetype
+    include OpenEHRProfile
   end
 end

data/lib/openehr/parser/adl_grammar.tt

@@ -3,7 +3,7 @@ require 'openehr/rm/data_types/quantity'
 require 'openehr/am/archetype/constraint_model'
 require 'openehr/am/openehr_profile/data_types/text'
 require 'openehr/am/openehr_profile/data_types/quantity'
-require 'adl_helper'
+require 'openehr/parser/adl_helper'
 
 module OpenEHR
   module Parser

data/lib/openehr/parser/adl_parser.rb

@@ -1,15 +1,11 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 require 'treetop'
 require 'polyglot'
-include OpenEHR::Parser
-include OpenEHR::AM::Archetype
-include OpenEHR::RM::Support::Identification
-include OpenEHR::RM::DataTypes::Text
+require 'openehr/parser'
 
 module OpenEHR
   module Parser
-    class ADLParser < Base
+
+    class ADLParser < ::OpenEHR::Parser::Base
       Treetop.load(File.dirname(__FILE__)+'/adl_grammar.tt')
 
       def initialize(filename)
@@ -27,18 +23,18 @@ module OpenEHR
       end
 
       def parse
-        archetype_id = ArchetypeID.new(:value => @result.archetype_id)
+        archetype_id = OpenEHR::RM::Support::Identification::ArchetypeID.new(:value => @result.archetype_id)
         definition = @result.definition
         ontology = @result.ontology
         original_language = nil
         if @result.original_language
           original_language = @result.original_language
         else
-          terminology_id = TerminologyID.new(:value => 'ISO639-1')
-          original_language = CodePhrase.new(:terminology_id => terminology_id,
+          terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(:value => 'ISO639-1')
+          original_language = OpenEHR::RM::DataTypes::Text::CodePhrase.new(:terminology_id => terminology_id,
                                       :code_string =>ontology.primary_language)
         end
-        archetype = Archetype.new(:archetype_id => archetype_id,
+        archetype = OpenEHR::AM::Archetype::Archetype.new(:archetype_id => archetype_id,
                                   :adl_version => @result.adl_version,
                                   :concept => @result.concept,
                                   :original_language => original_language,

data/lib/openehr/parser.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 module OpenEHR
   module Parser
     class Base
@@ -14,10 +12,7 @@ module OpenEHR
       end
     end
 
-    require 'parser/adl_parser'
-#    require 'parser/adl_parser'
-#    require 'parser/xml_perser'
-#    require 'parser/exception'
-#    require 'parser/scanner'
+    require 'openehr/parser/adl_parser'
+    # require 'parser/xml_perser'
   end
 end

data/lib/openehr/rm/common.rb

@@ -1,14 +1,19 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'common/archetyped'
+require 'common/generic'
+require 'common/change_control'
+require 'common/directory'
+require 'common/resource'
 
 module OpenEHR
   module RM
     module Common
-      require 'common/archetyped'
-      require 'common/generic'
-      require 'common/change_control'
-      require 'common/directory'
-      require 'common/resource'
+      include Archetyped
+      include Generic
+      include ChangeControl
+      include Directory
+      include Resource
     end
   end
 end

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

@@ -2,7 +2,6 @@
 # entry module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109264528523_312165_346Report.html
 # refs #56
-include OpenEHR::RM::Composition::Content
 require 'locale/info'
 
 module OpenEHR
@@ -10,9 +9,10 @@ module OpenEHR
     module Composition
       module Content
         module Entry
-          class Entry < ContentItem
+          class Entry < ::OpenEHR::RM::Composition::Content::ContentItem
             attr_reader :language, :encoding, :subject
             attr_accessor :provider, :other_participations, :workflow_id
+
             def initialize(args = { })
               super(args)
               self.language = args[:language]
@@ -129,7 +129,7 @@ module OpenEHR
             end
           end
 
-          class Activity < Locatable
+          class Activity < OpenEHR::RM::Common::Archetyped::Locatable
             attr_reader :description, :timing, :action_archetype_id
 
             def initialize(args = { })
@@ -195,7 +195,7 @@ module OpenEHR
             end
           end
 
-          class InstructionDetails < Pathable
+          class InstructionDetails < OpenEHR::RM::Common::Archetyped::Pathable
             attr_reader :instruction_id, :activity_id
             attr_accessor :wf_details
 
@@ -221,7 +221,7 @@ module OpenEHR
             end
           end
 
-          class IsmTransition < Pathable
+          class IsmTransition < OpenEHR::RM::Common::Archetyped::Pathable
             attr_reader :current_state, :transition
             attr_accessor :careflow_step
 

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

@@ -2,14 +2,15 @@
 # navigation module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109264528523_312165_346Report.html
 # refs #56
-include OpenEHR::RM::Composition::Content
+
+require 'openehr/rm/composition/content'
 
 module OpenEHR
   module RM
     module Composition
       module Content
         module Navigation
-          class Section < ContentItem
+          class Section < ::OpenEHR::RM::Composition::Content::ContentItem
             attr_reader :items 
 
             def initialize(args = { })

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

@@ -1,23 +1,22 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.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
-include OpenEHR::RM::Common::Archetyped
 
 module OpenEHR
   module RM
     module Composition
       module Content
-
-        class ContentItem < Locatable
+        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.rb

@@ -2,11 +2,15 @@
 # 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
 
@@ -53,7 +57,7 @@ module OpenEHR
         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
 
@@ -95,9 +99,6 @@ module OpenEHR
           @location = location
         end
       end
-
-      require 'composition/content'
-
     end # end of Composition
   end # end of RM
 end # end of OpenEHR

data/lib/openehr/rm/data_structures/item_structure.rb

@@ -2,21 +2,18 @@
 # ItemStructure module
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109346709572_859750_3810Report.html
 # refs #54
-$:.unshift(File.dirname(__FILE__))
-
 require 'set'
-#include OpenEHR::RM::DataStructures
+require 'openehr/rm/data_structures'
+require 'openehr/rm/data_structures/item_structure/representation'
+
 module OpenEHR
   module RM
     module DataStructures
       module ItemStructure
+        class ItemStructure < ::OpenEHR::RM::DataStructures::DataStructure
 
-        require 'item_structure/representation'
-
-        class ItemStructure < DataStructure
         end
 
-
         class ItemSingle < ItemStructure
           attr_reader :item
 
@@ -213,6 +210,8 @@ module OpenEHR
                                :items => @items)
           end
         end
+
+        include Representation
       end # of ItemStructure
     end # of DataStructures
   end # of RM

data/lib/openehr/rm/data_structures.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 # rm::data_structures
 # class DATA_STRUCTURE
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140447518205_872539_864Report.html
@@ -8,8 +6,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 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
@@ -19,8 +16,11 @@ module OpenEHR
         end
       end
 
-      require 'data_structures/item_structure'
-      require 'data_structures/history'
+      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

data/lib/openehr/rm/data_types.rb

@@ -1,15 +1,22 @@
 $:.unshift(File.dirname(__FILE__))
+require 'data_types/basic'
+require 'data_types/encapsulated'
+require 'data_types/quantity'
+require 'data_types/quantity/date_time'
+require 'data_types/text'
+require 'data_types/time_specification'
+require 'data_types/uri'
 
 module OpenEHR
   module RM
     module DataTypes
-      require 'data_types/basic'
-      require 'data_types/encapsulated'
-      require 'data_types/quantity'
-      require 'data_types/quantity/date_time'
-      require 'data_types/text'
-      require 'data_types/time_specification'
-      require 'data_types/uri'
+      include Basic
+      include Encapsulated
+      include Quantity
+      include Quantity::DateTime
+      include Text
+      include TimeSpecification
+      include URI
     end
   end
 end

data/lib/openehr/rm/support.rb

@@ -1,13 +1,16 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'support/definition'
+require 'support/identification'
+require 'support/measurement'
+#      require 'support/assumed_types'
 
 module OpenEHR
   module RM
     module Support
-#      require 'support/assumed_types'
-      require 'support/definition'
-      require 'support/identification'
-      require 'support/measurement'
+      include Definition
+      include Identification
+      include Measurement
     end
   end
 end

data/lib/openehr/rm.rb

@@ -1,16 +1,24 @@
-$:.unshift(File.dirname(__FILE__))
+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
-    require 'rm/support'
-    require 'rm/data_types'
-    require 'rm/common'
-    require 'rm/composition'
-    require 'rm/data_structures'
-    require 'rm/demographic'
-    require 'rm/security'
-    require 'rm/ehr'
-    require 'rm/integration'
-    require 'rm/factory'
+    include Support
+    include DataTypes
+    include Common
+    include Composition
+    include DataStructures
+    include Demographic
+    include Security
+    include EHR
+    include Integration
   end
 end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/lib/openehr.rb

@@ -1,9 +1,14 @@
-$:.unshift(File.dirname(__FILE__))
 require 'openehr/version'
-
 require 'openehr/assumed_library_types'
 require 'openehr/rm'
 require 'openehr/am'
 require 'openehr/parser'
 require 'openehr/serializer'
 
+module OpenEHR
+  include AssumedLibraryTypes
+  include RM
+  include AM
+  include Parser
+  include Serializer
+end

data/spec/lib/openehr/parser/adl_parser_spec.rb

@@ -1,11 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
-include OpenEHR::Parser
-include OpenEHR::AM::Archetype
-include OpenEHR::AM::Archetype::ConstraintModel
-include OpenEHR::AM::Archetype::Assertion
-include OpenEHR::AM::Archetype::Ontology
 
-describe ADLParser do
+describe OpenEHR::Parser::ADLParser do
 
   before (:all) do
     @adl_dir = File.dirname(__FILE__) + '/adl14/'
@@ -13,11 +8,11 @@ describe ADLParser do
 
   context 'openEHR-EHR-SECTION-summary.v1.adl' do
     before(:all) do
-      @ap = ADLParser.new(@adl_dir + 'openEHR-EHR-SECTION.summary.v1.adl')
+      @ap = OpenEHR::Parser::ADLParser.new(@adl_dir + 'openEHR-EHR-SECTION.summary.v1.adl')
     end
 
     it 'is an instance fo ADLParser' do
-      @ap.should be_an_instance_of ADLParser
+      @ap.should be_an_instance_of OpenEHR::Parser::ADLParser
     end
 
     context 'openEHR-EHR-SECTION.summary.v1 parse' do
@@ -27,7 +22,7 @@ describe ADLParser do
         end
 
         it 'archetype is an instance of Archetype' do
-          @archetype.should be_an_instance_of Archetype
+          @archetype.should be_an_instance_of OpenEHR::AM::Archetype::Archetype
         end
 
         it 'archetype_id should be openEHR-EHR-SECTION-summary' do
@@ -142,7 +137,7 @@ describe ADLParser do
             end
 
             it 'attribute is instance of CMultipleAttribute' do
-              @attribute.should be_an_instance_of CMultipleAttribute
+              @attribute.should be_an_instance_of OpenEHR::AM::Archetype::ConstraintModel::CMultipleAttribute
             end
 
             it 'rm_attribute_name is items' do
@@ -170,7 +165,7 @@ describe ADLParser do
               end
 
               it 'is an instance of ArchetypeSlot' do
-                @archetype_slot.should be_an_instance_of ArchetypeSlot
+                @archetype_slot.should be_an_instance_of OpenEHR::AM::Archetype::ConstraintModel::ArchetypeSlot
               end
 
               it 's rm type name is EVALUATION' do
@@ -196,7 +191,7 @@ describe ADLParser do
                   end
 
                   it 'assertion0 should be an instance of Assertion' do
-                    @assertion0.should be_an_instance_of Assertion
+                    @assertion0.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'expression type of assertion0 is Boolean' do
@@ -214,7 +209,7 @@ describe ADLParser do
                   end
 
                   it 'assertion1 is an instanse of Assertion' do
-                    @assertion1.should be_an_instance_of Assertion
+                    @assertion1.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'Assertion1 type is Boolean' do
@@ -233,7 +228,7 @@ describe ADLParser do
                   end
 
                   it 'assertion2 is an instanse of Assertion' do
-                    @assertion2.should be_an_instance_of Assertion
+                    @assertion2.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'Assertion2 type is Boolean' do
@@ -252,7 +247,7 @@ describe ADLParser do
                   end
 
                   it 'assertion3 is an instanse of Assertion' do
-                    @assertion3.should be_an_instance_of Assertion
+                    @assertion3.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'Assertion3 type is Boolean' do
@@ -271,7 +266,7 @@ describe ADLParser do
                   end
 
                   it 'assertion4 is an instanse of Assertion' do
-                    @assertion4.should be_an_instance_of Assertion
+                    @assertion4.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'Assertion4 type is Boolean' do
@@ -290,7 +285,7 @@ describe ADLParser do
                   end
 
                   it 'assertion5 is an instanse of Assertion' do
-                    @assertion5.should be_an_instance_of Assertion
+                    @assertion5.should be_an_instance_of OpenEHR::AM::Archetype::Assertion::Assertion
                   end
 
                   it 'Assertion5 type is Boolean' do
@@ -319,7 +314,7 @@ describe ADLParser do
           end
 
           it 'is an ArchtypeOntology instance' do
-            @archetype_ontology.should be_an_instance_of ArchetypeOntology
+            @archetype_ontology.should be_an_instance_of OpenEHR::AM::Archetype::Ontology::ArchetypeOntology
           end
 
           it 'term_definitions parsed and assigned properly' do

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

@@ -1,23 +1,20 @@
 require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-include OpenEHR::RM::Composition::Content::Entry
-include OpenEHR::RM::DataTypes::Text
-include OpenEHR::RM::Common::Generic
 
-describe Entry do
+describe OpenEHR::RM::Composition::Content::Entry::Entry do
 
-  let(:name) {DvText.new(:value => 'entry package')}
+  let(:name) {OpenEHR::RM::DataTypes::Text::DvText.new(:value => 'entry package')}
   let(:language) { double('language',:code_string => 'ja')}
   let(:encoding) { double('encoding', :code_string => 'UTF-8')}
   let(:subject) { double('PartyProxy')}
 
   before(:each) do
-    external_ref = stub(PartyRef, :type => 'entry')
-    subject = PartyProxy.new(:external_ref => external_ref)
-    provider_external_ref = stub(PartyRef, :type => 'provider')
-    provider = PartyProxy.new(:external_ref => provider_external_ref)
+    external_ref = stub(OpenEHR::RM::Support::Identification::PartyRef, :type => 'entry')
+    subject = OpenEHR::RM::Common::Generic::PartyProxy.new(:external_ref => external_ref)
+    provider_external_ref = stub(OpenEHR::RM::Support::Identification::PartyRef, :type => 'provider')
+    provider = OpenEHR::RM::Common::Generic::PartyProxy.new(:external_ref => provider_external_ref)
     other_participations = stub(Array, :size => 3, :empty? => false)
-    workflow_id = stub(ObjectRef, :type => 'workflow')
-    @entry = Entry.new(:archetype_node_id => 'at0001',
+    workflow_id = stub(OpenEHR::RM::Support::Identification::ObjectRef, :type => 'workflow')
+    @entry = OpenEHR::RM::Composition::Content::Entry::Entry.new(:archetype_node_id => 'at0001',
                        :name => DvText.new(:value => 'entry test'),
                        :language => language,
                        :encoding => encoding,
@@ -28,7 +25,7 @@ describe Entry do
   end
 
   it 'should be an instance of Entry' do
-    @entry.should be_an_instance_of Entry
+    @entry.should be_an_instance_of OpenEHR::RM::Composition::Content::Entry::Entry
   end
 
   it 'language should be assigned properly' do
@@ -42,8 +39,8 @@ describe Entry do
   end
 
   it 'should raise ArgumentError with invalid language code' do
-    terminology_id = TerminologyID.new(:value => 'ISO639-1')
-    invalid_language = CodePhrase.new(:code_string => 'jj',
+    terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(:value => 'ISO639-1')
+    invalid_language = OpenEHR::RM::DataTypes::Text::CodePhrase.new(:code_string => 'jj',
                                       :terminology_id => terminology_id)
     expect {@entry.language = invalid_language}.to raise_error ArgumentError
   end
@@ -59,8 +56,8 @@ describe Entry do
   end
 
   it 'should raise ArgumentError with invalid encoding' do
-    terminology_id = TerminologyID.new(:value => 'ISO639-1')
-    invalid_encoding = CodePhrase.new(:terminology_id => terminology_id,
+    terminology_id = OpenEHR::RM::Support::Identification::TerminologyID.new(:value => 'ISO639-1')
+    invalid_encoding = OpenEHR::RM::DataTypes::Text::CodePhrase.new(:terminology_id => terminology_id,
                                       :code_string => 'inv-19')
     expect {@entry.encoding = invalid_encoding}.to raise_error ArgumentError
   end
@@ -92,7 +89,7 @@ describe Entry do
   end
 
   it 'subject_is_self? should be true when subject is instance of PartySelf' do
-    @entry.subject = PartySelf.new
+    @entry.subject = OpenEHR::RM::Common::Generic::PartySelf.new
     @entry.subject_is_self?.should be_true
   end
 end

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

@@ -1,11 +1,13 @@
-require File.dirname(__FILE__) + '/../../../../../../spec_helper'
-include OpenEHR::RM::Composition::Content::Navigation
+#require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'spec_helper'
+#include 
 include OpenEHR::RM::DataTypes::Text
 
-describe Section do
+describe OpenEHR::RM::Composition::Content::Navigation::Section do
   before(:each) do
     items = stub(Array, :empty? => false, :size => 10)
-    @section = Section.new(:archetype_node_id => 'at0001',
+    @section = OpenEHR::RM::Composition::Content::Navigation::Section.new(
+                           :archetype_node_id => 'at0001',
                            :name => DvText.new(:value => 'section'),
                            :items => items)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake