Changeset 397 for ruby/trunk

Timestamp:

Jan 19, 2010, 8:54:57 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #71

Location:

ruby/trunk

Files:

• lib/open_ehr/am/archetype/constraint_model/primitive.rb (modified) (1 diff)
• lib/open_ehr/assumed_library_types.rb (modified) (2 diffs)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (1 diff)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_date_spec.rb (added)
• spec/lib/open_ehr/am/archetype/constraint_model/primitive/c_string_spec.rb (modified) (2 diffs)

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

@@ -133 +133 @@
           end
 
-          
+          class CDate < CPrimitive
+            attr_accessor :range, :timezone_validity
+            attr_reader :month_validity, :day_validity
+
+            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
         end # of Primitive
       end # of CostraintModel

ruby/trunk/lib/open_ehr/assumed_library_types.rb

@@ -135 +135 @@
 
     module ISO8601DateModule
+      include Comparable
       attr_reader :year, :month, :day
 
@@ -180 +181 @@
         month_unknown? or day_unknown?
       end
-
+      
+      def <=>(other)
+        (@year*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
+         @month*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + @day) <=>
+          (other.year*TimeDefinitions::NOMINAL_DAYS_IN_YEAR +
+           other.month*TimeDefinitions::NOMINAL_DAYS_IN_MONTH + other.month)
+      end
       protected
       def leapyear?(year)

ruby/trunk/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -181 +181 @@
             end
 
+            def <=>(other)
+              self.magnitude <=> other.magnitude
+            end
+
             private
 

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

@@ -23 +23 @@
   end
 
-  it 'pattern should be assigned properly' do
+  it 'pattern should be assigned properly by constructor' do
     @c_string.pattern.should == 't[a-z]st'
+  end
+
+  it 'pattern should be assigned properly by method' do
+    @c_string.pattern = '.*'
+    @c_string.pattern.should == '.*'
   end
 
@@ -47 +52 @@
     end
 
-    it 'list should be assigned properly' do
+    it 'list should be assigned properly by constructor' do
       @c_string.list.should == ['test', 'behavior']
+    end
+
+    it 'list shoudl be assigned properly by method' do
+      @c_string.list = ['spec']
+      @c_string.list.should == ['spec']
     end