Changeset 125

Timestamp:

May 22, 2009, 4:51:42 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #36

Location:

ruby/trunk/lib/models

Files:

• assumed_library_types.rb (modified) (7 diffs)
• tests/test_assumed_library_types.rb (modified) (2 diffs)

ruby/trunk/lib/models/assumed_library_types.rb

@@ -119 +119 @@
         @month = month
       end
+
       def day=(day)
         raise ArgumentError, "Day is not valid" unless day.nil? or ISO8601_DATE.valid_day?(@year, @month, day)
         @day = day
       end
+
       def as_string
         if (!@year.nil? and !@month.nil? and !@day.nil?)
@@ -132 +134 @@
         end          
       end
+
       def month_unknown?
         @month.nil?
       end
+
       def day_unknown?
         @day.nil?
       end
+
       def is_extended?
         true
       end
+
       def is_partial?
         month_unknown? or day_unknown?
@@ -241 +247 @@
         second_unknown? or minute_unknown?
       end
+
       def as_string
         s = sprintf("%02d", @hour)
@@ -248 +255 @@
             s += ":" + sprintf("%02d", @second)
             if !@fractional_second.nil?
-              s += "," + @fractional_second.to_s[2..-1]
+              s += "." + @fractional_second.to_s[2..-1]
               if !@timezone.nil?
                 s += @timezone
@@ -255 +262 @@
           end
         end
-        s
+        return s
       end
     end
@@ -332 +339 @@
 
     class ISO8601_DATE_TIME < ISO8601_DATE
-      include ISO8601_DATE_MODULE, ISO8601_TIME_MODULE
+      include ISO8601_TIME_MODULE, ISO8601_DATE_MODULE
       def initialize(string)
         /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
@@ -376 +383 @@
         end
       end
+
+      def as_string
+        if (!@year.nil? and !@month.nil? and !@day.nil?)
+          s = Date.new(@year, @month, @day).to_s
+        elsif (!@year.nil? and !@month.nil? and @day.nil?)
+          return Date.new(@year, @month).to_s[0,7]
+        elsif (!@year.nil? and @month.nil? and @day.nil?)
+          return Date.new(@year).to_s[0,4]
+        end          
+        s += sprintf("T%02d", @hour)
+        if !@minute.nil?
+          s += ":" + sprintf("%02d",@minute)
+          if !@second.nil?
+            s += ":" + sprintf("%02d", @second)
+            if !@fractional_second.nil?
+              s += "." + @fractional_second.to_s[2..-1]
+              if !@timezone.nil?
+                s += @timezone
+              end
+            end
+          end
+        end
+        return s
+      end
+
     end
 

ruby/trunk/lib/models/tests/test_assumed_library_types.rb

@@ -248 +248 @@
     assert @iso8601_time.has_fractional_second?
     assert_equal 0.23, @iso8601_time.fractional_second
-    assert_equal "23:59:59,23", @iso8601_time.as_string
+    assert_equal "23:59:59.23", @iso8601_time.as_string
     assert @iso8601_time.is_extended?
     assert @iso8601_time.is_decimal_sign_comma?
@@ -269 +269 @@
     assert_equal 0.32, @iso8601_date_time.fractional_second
     assert_equal '+0900', @iso8601_date_time.timezone
+    assert_equal '2009-04-27T15:55:37.32+0900', @iso8601_date_time.as_string
     assert_nothing_raised(Exception){
       @iso8601_date_time.year = 2008 }