Time.new -> Time.now

lib/adrian/file_item.rb

@@ -48,7 +48,7 @@ def created_at
       @created_at ||= mtime
     end
 
-    def touch(updated_at = Time.new)
+    def touch(updated_at = Time.now)
       @updated_at = updated_at.utc
       File.utime(updated_at, created_at, path)
     end

lib/adrian/filters.rb

@@ -17,7 +17,7 @@ def initialize(options = {})
       end
 
       def allow?(item)
-        item.updated_at <= (Time.new - duration)
+        item.updated_at <= (Time.now - duration)
       end
 
       def duration
@@ -39,7 +39,7 @@ def allow?(item)
       end
 
       def lock_expired?(item)
-        item.updated_at <= (Time.new - duration)
+        item.updated_at <= (Time.now - duration)
       end
 
       def locked?(item)

test/directory_queue_test.rb

@@ -58,21 +58,21 @@
         assert reserved_item
         one_hour = 3_600
 
-        Time.stub(:new, reserved_item.updated_at + one_hour - 1) do
+        Time.stub(:now, reserved_item.updated_at + one_hour - 1) do
           assert_equal nil, @q.pop
         end
 
-        Time.stub(:new, reserved_item.updated_at + one_hour) do
+        Time.stub(:now, reserved_item.updated_at + one_hour) do
           assert_equal @item, @q.pop
         end
 
       end
 
       it 'touches the item' do
         @q.push(@item)
-        now  = Time.new + 100
+        now  = Time.now + 100
         item = nil
-        Time.stub(:new, now) { item = @q.pop }
+        Time.stub(:now, now) { item = @q.pop }
 
         assert_equal now.to_i, item.updated_at.to_i
       end
@@ -111,8 +111,8 @@ def @q.files
       end
 
       it 'touches the item' do
-        now = Time.new - 100
-        Time.stub(:new, now) { @q.push(@item) }
+        now = Time.now - 100
+        Time.stub(:now, now) { @q.push(@item) }
 
         assert_equal now.to_i, @item.updated_at.to_i
       end

test/file_item_test.rb

@@ -115,7 +115,7 @@
 
     it 'changes the update timestamp to the current time' do
       now = Time.now - 100
-      Time.stub(:new, now) { @item.touch }
+      Time.stub(:now, now) { @item.touch }
 
       assert_equal now.to_i, @item.updated_at.to_i
     end
@@ -124,7 +124,7 @@
       atime = File.atime(@item.path).to_i
 
       now = (Time.now - 100)
-      Time.stub(:new, now) { @item.touch }
+      Time.stub(:now, now) { @item.touch }
 
       now.to_i.wont_equal atime
       File.atime(@item.path).to_i.must_equal now.to_i

test/filters_test.rb

@@ -46,12 +46,12 @@ module Updatable
       @filter          = Adrian::Filters::Delay.new
       @updatable_item  = Adrian::QueueItem.new("hello")
       @updatable_item.extend(Updatable)
-      @updatable_item.updated_at = Time.new
+      @updatable_item.updated_at = Time.now
       @fifteen_minutes = 900
     end
 
     it "allows items that have not been recently updated" do
-      Time.stub(:new, @updatable_item.updated_at + @fifteen_minutes) do
+      Time.stub(:now, @updatable_item.updated_at + @fifteen_minutes) do
         assert_equal true, @filter.allow?(@updatable_item)
       end
     end
@@ -82,13 +82,13 @@ module Updatable
     end
 
     it "allows items with an expired lock" do
-      @locked_item.stub(:updated_at, Time.new - @one_hour) do
+      @locked_item.stub(:updated_at, Time.now - @one_hour) do
         assert_equal true, @filter.allow?(@locked_item)
       end
     end
 
     it "does not allow items with a fresh lock" do
-      @locked_item.stub(:updated_at, Time.new) do
+      @locked_item.stub(:updated_at, Time.now) do
         assert_equal false, @filter.allow?(@locked_item)
       end
     end