timecop 0.5.7 → 0.5.8

data/lib/timecop/time_stack_item.rb

@@ -51,15 +51,14 @@ class Timecop
       end
 
       def time(time_klass = Time) #:nodoc:
-        actual_time = time_klass.at(@time)
-        calculated_time = time_klass.at(@time.to_f)
+        begin
+          time = time_klass.at(@time)
+        rescue
+          time = time_klass.at(@time.to_f)
+        end
 
         if travel_offset.nil?
-          if times_are_equal_within_epsilon(actual_time, calculated_time, 1)
-            actual_time
-          else
-            calculated_time
-          end
+          time
         elsif scaling_factor.nil?
           time_klass.at(Time.now_without_mock_time + travel_offset)
         else

data/lib/timecop/version.rb

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

data/test/time_stack_item_test.rb

@@ -242,6 +242,6 @@ class TestTimeStackItem < Test::Unit::TestCase
     time = Time.now
     Timecop.freeze time
     assert_equal time, Time.now
-    assert_equal time.nsec, Time.now.nsec
+    assert_equal time.nsec, Time.now.nsec if (Time.now.respond_to?(:nsec))
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.5.7
-  prerelease: 
+  prerelease:
+  version: 0.5.8
 platform: ruby
 authors:
 - Travis Jeffery
 - John Trupiano
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-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
-  Time.now, Date.today, and DateTime.now in a single call.
+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
 executables: []
 extensions: []
@@ -39,31 +37,31 @@ files:
 - test/timecop_without_date_but_with_time_test.rb
 homepage: https://github.com/travisjeffery/timecop
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: timecop
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: 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.
+summary: 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.
 test_files:
 - test/test_helper.rb
 - test/time_stack_item_test.rb