delayed-web 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25fdde762215849db97a0b7c9c9659b745e3730d
-  data.tar.gz: 3d9990884c2f2744642df00bb5feb8d0c8e14f98
+  metadata.gz: fa85d14efbf1c6206da15004e441fee6861f9ab5
+  data.tar.gz: c40e89fbc4985325ef4a1461b02e9b7c5efaa9c7
 SHA512:
-  metadata.gz: 82fb6099411dbef3f5558132e5eec9f9dae1665abe248020c7b8d19b4f2b4eca79e27cf8a680b118647be92208384a538a84574262d63a8a9d02ad82d5778cd6
-  data.tar.gz: 39c33b77dec932a4d189fad3ecf0b44784ff70a8bf3523630a7bbba3d77ed0b55b77a45fc0ea659eba7cc0413488c05e110dc4949fa03467fcedf2f19d1aa9ca
+  metadata.gz: 8a7b8e47ac5f8036391e38ebbe3c3fcfc636916d799fab0f359e115de36a8538db6956cbddd4738a9477ae0b20d80c8c9479c201e879f9e12b1a72808cb0354a
+  data.tar.gz: cf7c5e28b9bb91619355ff410f843dfc8018aa0aca697fdf79df90780dc71009f4f2816461877eadd20142d41d2f359a4b1aa39f7cddcd0586049c43be7856fd

data/app/assets/stylesheets/delayed/web/application.css

@@ -33,3 +33,11 @@
   margin-top: 20px;
   margin-bottom: 20px;
 }
+
+/* Base style to use text-overflow */
+.btn-action {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: 65px !important;
+}

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

@@ -6,7 +6,8 @@ module Delayed
           job.queue!
           flash[:notice] = t(:notice, scope: 'delayed/web.flashes.jobs.queued')
         else
-          flash[:alert] = t(:alert, scope: 'delayed/web.flashes.jobs.queued', status: job.status)
+          status = t(job.status, scope: 'delayed/web.views.statuses')
+          flash[:alert] = t(:alert, scope: 'delayed/web.flashes.jobs.queued', status: status)
         end
         redirect_to jobs_path
       end
@@ -16,12 +17,13 @@ module Delayed
           job.destroy
           flash[:notice] = t(:notice, scope: 'delayed/web.flashes.jobs.destroyed')
         else
-          flash[:alert] = t(:alert, scope: 'delayed/web.flashes.jobs.destroyed', status: job.status)
+          status = t(job.status, scope: 'delayed/web.views.statuses')
+          flash[:alert] = t(:alert, scope: 'delayed/web.flashes.jobs.destroyed', status: status)
         end
         redirect_to jobs_path
       end
 
-    private
+      private
 
       def job
         @job ||= Delayed::Web::Job.find params[:id]

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

@@ -1,4 +1,4 @@
-<% title 'Jobs' %>
+<% title t('delayed/web.views.jobs') %>
 
 <div class="page-header">
   <h1><%= title %></h1>
@@ -7,13 +7,13 @@
 <table class="table table-bordered">
   <thead>
     <tr>
-      <th>ID</th>
-      <th>Status</th>
-      <th>Created At</th>
-      <th>Run At</th>
-      <th>Attempts</th>
-      <th style="width: 190px;">Last Error</th>
-      <th style="width: 115px;">Actions</th>
+      <th><%= t('delayed/web.views.id') %></th>
+      <th><%= t('delayed/web.views.status') %></th>
+      <th><%= t('delayed/web.views.created_at') %></th>
+      <th><%= t('delayed/web.views.run_at') %></th>
+      <th><%= t('delayed/web.views.attempts') %></th>
+      <th style="width: 190px;"><%= t('delayed/web.views.last_error') %></th>
+      <th style="width: 140px"><%= t('delayed/web.views.actions') %></th>
     </tr>
   </thead>
   <tbody>
@@ -23,19 +23,25 @@
           <td><%= link_to "##{job.id}", job_path(job) %></td>
           <td>
             <span class="<%= status_dom_class(job.status) %>">
-              <%= job.status.capitalize %>
+              <%= t(job.status, scope: 'delayed/web.views.statuses').capitalize %>
             </span>
           </td>
-          <td><%= job.created_at %></td>
-          <td><%= job.run_at %></td>
+          <td><%= l(job.created_at, format: :short) %></td>
+          <td><%= l(job.run_at, format: :short) %></td>
           <td><%= job.attempts %></td>
