Merge branch 'tb/freeze_preserves_nanoseconds_for_datetime'

lib/timecop/time_stack_item.rb

@@ -76,7 +76,7 @@ def date(date_klass = Date)
 
       def datetime(datetime_klass = DateTime)
         if Float.method_defined?(:to_r)
-          fractions_of_a_second = time.to_f % 1
+          fractions_of_a_second = time.to_r - time.to_i
           datetime_klass.new(year, month, day, hour, min, (fractions_of_a_second + sec), utc_offset_to_rational(utc_offset))
         else
           datetime_klass.new(year, month, day, hour, min, sec, utc_offset_to_rational(utc_offset))
@@ -98,7 +98,7 @@ def parse_time(*args)
         if arg.is_a?(Time)
           arg
         elsif Object.const_defined?(:DateTime) && arg.is_a?(DateTime)
-          time_klass.at(arg.to_time.to_f).getlocal
+          time_klass.at(arg.to_time).getlocal
         elsif Object.const_defined?(:Date) && arg.is_a?(Date)
           time_klass.local(arg.year, arg.month, arg.day, 0, 0, 0)
         elsif args.empty? && (arg.kind_of?(Integer) || arg.kind_of?(Float))

test/timecop_test.rb

@@ -66,6 +66,12 @@ def test_travel_does_not_reduce_precision_of_datetime
     end
   end
 
+  def test_freeze_preserves_nanoseconds_for_datetime
+    dt = DateTime.new(2008, 10, 10, 10, 10, 10.123456789)
+    Timecop.freeze(dt)
+    assert_equal dt.sec_fraction, DateTime.now.sec_fraction
+  end
+
   def test_freeze_in_time_subclass_returns_mocked_subclass
     t = Time.local(2008, 10, 10, 10, 10, 10)
     custom_timeklass = Class.new(Time) do