timecop 0.5.8 → 0.5.9

data/lib/timecop/time_stack_item.rb

@@ -52,7 +52,9 @@ class Timecop
 
       def time(time_klass = Time) #:nodoc:
         begin
-          time = time_klass.at(@time)
+          actual_time = time_klass.at(@time)
+          calculated_time = time_klass.at(@time.to_f)
+          time = times_are_equal_within_epsilon(actual_time, calculated_time, 1) ? actual_time : calculated_time
         rescue
           time = time_klass.at(@time.to_f)
         end

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

data/test/time_stack_item_test.rb

@@ -244,4 +244,14 @@ class TestTimeStackItem < Test::Unit::TestCase
     assert_equal time, Time.now
     assert_equal time.nsec, Time.now.nsec if (Time.now.respond_to?(:nsec))
   end
+
+  def test_time_with_different_timezone
+    require 'active_support/all'
+    
+    Time.zone = "Tokyo"
+    t = Time.now
+    Timecop.freeze(t) do
+      assert_times_effectively_equal t, Time.now
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: timecop
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Travis Jeffery
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies: []
 description: A gem providing "time travel" and "time freezing" capabilities, making it dead simple to test time-dependent code.  It provides a unified method to mock Time.now, Date.today, and DateTime.now in a single call.
 email: travisjeffery@gmail.com