added timestamp to all jobs

lib/resque.rb

@@ -165,6 +165,7 @@ def enable_delay(queue)
   # Pushes a job onto a queue. Queue name should be a string and the
   # item should be any JSON-able Ruby object.
   def push(queue, item)
+    item[:resque_enqueue_timestamp] = Time.now
     if item[:unique]
       mongo[queue].update({'_id' => item[:_id]}, item, { :upsert => true})
     else

lib/resque/failure/mongo.rb

@@ -21,7 +21,6 @@ def self.count
       end
 
       def self.all(start = 0, count = 1)
-
         all_failures = Resque.mongo_failures.find().skip(start.to_i).limit(count.to_i).to_a
         all_failures.size == 1 ? all_failures.first : all_failures        
       end

lib/resque/server.rb

@@ -110,6 +110,10 @@ def processes_in(delay_until)
       return "Immediately (#{time})" if now > delay_until
       return time
     end
+
+    def enqueued_at(resque_enqueue_timestamp)
+
+    end
 
     def distance_of_time_in_words(from_time, to_time = 0, include_seconds = true, options = {})
       from_time = from_time.to_time if from_time.respond_to?(:to_time)

lib/resque/server/views/queues.erb

@@ -10,26 +10,30 @@
       <tr>
         <th>Class</th>
         <th>Args1</th>
+        <th>Enqueued At</th>
       </tr>
       <% for job in (jobs = resque.peek(queue.to_sym, start, 20)) %>
         <tr>
           <td class='class'><%= job['class'] %></td>
           <td class='args'><%=h job['args'].inspect %></td>
+        <td class='enqueuedat><%=h enqueued_at(job['resque_enqueue_timestamp']) %></td>
         </tr>
       <% end %>  
   <% else %>
     <p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque.size(queue.to_sym)%></b> jobs</p><table class='delays'>
       <tr>
         <th>Class</th>
         <th>Args</th>
+        <th>Enqueued At</th>
         <th>Processes In</th>
       </tr>
       <% for job in (jobs = resque.peek(queue.to_sym, start, 20, :all_sorted)) %>
       <tr>
         <td class='class'><%= job['class'] %></td>
         <td class='args'><%=h job['args'].inspect %></td>
+        <td class='enqueuedat'><%=h enqueued_at(job['resque_enqueue_timestamp']) %></td>      
         <td class='delay'><%=h processes_in(job['delay_until']) %></td>
-      </tr>
+        </tr>
       <% end %>    
     <% end %>
     <% if jobs.empty? %>

lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.1.3'
+  Version = VERSION = '1.1.4'
 end

test/resque_test.rb

@@ -141,27 +141,27 @@ def pop_no_id(queue)
 
 
   test "can pull items off a queue" do
-    assert_equal({ 'name' => 'chris' }, pop_no_id(:people))
-    assert_equal({ 'name' => 'bob' }, pop_no_id(:people)) 
-    assert_equal({ 'name' => 'mark' }, pop_no_id(:people))
+    assert_equal('chris', pop_no_id(:people)['name'])
+    assert_equal('bob', pop_no_id(:people)['name']) 
+    assert_equal('mark', pop_no_id(:people)['name'])
     assert_equal nil, Resque.pop(:people)
   end
 
   test "knows how big a queue is" do
     assert_equal 3, Resque.size(:people)
 
-    assert_equal({ 'name' => 'chris' }, pop_no_id(:people))
+    assert_equal('chris', pop_no_id(:people)['name'])
     assert_equal 2, Resque.size(:people)
 
-    assert_equal({ 'name' => 'bob' }, pop_no_id(:people))
-    assert_equal({ 'name' => 'mark' }, pop_no_id(:people))
+    assert_equal('bob', pop_no_id(:people)['name'])
+    assert_equal('mark', pop_no_id(:people)['name'])
     assert_equal 0, Resque.size(:people)
   end
 
   test "can peek at a queue" do
     peek = Resque.peek(:people)
     peek.delete "_id"
-    assert_equal({ 'name' => 'chris' }, peek)
+    assert_equal('chris', peek['name'])
     assert_equal 3, Resque.size(:people)
   end
 

test/worker_test.rb

@@ -19,8 +19,9 @@
   test "failed jobs report exception and message" do
     Resque::Job.create(:jobs, BadJobWithSyntaxError)
     @worker.work(0)
-    assert_equal('SyntaxError', Resque::Failure.all.first['exception'])
-    assert_equal('Extra Bad job!', Resque::Failure.all.first['error'])
+    failure = Resque::Failure.all.is_a?(Array) ? Resque::Failure.all.first : Resque::Failure.all
+    assert_equal('SyntaxError', failure['exception'])
+    assert_equal('Extra Bad job!', failure['error'])
   end
 
   test "fails uncompleted jobs on exit" do
@@ -142,6 +143,7 @@
     @worker.work(0) do
       task = @worker.job
       task['payload'].delete "_id"
+      task['payload'].delete "resque_enqueue_timestamp"
       assert_equal({"args"=>[20, "/tmp"], "class"=>"SomeJob"}, task['payload'])
       assert task['run_at']
       assert_equal 'jobs', task['queue'].to_s