timecop 0.4.3 → 0.4.4

data/History.rdoc

@@ -1,4 +1,14 @@
-=== 0.4.1 / 2012-07-27
+=== 0.4.4 / 2012-07-29
+
+* Maintenance
+  * Can now configure Timecop to not use ActiveSupport by setting Timecop.active_support = false
+
+=== 0.4.3 / 2012-07-27
+
+* Maintenance
+  * Fix alias of Time#new/Time#now when Time#new given with args
+
+=== 0.4.2 / 2012-07-27
 
 * Maintenance
   * Mock Time#new the same as Time#now since they're synonyms

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 4

data/lib/timecop/time_stack_item.rb

@@ -82,8 +82,8 @@ class Timecop
         time_klass = Time
         time_klass = Time.zone if Time.respond_to? :zone
         arg = args.shift
-        if arg.is_a?(Time)
-          if arg.respond_to?(:in_time_zone)
+        if arg.is_a?(Time) 
+          if Timecop.active_support != false && arg.respond_to?(:in_time_zone)
             arg.in_time_zone
           else
             arg.getlocal
@@ -99,7 +99,7 @@ class Timecop
         elsif arg.nil?
           Time.now
         else
-          if Time.respond_to?(:parse) && arg.is_a?(String)
+          if arg.is_a?(String) && Timecop.active_support != false && Time.respond_to?(:parse)
             Time.parse(arg)
           else
             # we'll just assume it's a list of y/m/d/h/m/s

data/lib/timecop/timecop.rb

@@ -13,78 +13,82 @@ require 'timecop/time_stack_item'
 class Timecop
   include Singleton
 
-  # Allows you to run a block of code and "fake" a time throughout the execution of that block.
-  # This is particularly useful for writing test methods where the passage of time is critical to the business
-  # logic being tested.  For example:
-  #
-  #   joe = User.find(1)
-  #   joe.purchase_home()
-  #   assert !joe.mortgage_due?
-  #   Timecop.freeze(2008, 10, 5) do
-  #     assert joe.mortgage_due?
-  #   end
-  #
-  # freeze and travel will respond to several different arguments:
-  # 1. Timecop.freeze(time_inst)
-  # 2. Timecop.freeze(datetime_inst)
-  # 3. Timecop.freeze(date_inst)
-  # 4. Timecop.freeze(offset_in_seconds)
-  # 5. Timecop.freeze(year, month, day, hour=0, minute=0, second=0)
-  #
-  # When a block is also passed, Time.now, DateTime.now and Date.today are all reset to their
-  # previous values after the block has finished executing.  This allows us to nest multiple
-  # calls to Timecop.travel and have each block maintain it's concept of "now."
-  #
-  # * Note: Timecop.freeze will actually freeze time.  This can cause unanticipated problems if
-  #   benchmark or other timing calls are executed, which implicitly expect Time to actually move
-  #   forward.
-  #
-  # * Rails Users: Be especially careful when setting this in your development environment in a
-  #   rails project.  Generators will load your environment, including the migration generator,
-  #   which will lead to files being generated with the timestamp set by the Timecop.freeze call
-  #   in your dev environment
-  #
-  # Returns the frozen time.
-  def self.freeze(*args, &block)
-    instance().send(:travel, :freeze, *args, &block)
-    Time.now
-  end
+  class << self
+    attr_accessor :active_support
+
+    # Allows you to run a block of code and "fake" a time throughout the execution of that block.
+    # This is particularly useful for writing test methods where the passage of time is critical to the business
+    # logic being tested.  For example:
+    #
+    #   joe = User.find(1)
+    #   joe.purchase_home()
+    #   assert !joe.mortgage_due?
+    #   Timecop.freeze(2008, 10, 5) do
+    #     assert joe.mortgage_due?
+    #   end
+    #
+    # freeze and travel will respond to several different arguments:
+    # 1. Timecop.freeze(time_inst)
+    # 2. Timecop.freeze(datetime_inst)
+    # 3. Timecop.freeze(date_inst)
+    # 4. Timecop.freeze(offset_in_seconds)
+    # 5. Timecop.freeze(year, month, day, hour=0, minute=0, second=0)
+    #
+    # When a block is also passed, Time.now, DateTime.now and Date.today are all reset to their
+    # previous values after the block has finished executing.  This allows us to nest multiple
+    # calls to Timecop.travel and have each block maintain it's concept of "now."
+    #
+    # * Note: Timecop.freeze will actually freeze time.  This can cause unanticipated problems if
+    #   benchmark or other timing calls are executed, which implicitly expect Time to actually move
+    #   forward.
+    #
+    # * Rails Users: Be especially careful when setting this in your development environment in a
+    #   rails project.  Generators will load your environment, including the migration generator,
+    #   which will lead to files being generated with the timestamp set by the Timecop.freeze call
+    #   in your dev environment
+    #
+    # Returns the frozen time.
+    def freeze(*args, &block)
+      instance().send(:travel, :freeze, *args, &block)
+      Time.now
+    end
 
