Changeset 259 for ruby/branches/0.5/lib/open_ehr/assumed_library_types.rb

Timestamp:

Sep 14, 2009, 1:21:16 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

support/identification package moving from test/unit to rspec

File:

• ruby/branches/0.5/lib/open_ehr/assumed_library_types.rb (modified) (4 diffs)

ruby/branches/0.5/lib/open_ehr/assumed_library_types.rb

@@ -95 +95 @@
 
       def self.valid_year?(year)
-        year >= 0
+        return !year.nil? && year >= 0
       end
 
       def self.valid_day?(y, m, d)
-        Date.valid_date?(y,m,d) and valid_year? y
+        unless y.nil? || m.nil? || d.nil?
+          return Date.valid_date?(y,m,d)
+        end
+        if (y.nil?) || (m.nil? && !d.nil?)
+          return false
+        end
+        return self.valid_year?(y) && self.valid_month?(m)
       end
 
@@ -126 +132 @@
 
       def year=(year)
-        unless !year.nil? && ISO8601Date.valid_year?(year)
+        unless ISO8601Date.valid_year?(year)
           raise ArgumentError, "Year is not valid"
         end
@@ -138 +144 @@
 
       def day=(day)
+        
         raise ArgumentError, "Day is not valid" unless day.nil? or ISO8601Date.valid_day?(@year, @month, day)
         @day = day
@@ -548 +555 @@
       end
     end
+
     class ISO8601_DURATION < TimeDefinitions
       include ISO8601_DURATION_MODULE