timecop 0.5.6 → 0.5.7

data/lib/timecop/time_stack_item.rb

@@ -1,91 +1,98 @@
-
 class Timecop
-  # A data class for carrying around "time movement" objects.  Makes it easy to keep track of the time
-  # movements on a simple stack.
-  class TimeStackItem #:nodoc:
-    attr_reader :mock_type
-
-    def initialize(mock_type, *args)
-      raise "Unknown mock_type #{mock_type}" unless [:freeze, :travel, :scale].include?(mock_type)
-      @scaling_factor = args.shift if mock_type == :scale
-      @mock_type      = mock_type
-      @time           = parse_time(*args)
-      @time_was       = Time.now_without_mock_time
-      @travel_offset  = compute_travel_offset
-      @dst_adjustment = compute_dst_adjustment(@time)
-    end
-
-    def year
-      time.year
-    end
+    # A data class for carrying around "time movement" objects.  Makes it easy to keep track of the time
+    # movements on a simple stack.
+    class TimeStackItem #:nodoc:
+      attr_reader :mock_type
+
+      def initialize(mock_type, *args)
+        raise "Unknown mock_type #{mock_type}" unless [:freeze, :travel, :scale].include?(mock_type)
+        @scaling_factor = args.shift if mock_type == :scale
+        @mock_type      = mock_type
+        @time           = parse_time(*args)
+        @time_was       = Time.now_without_mock_time
+        @travel_offset  = compute_travel_offset
+        @dst_adjustment = compute_dst_adjustment(@time)
+      end
 
-    def month
-      time.month
-    end
+      def year
+        time.year
+      end
 
-    def day
-      time.day
-    end
+      def month
+        time.month
+      end
 
-    def hour
-      time.hour
-    end
+      def day
+        time.day
+      end
 
-    def min
-      time.min
-    end
+      def hour
+        time.hour
+      end
 
-    def sec
-      time.sec
-    end
+      def min
+        time.min
+      end
 
-    def utc_offset
-      time.utc_offset
-    end
+      def sec
+        time.sec
+      end
 
-    def travel_offset
-      @travel_offset
-    end
+      def utc_offset
+        time.utc_offset
+      end
 
-    def scaling_factor
-      @scaling_factor
-    end
+      def travel_offset
+        @travel_offset
+      end
 
-    def time(time_klass = Time) #:nodoc:
-      if travel_offset.nil?
-        time_klass.at(@time)
-      elsif scaling_factor.nil?
-        time_klass.at(Time.now_without_mock_time + travel_offset)
-      else
-        time_klass.at(scaled_time)
+      def scaling_factor
+        @scaling_factor
       end
-    end
 
-    def scaled_time
-      (@time + (Time.now_without_mock_time - @time_was) * scaling_factor).to_f
-    end
+      def time(time_klass = Time) #:nodoc:
+        actual_time = time_klass.at(@time)
+        calculated_time = time_klass.at(@time.to_f)
 
-    def date(date_klass = Date)
-      date_klass.jd(time.__send__(:to_date).jd)
-    end
+        if travel_offset.nil?
+          if times_are_equal_within_epsilon(actual_time, calculated_time, 1)
+            actual_time
+          else
+            calculated_time
+          end
+        elsif scaling_factor.nil?
+          time_klass.at(Time.now_without_mock_time + travel_offset)
+        else
+          time_klass.at(scaled_time)
+        end
+      end
 
-    def datetime(datetime_klass = DateTime)
-      our_offset = utc_offset + dst_adjustment
+      def scaled_time
+        (@time + (Time.now_without_mock_time - @time_was) * scaling_factor).to_f
+      end
+
+      def date(date_klass = Date)
+        date_klass.jd(time.__send__(:to_date).jd)
+      end
 
-      if Float.method_defined?(:to_r)
-        fractions_of_a_second = time.to_f % 1
-        datetime_klass.new(year, month, day, hour, min, sec + fractions_of_a_second, utc_offset_to_rational(our_offset))
-      else
+      def datetime(datetime_klass = DateTime)
         our_offset = utc_offset + dst_adjustment
-        datetime_klass.new(year, month, day, hour, min, sec, utc_offset_to_rational(our_offset))
+
+        if Float.method_defined?(:to_r)
+          fractions_of_a_second = time.to_f % 1
+          datetime_klass.new(year, month, day, hour, min, sec + fractions_of_a_second, utc_offset_to_rational(our_offset))
+        else
+          our_offset = utc_offset + dst_adjustment
+          datetime_klass.new(year, month, day, hour, min, sec, utc_offset_to_rational(our_offset))
+        end
       end
-    end
 
-    def dst_adjustment
-      @dst_adjustment
-    end
+      def dst_adjustment
+        @dst_adjustment
+      end
+
+      private
 
-    private
       def rational_to_utc_offset(rational)
         ((24.0 / rational.denominator) * rational.numerator) * (60 * 60)
       end
@@ -139,5 +146,9 @@ class Timecop
         return nil if mock_type == :freeze
         time - Time.now_without_mock_time
       end
-  end
-end
+
+      def times_are_equal_within_epsilon t1, t2, epsilon_in_seconds
+        (t1 - t2).abs < epsilon_in_seconds
+      end
+    end
+  end

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/test/time_stack_item_test.rb

@@ -183,6 +183,15 @@ class TestTimeStackItem < Test::Unit::TestCase
     assert_equal nil, tsi.send(:travel_offset)
   end
 
+  def test_timezones
+    require 'active_support/all'
+    Time.zone = "Europe/Zurich"
+    time = Time.zone.parse("2012-12-27T12:12:12+08:00")
+    Timecop.freeze(time) do |frozen_time|
+      assert_equal time, frozen_time
+    end
+  end
+
   def test_set_scaling_factor_for_scale
     t_now = Time.now
     t = Time.local(2009, 10, 1, 0, 0, 30)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 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