timecop 0.4.6 → 0.5.0

data/History.rdoc

@@ -1,3 +1,18 @@
+=== 0.5.0 / 2012-09-12
+
+* Maintenance
+  * Timecop#travel, Timecop#freeze blocks return nil or block value
+
+=== 0.4.6 / 2012-09-05
+
+* Maintenance
+  * Fix rounding support for Ruby < 1.9
+
+=== 0.4.5 / 2012-08-09
+
+* Maintenance
+  * Subclasses of Time/Date/DateTime now return proper instances
+
 === 0.4.4 / 2012-07-29
 
 * Maintenance

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 6
+:patch: 0
 :major: 0
-:minor: 4
+:minor: 5

data/lib/timecop/timecop.rb

@@ -47,10 +47,11 @@ class Timecop
     #   which will lead to files being generated with the timestamp set by the Timecop.freeze call
     #   in your dev environment
     #
-    # Returns the frozen time.
+    # Returns the value of the block or nil.
     def freeze(*args, &block)
-      instance().send(:travel, :freeze, *args, &block)
-      Time.now
+      val = instance().send(:travel, :freeze, *args, &block)
+
+      block_given? ? val : nil
     end
 
     # Allows you to run a block of code and "fake" a time throughout the execution of that block.
@@ -59,10 +60,11 @@ class Timecop
     # * Note: Timecop.travel will not freeze time (as opposed to Timecop.freeze).  This is a particularly
     #   good candidate for use in environment files in rails projects.
     #
-    # Returns the 'new' current Time.
+    # Returns the value of the block or nil.
     def travel(*args, &block)
-      instance().send(:travel, :travel, *args, &block)
-      Time.now
+      val = instance().send(:travel, :travel, *args, &block)
+
+      block_given? ? val : nil
     end
 
     def baseline
@@ -74,11 +76,9 @@ class Timecop
     end
 
     # Reverts back to system's Time.now, Date.today and DateTime.now (if it exists).
-    #
-    # Returns Time.now, which is now the real current time.
     def return
       instance().send(:unmock!)
-      Time.now
+      nil
     end
 
     def return_to_baseline

data/test/timecop_test.rb

@@ -324,29 +324,34 @@ class TestTimecop < Test::Unit::TestCase
     assert_nil Time.send(:mock_time)
   end
 
-  def test_return_values_are_Time_instances
-    assert Timecop.freeze.is_a?(Time)
-    assert Timecop.travel.is_a?(Time)
-    assert Timecop.return.is_a?(Time)
+  def test_travel_time_returns_nil
+    t_future = Time.local(2030, 10, 10, 10, 10, 10)
+    assert_nil Timecop.travel(t_future)
+  end
+
+  def test_travel_time_with_block_returns_the_value_of_the_block
+    t_future = Time.local(2030, 10, 10, 10, 10, 10)
+    expected = :foo
+    actual = Timecop.travel(t_future) { expected }
+
+    assert_equal expected, actual
   end
 
-  def test_travel_time_returns_passed_value
+  def test_freeze_time_returns_nil
     t_future = Time.local(2030, 10, 10, 10, 10, 10)
-    t_travel = Timecop.travel t_future
-    assert times_effectively_equal(t_future, t_travel)
+    assert_nil Timecop.freeze(t_future)
   end
 
-  def test_freeze_time_returns_passed_value
+  def test_freeze_time_with_block_returns_the_value_of_the_block
     t_future = Time.local(2030, 10, 10, 10, 10, 10)
-    t_frozen = Timecop.freeze t_future
-    assert times_effectively_equal(t_future, t_frozen)
+    expected = :foo
+    actual = Timecop.freeze(t_future) { expected }
+
+    assert_equal expected, actual
   end
 
-  def test_return_time_returns_actual_time
-    t_real = Time.now
-    Timecop.freeze Time.local(2030, 10, 10, 10, 10, 10)
-    t_return = Timecop.return
-    assert times_effectively_equal(t_real, t_return)
+  def test_return_returns_nil
+    assert_nil Timecop.return
   end
 
   def test_freeze_without_params

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: timecop
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 6
-  version: 0.4.6
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Travis Jeffery