Changeset 400

Timestamp:

Jan 25, 2010, 2:56:50 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #71

Location:

ruby/trunk

Files:

• lib/open_ehr/am/archetype/constraint_model/primitive.rb (modified) (2 diffs)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_time_spec.rb (added)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb (modified) (1 diff)

ruby/trunk/lib/open_ehr/am/archetype/constraint_model/primitive.rb

@@ -133 +133 @@
           end
 
-          class CDate < CPrimitive
+          module CDateModule
             attr_accessor :range, :timezone_validity
             attr_reader :month_validity, :day_validity
 
+            def month_validity=(month_validity)
+              if (month_validity == ValidityKind::OPTIONAL &&
+                  !(@day_validity == ValidityKind::OPTIONAL ||
+                    @day_validity == ValidityKind::DISALLOWED)) ||
+                  (month_validity == ValidityKind::DISALLOWED &&
+                  !(@day_validity == ValidityKind::DISALLOWED))
+                raise ArgumentError, 'month validity disallowed'
+              end
+              @month_validity = month_validity
+            end
+
+            def day_validity=(day_validity)
+              @day_validity = day_validity
+            end
+
+            def validity_is_range?
+              return !@range.nil?
+            end
+
+            private
+            def consistency_validity(month_validity, day_validity)
+            end
+          end
+
+          class CDate < CPrimitive
+            include CDateModule
+
             def initialize(args = { })
               super(args)
               self.range = args[:range]
-              consistency_validity(args[:month_validity], args[:day_validity])
-              @month_validity = args[:month_validity]
-              @day_validity = args[:day_validity]
               self.timezone_validity = args[:timezone_validity]
-            end
-
-            def month_validity=(month_validity)
-              consistency_validity(month_validity, @day_validity)
-              @month_validity = month_validity
-            end
-
-            def day_validity=(day_validity)
-              consistency_validity(@month_validity, day_validity)
-              @day_validity = day_validity
-            end
-
-            def validity_is_range?
-              return !@range.nil?
-            end
-
-            private
-            def consistency_validity(month_validity, day_validity)
-              if (month_validity == ValidityKind::OPTIONAL) &&
-                  !((day_validity == ValidityKind::OPTIONAL) ||
-                    (day_validity == ValidityKind::DISALLOWED))
-                raise ArgumentError, 'month_validity inconsistent'
-              end
-              if (month_validity == ValidityKind::DISALLOWED) &&
-                  !(day_validity == ValidityKind::DISALLOWED)
-                raise ArgumentError, 'month validity disallowed'
-              end
-            end
-          end
-
-          class CTime < CPrimitive
+              self.day_validity = args[:day_validity]
+              self.month_validity = args[:month_validity]
+            end
+          end
+
+          module CTimeModule
             attr_accessor :range
             attr_reader :minute_validity, :second_validity,
                         :millisecond_validity
-
-            def initialize(args = { })
-              super
-              self.range = args[:range]
-              self.millisecond_validity = args[:millisecond_validity]
-              self.second_validity = args[:second_validity]
-              self.minute_validity = args[:minute_validity]
-            end
 
             def minute_validity=(minute_validity)
@@ -215 +206 @@
             end
           end
+
+          class CTime < CPrimitive
+            include CTimeModule
+
+            def initialize(args = { })
+              super
+              self.range = args[:range]
+              self.millisecond_validity = args[:millisecond_validity]
+              self.second_validity = args[:second_validity]
+              self.minute_validity = args[:minute_validity]
+            end
+          end
+
+          class CDateTime < CPrimitive
+            include CDateModule, CTimeModule
+            attr_reader :hour_validity
+
+            def initialize(args = { })
+              super
+              self.timezone_validity = args[:timezone_validity]
+              self.millisecond_validity = args[:millisecond_validity]
+              self.second_validity = args[:second_validity]
+              self.minute_validity = args[:minute_validity]
+              self.hour_validity = args[:hour_vaildity]
+              self.day_validity = args[:day_validity]
+              self.month_validity = args[:day_validity]
+            end
+
+            def hour_validity=(hour_validity)
+              if (hour_validity == ValidityKind::DISALLOWED &&
+                  @minute_validity != ValidityKind::DISALLOWED) ||
+                  (hour_validity == ValidityKind::OPTIONAL &&
+                   !(@minute_validity == ValidityKind::OPTIONAL ||
+                     @minute_validity == ValidityKind::DISALLOWED))
+                raise ArgumentError, 'hour_validity is invalid'
+              end
+              @hour_validity = hour_validity
+            end
+
+            def day_validity=(day_validity)
+              if (day_validity == ValidityKind::DISALLOWED &&
+                  @hour_validity != ValidityKind::DISALLOWED) ||
+                  (day_validity == ValidityKind::OPTIONAL &&
+                   !(@hour_validity == ValidityKind::OPTIONAL ||
+                     @hour_validity == ValidityKind::DISALLOWED))
+                raise ArgumentError, 'day_validity is invaild'
+              end
+              @day_validity = day_validity
+            end
+          end
         end # of Primitive
       end # of CostraintModel

ruby/trunk/spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_time_spec.rb

@@ -3 +3 @@
 include OpenEHR::AM::Archetype
 include OpenEHR::AM::Archetype::ConstraintModel::Primitive
-
 
 describe CTime do