timecop 0.5.9 → 0.6.0

data/lib/timecop/time_stack_item.rb

@@ -50,21 +50,21 @@ class Timecop
         @scaling_factor
       end
 
-      def time(time_klass = Time) #:nodoc:
+      def time(klass = time_klass) #:nodoc:
         begin
-          actual_time = time_klass.at(@time)
-          calculated_time = time_klass.at(@time.to_f)
+          actual_time = klass.at(@time)
+          calculated_time = klass.at(@time.to_f)
           time = times_are_equal_within_epsilon(actual_time, calculated_time, 1) ? actual_time : calculated_time
         rescue
-          time = time_klass.at(@time.to_f)
+          time = klass.at(@time.to_f)
         end
 
         if travel_offset.nil?
           time
         elsif scaling_factor.nil?
-          time_klass.at(Time.now_without_mock_time + travel_offset)
+          klass.at(Time.now_without_mock_time + travel_offset)
         else
-          time_klass.at(scaled_time)
+          klass.at(scaled_time)
         end
       end
 
@@ -103,7 +103,6 @@ class Timecop
       end
 
       def parse_time(*args)
-        time_klass = Time.respond_to?(:zone) && Time.zone ? Time.zone : Time
         arg = args.shift
         if arg.is_a?(Time)
           if Timecop.active_support != false && arg.respond_to?(:in_time_zone)
@@ -151,5 +150,9 @@ class Timecop
       def times_are_equal_within_epsilon t1, t2, epsilon_in_seconds
         (t1 - t2).abs < epsilon_in_seconds
       end
+
+      def time_klass
+        Time.respond_to?(:zone) ? Time.zone : Time
+      end
     end
-  end
+  end

data/lib/timecop/timecop.rb

@@ -107,7 +107,7 @@ class Timecop
     private
     def send_travel(mock_type, *args, &block)
       val = instance.send(:travel, mock_type, *args, &block)
-      block_given? ? val : Time.now  
+      block_given? ? val : Time.now
     end
   end
 

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

data/test/time_stack_item_test.rb

@@ -192,6 +192,16 @@ class TestTimeStackItem < Test::Unit::TestCase
     end
   end
 
+  def test_timezones_apply_dates
+    require 'active_support/all'
+    Time.zone = "Marshall Is."
+    time = Time.zone.local(2013,1,3)
+
+    Timecop.freeze(time) do
+      assert_equal time.to_date, Date.today
+    end
+  end
+
   def test_set_scaling_factor_for_scale
     t_now = Time.now
     t = Time.local(2009, 10, 1, 0, 0, 30)
@@ -247,7 +257,7 @@ class TestTimeStackItem < Test::Unit::TestCase
 
   def test_time_with_different_timezone
     require 'active_support/all'
-    
+
     Time.zone = "Tokyo"
     t = Time.now
     Timecop.freeze(t) do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.5.9
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Travis Jeffery
 - John Trupiano
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-03-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: []
@@ -20,7 +22,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files:
-- History.rdoc
 - LICENSE
 - README.markdown
 - Rakefile
@@ -36,32 +37,33 @@ files:
 - test/timecop_without_date_test.rb
 - test/timecop_without_date_but_with_time_test.rb
 homepage: https://github.com/travisjeffery/timecop
-licenses: []
-post_install_message:
+licenses:
+- MIT
+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: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: timecop
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.23
+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

data/History.rdoc

@@ -1,142 +0,0 @@
-=== 0.5.4 / 2012-11-29
-
-* Maintenance
-  * Fix usage with Ruby 1.8
-
-=== 0.5.2 / 2012-09-20
-
-* Feature
-  * Timecop#scale, ability to accelerate time by a given scaling factor
-
-=== 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
-  * 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
-  * Set default arg in parsing to 2000
-  * Time.freeze defaults to Time#now
-  * Use Time#parse is available to parse Time's given as strings
-  * Add ActiveSupport Time.zone support
-  * Stop DateTime from losing precision after traveling
-
-=== 0.3.5 / 2010-06-07
-
-* Maintenance
-  * Return a cloned time instance in order to support the destructive methods #gmt, #utc and #localtime
-  * Don't use full path requires where unnecessary
-
-=== 0.3.4 / 2009-12-07
-
-* Maintenance
-  * Fix various timezone-related issues.  Notably, when traveling to a DateTime
-    instance specified in a non-local timezone, convert provided DateTime 
-    instance to a local instance and return that from DateTime.now.
-    Code contributed by Michaël Witrant [piglop]
-  * Fix bug that would not allow Timecop to be used when Ruby's 'date'
-    library had not been previously loaded.
-    Code contributed by Tuomas Kareinen [tuomas]
-  * Fix bug when traveling to a DateTime across a DST boundary that
-    resulted in DateTime's being off by an hour.
-  * Migrate argument parsing into Timecop::TimeStackItem to reduce the
-    responsibility of the Timecop class.
-
-=== 0.3.3  2009-10-30
-
-* Revoked due to regression.
-
-=== 0.3.2 / 2009-10-24
-
-* Revoked due to regression.
-    
-=== 0.3.1 / 2009-09-30
-
-* Maintenance
-  * DRY up the Timecop class internals.
-
-=== 0.3.0 / 2009-09-20
-
-* API
-  * Completely remove Timecop#unset_all (deprecated by Timecop#return in 0.2.0)
-  * Return Time.now from #freeze, #travel and #return  -- code contributed by Keith Bennett [keithrbennett]
-
-* Maintenance
-  * Fix bug that left Time#mock_time set in some instances
-  * Upped build dependency to jeweler ~> 1.2.1
-  * Don't pollute top-level namespace with classes/constants
-
-* Documentation
-  * Clearer examples in the README, better description in the gemspec
-  * Improve RDoc
-
-=== 0.2.1 / 2009-03-06
-* API Changes
-  
-  * Introduced a 5th style of arguments to be passed into #travel and #freeze.  Now, if you pass in a single integer value,
-    it will be interpreted as a relative offset in seconds from the current Time.now.  Previously this was interpreted as
-    only the year, similar to calling Time.local(2008) --> Jan. 1, 2008.  This is no longer the case.
-    
-* Documentation
-
-  * Moved to Textile for the README.
-  
-  * Added documentation for the new feature, and fixed a few typos.
-
-=== 0.2.0 / 2008-12-23
-
-* API Changes
-
-  * Timecop#travel no longer freezes time.  Rather, it computes the current offset between the new "now" and the real "now", and
-    returns times as if Time had continued to move forward
-    
-  * Timecop#freeze now behaves exactly as the old Timecop#travel behaved.  Unless you depended on the actual freezing of time
-    (which I think would be rare), you should be able to continue to use #travel without worry.
-    
-  * Timecop#return is now exposed (previously Timecop#unset_all, but not well advertised).  It will completely unmock time,
-    and will probably be rarely used outside of the actual implementation of this library.
-    
-* More Test Coverage
-
-  * Tests now explicitly cover the cases when the Date and DateTime objects are not loaded, and ensures proper functionality
-    in their absence and existence.
-    
-  * Still haven't done regression testing against anything other than a few version of 1.8.6 (including REE).  We should
-    probably try to get this tested on both 1.8.7 and 1.9.1.
-
-* Documentation
-
-  * Fixed up a lot of the poorly-formatted rdoc syntax.  The public API should now be properly published in the rdoc,
-    and the internals are omitted.
-    
-=== 0.1.0 / 2008-11-09
-
-* Initial Feature Set
-
-  * Temporarily (or permanently if you prefer) change the concept of Time.now, DateTime.now (if defined), and Date.today (if defined)
-  * Timecop#travel api allows an argument to be passed in as one of: 1) Time instance, 2) DateTime instance, 3) Date instance,
-    4) individual arguments (year, month, day, hour, minute, second)
-  * Nested calls to Timecop#travel are supported -- each block will maintain it's interpretation of now.
-