open_ehr 0.9.4 → 0.9.5

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.9.5 2011-12-02
+Bug fix around ADL parser, data types, constranit
+
 === 0.9.4 2011-11-22
 Bug fix around ADL parser, ArchetypeOntology
 

data/README.rdoc

@@ -5,12 +5,12 @@ Ruby openEHR implementation project.
 
 = Version
 
-Release-0.9.4
+Release-0.9.5
 
 = Requirements
 
-* Ruby 1.9.2 reccomended
-* Tested with Ruby 1.9.2 on Linux and FreeBSD.
+* Ruby 1.9.x reccomended
+* Tested with Ruby 1.9.3 on Linux and FreeBSD.
 * It would work with some adjustment on Ruby 1.8 or earlier,
   but not confirmed.
 * It should work on other platforms with Ruby

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/open_ehr/am/archetype/constraint_model/primitive.rb

@@ -34,6 +34,7 @@ module OpenEHR
               binary_consistency(args[:true_valid], args[:false_valid])
               @true_valid = args[:true_valid]
               @false_valid = args[:false_valid]
+              args[:type] = 'Boolean'
               super(args)
             end
 
@@ -78,6 +79,7 @@ module OpenEHR
             attr_reader :pattern, :list
 
             def initialize(args = { })
+              args[:type] = 'String'
               super
               consistency(args[:pattern], args[:list])
               @pattern = args[:pattern]
@@ -106,6 +108,7 @@ module OpenEHR
             attr_reader :list, :range
 
             def initialize(args = { })
+              args[:type] ||= 'Integer'
               super
               consistency(args[:list], args[:range])
               @list = args[:list]
@@ -132,13 +135,14 @@ module OpenEHR
 
           class CReal < CInteger
             def initialize(args = { })
+              args[:type] = 'Real'
               super
             end
           end
 
           module CDateModule
-            attr_accessor :range, :timezone_validity
-            attr_reader :month_validity, :day_validity
+            attr_accessor :timezone_validity, :day_validity, :range, :list
+            attr_reader :month_validity, :day_validity, :range, :pattern
 
             def month_validity=(month_validity)
               if (month_validity == ValidityKind::OPTIONAL &&
@@ -151,14 +155,23 @@ module OpenEHR
               @month_validity = month_validity
             end
 
-            def day_validity=(day_validity)
-              @day_validity = day_validity
+            def pattern=(pattern)
+              @pattern = pattern if valid_pattern?(pattern)
             end
 
             def validity_is_range?
               return !@range.nil?
             end
 
+            protected
+            def valid_pattern?(pattern)
+              if /^([Yy?X]{4})(-([Mm?X]{2})(-([Dd?X]{2}))?)?$/ =~ pattern
+                true
+              else
+                false
+              end
+            end
+
             private
             def consistency_validity(month_validity, day_validity)
             end
@@ -168,8 +181,13 @@ module OpenEHR
             include CDateModule
 
             def initialize(args = { })
-              super(args)
-              self.range = args[:range]
+              args[:type] = 'ISO8601_DATE'
+              super
+              @range = args[:range]
+              if args[:pattern]
+                self.pattern = args[:pattern]
+              end
+              self.list = args[:list]
               self.timezone_validity = args[:timezone_validity]
               self.day_validity = args[:day_validity]
               self.month_validity = args[:month_validity]
@@ -177,9 +195,12 @@ module OpenEHR
           end
 
           module CTimeModule
-            attr_accessor :range
+            attr_accessor :range, :list
             attr_reader :minute_validity, :second_validity,
-                        :millisecond_validity
+                        :millisecond_validity, :pattern
+            def pattern=(pattern)
+              @pattern = pattern if valid_pattern? pattern
+            end
 
             def minute_validity=(minute_validity)
               if (minute_validity == ValidityKind::OPTIONAL &&
@@ -205,17 +226,29 @@ module OpenEHR
               @millisecond_validity = millisecond_validity
             end
 
+            protected
             def validity_is_range?
               return !@range.nil?
             end
+
+            def valid_pattern?(pattern)
+              if /^([Hh?X]{2})(:([Mm?X]{2})(:([Ss?X]{2}))?)?$/ =~ pattern
+                true
+              else
+                false
+              end
+            end
           end
 
           class CTime < CPrimitive
             include CTimeModule
 
             def initialize(args = { })
+              args[:type] = 'ISO8601_TIME'
               super
+              self.pattern = args[:pattern]
               self.range = args[:range]
+              self.list = args[:list]
               self.millisecond_validity = args[:millisecond_validity]
               self.second_validity = args[:second_validity]
               self.minute_validity = args[:minute_validity]
@@ -227,7 +260,11 @@ module OpenEHR
             attr_reader :hour_validity
 
             def initialize(args = { })
+              args[:type] = 'ISO8601_DATE_TIME'
               super
+              self.pattern = args[:pattern]
+              self.list = args[:list]
+              self.range = args[:range]
               self.timezone_validity = args[:timezone_validity]
               self.millisecond_validity = args[:millisecond_validity]
               self.second_validity = args[:second_validity]
@@ -258,40 +295,30 @@ module OpenEHR
               end
               @day_validity = day_validity
             end
+
+            protected
+            def valid_pattern?(pattern)
+              if /^([Yy?X]{4})(-([Mm?X]{2})(-([Dd?X]{2}))?)?[T ]?([Hh?X]{2})(:([Mm?X]{2})(:([Ss?X]{2}))?)?$/ =~ pattern
+                true
+              else
+                false
+              end
+            end
           end
 
           class CDuration < CPrimitive
-            attr_reader :range
-            attr_accessor :years_allowed, :months_allowed, :weeks_allowed,
-                          :days_allowed, :hours_allowed, :minutes_allowed,
-                          :seconds_allowed, :fractional_seconds_allowed
+            attr_accessor :years_allowed, :months_allowed, :weeks_allowed
+            attr_accessor :days_allowed, :hours_allowed, :minutes_allowed
+            attr_accessor :seconds_allowed, :fractional_seconds_allowed
+            attr_accessor :pattern, :list, :range
 
             def initialize(args = { })
+              args[:type] = 'ISO8601_DURATION'
               super
-              self.fractional_seconds_allowed = args[:fractional_seconds_allowed]
-              self.seconds_allowed = args[:seconds_allowed]
-              self.minutes_allowed = args[:minutes_allowed]
-              self.hours_allowed = args[:hours_allowed]
-              self.days_allowed = args[:days_allowed]
-              self.months_allowed = args[:months_allowed]
-              self.weeks_allowed = args[:weeks_allowed]
-              self.years_allowed = args[:years_allowed]
+              self.pattern = args[:pattern]
+              self.list = args[:list]
               self.range = args[:range]
             end
-
-            def range=(range)
-              if range.nil? && !(@years_allowed ||
-                    @months_allowed ||
-                    @weeks_allowed ||
-                    @days_allowed ||
-                    @hours_allowed ||
-                    @minutes_allowed ||
-                    @seconds_allowed ||
-                    @fractional_seconds_allowed)
-                raise ArgumentError, 'invalid range'
-              end
-              @range = range
-            end
           end
         end # of Primitive
       end # of CostraintModel

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

@@ -0,0 +1,27 @@
+module OpenEHR
+  module AM
+    module OpenEHRProfile
+      module DataTypes
+        module Basic
+          class CDvState
+          end
+
+          class StateMachine
+          end
+
+          class State
+          end
+
+          class TerminalState < State
+          end
+
+          class NonTerminalState < State
+          end
+
+          class Transition
+          end
+        end
+      end # of DataTypes
+    end # of OpenEHR Profile
+  end # of AM
+end # of OpenEHR

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

@@ -0,0 +1,18 @@
+module OpenEHR
+  module AM
+    module OpenEHRProfile
+      module DataTypes
+        module Quantity
+          class CDvQuantity < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
+          end
+          
+          class CDvOrdinal < OpenEHR::AM::Archetype::ConstraintModel::CDomainType
+          end
+
+          class CQuantityItem
+          end
+        end
+      end # of DataTypes
+    end # of OpenEHRProfile
+  end # of AM
+end # of OpenEHR

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

@@ -0,0 +1,22 @@
+include OpenEHR::AM::Archetype::ConstraintModel
+
+module OpenEHR
+  module AM
+    module OpenEHRProfile
+      module DataTypes
+        module Text
+          class CCodePhrase < CDomainType
+            attr_accessor :terminology_id, :code_list
+
+            def initialize(args = { })
+              super
+              self.terminology_id = args[:terminology_id]
+              self.code_list = args[:code_list]
+              self.assumed_value = args[:assumed_value]
+            end
+          end
+        end # of Text
+      end # of Data_Types
+    end # of OpenEHR Profile
+  end # of AM
+end # of OpenEHR

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

@@ -0,0 +1,12 @@
+$:.unshift(File.dirname(__FILE__)) 
+
+module OpenEHR
+  module AM
+    module OpenEHRProfile
+      module DataTypes
+        autoload :Text, 'data_types/text'
+
+      end
+    end
+  end
+end

data/lib/open_ehr/am/openehr_profile.rb

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

data/lib/open_ehr/am.rb

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

data/lib/open_ehr/assumed_library_types.rb

@@ -80,7 +80,7 @@ module OpenEHR
       end
     end # end of Interval
   
-    class TimeDefinitions < Any
+    module TimeDefinitions #< Any
       DAYS_IN_LEAP_YEAR = 366
       DAYS_IN_WEEK = 7
       DAYS_IN_YEAR = 365
@@ -131,26 +131,33 @@ module OpenEHR
       def self.valid_month?(mo)
         mo >= 1 and mo <= MONTH_IN_YEAR
       end
+
+      protected
+      def nilthenzero(value)
+        return value ? value : 0
+      end
+
     end # end of TimeDefinitions
 
     module ISO8601DateModule
+      include TimeDefinitions
       attr_reader :year, :month, :day
 
       def year=(year)
-        unless ISO8601Date.valid_year?(year)
+        unless TimeDefinitions.valid_year?(year)
           raise ArgumentError, "Year is not valid"
         end
         @year = year
       end
 
       def month=(month)
-        raise ArgumentError, "Month is not valid" unless month.nil? or ISO8601Date.valid_month?(month)
+        raise ArgumentError, "Month is not valid" unless month.nil? or TimeDefinitions.valid_month?(month)
         @month = month
       end
 
       def day=(day)
         
-        raise ArgumentError, "Day is not valid" unless day.nil? or ISO8601Date.valid_day?(@year, @month, day)
+        raise ArgumentError, "Day is not valid" unless day.nil? or TimeDefinitions.valid_day?(@year, @month, day)
         @day = day
       end
 
@@ -197,11 +204,7 @@ module OpenEHR
       end
     end
 
-    def nilthenzero(value)
-      return value ? value : 0
-    end
-
-    class ISO8601Date < TimeDefinitions
+    class ISO8601Date
       include ISO8601DateModule, Comparable
       def initialize(string)
         /(\d{4})(?:-(\d{2})(?:-(\d{2})?)?)?/ =~ string
@@ -237,10 +240,11 @@ module OpenEHR
     end # end of ISO8601_DATE
 
     module ISO8601TimeModule
+      include TimeDefinitions
       attr_reader :hour, :minute, :second, :fractional_second, :timezone
 
       def hour=(hour)
-        unless ISO8601Time.valid_hour?(hour, @minute, @second)
+        unless TimeDefinitions.valid_hour?(hour, @minute, @second)
           raise ArgumentError, "hour is not valid"
         end
         @hour = hour
@@ -251,7 +255,7 @@ module OpenEHR
       end
 
       def minute=(minute)
-        raise ArgumentError, "minute is not valid" if !minute.nil? and !ISO8601Time.valid_minute?(minute)
+        raise ArgumentError, "minute is not valid" if !minute.nil? and !TimeDefinitions.valid_minute?(minute)
         @minute = minute
       end
 
@@ -261,7 +265,7 @@ module OpenEHR
 
       def second=(second)
         raise ArgumentError, "minute not defined" if @minute.nil? and !second.nil?
-        raise ArgumentError, "second is not valid" if !second.nil? and !ISO8601Time.valid_second?(second)
+        raise ArgumentError, "second is not valid" if !second.nil? and !TimeDefinitions.valid_second?(second)
         @second = second
       end
 
@@ -280,8 +284,8 @@ module OpenEHR
       end
 
       def timezone=(timezone)
-        unless timezone.nil? or timezone == 'Z'
-          if /[+-](\d{2}):?(\d{2})/ =~ timezone
+        unless timezone.nil?
+          if /([+-](\d{2}):?(\d{2})|Z)/ =~ timezone
             @timezone = timezone
           else
             raise ArgumentError, "timezone invalid"
@@ -328,10 +332,10 @@ module OpenEHR
       end
     end
 
-    class ISO8601Time < TimeDefinitions
+    class ISO8601Time
       include ISO8601TimeModule, Comparable
       def initialize(string)
-        /(\d{2}):?(\d{2})?(:?)(\d{2})?((\.|,)(\d+))?(Z|([+-](\d{2}):?(\d{2})))?/ =~ string
+        /^(\d{2}):?(\d{2})?(:?)(\d{2})?((\.|,)(\d+))?(Z|([+-](\d{2}):?(\d{2})))?$/ =~ string
         if $2.nil?
           self.minute = nil
         else
@@ -376,12 +380,12 @@ module OpenEHR
             return false
           end
           if !mm.nil? 
-            if !self.valid_minute?(mm.to_i)
+            if !TimeDefinitions.valid_minute?(mm.to_i)
               return false
             end
           end
           if !ss.nil? 
-            if !self.valid_second?(ss.to_i)
+            if !TimeDefinitions.valid_second?(ss.to_i)
               return false
             end
           end
@@ -435,7 +439,7 @@ module OpenEHR
     class ISO8601DateTime < ISO8601Date
       include ISO8601DateTimeModule
       def initialize(string)
-        unless /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
+        unless /(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?T(\d{2})(?::(\d{2})(?::(\d{2})(?:(\.|,)(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?/ =~ string
           raise ArgumentError, 'format invalid'
         else
           self.year = $1.to_i
@@ -465,15 +469,15 @@ module OpenEHR
         else
           self.hour = $4.to_i
         end
-        if $7.nil? or $7.empty?
+        if $8.nil? or $8.empty?
           self.fractional_second = nil
         else
-          self.fractional_second = ("0."+$7).to_f
+          self.fractional_second = ("0."+$8).to_f
         end
-        if $8.nil?
+        if $9.nil?
           self.timezone = nil
         else
-          self.timezone = $9+$10
+          self.timezone = $9
         end
       end
 
@@ -517,6 +521,7 @@ module OpenEHR
     end # end of ISO8601Timezone
 
     module ISO8601DurationModule
+      include TimeDefinitions
       attr_reader :years, :months, :weeks, :days
       attr_reader :hours, :minutes, :seconds, :fractional_second
 
@@ -607,10 +612,10 @@ module OpenEHR
       end
     end
 
-    class ISO8601Duration < TimeDefinitions
+    class ISO8601Duration
       include ISO8601DurationModule
       def initialize(str)
-        /^P((\d+)Y)?((\d+)M)?((\d+)W)?((\d)D)?(T((\d+)H)?((\d+)M)?((\d+)(\.\d+)?S)?)?$/ =~ str
+        /^P((\d+)[Yy])?((\d+)[Mm])?((\d+)[Ww])?((\d)[dD])?(T((\d+)[Hh])?((\d+)[Mm])?((\d+)(\.\d+)?[Ss])?)?$/ =~ str
         self.years = $2.to_i
         self.months = $4.to_i
         self.weeks = $6.to_i