openehr 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62bd04780c1cc6e2aa0754554f6b53c8878f0000
-  data.tar.gz: 37716a093625c4e4a2ebfd50469932879e46f945
+  metadata.gz: 25bb1088a748632a3c49a91baa2d7d7851e14dbe
+  data.tar.gz: a5737fec858751805a134c214c36d6cc3894f1fc
 SHA512:
-  metadata.gz: d9e41762ce811781c8f78e528d414fd9d1fb5d0ea71690dbb5d29fa8c5e7209387d4a090b7f4484e4954b79fbf8b332cadb27856581d66da926f5635017ec681
-  data.tar.gz: 9a1de874df39fec7a6e8ec03399bbce810b0e81d239ca181f84df40ec863a9a21c8845c6728c0efae1ed88170f001f0eddc969b7b4837fef26cc950bfeafb09e
+  metadata.gz: 99b27154f9c3a897e44c5c8583ef11975d6e1ce9baa2ed056282c4c63fd6357cd433e048dce3e77dd42c66e18cc2f64ad40054ce7b6359be8049494f16e79f6a
+  data.tar.gz: 4b18acd91c8b25d047d63dc127e5b5039846857be4b5be0f8df5f71cb4ae7914e51aeec8c68f276e6b923457f0fdcaabaafdaddb3815b36fdd077a0d4e92c70f

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

@@ -187,8 +187,23 @@ module OpenEHR
           def any_allowed?
             return item.nil?
           end
-        end
 
+          %w(assumed_value assumed_value= has_assumed_value? default_value 
+            any_allowed?, valid_value?).each do |m| 
+            define_method(m) do |*args| 
+              self.item.send(m, *args) if !self.item.nil?
+            end
+          end
+
+          def method_missing(meth, *args)
+            if !self.item.nil? && self.item.respond_to?(meth)
+              self.item.send(meth, *args)
+            else
+              super
+            end
+          end
+        end
+   
         class CComplexObject < CDefinedObject
           attr_accessor :attributes
 

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

@@ -14,6 +14,10 @@ module OpenEHR
               self.code_list = args[:code_list]
               self.assumed_value = args[:assumed_value]
             end
+            
+            def any_allowed?
+              @terminology_id.nil? && @code_list.nil?
+            end
           end
         end # of Text
       end # of Data_Types

data/lib/openehr/assumed_library_types.rb

@@ -458,7 +458,11 @@ module OpenEHR
 
     module ISO8601DateTimeModule
       include ISO8601DateModule, ISO8601TimeModule
-
+      
+      def hour_unknown?
+        @hour.nil?
+      end
+      
       def as_string
         if (!@year.nil? and !@month.nil? and !@day.nil?)
           s = Date.new(@year, @month, @day).to_s

data/lib/openehr/parser/adl_grammar.tt

@@ -260,7 +260,7 @@ module OpenEHR
           def value(node = ArchetypeNode.new)
             args = head.value
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
-              :lower => 1, :upper => 1)
+              :lower => 1, :upper => 1, :lower_included => true, :upper_included => true)
             node.id = args[:node_id]
             if node.root? or node.id.nil?
               args[:path] = node.path
@@ -275,7 +275,7 @@ module OpenEHR
           def value(node = ArchetypeNode.new)
             args = c_complex_object_head.value
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
-              :lower => 1, :upper => 1)
+              :lower => 1, :upper => 1, :lower_included => true, :upper_included => true)
             node.id = args[:node_id]
             args[:path] = node.path
             OpenEHR::AM::Archetype::ConstraintModel::CComplexObject.new(args)
@@ -337,14 +337,14 @@ module OpenEHR
             args[:path] = node.path
             args[:rm_type_name] = 'DV_ORDINAL'
             args[:occurrences] ||= OpenEHR::AssumedLibraryTypes::Interval.new(
-              :upper => 1, :lower => 1)
+              :upper => 1, :lower => 1, :lower_included => true, :upper_included => true)
             OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CDvOrdinal.new(
              args)
           end
         }
       / c_primitive_object '' {
           def value(node)
-            c_primitive_object.value
+            c_primitive_object.value(node)
           end
         }
       / c_complex_object '' {
@@ -395,7 +395,7 @@ module OpenEHR
             OpenEHR::AM::Archetype::ConstraintModel::ArchetypeInternalRef.new(
               :rm_type_name => type_identifier.value,
               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
-                :lower => 1, :upper => 1),
+                :lower => 1, :upper => 1, :lower_included => true, :upper_included => true),
               :path => node.path,
               :target_path => object_path.value)
            end
@@ -439,7 +439,7 @@ module OpenEHR
           def value(node)
             args = c_archetype_slot_id.value(node)
             args[:occurrences] = OpenEHR::AssumedLibraryTypes::Interval.new(
-              :upper => 1, :lower => 1)
+              :upper => 1, :lower => 1, :lower_included => true, :upper_included => true)
             args
           end
         }
@@ -463,8 +463,16 @@ module OpenEHR
 
       rule c_primitive_object
         c_primitive '' {
-          def value
-            c_primitive.value
+          def value(node)
+            OpenEHR::AM::Archetype::ConstraintModel::CPrimitiveObject.new(
+              {:item => c_primitive.value,
+               :rm_type_name => c_primitive.value.type,
+               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
+                                 :upper => 1, 
+                                 :lower => 1, 
+                                 :lower_included => true, 
+                                 :upper_included => true),
+               :path => node.path})
           end
         }
       end
@@ -517,8 +525,8 @@ module OpenEHR
           def value(node)
             OpenEHR::AM::Archetype::ConstraintModel::CAttribute.new(
               :path => node.path, :rm_attribute_name => 'ANY',
-              :exsitence => OpenEHR::AssumedLibraryTypes::Interval.new(
-                :lower => 1, :upper => 1))
+              :existence => OpenEHR::AssumedLibraryTypes::Interval.new(
+                :lower => 1, :upper => 1, :lower_included => true, :upper_included => true))
           end
         }
       end
@@ -661,12 +669,20 @@ module OpenEHR
       rule existence_spec
         lo:V_INTEGER SYM_ELLIPSIS up:V_INTEGER {
           def value
-            OpenEHR::AssumedLibraryTypes::Interval.new(:lower => lo.value, :upper => up.value)
+            OpenEHR::AssumedLibraryTypes::Interval.new(
+              :lower => lo.value, 
+              :upper => up.value, 
+              :lower_included => true, 
+              :upper_included => true)
           end
         }
       / V_INTEGER '' {
           def value
-            OpenEHR::AssumedLibraryTypes::Interval.new(:lower => V_INTEGER.value, :upper => V_INTEGER.value)
+            OpenEHR::AssumedLibraryTypes::Interval.new(
+              :lower => V_INTEGER.value, 
+              :upper => V_INTEGER.value, 
+              :lower_included => true, 
+              :upper_included => true)
           end
         }
       end
@@ -754,11 +770,14 @@ module OpenEHR
           def value
             if ed.value == '*'
               OpenEHR::AssumedLibraryTypes::Interval.new(
-                 :lower => st.value)
+                 :lower => st.value,
+                 :lower_included => true)
             else
               OpenEHR::AssumedLibraryTypes::Interval.new(
                 :lower => st.value,
-                :upper => ed.value)
+                :upper => ed.value,
+                :lower_included => true, 
+                :upper_included => true)
             end
           end
         }
@@ -766,7 +785,9 @@ module OpenEHR
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(
               :lower => cardinality_limit_value.value,
-              :upper => cardinality_limit_value.value)
+              :upper => cardinality_limit_value.value,
+              :lower_included => true,
+              :upper_included => true)
           end
         }
       end
@@ -1107,7 +1128,11 @@ module OpenEHR
             OpenEHR::AM::Archetype::ConstraintModel::ConstraintRef.new(
               :path => node.path,
               :rm_type_name => 'ConstraintRef',
-              :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(:upper => 1, :lower => 1),
+              :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
+                                :upper => 1, 
+                                :lower => 1, 
+                                :lower_included => true, 
+                                :upper_included => true),
               :reference => vltcr.value)
           end
         }
@@ -1160,7 +1185,10 @@ module OpenEHR
             ::OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(
               :rm_type_name => 'CodePhrase',
               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
-                                :upper => 1, :lower => 1),
+                                :upper => 1, 
+                                :lower => 1, 
+                                :lower_included => true, 
+                                :upper_included => true),
               :terminology_id => ti.value, :code_list => code_string_spec.value,
               :assumed_value => code_string.value,
               :path => node.path)
@@ -1171,7 +1199,10 @@ module OpenEHR
             ::OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(
               :rm_type_name => 'CodePhrase',
               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
-                                :upper => 1, :lower => 1),
+                                :upper => 1, 
+                                :lower => 1, 
+                                :lower_included => true, 
+                                :upper_included => true),
               :terminology_id => ti.value, :code_list => code_string_spec.value,
               :path => node.path)
           end
@@ -1181,7 +1212,10 @@ module OpenEHR
             ::OpenEHR::AM::OpenEHRProfile::DataTypes::Text::CCodePhrase.new(
               :rm_type_name => 'CodePhrase',
               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
-                                :upper => 1, :lower => 1),
+                                :upper => 1, 
+                                :lower => 1, 
+                                :lower_included => true, 
+                                :upper_included => true),
               :terminology_id => ti.value, :code_list => [], :path => node.path)
           end
         }
@@ -1357,7 +1391,10 @@ module OpenEHR
             OpenEHR::AM::OpenEHRProfile::DataTypes::Quantity::CQuantityItem.new(
               :path => node.path, :rm_type_name => 'DvQuantity',
               :occurrences => OpenEHR::AssumedLibraryTypes::Interval.new(
-                :upper => 1, :lower => 1),
+                                :upper => 1, 
+                                :lower => 1, 
+                                :lower_included => true, 
+                                :upper_included => true),
               :units => units.value,
               :magnitude => magnitude, :precision => precision)
           end
@@ -2203,7 +2240,7 @@ module OpenEHR
         SYM_INTERVAL_DELIM SYM_GT lo:integer_value SYM_ELLIPSIS SYM_LT up:integer_value SYM_INTERVAL_DELIM {
           def value
             OpenEHR::AssumedLibraryTypes::Interval.new(:lower => lo.value,
-                  :upper => up.value,
+            :upper => up.value,
                   :lower_included => false,
                   :upper_included => false)
           end

data/lib/openehr/parser/adl_parser.rb

@@ -10,11 +10,12 @@ include OpenEHR::RM::DataTypes::Text
 module OpenEHR
   module Parser
     class ADLParser < Base
+      Treetop.load(File.dirname(__FILE__)+'/adl_grammar.tt')
+
       def initialize(filename)
         super(filename)
         file = File.open(filename, 'r:bom|utf-8')
         data = file.read
-        Treetop.load(File.dirname(__FILE__)+'/adl_grammar.tt')
         ap = ADLGrammarParser.new
         @result = ap.parse(data)
         file.close

data/lib/openehr/version.rb

@@ -1,3 +1,3 @@
 module OpenEHR
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

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

@@ -8,7 +8,8 @@ describe ADLParser do
       archetype = adl14_archetype('adl-test-entry.structure_test1.test.adl')
       @definition = archetype.definition
       @occurrences = OpenEHR::AssumedLibraryTypes::Interval.new(
-                       :upper => 1, :lower => 1)
+                       :upper => 1, :lower => 1, 
+                       :lower_included => true, :upper_included => true)
     end
 
     context 'root definition object' do
@@ -148,13 +149,15 @@ describe ADLParser do
 
       it 'existence are 0..1' do
         existence = OpenEHR::AssumedLibraryTypes::Interval.new(
-                        :lower => 0, :upper => 1)
+                        :lower => 0, :upper => 1,
+                        :lower_included => true, :upper_included => true)
         @attr.existence.should == existence
       end
 
       it 'cardinality interval is 0..8' do
         interval = OpenEHR::AssumedLibraryTypes::Interval.new(
-                        :lower => 0, :upper => 8)
+                        :lower => 0, :upper => 8,
+                        :lower_included => true, :upper_included => true)
         @attr.cardinality.interval.should == interval
       end
 
@@ -191,7 +194,7 @@ describe ADLParser do
 
         it 'occurences is upper unbounded' do
           occurrences = OpenEHR::AssumedLibraryTypes::Interval.new(
-                          :lower => 0)
+                          :lower => 0, :lower_included => true)
           @second.occurrences.should == occurrences
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openehr
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Shinji KOBAYASHI
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake