Changeset 3645

Timestamp:

12/28/07 01:39:24 (11 months ago)

Author:

walf443

Message:

lang/ruby/date_time-duration: supported nagative duration.

Location:

lang/ruby/date_time-duration

Files:

• lib/date_time/duration.rb (modified) (2 diffs)
• spec/date_time-duration_spec.rb (modified) (4 diffs)

lang/ruby/date_time-duration/lib/date_time/duration.rb

@@ -7 +7 @@
 class DateTime::Duration
   def initialize from, to
-    @from = from
-    @to   = to
+    @flag = ( from <= to ) ? 1 : -1
+    @from, @to = ( from <= to ) ? [from, to] : [ to, from ]
     @duration = to - from
   end
@@ -35 +35 @@
   # This method return not Rational but Fixnum.
   def months
-    i = 0
-    while ( ( @from >> i ) <= @to ) do
-      i += 1
+    if @months.nil?
+      i = 0
+      while ( ( @from >> i ) <= @to ) do
+        i += 1
+      end
+
+      @months = ( @flag * ( i - 1 ) )
     end
-
-    return i - 1
+    
+    return @months
   end
 

lang/ruby/date_time-duration/spec/date_time-duration_spec.rb

@@ -14 +14 @@
     @dd3 = DateTime::Duration.new(@birth, @birth_after_a_year_before_one_day)
     @dd4 = DateTime::Duration.new(@birth, @birth_after_a_year )
+    @dd5 = DateTime::Duration.new(@birth_after_a_year, @birth)
   end
 
@@ -21 +22 @@
     @dd3.days.to_i.should == 364
     @dd4.days.to_i.should == 365
+    @dd5.days.to_i.should == -365
   end
 
@@ -28 +30 @@
     @dd3.months.to_i.should == 11
     @dd4.months.to_i.should == 12
+    @dd5.months.to_i.should == -12
   end
 
@@ -35 +38 @@
     @dd3.years.to_i.should == 0
     @dd4.years.to_i.should == 1
+    @dd5.years.to_i.should == -1
   end