anytime 0.1.6 → 0.2.0

data/lib/anytime.rb

@@ -1,4 +1,4 @@
-require 'mocha/setup'
+require 'timecop'
 require 'app/controllers/anytime_controller'
 require 'config/routes.rb'
 require 'generators/install_generator'
@@ -13,20 +13,16 @@ module Anytime
   ActionView::Base.send :include, AnytimeHelper
 
   def self.freeze_at(year, month, date, hour=0, min=0, sec=0)
-    DateTime.stubs(:now).returns(DateTime.new(year, month, date, hour, min, sec, self.utc_offset))
-    Time.stubs(:now).returns(Time.send(self.time_mode, year, month, date, hour, min, sec))
-    Date.stubs(:today).returns(Date.new(year, month, date))
+    Timecop.travel(year, month, date, hour, min, sec)
   end
 
   def self.unfreeze!
-    Time.unstub(:now)
-    Date.unstub(:today)
-    DateTime.unstub(:now)
+    Timecop.return
   end
 
-  def self.is_frozen?
-    Mocha::Mockery.instance.stubba.stubba_methods.map(&:to_s).eql? ['DateTime.now', 'Time.now', 'Date.today']
-  end
+  #def self.is_frozen?
+  #  Mocha::Mockery.instance.stubba.stubba_methods.map(&:to_s).eql? ['DateTime.now', 'Time.now', 'Date.today']
+  #end
 
   def self.setup
     yield self
@@ -34,13 +30,13 @@ module Anytime
 
   private
 
-  def self.utc_offset
-    case self.time_mode
-      when :local
-        ActiveSupport::TimeZone.seconds_to_utc_offset(Time.new.utc_offset)
-      else
-        "00:00"
-    end
-
-  end
+  #def self.utc_offset
+  #  case self.time_mode
+  #    when :local
+  #      ActiveSupport::TimeZone.seconds_to_utc_offset(Time.new.utc_offset)
+  #    else
+  #      "00:00"
+  #  end
+  #
+  #end
 end

data/lib/app/helpers/anytime_helper.rb

@@ -2,7 +2,7 @@ module AnytimeHelper
   def anytime_tag(time_option=false)
     if active_environments.include?(Rails.env)
       form_content = date_selector.safe_concat(form_submitter)
-      form_content.safe_concat(unfreeze_button) if Anytime.is_frozen?
+      form_content.safe_concat(unfreeze_button)
       content_tag_string(:form, form_content, :action => freeze_path, :method => :post, :class => "anytime-form")
     end
   end
@@ -13,7 +13,7 @@ module AnytimeHelper
   end
 
   def form_submitter
-    submit_tag Anytime.is_frozen? ? :freeze_again : :freeze
+    submit_tag :freeze
   end
 
   def unfreeze_button

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anytime
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,13 +12,13 @@ cert_chain: []
 date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.6.0
 description: A relatively complete version to flexibly switch current time/date in
   Rails
 email: aquajach@gmail.com