timecop 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28306a2c78d6588f97b394b65bba1163a9a1cf4a
-  data.tar.gz: c2323a791bb954e70a70b9595cb56135e54ff64d
+  metadata.gz: a736f9ef7fd96e85e0575f736c0a507095012f41
+  data.tar.gz: c9819e7dca7ace18be6d27445538a0c8a0a36511
 SHA512:
-  metadata.gz: 5e445072106712764a97139527912b59ec29cb0e4a97b4a1203dd8c5d72aebea0788935ca56fec863285cb2d764f3312ad604f1d311fa51fcd4ea07a9bd4c8d8
-  data.tar.gz: 6f690a4c4d944c7f3df343616bb4e78c707e0efaf8b9c102d71da2a72029bffb0d26dcd64dea856e59183c04cc98d5c0c5d5c7549892338dc823ba3d963968cc
+  metadata.gz: 5f58a4a57151a9fa501ca0dfbcd960ac0f12ccc0bee9a37198599f71fb9dd2b1ffa9781805cd8187ff2901992ea3df107845417eff4f9609b0ff6a6bd9f71810
+  data.tar.gz: 674f4a2d227d6aacbe0d8c4920c12ee9cd44597157b92fe16bafa1d4ed5839a3a61af66760f66144b7dc1df3a8ef07a6bc2a3a1aa283c7ca98ef2702443318d1

data/README.markdown

@@ -2,8 +2,8 @@
 
 [![Build Status](https://secure.travis-ci.org/travisjeffery/timecop.png)](http://travis-ci.org/travisjeffery/timecop)
 
-- Source[http://github.com/travisjeffery/timecop]
-- Documentation[http://johntrupiano.rubyforge.org/timecop]
+- [Source](http://github.com/travisjeffery/timecop)
+- [Documentation](http://johntrupiano.rubyforge.org/timecop)
 
 ## DESCRIPTION
 
@@ -111,7 +111,6 @@ Time.now
 # => 2012-09-21 06:22:59 -0500
 ```
 
-<<<<<<< HEAD
 ### Timecop.safe_mode
 
 Safe mode forces you to use Timecop with the block syntax since it always puts time back the way it was. If you are running in safe mode and use Timecop without the block syntax `Timecop::SafeModeException` will be raised to tell the user they are not being safe.

data/lib/timecop/time_extensions.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'time'
 
 class Time #:nodoc:
   class << self
@@ -39,6 +40,14 @@ class Date #:nodoc:
     end
 
     alias_method :today, :today_with_mock_date
+
+    alias_method :strptime_without_mock_date, :strptime
+
+    def strptime_with_mock_date(str, fmt)
+      Time.strptime(str, fmt).to_date
+    end
+
+    alias_method :strptime, :strptime_with_mock_date
   end
 end
 

data/lib/timecop/time_stack_item.rb

@@ -51,7 +51,7 @@ class Timecop
 
       def time(time_klass = Time) #:nodoc:
         if @time.respond_to?(:in_time_zone)
-          time = time_klass.at(@time.utc.to_r)
+          time = time_klass.at(@time.dup.utc.to_r)
         else
           time = time_klass.at(@time)
         end

data/lib/timecop/version.rb

@@ -1,3 +1,3 @@
 class Timecop
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

data/test/time_stack_item_test.rb

@@ -249,6 +249,14 @@ class TestTimeStackItem < Test::Unit::TestCase
     end
   end
 
+  def test_freezing_a_time_leaves_timezone_intact
+    Time.zone = "Tokyo"
+    t = Time.now
+    t_dup = t.dup
+    Timecop.freeze(t) {}
+    assert_equal t_dup.zone, t.zone
+  end
+
   def test_freezing_a_time_with_zone_returns_proper_zones
     Time.zone = "Hawaii"
     t = ActiveSupport::TimeWithZone.new(Time.utc(2000, 1, 1), ActiveSupport::TimeZone['Tokyo'])

data/test/timecop_test.rb

@@ -483,6 +483,12 @@ class TestTimecop < Test::Unit::TestCase
     end
   end
 
+  def test_date_strptime_without_year
+    Timecop.freeze(Time.new(1984,2,28)) do
+      assert_equal Date.strptime('04-14', '%m-%d'), Date.new(1984, 4, 14)
+    end
+  end
+
   private
 
   def with_safe_mode(enabled=true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timecop
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Travis Jeffery
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-11-29 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