-  # Allows you to run a block of code and "fake" a time throughout the execution of that block.
-  # See Timecop#freeze for a sample of how to use (same exact usage syntax)
-  #
-  # * 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.
-  def self.travel(*args, &block)
-    instance().send(:travel, :travel, *args, &block)
-    Time.now
-  end
+    # Allows you to run a block of code and "fake" a time throughout the execution of that block.
+    # See Timecop#freeze for a sample of how to use (same exact usage syntax)
+    #
+    # * 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.
+    def travel(*args, &block)
+      instance().send(:travel, :travel, *args, &block)
+      Time.now
+    end
 
-  def self.baseline
-    instance().send(:baseline)
-  end
+    def baseline
+      instance().send(:baseline)
+    end
 
-  def self.baseline=(baseline)
-    instance().send(:baseline=, baseline)
-  end
+    def baseline=(baseline)
+      instance().send(:baseline=, baseline)
+    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 self.return
-    instance().send(:unmock!)
-    Time.now
-  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
+    end
 
-  def self.return_to_baseline
-    instance().send(:return_to_baseline)
-    Time.now
-  end
+    def return_to_baseline
+      instance().send(:return_to_baseline)
+      Time.now
+    end
 
-  def self.top_stack_item #:nodoc:
-    instance().instance_variable_get(:@_stack).last
+    def top_stack_item #:nodoc:
+      instance().instance_variable_get(:@_stack).last
+    end
   end
 
   protected

data/test/time_stack_item_test.rb

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
 class TestTimeStackItem < Test::Unit::TestCase
   
   def teardown
+    Timecop.active_support = nil
     Timecop.return
   end
   
@@ -182,19 +183,22 @@ class TestTimeStackItem < Test::Unit::TestCase
     Timecop.freeze(2011, 01, 02, hour=0, minute=0, second=0)
   end
 
-  def test_integration_with_rails_time_zone
+  def test_parse_with_active_support_off
+    date = '2012-01-02'
+    Timecop.active_support = false
+    Time.expects(:parse).never
+    Timecop.freeze(date)
+  end
+
+  def test_uses_active_supports_in_time_zone
     time = Time.now
-    def time.in_time_zone
-      self - 3600
-    end
-    t = time - 3600
-    stack_item = Timecop::TimeStackItem.new(:freeze, time)
-    y, m, d, h, min, s = t.year, t.month, t.day, t.hour, t.min, t.sec
-    assert_equal y,   stack_item.year
-    assert_equal m,   stack_item.month
-    assert_equal d,   stack_item.day
-    assert_equal h,   stack_item.hour
-    assert_equal min, stack_item.min
-    assert_equal s,   stack_item.sec
+    Time.any_instance.expects(:in_time_zone).returns(time)
+    Timecop::TimeStackItem.new(:freeze, time)
+  end
+
+  def test_configured_off_active_support_in_time_zone_xxx
+    Timecop.active_support = false
+    Time.any_instance.expects(:in_time_zone).never
+    Timecop::TimeStackItem.new(:freeze, Time.now)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: johntrupiano
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A gem providing "time travel" and "time freezing" capabilities, making it
@@ -70,4 +70,3 @@ test_files:
 - test/timecop_test.rb
 - test/timecop_without_date_test.rb
 - test/timecop_without_date_but_with_time_test.rb
-has_rdoc: