resque-igo 1.1.3 → 1.1.4

data/lib/resque.rb

@@ -165,6 +165,7 @@ module Resque
   # 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

data/lib/resque/failure/mongo.rb

@@ -21,7 +21,6 @@ module Resque
       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

data/lib/resque/server.rb

@@ -110,6 +110,13 @@ module Resque
       return "Immediately (#{time})" if now > delay_until
       return time
     end
+
+    def enqueued_at(resque_enqueue_timestamp)
+      return 'Unknown' if resque_enqueue_timestamp.nil?
+      now = Time.now
+      time = distance_of_time_in_words(now, resque_enqueue_timestamp)
+      return time
+    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)

data/lib/resque/server/public/style.css

@@ -37,12 +37,14 @@ body { padding:0; margin:0; }
 #main table.queues tr.failure td { background:#ffecec; border-top:2px solid #d37474; font-size:90%; color:#d37474;}
 #main table.queues tr.failure td a{ color:#d37474;}
 
-#main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
-#main table.jobs td.args{ width:50%;}
+#main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:30%;}
+#main table.jobs td.args{ width:50%;word-break:break-word;}
+#main table.jobs td.enqueuedat{ width:20%;}
 
 #main table.delays td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:20%;}
-#main table.delays td.args{ width:40%;}
-#main table.delays td.delay{ width:40%;}
+#main table.delays td.args{ width:40%;word-break:break-word;}
+#main table.delays td.delay{ width:20%;}
+#main table.delays td.enqueuedat{ width:20%;}
 
 
 #main table.workers td.icon {width:1%; background:#efefef;text-align:center;}

data/lib/resque/server/views/queues.erb

@@ -9,12 +9,14 @@
     <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='jobs'>
       <tr>
         <th>Class</th>
-        <th>Args1</th>
+        <th>Args</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 %>
@@ -22,14 +24,16 @@
       <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? %>

data/lib/resque/version.rb

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

data/test/resque_test.rb

@@ -141,27 +141,27 @@ context "Resque" do
 
 
   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
 

data/test/worker_test.rb

@@ -19,8 +19,9 @@ context "Resque::Worker" do
   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 @@ context "Resque::Worker" do
     @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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-igo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Nathan D Acuff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency