openehr 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.2.2
+Removed autoload and replaced them to require
+
 === 1.2.1
 Fixed bug and merged pull request from caron10
 

data/lib/openehr.rb

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

data/lib/openehr/am.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__))
 
 module OpenEHR
   module AM
-    autoload :Archetype, 'am/archetype'
-    autoload :OpenEHRProfile, 'am/openehr_profile'
+    require 'am/archetype'
+    require 'am/openehr_profile'
   end
 end

data/lib/openehr/am/archetype.rb

@@ -4,9 +4,9 @@ include OpenEHR::RM::Common::Resource
 module OpenEHR
   module AM
     module Archetype
-      autoload :Assertion, 'archetype/assertion'
-      autoload :ConstraintModel, 'archetype/constraint_model'
-      autoload :Ontology, 'archetype/ontology'
+      require 'archetype/assertion'
+      require 'archetype/constraint_model'
+      require 'archetype/ontology'
 
       module ADLDefinition
         CURRENT_ADL_VERSION = "1.4"
@@ -66,7 +66,7 @@ module OpenEHR
         end
 
         def concept_name(a_lang)
-          return @ontology.term_definition(:lang => a_lang, :code => @concept).items[:text]
+          return @ontology.term_definition(:lang => a_lang, :code => @concept).items['text']
         end
 
         def constraint_references_valid?

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

@@ -4,7 +4,7 @@ module OpenEHR
     module Archetype
       module ConstraintModel
 
-        autoload :Primitive, 'constraint_model/primitive'
+        require 'constraint_model/primitive'
 
         class ArchetypeConstraint
           attr_reader :path

data/lib/openehr/am/openehr_profile.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__))
 module OpenEHR
   module AM
     module OpenEHRProfile
-      autoload :DataTypes, 'openehr_profile/data_types'
+      require 'openehr_profile/data_types'
     end
   end
 end

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

@@ -4,9 +4,9 @@ module OpenEHR
   module AM
     module OpenEHRProfile
       module DataTypes
-        autoload :Text, 'data_types/text'
-        autoload :Quantity, 'data_types/quantity'
-        autoload :Basic, 'data_types/basic'
+        require 'data_types/text'
+        require 'data_types/quantity'
+        require 'data_types/basic'
       end
     end
   end

data/lib/openehr/parser.rb

@@ -14,10 +14,10 @@ module OpenEHR
       end
     end
 
-    autoload :ADLParser, 'parser/adl_parser'
-#    autoload :CADLParser, 'parser/adl_parser'
-#    autoload :XMLParser, 'parser/xml_perser'
-#    autoload :Exception, 'parser/exception'
-#    autoload :Scanner, 'parser/scanner'
+    require 'parser/adl_parser'
+#    require 'parser/adl_parser'
+#    require 'parser/xml_perser'
+#    require 'parser/exception'
+#    require 'parser/scanner'
   end
 end

data/lib/openehr/rm.rb

@@ -2,15 +2,15 @@ $:.unshift(File.dirname(__FILE__))
 
 module OpenEHR
   module RM
-    autoload :Common, 'rm/common'
-    autoload :Composition, 'rm/composition'
-    autoload :DataStructures, 'rm/data_structures'
-    autoload :DataTypes, 'rm/data_types'
-    autoload :Demographic, 'rm/demographic'
-    autoload :EHR, 'rm/ehr'
-    autoload :Integration, 'rm/integration'
-    autoload :Security, 'rm/security'
-    autoload :Support, 'rm/support'
-    autoload :Factory, 'rm/factory'
+    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'
   end
 end

data/lib/openehr/rm/common.rb

@@ -4,11 +4,11 @@ $:.unshift(File.dirname(__FILE__)) unless
 module OpenEHR
   module RM
     module Common
-      autoload :Archetyped, 'common/archetyped'
-      autoload :ChangeControl, 'common/change_control'
-      autoload :Directory, 'common/directory'
-      autoload :Generic, 'common/generic.rb'
-      autoload :Resource, 'common/resource'
+      require 'common/archetyped'
+      require 'common/generic'
+      require 'common/change_control'
+      require 'common/directory'
+      require 'common/resource'
     end
   end
 end

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

@@ -2,6 +2,7 @@
 # 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
+
 module OpenEHR
   module RM
     module Common

data/lib/openehr/rm/composition.rb

@@ -96,7 +96,7 @@ module OpenEHR
         end
       end
 
-      autoload :Content, 'composition/content'
+      require 'composition/content'
 
     end # end of Composition
   end # end of RM

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

@@ -10,12 +10,14 @@ module OpenEHR
   module RM
     module Composition
       module Content
-        autoload :Navigation, 'content/navigation'
-        autoload :Entry, 'content/entry'
 
         class ContentItem < Locatable
 
         end
