Changeset 121 for ruby/trunk

Timestamp:

May 4, 2009, 9:43:50 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #36

Location:

ruby/trunk/lib/models

Files:

• assumed_library_types.rb (modified) (4 diffs)
• tests/test_assumed_library_types.rb (modified) (1 diff)

ruby/trunk/lib/models/assumed_library_types.rb

@@ -2 +2 @@
 require 'date'
 require 'time'
-require 'parsedate'
 
 module OpenEHR
@@ -325 +324 @@
       include ISO8601_DATE_MODULE, ISO8601_TIME_MODULE
       def initialize(string)
-        /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d))?)?(Z|([+-]\d{2}):(\d{2}))?)?)?)?/ =~ string
+        /(\d{4})(?:-(\d{2})(?:-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d+))?)?(Z|([+-]\d{2}):?(\d{2}))?)?)?)?/ =~ string
         if $1.empty?
           raise ArgumentError, 'format invalid'
@@ -356 +355 @@
           self.hour = $4.to_i
         end
-        if $7.nil?
+        if $7.nil? or $7.empty?
           self.fractional_second = nil
         else
@@ -364 +363 @@
           self.timezone = nil
         else
-          self.timezone = $8+$9+$10
+          self.timezone = $9+$10
         end
       end

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

@@ -258 +258 @@
   def test_iso_8601_date_time
     assert_equal 2009, @iso8601_date_time.year
-    
-#    assert_nothing_raised(Exception){@iso8601_date_time = OpenEHR::Assumed_Library_Types::ISO8601_DATE_TIME.new('2009-04-27T15:55:37.32+0900')}
+    assert_equal 4, @iso8601_date_time.month
+    assert_equal 27, @iso8601_date_time.day
+    assert_equal 15, @iso8601_date_time.hour
+    assert_equal 55, @iso8601_date_time.minute
+    assert_equal 37, @iso8601_date_time.second
+    assert_equal 0.32, @iso8601_date_time.fractional_second
+    assert_equal '+0900', @iso8601_date_time.timezone
   end