timecop 0.5.9.2 → 0.6.0

data/lib/timecop/time_stack_item.rb

@@ -50,21 +50,21 @@ class Timecop
         @scaling_factor
       end
 
-      def time(time_klass = Time) #:nodoc:
+      def time(klass = time_klass) #:nodoc:
         begin
-          actual_time = time_klass.at(@time)
-          calculated_time = time_klass.at(@time.to_f)
+          actual_time = klass.at(@time)
+          calculated_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)
+          time = klass.at(@time.to_f)
         end
 
         if travel_offset.nil?
           time
         elsif scaling_factor.nil?
-          time_klass.at(Time.now_without_mock_time + travel_offset)
+          klass.at(Time.now_without_mock_time + travel_offset)
         else
-          time_klass.at(scaled_time)
+          klass.at(scaled_time)
         end
       end
 
@@ -103,7 +103,6 @@ class Timecop
       end
 
       def parse_time(*args)
-        time_klass = Time.respond_to?(:zone) && Time.zone ? Time.zone : Time
         arg = args.shift
         if arg.is_a?(Time)
           if Timecop.active_support != false && arg.respond_to?(:in_time_zone)
@@ -151,5 +150,9 @@ class Timecop
       def times_are_equal_within_epsilon t1, t2, epsilon_in_seconds
         (t1 - t2).abs < epsilon_in_seconds
       end
+
+      def time_klass
+        Time.respond_to?(:zone) ? Time.zone : Time
+      end
     end
-  end
+  end

data/lib/timecop/timecop.rb

@@ -107,7 +107,7 @@ class Timecop
     private
     def send_travel(mock_type, *args, &block)
       val = instance.send(:travel, mock_type, *args, &block)
-      block_given? ? val : Time.now  
+      block_given? ? val : Time.now
     end
   end
 

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.5.9.2"
+  VERSION = "0.6.0"
 end

data/test/time_stack_item_test.rb

@@ -192,6 +192,16 @@ class TestTimeStackItem < Test::Unit::TestCase
     end
   end
 
+  def test_timezones_apply_dates
+    require 'active_support/all'
+    Time.zone = "Marshall Is."
+    time = Time.zone.local(2013,1,3)
+
+    Timecop.freeze(time) do
+      assert_equal time.to_date, Date.today
+    end
+  end
+
   def test_set_scaling_factor_for_scale
     t_now = Time.now
     t = Time.local(2009, 10, 1, 0, 0, 30)
@@ -247,7 +257,7 @@ class TestTimeStackItem < Test::Unit::TestCase
 
   def test_time_with_different_timezone
     require 'active_support/all'
-    
+
     Time.zone = "Tokyo"
     t = Time.now
     Timecop.freeze(t) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.5.9.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-08 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