+
+        require 'content/navigation'
+        require 'content/entry'
+
       end # end of Content
     end # end of Composition
   end # end of RM

data/lib/openehr/rm/data_structures.rb

@@ -8,8 +8,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 module OpenEHR
   module RM
     module DataStructures
-      autoload :ItemStructure, 'data_structures/item_structure'
-      autoload :History, 'data_structures/history'
 
       class DataStructure < OpenEHR::RM::Common::Archetyped::Locatable
         def initialize(args = { })
@@ -20,6 +18,9 @@ module OpenEHR
           raise NotImplementedError, "as_hirarchy must be implemented"
         end
       end
+
+      require 'data_structures/item_structure'
+      require 'data_structures/history'
     end # of Data_Structures
   end # of RM
 end # of OpenEHR

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

@@ -11,11 +11,12 @@ module OpenEHR
     module DataStructures
       module ItemStructure
 
-        autoload :Representation, 'item_structure/representation'
+        require 'item_structure/representation'
 
         class ItemStructure < DataStructure
         end
 
+
         class ItemSingle < ItemStructure
           attr_reader :item
 

data/lib/openehr/rm/data_types.rb

@@ -3,12 +3,13 @@ $:.unshift(File.dirname(__FILE__))
 module OpenEHR
   module RM
     module DataTypes
-      autoload :Basic, 'data_types/basic'
-      autoload :Encapsulated, 'data_types/encapsulated'
-      autoload :Quantity, 'data_types/quantity'
-      autoload :Text, 'data_types/text'
-      autoload :TimeSpecification, 'data_types/time_specification'
-      autoload :URI, 'data_types/uri'
+      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'
     end
   end
 end

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

@@ -9,7 +9,6 @@ module OpenEHR
   module RM
     module DataTypes
       module Quantity
-        autoload :DateTime, 'quantity/date_time'
 
         class DvOrdered < OpenEHR::RM::DataTypes::Basic::DataValue
           include Comparable

data/lib/openehr/rm/data_types/quantity/date_time.rb

@@ -1,9 +1,7 @@
 # This module is implementation of the UML:
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109696321450_28117_5362Report.html
 # Ticket refs #49
-require 'openehr/assumed_library_types'
 require 'date'
-require 'openehr/rm/data_types/quantity'
 
 module OpenEHR
   module RM

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

@@ -4,7 +4,7 @@ module OpenEHR
   module RM
     module DataTypes
       module TimeSpecification
-        class DvTimeSpecification < OpenEhr::RM::DataTypes::Basic::DataValue
+        class DvTimeSpecification < OpenEHR::RM::DataTypes::Basic::DataValue
           attr_reader :value
 
           def initialize(value)

data/lib/openehr/rm/support.rb

@@ -4,10 +4,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 module OpenEHR
   module RM
     module Support
-      autoload :AssumedTypes, 'support/assumed_types'
-      autoload :Definition, 'support/definition'
-      autoload :Identification, 'support/identification'
-      autoload :Measurement, 'support/measurement'
+#      require 'support/assumed_types'
+      require 'support/definition'
+      require 'support/identification'
+      require 'support/measurement'
     end
   end
 end

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/lib/openehr/am/archetype/archetype_spec.rb

@@ -12,7 +12,7 @@ describe Archetype do
     original_language = stub(CodePhrase, :code_string => 'ja')
     archetype_id = ArchetypeID.new(:value => 'openEHR-EHR-SECTION.physical_examination-prenatal.v2')
     definition = stub(CComplexObject, :rm_type_name => 'SECTION')
-    items = {:text => 'Physical examination'}
+    items = {'text' => 'Physical examination'}
     term1 = ArchetypeTerm.new(:code => 'at0000', :items => items)
     ontology = ArchetypeOntology.new(:specialisation_depth => 1, :term_definitions => {'ja' => {'at0000' =>term1}})
     uid = HierObjectID.new(:value => 'ABCD::1')

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

@@ -3,7 +3,7 @@ include OpenEHR::AM::Archetype::Ontology
 
 describe ArchetypeTerm do
   before(:each) do
-    items = {:text => 'text', :desc => 'description'}
+    items = {'text' => 'text', 'description' => 'description'}
     @archetype_term = ArchetypeTerm.new(:code => 'at0001',
                                         :items => items)
   end
@@ -29,11 +29,11 @@ describe ArchetypeTerm do
   end
 
   it 'items should be assigned properly' do
-    @archetype_term.items[:text].should == 'text'
+    @archetype_term.items['text'].should == 'text'
   end
 
   it 'keys should be a set of keys of item' do
-    @archetype_term.keys.should == Set[:text, :desc]
+    @archetype_term.keys.should == Set['text', 'description']
   end
 
   it 'keys should be empty if items are nil' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake