queue_classic_admin 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3319df3083270e6c8c83496f0162e6260eeeaaa0
-  data.tar.gz: 9bf860fe44bc4e710ea2efefeb8e30848e2e2fd9
+  metadata.gz: be770c2f38dae73c292915265522e9311a4a8edc
+  data.tar.gz: d7f4418257899860ac907f083dcc71d06af53fb0
 SHA512:
-  metadata.gz: caf72fb82c582f02ef96932d18544191b3d0776c988b4adc380818d49626f8300519e0fe68e6cf7683b9cd9d30929c178758d1cb3cb25ee7e11228f63a9f73fb
-  data.tar.gz: 116638af8da5388b2fa82258034fc10d7283fd5f878af500cdf38a80225d9aa71973cffbaedf5a5a59dd9d8543e8b13897616b5cd61298f98e50b1af644d4b8a
+  metadata.gz: 1138e8c3b1d45c114d1713c3660f077024660b73fdce7bf91ce23fd76105ed4e574fde65acd80c219b5d823674ff1214af134893405eb3c3e85720ff7485ad9c
+  data.tar.gz: 4340000864136623df22517454d0301e654a318956358c2967cb4453993a64e75aa807d303c360cedf77f011c7c8673662fc020320d2fb12dd2e79b2195cd20d

data/README.md

