delta_t 0.0.1 → 0.0.2

data/lib/delta_t/time_diff.rb

@@ -30,7 +30,7 @@ module DeltaT
             sum += @diff[i].send UNITS[i]
             i += 1
           end
-          sum / 1.send(UNITS[index])
+          sum.to_i / 1.send(UNITS[index]).to_i
         end
       end
     end
@@ -45,6 +45,22 @@ module DeltaT
       eql
     end
 
+    def < other
+      to_f < other.to_f
+    end
+
+    def > other
+      other < self
+    end
+
+    def <= other
+      !(self > other)
+    end
+
+    def >= other
+      !(self < other)
+    end
+
     ##
     # Either adds two TimeDiffs together or advances a time by this TimeDiff
     def + other
@@ -111,6 +127,10 @@ module DeltaT
       h
     end
 
+    def to_s
+      to_f.to_s
+    end
+
     protected
 
     def apply_time_diff ending, start

data/lib/delta_t/version.rb

@@ -1,3 +1,3 @@
 module DeltaT
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/delta_t_test.rb

@@ -1,16 +1,11 @@
 require File.dirname(__FILE__) + '/helper'
 
-class DeltaT::TimeDiff
-  # exposing internals for better testing
-  # nano secs are ignored cause they are just implemented for compatibility with old play time diff
-  # current implementation: [y,m,d,h,m,s]
-  def diff
-    @diff.reverse[0..-2]
-  end
-end
-
 class DeltaTTest < Test::Unit::TestCase
 
+  def assert_components expected, actual
+    assert_equal expected, [actual.years, actual.months, actual.days, actual.hours, actual.minutes, actual.seconds]
+  end
+
   # caution - depends on current time so if buggy non deterministic
   def test_simple_difference
     now = Time.now
@@ -24,19 +19,19 @@ class DeltaTTest < Test::Unit::TestCase
   end
 
   def test_overlapping_difference
-    assert_equal [0,0,0,0,0,2], DeltaT::TimeDiff.new(Time.new(2000, 1, 1, 0, 1 , 1), Time.new(2000, 1, 1, 0, 0, 59)).diff
-    assert_equal [0,0,2,0,0,0], DeltaT::TimeDiff.new(Time.new(2000, 2, 1), Time.new(2000, 1, 30)).diff
+    assert_components [0,0,0,0,0,2], DeltaT::TimeDiff.new(Time.new(2000, 1, 1, 0, 1 , 1), Time.new(2000, 1, 1, 0, 0, 59))
+    assert_components [0,0,2,0,0,0], DeltaT::TimeDiff.new(Time.new(2000, 2, 1), Time.new(2000, 1, 30))
   end
 
   def test_negative_difference
-    assert_equal [1, 2, 10, 0, 3, 2], DeltaT::TimeDiff.new(Time.new(2001, 6, 15, 10, 4, 1), Time.new(2000, 4, 5, 10, 0, 59)).diff
-    assert_equal [-1, -2, -10, 0, -3, -2], DeltaT::TimeDiff.new(Time.new(2000, 4, 5, 10, 0, 59), Time.new(2001, 6, 15, 10, 4, 1)).diff
+    assert_components [1, 2, 10, 0, 3, 2], DeltaT::TimeDiff.new(Time.new(2001, 6, 15, 10, 4, 1), Time.new(2000, 4, 5, 10, 0, 59))
+    assert_components [-1, -2, -10, 0, -3, -2], DeltaT::TimeDiff.new(Time.new(2000, 4, 5, 10, 0, 59), Time.new(2001, 6, 15, 10, 4, 1))
   end
 
   def test_init
-    assert_equal [1,2,3,4,5,6], DeltaT::TimeDiff.new(years: 1, months: 2, days: 3, hours: 4, minutes: 5, seconds: 6).diff
-    assert_equal [1,0,3,0,0,0], DeltaT::TimeDiff.new(years: 1, days: 3).diff
-    assert_equal [1,0,0,0,0,0], DeltaT::TimeDiff.new(years: 1).diff
+    assert_components [1,2,3,4,5,6], DeltaT::TimeDiff.new(years: 1, months: 2, days: 3, hours: 4, minutes: 5, seconds: 6)
+    assert_components [1,0,3,0,0,0], DeltaT::TimeDiff.new(years: 1, days: 3)
+    assert_components [1,0,0,0,0,0], DeltaT::TimeDiff.new(years: 1)
   end
 
   def test_equals
@@ -54,9 +49,9 @@ class DeltaTTest < Test::Unit::TestCase
   end
 
   def test_normalization
-    assert_equal [0,1,21,0,0,0], DeltaT::TimeDiff.new(days: 51).diff
-    assert_equal [0,1,10,18,5,0], DeltaT::TimeDiff.new(minutes: 60*24*40 + 60*18 + 5).diff
-    assert_equal [0,-1,-10,-18,-5,0], DeltaT::TimeDiff.new(minutes: -(60*24*40 + 60*18 + 5)).diff
+    assert_components [0,1,21,0,0,0], DeltaT::TimeDiff.new(days: 51)
+    assert_components [0,1,10,18,5,0], DeltaT::TimeDiff.new(minutes: 60*24*40 + 60*18 + 5)
+    assert_components [0,-1,-10,-18,-5,0], DeltaT::TimeDiff.new(minutes: -(60*24*40 + 60*18 + 5))
   end
 
   def test_to_hash
@@ -65,9 +60,18 @@ class DeltaTTest < Test::Unit::TestCase
   end
 
   def test_operators
-    assert_equal [1,3,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) + DeltaT::TimeDiff.new(months: 4)).diff
-    assert_equal [0,7,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) - DeltaT::TimeDiff.new(months: 4)).diff
-    assert_equal [2,9,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) * 3).diff
+    assert_components [1,3,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) + DeltaT::TimeDiff.new(months: 4))
+    assert_components [0,7,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) - DeltaT::TimeDiff.new(months: 4))
+    assert_components [2,9,0,0,0,0], (DeltaT::TimeDiff.new(months: 11) * 3)
+  end
+
+  def test_comparison_operators
+    assert DeltaT::TimeDiff.new(months: 1) < DeltaT::TimeDiff.new(days: 35)
+    assert DeltaT::TimeDiff.new(days: 35) > DeltaT::TimeDiff.new(months: 1)
+
+    assert DeltaT::TimeDiff.new(hours: 3) <= DeltaT::TimeDiff.new(minutes: 180)
+    assert DeltaT::TimeDiff.new(hours: 3) <= DeltaT::TimeDiff.new(minutes: 180, seconds: 5)
+    assert !(DeltaT::TimeDiff.new(hours: 3) >= DeltaT::TimeDiff.new(minutes: 180, seconds: 5))
   end
 
   def test_time_operators
@@ -83,4 +87,4 @@ class DeltaTTest < Test::Unit::TestCase
     assert_equal before, after - (after - before)
     assert_equal before, -(after - before) + after
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delta_t
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake