delayed-web 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935453f8f9b38036058aafef77497d647a50e15b
-  data.tar.gz: e9285fe594414a60123d0ac3ebfb48e04ee71259
+  metadata.gz: dd66d05ef2a11a4adf4cf9e3e3de06b25662cd63
+  data.tar.gz: 61e2fa4a7b7f861db38fa13f04e42fed1dd31c01
 SHA512:
-  metadata.gz: b74eb09404b8a3c582a078b18c37f179efd5ff80ebd935e2249102d3e7c75e20eabadfe2d8c1d1302ed32ab1b116d0bc1a07fc1f13c409ba5393f26c1e746f25
-  data.tar.gz: c60be9c1612338a4ef9b002976eeda760b3e052e20aa38b49f556bad1dffb9c6c06549fd4ccd33319bbe4d28d22641e058433266279210025f139ef02ef46122
+  metadata.gz: eac0eb772a06388b98c5649fb64a067152dab24a69f8104f66bbda9acf9b9ac7c6e40e3abd7685d3011c22cf527888a8ffd10fa806eae679bd15ab6837f6aa3e
+  data.tar.gz: 424138ac419742487d80f19a67acb62bd52c0cdfa664590a1da19a235b03e5ba789568b7485d44ba8d941cede50b46b31752a335056fa1d327f3377f80d0e83b

data/app/controllers/delayed/web/jobs_controller.rb

@@ -1,16 +1,6 @@
 module Delayed
   module Web
     class JobsController < Delayed::Web::ApplicationController
-      def invoke
-        if job.can_invoke?
-          job.invoke!
-          flash[:notice] = t(:notice, scope: 'delayed/web.flashes.jobs.invoked')
-        else
-          flash[:alert] = t(:alert, scope: 'delayed/web.flashes.jobs.invoked', status: job.status)
-        end
-        redirect_to jobs_path
-      end
-
       def queue
         if job.can_queue?
           job.queue!

data/app/decorators/delayed/web/active_record_decorator.rb

@@ -4,10 +4,6 @@ module Delayed
       def queue! now = Time.current
         update_attributes! run_at: now, failed_at: nil, last_error: nil
       end
-
-      def invoke!
-        invoke_job
-      end
     end
   end
 end

data/app/decorators/delayed/web/status_decorator.rb

@@ -12,16 +12,12 @@ module Delayed
         end
       end
 
-      def can_invoke?
-        status != 'executing'
-      end
-
       def can_destroy?
         status != 'executing'
       end
 
       def can_queue?
-        status != 'queued' and status != 'executing'
+        status != 'executing'
       end
     end
   end

data/app/models/delayed/web/job/double.rb

@@ -31,10 +31,6 @@ module Delayed
         true
       end
 
-      def invoke!
-        true
-      end
-
       def destroy
         self
       end

data/app/models/delayed/web/job/mongoid.rb

@@ -0,0 +1,24 @@
+module Delayed
+  module Web
+    class Job::Mongoid
+
+      def self.find *args
+        decorate Delayed::Job.find(*args)
+      end
+
+      def self.all
+        jobs = Delayed::Job.order_by(created_at: 'desc').limit(100)
+        Enumerator.new do |enumerator|
+          jobs.each do |job|
+            enumerator.yield decorate(job)
+          end
+        end
+      end
+
+      def self.decorate job
+        ActiveRecordDecorator.new StatusDecorator.new(job)
+      end
+
+    end
+  end
+end

data/app/views/delayed/web/jobs/index.html.erb

@@ -4,12 +4,6 @@
   <h1><%= title %></h1>
 </div>
 
-Page last updated: <span id="lastUpdated"></span>
-<br>
-<a id="loadNow" href="#">Updated now</a>
-<br>
-<a id="startLoading" href="#">Start Loading</a>
-<a id="stopLoading" href="#">Stop Loading</a>
 <table class="table table-bordered">
   <thead>
     <tr>
@@ -19,10 +13,10 @@ Page last updated: <span id="lastUpdated"></span>
       <th>Run At</th>
       <th>Attempts</th>
       <th style="width: 190px;">Last Error</th>
-      <th style="width: 150px;">Actions</th>
+      <th style="width: 115px;">Actions</th>
     </tr>
   </thead>
-  <tbody id="jobRows">
+  <tbody>
     <% if jobs.any? %>
       <% jobs.each do |job| %>
         <tr>
@@ -37,9 +31,6 @@ Page last updated: <span id="lastUpdated"></span>
           <td><%= job.attempts %></td>
           <td><%= link_to_if job.last_error.present?, truncate(job.last_error), job_path(job) %></td>
           <td>
-            <% if job.can_invoke? %>
-              <%= button_to 'Invoke', invoke_job_path(job), method: :put, class: 'btn btn-mini', form_class: 'btn-rails pull-left' %>
-            <% end %>
             <% if job.can_queue? %>
               <%= button_to 'Run Next', queue_job_path(job), method: :put, class: 'btn btn-mini', form_class: 'btn-rails pull-left' %>
             <% end %>

data/app/views/delayed/web/jobs/show.html.erb

@@ -5,11 +5,8 @@
     <%= link_to 'Jobs', jobs_path %> / <%= title %>
   </h1>
   <div class="btn-group">
-    <% if job.can_invoke? %>
-      <%= button_to 'Invoke', invoke_job_path(job), method: :put, class: 'btn', form_class: 'btn-rails pull-left' %>
-    <% end %>
     <% if job.can_queue? %>
-      <%= button_to 'Run Next', queue_job_path(job), method: :put, class: 'btn', form_class: 'btn-rails' %>
+      <%= button_to 'Run Next', queue_job_path(job), method: :put, class: 'btn', form_class: 'btn-rails pull-left' %>
     <% end %>
     <% if job.can_destroy? %>
       <%= button_to 'Delete', job_path(job), method: :delete, class: 'btn btn-danger', form_class: 'btn-rails pull-right' %>

data/app/views/layouts/delayed/web/application.html.erb

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <title><%= title %></title>
-    <%= javascript_include_tag 'delayed/web/application' %>
     <%= stylesheet_link_tag 'delayed/web/application' %>
   </head>
   <body>

data/config/locales/en.yml

@@ -8,6 +8,3 @@ en:
         destroyed:
           alert: 'Job cannot be deleted because it is already %{status}'
           notice: 'Job destroyed'
-        invoked:
-          alert: 'Job cannot be invoked because it is already %{status}'
-          notice: 'Job invoked'

data/config/routes.rb

@@ -3,6 +3,5 @@ Delayed::Web::Engine.routes.draw do
 
   resources :jobs, only: [:destroy, :index, :show] do
     put :queue, on: :member
-    put :invoke, on: :member
   end
 end

data/lib/delayed/web/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   module Web
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/spec/decorators/status_decorator_spec.rb

@@ -33,27 +33,13 @@ describe Delayed::Web::StatusDecorator do
     end
   end
 
-  describe '#can_invoke?' do
-    it 'is true when failed' do
-      expect(failed_job.can_invoke?).to be_true
-    end
-
-    it 'is true when queued' do
-      expect(queued_job.can_invoke?).to be_true
-    end
-
-    it 'is false when executing' do
-      expect(executing_job.can_invoke?).to be_false
-    end
-  end
-
   describe '#can_queue?' do
     it 'is true when failed' do
       expect(failed_job.can_queue?).to be_true
     end
 
-    it 'is false when queued' do
-      expect(queued_job.can_queue?).to be_false
+    it 'is true when queued' do
+      expect(queued_job.can_queue?).to be_true
     end
 
     it 'is false when executing' do