@@ -2,16 +2,15 @@
 
 [![Build Status](https://travis-ci.org/QueueClassic/queue_classic_admin.png)](https://travis-ci.org/QueueClassic/queue_classic_admin)
 
-An admin interface for the [queue_classic](https://github.com/ryandotsmith/queue_classic) and [queue_classic-later](https://github.com/dpiddy/queue_classic-later) gems.
+An admin interface for the [queue_classic](https://github.com/QueueClassic/queue_classic) gem.
 
-**IMPORTANT: this branch is for QueueClassic 3. See the [queueclassic-2-support](https://github.com/dpiddy/queue_classic-later/tree/queueclassic-2-support) branch for prior version support.**
+**IMPORTANT**: this branch is for queue_classic 3.1. Support for queue_classic-later has been removed and replaced by queue_classic 3.1's implementation of scheduling instead.  See the [queueclassic-2-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-2-support) and [queueclassic-3-support](https://github.com/QueueClassic/queue_classic_admin/tree/queueclassic-3-support) branches for prior version support.
 
 ![qc admin](https://f.cloud.github.com/assets/148622/865030/9b1b2610-f62e-11e2-8908-8c271bfe0f6c.png)
 
-
 # Features
 
-* Support for [queue_classic-later](https://github.com/dpiddy/queue_classic-later)
+* Support for QueueClassic 3.1's future job scheduling: **enqueue_at()** and **enqueue_in()**
 * Support for custom columns
 * Delete entire queues
 * Delete jobs
@@ -76,9 +75,6 @@ ln -s $PWD/spec/dummy ~/.pow/qc-admin
 # Run the engine's migration.
 bundle exec rake db:migrate
 (cd spec/dummy && bundle exec rake db:schema:dump)
-
-ln -s $PWD/spec/dummy-no-later ~/.pow/qc-admin-no-later
-(cd spec/dummy-no-later && bundle exec rake db:create:all db:migrate)
 ```
 
 Then go to [http://qc-admin.dev/](http://qc-admin.dev/).

data/app/assets/javascripts/queue_classic_admin/application.js

@@ -12,5 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap
 //= require_tree .

data/app/assets/stylesheets/queue_classic_admin/application.css

@@ -9,7 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require twitter-bootstrap-static/bootstrap
+ *= require qc-admin-bootstrap/bootstrap.min
  *= require_tree .
  */
 

data/app/controllers/queue_classic_admin/application_controller.rb

@@ -1,9 +1,17 @@
 module QueueClassicAdmin
   class ApplicationController < ActionController::Base
     protected
-    def filter_jobs(klass)
-      @klass = klass
-      @queue_classic_jobs = klass.order("id DESC")
+    def filter_jobs
+      @queue_classic_jobs = QueueClassicJob.order("id DESC")
+
+      if self.class == QueueClassicScheduledJobsController
+        @scoped_jobs = QueueClassicJob.scheduled
+        @queue_classic_jobs = @queue_classic_jobs.scheduled
+      else
+        @scoped_jobs = QueueClassicJob.ready
+        @queue_classic_jobs = @queue_classic_jobs.ready
+      end
+
       if params[:q_name].present?
         @queue_classic_jobs = @queue_classic_jobs.where(q_name: params[:q_name])
       end

data/app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb

@@ -2,9 +2,9 @@ require_dependency "queue_classic_admin/application_controller"
 
 module QueueClassicAdmin
   class QueueClassicJobsController < ApplicationController
-    before_filter :get_job, only: [:destroy, :unlock, :custom, :show]
+    before_action :get_job, only: [:destroy, :unlock, :custom, :show]
+    before_action :filter_jobs, only: [:index, :destroy_all, :unlock_all, :bulk_custom_action]
     def index
-      filter_jobs(QueueClassicJob)
       @queue_classic_jobs = @queue_classic_jobs.paginate(page: params[:page])
     end
 
@@ -14,20 +14,18 @@ module QueueClassicAdmin
     end
 
     def destroy_all
-      filter_jobs(QueueClassicJob).delete_all
+      @queue_classic_jobs.delete_all
       redirect_to queue_classic_jobs_url
     end
 
     def unlock_all
-      filter_jobs(QueueClassicJob).where('locked_at < ?', 5.minutes.ago).update_all(locked_at: nil)
+      @queue_classic_jobs.where('locked_at < ?', 5.minutes.ago).update_all(locked_at: nil)
       redirect_to queue_classic_jobs_url
     end
 
     def bulk_custom_action
-      jobs = filter_jobs(QueueClassicJob)
-
       custom_action = QueueClassicAdmin.custom_bulk_actions[params[:custom_action]]
-      custom_action.action.call(jobs)
+      custom_action.action.call(@queue_classic_jobs)
 
       redirect_to queue_classic_jobs_url
     end
@@ -58,11 +56,11 @@ module QueueClassicAdmin
       @queue_classic_job = QueueClassicJob.find(params[:id])
     end
 
-    def later?
+    def scheduled?
       false
     end
 
     helper_method :index_path
-    helper_method :later?
+    helper_method :scheduled?
   end
 end

data/app/controllers/queue_classic_admin/queue_classic_scheduled_jobs_controller.rb

@@ -0,0 +1,33 @@
+require_dependency "queue_classic_admin/application_controller"
+
+module QueueClassicAdmin
+  class QueueClassicScheduledJobsController < ApplicationController
+    before_action :filter_jobs, only: %i(index destroy_all)
+    def index
+      @queue_classic_jobs = @queue_classic_jobs.paginate(page: params[:page])
+    end
+
+    def destroy
+      @queue_classic_scheduled_job = QueueClassicJob.find(params[:id])
+      @queue_classic_scheduled_job.destroy
+      redirect_to queue_classic_scheduled_jobs_url
+    end
+
+    def destroy_all
+      @queue_classic_jobs.delete_all
+      redirect_to queue_classic_jobs_url
+    end
+
+    private
+    def index_path(*params)
+      queue_classic_scheduled_jobs_path(*params)
+    end
+
+    def scheduled?
+      true
+    end
+
+    helper_method :index_path
+    helper_method :scheduled?
+  end
+end

data/app/helpers/queue_classic_admin/application_helper.rb

@@ -1,11 +1,5 @@
 module QueueClassicAdmin
   module ApplicationHelper
-    def has_qc_later?
-      QC.respond_to?(:enqueue_in) &&
-        defined?(QC::Later) &&
-        ActiveRecord::Base.connection.table_exists?(QC::Later::TABLE_NAME)
-    end
-
     def sortable_column(name, title)
       opts = {sort: name}
       opts[:dir] = (params[:dir] == "asc" ? "desc" : "asc")

data/app/helpers/queue_classic_admin/queue_classic_scheduled_jobs_helper.rb

@@ -0,0 +1,4 @@
+module QueueClassicAdmin
+  module QueueClassicScheduledJobsHelper
+  end
+end

data/app/models/queue_classic_admin/job_common.rb

@@ -3,7 +3,7 @@ require 'will_paginate'
 module QueueClassicAdmin
   module JobCommon
     module ClassMethods
-      KNOWN_COLUMN = ["id", "q_name", "method", "args", "locked_at", "created_at", "not_before", "locked_by"].freeze
+      KNOWN_COLUMN = ["id", "q_name", "method", "args", "locked_at", "created_at", "not_before", "locked_by", 'scheduled_at'].freeze
       SEARCHABLE_COLUMNS = [ :method, :args ].freeze
 
       def queue_counts

data/app/models/queue_classic_admin/queue_classic_job.rb

@@ -2,5 +2,8 @@ module QueueClassicAdmin
   class QueueClassicJob < ActiveRecord::Base
     include JobCommon
     self.table_name = 'queue_classic_jobs'
+
+    scope :ready, -> { where("queue_classic_jobs.scheduled_at <= now()") }
+    scope :scheduled, -> { where("queue_classic_jobs.scheduled_at > now()") }
   end
 end

data/app/views/layouts/queue_classic_admin/application.html.erb

@@ -29,9 +29,7 @@
           <div class="container-fluid nav-collapse">
             <ul class="nav">
               <li><%= link_to "Jobs", queue_classic_jobs_path  %></li>
-              <% if has_qc_later? %>
-                <li><%= link_to "Scheduled Jobs", queue_classic_later_jobs_path %></li>
-              <% end %>
+              <li><%= link_to "Scheduled Jobs", queue_classic_scheduled_jobs_path %></li>
             </ul>
           </div><!--/.nav-collapse -->
         </div>

data/app/views/queue_classic_admin/shared/_job_list.html.erb

@@ -7,9 +7,10 @@
 
 <ul class="nav nav-pills">
   <li class="<%= q_name_pill_class(nil)%>" >
-    <a href="<%= index_path %>"><%= "All (#{@klass.count})" %></a>
+    <a href="<%= index_path %>"><%= "All (#{@scoped_jobs.count})" %></a>
   </li>
-  <% @klass.queue_counts.each do |q_name, count| %>
+
+  <% @scoped_jobs.queue_counts.each do |q_name, count| %>
     <li class="<%= q_name_pill_class(q_name) %>">
     <a href="<%= index_path(q_name: q_name) %>"><%= "#{q_name} (#{count})" %></a>
     </li>
@@ -26,17 +27,17 @@
       <%= sortable_column :locked_by, "Locked By" %>
       <%= sortable_column :method, "Method" %>
       <%= sortable_column :args, "Arguments" %>
-      <% if @klass.columns_hash['not_before'] %>
+      <% if QueueClassicAdmin::QueueClassicJob.columns_hash['not_before'] %>
         <th>Run At</th>
       <% end %>
-      <% @klass.extra_columns.each do |column| %>
+      <% QueueClassicAdmin::QueueClassicJob.extra_columns.each do |column| %>
         <%= sortable_column column, column.titleize %>
       <% end %>
       <th>
         <%=
           link_to "Destroy Matching", url_for(params.merge(action: 'destroy_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :delete}
         %>
-        <% unless later? %>
+        <% unless scheduled? %>
           <%=
             link_to "Unlock Matching > 5 mins", url_for(params.merge(action: 'unlock_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :put}
           %>
@@ -80,11 +81,11 @@
       </td>
       <td><%= queue_classic_job.method  %></td>
       <td><%= queue_classic_job.arguments.inspect%></td>
-      <% if @klass.columns_hash['not_before'] %>
+      <% if QueueClassicAdmin::QueueClassicJob.columns_hash['not_before'] %>
         <td><%= queue_classic_job.not_before %></td>
       <% end %>
 
-      <% @klass.extra_columns.each do |column| %>
+      <% QueueClassicAdmin::QueueClassicJob.extra_columns.each do |column| %>
         <td><%= queue_classic_job[column] %></th>
       <% end %>
 

data/config/routes.rb

@@ -1,5 +1,5 @@
 QueueClassicAdmin::Engine.routes.draw do
-  resources :queue_classic_later_jobs do
+  resources :queue_classic_scheduled_jobs do
     collection do
       delete :destroy_all
     end

data/lib/queue_classic_admin.rb

@@ -2,7 +2,6 @@ require "queue_classic_admin/engine"
 require "queue_classic_admin/custom_action"
 require 'will_paginate'
 require "will_paginate-bootstrap"
-require 'twitter-bootstrap-rails'
 
 module QueueClassicAdmin
 

data/lib/queue_classic_admin/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicAdmin
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Simon Mathieu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -120,24 +106,22 @@ files:
 - Rakefile
 - app/assets/javascripts/queue_classic_admin/application.js
 - app/assets/javascripts/queue_classic_admin/queue_classic_jobs.js
-- app/assets/javascripts/queue_classic_admin/queue_classic_later_jobs.js
+- app/assets/javascripts/queue_classic_admin/queue_classic_scheduled_jobs.js
 - app/assets/stylesheets/queue_classic_admin/application.css
 - app/assets/stylesheets/queue_classic_admin/queue_classic_jobs.css
-- app/assets/stylesheets/queue_classic_admin/queue_classic_later_jobs.css
-- app/assets/stylesheets/scaffold.css
+- app/assets/stylesheets/queue_classic_admin/queue_classic_scheduled_jobs.css
 - app/controllers/queue_classic_admin/application_controller.rb
 - app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb
-- app/controllers/queue_classic_admin/queue_classic_later_jobs_controller.rb
+- app/controllers/queue_classic_admin/queue_classic_scheduled_jobs_controller.rb
 - app/helpers/queue_classic_admin/application_helper.rb
 - app/helpers/queue_classic_admin/queue_classic_jobs_helper.rb
-- app/helpers/queue_classic_admin/queue_classic_later_jobs_helper.rb
+- app/helpers/queue_classic_admin/queue_classic_scheduled_jobs_helper.rb
 - app/models/queue_classic_admin/job_common.rb
 - app/models/queue_classic_admin/queue_classic_job.rb
-- app/models/queue_classic_admin/queue_classic_later_job.rb
 - app/views/layouts/queue_classic_admin/application.html.erb
 - app/views/queue_classic_admin/queue_classic_jobs/index.html.erb
 - app/views/queue_classic_admin/queue_classic_jobs/show.html.erb
-- app/views/queue_classic_admin/queue_classic_later_jobs/index.html.erb
+- app/views/queue_classic_admin/queue_classic_scheduled_jobs/index.html.erb
 - app/views/queue_classic_admin/shared/_job_list.html.erb
 - config/routes.rb
 - db/migrate/20130626182618_add_id_to_later.rb
@@ -167,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An admin interface for QueueClassic

data/app/assets/stylesheets/scaffold.css

@@ -1,56 +0,0 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-div.field, div.actions {
-  margin-bottom: 10px;
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-}
-
-#error_explanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  margin-bottom: 0px;
-  background-color: #c00;
-  color: #fff;
-}
-
-#error_explanation ul li {
-  font-size: 12px;
-  list-style: square;
-}

data/app/controllers/queue_classic_admin/queue_classic_later_jobs_controller.rb

@@ -1,33 +0,0 @@
-require_dependency "queue_classic_admin/application_controller"
-
-module QueueClassicAdmin
-  class QueueClassicLaterJobsController < ApplicationController
-    def index
-      filter_jobs(QueueClassicLaterJob)
-      @queue_classic_jobs = @queue_classic_jobs.paginate(page: params[:page])
-    end
-  
-    def destroy
-      @queue_classic_later_job = QueueClassicLaterJob.find(params[:id])
-      @queue_classic_later_job.destroy
-      redirect_to queue_classic_later_jobs_url
-    end
-
-    def destroy_all
-      filter_jobs(QueueClassicLaterJob).delete_all
-      redirect_to queue_classic_jobs_url
-    end
-
-    private
-    def index_path(*params)
-      queue_classic_later_jobs_path(*params)
-    end
-
-    def later?
-      true
-    end
-
-    helper_method :index_path
-    helper_method :later?
-  end
-end

data/app/helpers/queue_classic_admin/queue_classic_later_jobs_helper.rb

@@ -1,4 +0,0 @@
-module QueueClassicAdmin
-  module QueueClassicLaterJobsHelper
-  end
-end

data/app/models/queue_classic_admin/queue_classic_later_job.rb

@@ -1,6 +0,0 @@
-module QueueClassicAdmin
-  class QueueClassicLaterJob < ActiveRecord::Base
-    include JobCommon
-    self.table_name = 'queue_classic_later_jobs'
-  end
-end