better_delayed_job_web 1.3.5 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e78049cb459bf7f327a41c30c73afe25b21ee9ad
-  data.tar.gz: 8a9a0d0d50e9928f0cc9f135936dd2c5853bc0ea
+  metadata.gz: 6ebd0d58d88efa052fda53a9abfb5f3113388a30
+  data.tar.gz: efda9bc4d973940e9815ed93095013cce879cb77
 SHA512:
-  metadata.gz: 15bd03012e2cf113129fe97d18b0236b772f1f48a5dd161704f4e7193652ebc90c98045fb3f05ccc916a6aa91bfcf44d96468891bcb04e8260d1e919a8ebc127
-  data.tar.gz: 005a07adb26c8f733963cbde68498d6f38a407c79aa2e8890df58080bb20914a2226cc57226c8ccee50519badc13b58575bd2c148a10d9d2d055b59bd7842004
+  metadata.gz: 0c5012ad8a8b05837e210779669a4396f918f737fd152dbd5e2d765e9c74c7f92189c1c27c5c1f54596f8fc38d08e29923835a40c2cea7c87bc49a142a8f9ac0
+  data.tar.gz: dd4232c2ede7c922763adf1aa4e039582f67ce949a1e0a43ac6810e0ebbfb7f038de9fbfaa7bae0841cfe0c2af085c14f11b61569b47d9c208cbd604a8fbfb52

data/README.markdown

@@ -15,7 +15,7 @@ Some features:
 
 The interface:
 
-![Screen shot](http://dl.dropbox.com/u/1506097/Screenshots/delayed_job_web_1.png)
+![Screen shot](http://i.imgur.com/eji1Z8s.png)
 
 A beautiful Bootstrap based responsive interface.
 

data/better_delayed_job_web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "better_delayed_job_web"
-  gem.version     = "1.3.5"
+  gem.version     = "1.3.11"
   gem.author      = "Skcript"
   gem.email       = "bello@skcript.com"
   gem.homepage    = "https://github.com/skcript/better_delayed_job_web"

data/lib/better_delayed_job_web/application/public/javascripts/data-confirm-modal.js

@@ -0,0 +1,256 @@
+/*
+ * Implements a user-facing modal confirmation when link has a
+ * "data-confirm" attribute using bootstrap's modals. MIT license.
+ *
+ *   - vjt@openssl.it  Tue Jul  2 18:45:15 CEST 2013
+ */
+(function ($) {
+
+  /**
+   * Builds the markup for a [Bootstrap modal](http://twitter.github.io/bootstrap/javascript.html#modals)
+   * for the given `element`. Uses the following `data-` parameters to
+   * customize it:
+   *
+   *  * `data-confirm`: Contains the modal body text. HTML is allowed.
+   *                    Separate multiple paragraphs using \n\n.
+   *  * `data-commit`:  The 'confirm' button text. "Confirm" by default.
+   *  * `data-cancel`:  The 'cancel' button text. "Cancel" by default.
+   *  * `data-verify`:  Adds a text input in which the user has to input
+   *                    the text in this attribute value for the 'confirm'
+   *                    button to be clickable. Optional.
+   *  * `data-verify-text`:  Adds a label for the data-verify input. Optional
+   *  * `data-focus`:   Define focused input. Supported values are
+   *                    'cancel' or 'commit', 'cancel' is default for
+   *                    data-method DELETE, 'commit' for all others.
+   *
+   * You can set global setting using `dataConfirmModal.setDefaults`, for example:
+   *
+   *    dataConfirmModal.setDefaults({
+   *      title: 'Confirm your action',
+   *      commit: 'Continue',
+   *      cancel: 'Cancel',
+   *      fade:   false,
+   *      verifyClass: 'form-control',
+   *    });
+   *
+   */
+
+  var defaults = {
+    title: 'Are you sure?',
+    commit: 'Confirm',
+    commitClass: 'btn-danger',
+    cancel: 'Cancel',
+    cancelClass: 'btn-default',
+    fade: true,
+    verifyClass: '',
+    elements: ['a[data-confirm]', 'button[data-confirm]', 'input[type=submit][data-confirm]'],
+    focus: 'commit'
+  };
+
+  var settings;
+
+  window.dataConfirmModal = {
+    setDefaults: function (newSettings) {
+      settings = $.extend(settings, newSettings);
+    },
+
+    restoreDefaults: function () {
+      settings = $.extend({}, defaults);
+    },
+
+    confirm: function (options) {
+      // Build an ephemeral modal
+      //
+      var modal = buildModal (options);
+
+      modal.modal('show');
+      modal.on('hidden.bs.modal', function () {
+        modal.remove();
+      });
+
+      modal.find('.commit').on('click', function () {
+        if (options.onConfirm && options.onConfirm.call)
+          options.onConfirm.call();
+
+        modal.modal('hide');
+      });
+
+      modal.find('.cancel').on('click', function () {
+        if (options.onCancel && options.onCancel.call)
+          options.onCancel.call();
+
+        modal.modal('hide');
+      });
+    }
+  };
+
+  dataConfirmModal.restoreDefaults();
+
+  var buildElementModal = function (element) {
+    var options = {
+      title:        element.attr('title') || element.data('original-title'),
+      text:         element.data('confirm'),
+      focus:        element.data('focus'),
+      method:       element.data('method'),
+      commit:       element.data('commit'),
+      commitClass:  element.data('commit-class'),
+      cancel:       element.data('cancel'),
+      cancelClass:  element.data('cancel-class'),
+      remote:       element.data('remote'),
+      verify:       element.data('verify'),
+      verifyRegexp: element.data('verify-regexp'),
+      verifyLabel:  element.data('verify-text'),
+      verifyRegexpCaseInsensitive: element.data('verify-regexp-caseinsensitive')
+    };
+
+    var modal = buildModal (options);
+
+    modal.data('confirmed', false);
+    modal.find('.commit').on('click', function () {
+      modal.data('confirmed', true);
+      element.trigger('click');
+      modal.modal('hide');
+    });
+
+    return modal;
+  }
+
+  var buildModal = function (options) {
+    var id = 'confirm-modal-' + String(Math.random()).slice(2, -1);
+    var fade = settings.fade ? 'fade' : '';
+
+    var modal = $(
+      '<div id="'+id+'" class="modal '+fade+'" tabindex="-1" role="dialog" aria-labelledby="'+id+'Label" aria-hidden="true">' +
+        '<div class="modal-dialog">' +
+          '<div class="modal-content">' +
+            '<div class="modal-header">' +
+              '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+              '<h4 id="'+id+'Label" class="modal-title"></h4> ' +
+            '</div>' +
+            '<div class="modal-body"></div>' +
+            '<div class="modal-footer">' +
+              '<button class="btn cancel" data-dismiss="modal" aria-hidden="true"></button>' +
+              '<button class="btn commit"></button>' +
+            '</div>'+
+          '</div>'+
+        '</div>'+
+      '</div>'
+    );
+
+    modal.find('.modal-title').text(options.title || settings.title);
+
+    var body = modal.find('.modal-body');
+
+    $.each((options.text||'').split(/\n{2}/), function (i, piece) {
+      body.append($('<p/>').html(piece));
+    });
+
+    var commit = modal.find('.commit');
+    commit.text(options.commit || settings.commit);
+    commit.addClass(options.commitClass || settings.commitClass);
+
+    var cancel = modal.find('.cancel');
+    cancel.text(options.cancel || settings.cancel);
+    cancel.addClass(options.cancelClass || settings.cancelClass);
+
+    if (options.remote) {
+      commit.attr('data-dismiss', 'modal');
+    }
+
+    if (options.verify || options.verifyRegexp) {
+      commit.prop('disabled', true);
+
+      var isMatch;
+      if (options.verifyRegexp) {
+        var caseInsensitive = options.verifyRegexpCaseInsensitive;
+        var re = new RegExp(regexp, caseInsensitive ? 'i' : '');
+
+        isMatch = function (input) { return input.match(re) };
+      } else {
+        isMatch = function (input) { return options.verify == input };
+      }
+
+      var verification = $('<input/>', {"type": 'text', "class": settings.verifyClass}).on('keyup', function () {
+        commit.prop('disabled', !isMatch($(this).val()));
+      });
+
+      modal.on('shown', function () {
+        verification.focus();
+      });
+
+      modal.on('hide', function () {
+        verification.val('').trigger('keyup');
+      });
+
+      if (options.verifyLabel)
+        body.append($('<p>', {text: options.verifyLabel}))
+
+      body.append(verification);
+    }
+
+    var focus_element;
+    if (options.focus) {
+      focus_element = options.focus;
+    } else if (options.method == 'delete') {
+      focus_element = 'cancel'
+    } else {
+      focus_element = settings.focus;
+    }
+    focus_element = modal.find('.' + focus_element);
+
+    modal.on('shown.bs.modal', function () {
+      focus_element.focus();
+    });
+
+    $('body').append(modal);
+
+    return modal;
+  };
+
+
+  /**
+   * Returns a modal already built for the given element or builds a new one,
+   * caching it into the element's `confirm-modal` data attribute.
+   */
+  var getModal = function (element) {
+    var modal = element.data('confirm-modal') || buildElementModal(element);
+
+    if (modal && !element.data('confirm-modal'))
+      element.data('confirm-modal', modal);
+
+    return modal;
+  };
+
+  $.fn.confirmModal = function () {
+    getModal($(this)).modal('show');
+
+    return this;
+  };
+
+  if ($.rails) {
+    /**
+     * Attaches to the Rails' UJS adapter 'confirm' event on links having a
+     * `data-confirm` attribute. Temporarily overrides the `$.rails.confirm`
+     * function with an anonymous one that returns the 'confirmed' status of
+     * the modal.
+     *
+     * A modal is considered 'confirmed' when an user has successfully clicked
+     * the 'confirm' button in it.
+     */
+    $(document).delegate(settings.elements.join(', '), 'confirm', function() {
+      var element = $(this), modal = getModal(element);
+      var confirmed = modal.data('confirmed');
+
+      if (!confirmed && !modal.is(':visible')) {
+        modal.modal('show');
+
+        var confirm = $.rails.confirm;
+        $.rails.confirm = function () { return modal.data('confirmed'); }
+        modal.on('hide', function () { $.rails.confirm = confirm; });
+      }
+
+      return confirmed;
+    });
+  }
+
+})(jQuery);

data/lib/better_delayed_job_web/application/public/stylesheets/style.css

@@ -56,3 +56,36 @@
   code {
     font-size: 80%;
   }
+
+.job-actions {
+  text-align: center;
+}
+
+.more-job-actions {
+  float: right;
+}
+
+dt {
+  font-size: 24px;
+  margin-top: 11.5px;
+  margin-bottom: 11.5px;
+  font-family: inherit;
+  font-weight: 400!important;
+  line-height: 1.1;
+  color: #444444;
+}
+
+.failed-job {
+  margin: 0 auto;
+  width: 100%;
+  float: left;
+}
+
+.job-stat {
+  text-align: center;
+}
+
+.failed-job-actions {
+  float: left;
+  padding-right: 20px;
+}

data/lib/better_delayed_job_web/application/views/enqueued.erb

@@ -1,10 +1,12 @@
 <h2 class="sub-header">Enqueued</h2>
-<p class="text-info">
+<p class="lead">
   The list below contains all jobs currently in the delayed_job queue.
 </p>
-<p class="sub">
+<div class="job-stat">
+<h4>
   <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} enqueued jobs." %>
-</p>
+</h4>
+</div>
 <ul class="job">
   <% @jobs.each do |job| %>
     <%= partial :job, {:job => job} %>

data/lib/better_delayed_job_web/application/views/failed.erb

@@ -1,24 +1,27 @@
 <h2 class="sub-header">Failed Jobs</h2>
-<p class="text-info">
+<p class="lead">
   Here are the list of jobs that failed during execution.
 </p>
 <% if @jobs.any? %>
-  <form action="<%= u('failed/clear') %>" method="POST">
-    <%= csrf_token_tag %>
-    <input type="submit" value="Clear Failed Jobs"></input>
-  </form>
-  <form action="<%= u('requeue/all') %>" method="POST">
-    <%= csrf_token_tag %>
-    <input type="submit" value="Retry Failed Jobs"></input>
-  </form>
+<div class="failed-job-actions">
+<form action="<%= u('requeue/all') %>" method="POST">
+  <%= csrf_token_tag %>
+  <button type="submit" value="Retry Failed Jobs" class="btn btn-primary">Retry All Jobs</button>
+</form>
+</div>
+<div class="failed-job-actions">
+<form action="<%= u('failed/clear') %>" method="POST">
+  <%= csrf_token_tag %>
+  <button type="submit" value="Clear Failed Jobs" class="btn btn-warning">Clear All Jobs</button>
+</form>
+</div>
 <% end %>
-<p class="text-info">
-  The list below contains all jobs that have a last_error message set.
-</p>
-<p class="sub">
+<div class="job-stat">
+<h4>
   <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} failed jobs." %>
-</p>
-<ul class="failed job">
+</h4>
+</div>
+<ul class="failed-job">
   <% @jobs.each do |job| %>
     <%= partial :job, {:job => job} %>
   <% end %>

data/lib/better_delayed_job_web/application/views/job.erb

@@ -1,25 +1,68 @@
 <li class="list-group-item">
-  <dl>
-    <dt>ID</dt>
-    <dd>
-      <a name="<%= job.id %>"></a>
+<!-- New Table Interface -->
+<table class="overview table table-striped table-hover">
+  <tbody><tr>
+    <th>Info</th>
+    <th>Details</th>
+  </tr>
+  <tr>
+    <td class="status">
+      ID
+    </td>
+    <td class="status">
       <a href="#<%= job.id %>"><%=h job.id %></a>
-      <div class="controls">
-        <form action="<%= u("requeue/#{job.id}") %>" method="post"><%= csrf_token_tag %><input type="submit" value="Retry"></input></form>
-        or
-        <form action="<%= u("remove/#{job.id}") %>" method="post"><%= csrf_token_tag %><input type="submit" value="Remove"></input></form>
-        or
-        <form action="<%= u("reload/#{job.id}") %>" method="post"><%= csrf_token_tag %><input type="submit" value="Reload"></input></form>
-      </div>
-    </dd>
-    <dt>Priority</dt>
-    <dd><%=h job.priority %></dd>
-    <dt>Attempts</dt>
-    <dd><%=h job.attempts %></dd>
-    <% if job.respond_to?(:queue) && job.queue %>
-      <dt>Queue</dt>
-      <dd><%=h job.queue %></dd>
-    <% end %>
+    </td>
+  </tr>
+  <tr>
+    <td class="status">
+      Priority
+    </td>
+    <td class="status">
+      <%=h job.priority %>
+    </td>
+  </tr>
+  <tr>
+    <td class="status">
+      Attempts
+    </td>
+    <td class="status">
+      <%=h job.attempts %>
+    </td>
+  </tr>
+  <% if job.respond_to?(:queue) && job.queue %>
+  <tr class="failure">
+    <td class="status">
+      <a href="/delayed_job/failed">Queue</a>
+    </td>
+    <td class="status danger">
+      <%=h job.queue %>
+    </td>
+  </tr>
+  <% end %>
+</tbody>
+</table>
+<!-- End of New Table Interface -->
+<hr>
+<!-- Begin the amazing controls -->
+<div class="controls">
+<div class="col-md-4 job-actions">
+  <form action="<%= u("requeue/#{job.id}") %>" method="post"><%= csrf_token_tag %>
+  <button type="submit" value="Retry" class="btn btn-primary">Retry</button>
+  </form>
+  </div>
+  <div class="col-md-4 job-actions">
+  <form action="<%= u("remove/#{job.id}") %>" method="post"><%= csrf_token_tag %>
+  <button type="submit" value="Remove" class="btn btn-danger">Remove</button>
+  </form>
+  </div>
+  <div class="col-md-4 job-actions">
+  <form action="<%= u("reload/#{job.id}") %>" method="post"><%= csrf_token_tag %>
+  <button type="submit" value="Reload" class="btn btn-default">Reload</button>
+  </form>
+  </div>
+</div>
+<!-- End of the amazing controls -->
+  <dl>
     <dt>Handler</dt>
     <dd>
     <pre><%=h job.handler %></pre>

data/lib/better_delayed_job_web/application/views/layout.erb

@@ -49,5 +49,6 @@
     <script src="<%= u("javascripts/application.js") %>" type="text/javascript"></script>
     <script src="<%= u("javascripts/bootstrap.min.js") %>" type="text/javascript"></script>
     <script src="<%= u("javascripts/material.js") %>" type="text/javascript"></script>
+    <script src="<%= u("javascripts/data-confirm-modal.js") %>" type="text/javascript"></script>
   </body>
 </html>

data/lib/better_delayed_job_web/application/views/overview.erb

@@ -1,7 +1,7 @@
 <div class="col-xs-6">
   <h2 class="sub-header">Overview</h2>
   <div class="table-responsive">
-<p class="text-info">
+<p class="lead">
   The list below shows an overview of the jobs in the delayed_job queue.
 </p>
 <table class="overview table table-striped table-hover">
@@ -48,7 +48,7 @@
 <div class="col-xs-6">
   <h2 class="sub-header">Statistics</h2>
   <div class="table-responsive">
-  <p class="text-info">
+  <p class="lead">
   The list below shows an overview of the jobs in the delayed_job queue.
 </p>
 <table class="stats table table-striped table-hover">

data/lib/better_delayed_job_web/application/views/pending.erb

@@ -1,19 +1,21 @@
 <h2 class="sub-header">Pending</h2>
-<p class="text-info">
+<p class="lead">
   The list below shows an overview of the jobs that are pending.
 </p>
 <% if @jobs.any? %>
+<div class="failed-job-actions">
   <form action="<%= u('requeue/all') %>" method="POST">
     <%= csrf_token_tag %>
-    <input type="submit" value="Enqueue All Immediately"></input>
+    <button type="submit" value="Enqueue All Immediately" class="btn btn-primary">Enqueue All Immediately</button>
   </form>
+  </div>
 <% end %>
-<p class="sub">
-  The list below contains jobs currently being processed.
-</p>
-<p class="sub">
+
+<div class="job-stat">
+<h4>
   <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} pending jobs." %>
-</p>
+</h4>
+</div>
 <ul class="job">
   <% @jobs.each do |job| %>
     <%= partial :job, {:job => job} %>

data/lib/better_delayed_job_web/application/views/working.erb

@@ -1,13 +1,15 @@
 <h2 class="sub-header">Processing</h2>
-<p class="text-info">
+<p class="lead">
   The list below shows an overview of the jobs that are currently being processed.
 </p>
 <p class="sub">
   The list below contains jobs currently being processed.
 </p>
-<p class="sub">
+<div class="job-stat">
+<h4>
   <%= "Showing #{start} to #{start + per_page} of #{@all_jobs.count} working jobs." %>
-</p>
+</h4>
+</div>
 <ul class="list-group">
   <% @jobs.each do |job| %>
     <%= partial :job, {:job => job} %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_delayed_job_web
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.11
 platform: ruby
 authors:
 - Skcript
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -114,6 +114,7 @@ files:
 - lib/better_delayed_job_web/application/public/images/poll.png
 - lib/better_delayed_job_web/application/public/javascripts/application.js
 - lib/better_delayed_job_web/application/public/javascripts/bootstrap.min.js
+- lib/better_delayed_job_web/application/public/javascripts/data-confirm-modal.js
 - lib/better_delayed_job_web/application/public/javascripts/jquery-1.11.2.min.js
 - lib/better_delayed_job_web/application/public/javascripts/jquery.relatize_date.js
 - lib/better_delayed_job_web/application/public/javascripts/material.js