-          <td><%= link_to_if job.last_error.present?, truncate(job.last_error), job_path(job) %></td>
+          <td>
+            <% if job.last_error.present? %>
+              <%= link_to truncate(job.last_error), job_path(job) %>
+            <% else %>
+              <span class="label label-success"><%= t('delayed/web.views.errors.empty') %></span>
+            <% end %>
+          </td>
           <td>
             <% if job.can_queue? %>
-              <%= button_to 'Run Next', queue_job_path(job), method: :put, class: 'btn btn-mini', form_class: 'btn-rails pull-left' %>
+              <%= button_to t('delayed/web.views.buttons.run_next'), queue_job_path(job), method: :put, class: 'btn btn-mini btn-action', form_class: 'btn-rails pull-left', title: t('delayed/web.views.buttons.run_next') %>
             <% end %>
             <% if job.can_destroy? %>
-              <%= button_to 'Delete', job_path(job), method: :delete, class: 'btn btn-danger btn-mini', form_class: 'btn-rails pull-right' %>
+              <%= button_to t('delayed/web.views.buttons.delete'), job_path(job), method: :delete, class: 'btn btn-danger btn-mini btn-action', form_class: 'btn-rails pull-right', title: t('delayed/web.views.buttons.delete'), onclick: "return confirm('#{t('delayed/web.views.confirm.delete')}')" %>
             <% end %>
           </td>
         </tr>
@@ -43,7 +49,7 @@
     <% else %>
       <tr>
         <td colspan="7">
-          An empty queue is a good queue.
+          <%= t('delayed/web.views.queue.empty') %>
         </td>
       </tr>
     <% end %>

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

@@ -1,21 +1,30 @@
-<% title "Job ##{job.id}" %>
+<% title "#{t('delayed/web.views.job')} ##{job.id}" %>
 
 <div class="page-header">
   <h1>
-    <%= link_to 'Jobs', jobs_path %> / <%= title %>
+    <%= link_to t('delayed/web.views.jobs'), jobs_path %> / <%= title %>
   </h1>
   <div class="btn-group">
     <% if job.can_queue? %>
-      <%= button_to 'Run Next', queue_job_path(job), method: :put, class: 'btn', form_class: 'btn-rails pull-left' %>
+      <%= button_to t('delayed/web.views.buttons.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' %>
+      <%= button_to t('delayed/web.views.buttons.delete'), job_path(job), method: :delete, class: 'btn btn-danger', form_class: 'btn-rails pull-right', onclick: "return confirm('#{t('delayed/web.views.confirm.delete')}')" %>
     <% end %>
   </div>
 </div>
 
-<h2>Last Error</h2>
-<pre><%= job.last_error %></pre>
+<h2><%= t('delayed/web.views.status') %></h2>
+<p class="<%= status_dom_class(job.status) %>">
+  <%= t(job.status, scope: 'delayed/web.views.statuses').capitalize %>
+</p>
 
-<h2>Handler</h2>
+<h2><%= t('delayed/web.views.last_error') %></h2>
+<% if job.last_error.present? %>
+  <pre><%= job.last_error %></pre>
+<% else %>
+  <p class="label label-success"><%= t('delayed/web.views.errors.empty') %></p>
+<% end %>
+
+<h2><%= t('delayed/web.views.handler') %></h2>
 <pre><%= job.handler %></pre>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="<%= I18n.locale %>">
   <head>
-    <title><%= title %></title>
+    <title><%= title %> | Delayed Job</title>
     <%= stylesheet_link_tag 'delayed/web/application' %>
   </head>
   <body>

data/config/locales/en.yml

@@ -1,5 +1,29 @@
 en:
   delayed/web:
+    views:
+      id: ID
+      job: Job
+      jobs: Jobs
+      status: Status
+      created_at: Created At
+      run_at: Run At
+      attempts: Attempts
+      last_error: Last Error
+      handler: Handler
+      actions: Actions
+      buttons:
+        run_next: Run Next
+        delete: Delete
+      queue:
+        empty: An empty queue is a good queue.
+      errors:
+        empty: There is no error
+      statuses:
+        executing: Executing
+        failed: Failed
+        queued: Queued
+      confirm:
+        delete: Are you sure you want to delete this job ?
     flashes:
       jobs:
         queued:
@@ -8,3 +32,7 @@ en:
         destroyed:
           alert: 'Job cannot be deleted because it is already %{status}'
           notice: 'Job destroyed'
+
+  time:
+    formats:
+      short: '%d/%m/%Y at %I.%m %p'

data/config/locales/fr.yml

@@ -0,0 +1,38 @@
+fr:
+  delayed/web:
+    views:
+      id: ID
+      job: Tâche
+      jobs: Tâches
+      status: Statut
+      created_at: Ajouté le
+      run_at: Démarré le
+      attempts: Essais
+      last_error: Dernière Erreur
+      handler: Gestionnaire
+      actions: Actions
+      queue:
+        empty: Une file d'attente vide est une bonne file d'attente.
+      errors:
+        empty: Il n'y aucune erreur
+      buttons:
+        run_next: Suivant
+        delete: Supprimer
+      statuses:
+        executing: En cours
+        failed: Echec
+        queued: En Attente
+      confirm:
+        delete: Êtes-vous sûr de vouloir supprimer cette tâche ?
+    flashes:
+      jobs:
+        queued:
+          alert: Cette tâche ne peut pas être mise en file d'attente car elle est déjà %{status}
+          notice: Tâche placée en file d'attente
+        destroyed:
+          alert: Cette tâche ne peut pas être supprimée car elle est déjà %{status}
+          notice: Tâche supprimée
+
+  time:
+    formats:
+      short: '%d/%m/%Y à %H:%M'

data/lib/delayed/web/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   module Web
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/spec/decorators/status_decorator_spec.rb

@@ -21,29 +21,29 @@ describe Delayed::Web::StatusDecorator do
 
   describe '#can_destroy?' do
     it 'is true when failed' do
-      expect(failed_job.can_destroy?).to be_true
+      expect(failed_job.can_destroy?).to be_truthy
     end
 
     it 'is true when queued' do
-      expect(queued_job.can_destroy?).to be_true
+      expect(queued_job.can_destroy?).to be_truthy
     end
 
     it 'is false when executing' do
-      expect(executing_job.can_destroy?).to be_false
+      expect(executing_job.can_destroy?).to be_falsy
     end
   end
 
   describe '#can_queue?' do
     it 'is true when failed' do
-      expect(failed_job.can_queue?).to be_true
+      expect(failed_job.can_queue?).to be_truthy
     end
 
     it 'is true when queued' do
-      expect(queued_job.can_queue?).to be_true
+      expect(queued_job.can_queue?).to be_truthy
     end
 
     it 'is false when executing' do
-      expect(executing_job.can_queue?).to be_false
+      expect(executing_job.can_queue?).to be_falsy
     end
   end
 end

data/spec/dummy/{README.rdoc → README.md}

@@ -1,4 +1,4 @@
-== README
+# README
 
 This README would normally document whatever steps are necessary to get the
 application up and running.
@@ -22,7 +22,3 @@ Things you may want to cover:
 * Deployment instructions
 
 * ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/assets/javascripts/application.js

@@ -2,12 +2,12 @@
 // listed below.
 //
 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
 //
 //= require_tree .

data/spec/dummy/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the rails generate channel command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/spec/dummy/app/assets/stylesheets/application.css

@@ -3,11 +3,13 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

data/spec/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/spec/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,3 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
 end

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/spec/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/spec/dummy/app/views/layouts/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/spec/dummy/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/spec/dummy/bin/rails

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/rake

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
+begin
+  load File.expand_path('../spring', __FILE__)
+rescue LoadError => e
+  raise unless e.message.include?('spring')
+end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/spring

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
+
+unless defined?(Spring)
+  require 'rubygems'
+  require 'bundler'
+
+  lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+  if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem 'spring', spring.version
+    require 'spring/binstub'
+  end
+end

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/config/application.rb

@@ -1,7 +1,9 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 require 'delayed-web'
 
@@ -10,14 +12,5 @@ module Dummy
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -1,5 +1,3 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/dummy/config/cable.yml

@@ -0,0 +1,9 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: redis://localhost:6379/1

data/spec/dummy/config/database.yml

@@ -3,23 +3,23 @@
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
-development:
+#
+default: &default
   adapter: sqlite3
-  database: db/development.sqlite3
   pool: 5
   timeout: 5000
 
+development:
+  <<: *default
+  database: db/development.sqlite3
+
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  <<: *default
   database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
 
 production:
-  adapter: sqlite3
+  <<: *default
   database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application.
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative 'application'
 
-# Initialize the rails application.
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!