queue_classic_admin 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a58c69e7e867116a6c77b00df9c6005ad3f5599
-  data.tar.gz: 39f32e4d9a8204087f939833df9109ac356ba3a5
+  metadata.gz: 41a0eb24e9a9c27f51984d4752a4968996fa6b17
+  data.tar.gz: 2d04cb799e6465d420aaded11d2372364aed63c3
 SHA512:
-  metadata.gz: 0352c8793f908735b614110b0fe8f060a5e8514425807466f343d81b84310667aaa18b27838040a4c0c133497ba2a5714e4a2fec2a5f2471419c6fdcd54feabe
-  data.tar.gz: 7f618ede8f3f8c7e3599951a7033c693b10026ed1398c6a39f9e94eb990a0b3bf2d5f2a56232be99f99917dd479d6298930d69ba0f5e378cfe1d6876f4d97b9f
+  metadata.gz: 5d05e96c59f06aa118cd1e5c15689ecc2078d849f9d73ecc1ccd857650b7ade9a856e6c6a17a2bc41b95a090241b873747c32193c46d695edb4e8fe6e10d1677
+  data.tar.gz: 9f3dd7e54e6509deb451c4bfb099fd5cfa73652cd914b6db362d6d46a1813c23bf2967cc3f195e0113952f056f6d86bfacea29e3781719c1be9ab542022f6f15

data/README.md

@@ -1,5 +1,7 @@
 # Queue Classic Admin
 
+[![Build Status](https://travis-ci.org/rainforestapp/queue_classic_admin.png)](https://travis-ci.org/rainforestapp/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.
 
 ![qc admin](https://f.cloud.github.com/assets/148622/865030/9b1b2610-f62e-11e2-8908-8c271bfe0f6c.png)
@@ -12,6 +14,7 @@ An admin interface for the [queue_classic](https://github.com/ryandotsmith/queue
 * Delete entire queues
 * Delete jobs
 
+
 # Install
 
 Copy and run the migrations
@@ -23,7 +26,34 @@ Mount in your rails app config/routes.rb file
 
     mount QueueClassicAdmin::Engine => "/queue_classic_admin"
 
-# TODO 
+# Configuration
+
+## Custom searchable fields
+
+```ruby
+QueueClassicJob.searchable_columns << :my_custom_fields
+
+```
+
+## Custom job action
+
+```ruby
+QueueClassicAdmin.add_custom_action "Retry" do |job|
+  job.q_name = "low"
+  job.save!
+end
+```
+
+# Development
+
+You can develop with POW by configuring it like so:
+
+```bash
+ln -s $PWD/spec/dummy ~/.pow/qc-admin
+(cd spec/dummy && rake db:create:all db:migrate)
+
+ln -s $PWD/spec/dummy-no-later ~/.pow/qc-admin-no-later
+(cd spec/dummy-no-later && rake db:create:all db:migrate)
+```
 
-- Use something more lightweight than bootstrap
-- Don't die if the queue_classic-later gem is missing
+Then go to [http://qc-admin.dev/](http://qc-admin.dev/).

data/Rakefile

@@ -23,7 +23,8 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

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

@@ -16,3 +16,8 @@
 body .container-fluid .row-fluid {
   padding-top: 60px;
 }
+
+#search {
+  display: inline-block;
+  float: right;
+}

data/app/controllers/queue_classic_admin/application_controller.rb

@@ -3,10 +3,16 @@ module QueueClassicAdmin
     protected
     def filter_jobs(klass)
       @klass = klass
-      @queue_classic_jobs = klass.scoped
+      @queue_classic_jobs = klass.order("id DESC")
       if params[:q_name].present?
         @queue_classic_jobs = @queue_classic_jobs.where(q_name: params[:q_name])
       end
+      if params[:search].present?
+        @queue_classic_jobs = @queue_classic_jobs.search(params[:search])
+      end
+      if params[:sort].present?
+        @queue_classic_jobs = @queue_classic_jobs.reorder("#{params[:sort]} #{params[:dir]}")
+      end
       @queue_classic_jobs
     end
   end

data/app/controllers/queue_classic_admin/queue_classic_jobs_controller.rb

@@ -2,7 +2,7 @@ require_dependency "queue_classic_admin/application_controller"
 
 module QueueClassicAdmin
   class QueueClassicJobsController < ApplicationController
-    before_filter :get_job, only: [:destroy, :unlock]
+    before_filter :get_job, only: [:destroy, :unlock, :custom]
     def index
       filter_jobs(QueueClassicJob)
       @queue_classic_jobs = @queue_classic_jobs.paginate(page: params[:page])
@@ -10,14 +10,14 @@ module QueueClassicAdmin
 
     def destroy
       @queue_classic_job.destroy
-      redirect_to queue_classic_jobs_url
+      redirect_to :back
     end
 
     def destroy_all
       filter_jobs(QueueClassicJob).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)
       redirect_to queue_classic_jobs_url
@@ -26,8 +26,13 @@ module QueueClassicAdmin
     def unlock
       @queue_classic_job.locked_at = nil
       @queue_classic_job.save
-      
-      redirect_to queue_classic_jobs_url
+      redirect_to :back
+    end
+
+    def custom
+      custom_action = QueueClassicAdmin.custom_actions[params[:custom_action]]
+      custom_action.action.call(@queue_classic_job)
+      redirect_to :back
     end
 
     private

data/app/helpers/queue_classic_admin/application_helper.rb

@@ -1,4 +1,26 @@
 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")
+      content_tag :th do
+        s = link_to title, params.merge(opts)
+        if params[:sort] == name.to_s
+          icon = if params[:dir] == 'asc'
+            "↑"
+          else
+            "↓"
+          end
+          s += raw(icon)
+        end
+        s.html_safe
+      end
+    end
   end
 end

data/app/models/queue_classic_admin/job_common.rb

@@ -2,6 +2,8 @@ module QueueClassicAdmin
   module JobCommon
     module ClassMethods
       KNOWN_COLUMN = ["id", "q_name", "method", "args", "locked_at", "created_at", "not_before"]
+      SEARCHABLE_COLUMNS = [ :method, :args ]
+
       def queue_counts
         group(:q_name).count
       end
@@ -9,14 +11,27 @@ module QueueClassicAdmin
       def extra_columns
         columns.map(&:name) - KNOWN_COLUMN
       end
+
+      def searchable_columns
+        @searchable_columns ||= SEARCHABLE_COLUMNS.dup
+      end
+
+      def search(query)
+        sql = searchable_columns.inject([]) do |sql, field|
+          sql << "#{field} LIKE ?"
+        end.join(" OR ")
+
+        wildcard_query = ["%", query, "%"].join
+        relation.where(sql, *([wildcard_query] * SEARCHABLE_COLUMNS.size))
+      end
     end
-  
+
     module InstanceMethods
       def arguments
         JSON.parse(args)
       end
     end
-  
+
     def self.included(receiver)
       receiver.extend ClassMethods
       receiver.send :include, InstanceMethods

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

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

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

@@ -1,3 +1,10 @@
+<div id="search">
+  <%= form_tag(url_for(params), method: 'GET') do %>
+    <%= hidden_field_tag :q_name, params[:q_name] %>
+    <input class="search-query" name="search" placeholder="Search jobs" value="<%= params[:search] %>"/>
+  <% end %>
+</div>
+
 <ul class="nav nav-pills">
   <li class="<%= q_name_pill_class(nil)%>" >
     <a href="<%= index_path %>"><%= "All (#{@klass.count})" %></a>
@@ -12,25 +19,25 @@
 <table class="table table-striped table-bordered">
   <thead>
     <tr>
-      <th>Queue</th>
-      <th>ID</th>
-      <th>Enqueued At</th>
-      <th>Locked At</th>
-      <th>Method</th>
-      <th>Arguments</th>
+      <%= sortable_column :queue_name, "Queue" %>
+      <%= sortable_column :id, "ID" %>
+      <%= sortable_column :created_at, "Enqueued At" %>
+      <%= sortable_column :locked_at, "Locked At" %>
+      <%= sortable_column :method, "Method" %>
+      <%= sortable_column :args, "Arguments" %>
       <% if @klass.columns_hash['not_before'] %>
         <th>Run At</th>
       <% end %>
       <% @klass.extra_columns.each do |column| %>
-        <th><%= column %></th>
+        <%= sortable_column column, column.titleize %>
       <% end %>
       <th>
         <%=
-          link_to "Destroy All", url_for(params.merge(action: 'destroy_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :delete}
+          link_to "Destroy Matching", url_for(params.merge(action: 'destroy_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :delete}
         %>
         <% unless later? %>
           <%=
-            link_to "Unlock All > 5 mins", url_for(params.merge(action: 'unlock_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :put}
+            link_to "Unlock Matching > 5 mins", url_for(params.merge(action: 'unlock_all')), class: 'btn btn-danger', data: {confirm: "Are you sure?", method: :put}
           %>
         <% end %>
       </th>
@@ -75,6 +82,9 @@
         <% if queue_classic_job[:locked_at] %>
           <%= link_to 'Unlock', unlock_queue_classic_job_path(queue_classic_job), method: :post, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
         <% end %>
+        <% QueueClassicAdmin.custom_actions.each do |slug, action| %>
+          <%= link_to action.name, custom_queue_classic_job_path(queue_classic_job, custom_action: slug), method: :post, class: "btn btn-danger" %>
+        <% end %>
       </td>
     </tr>
   <% end %>

data/config/routes.rb

@@ -13,8 +13,9 @@ QueueClassicAdmin::Engine.routes.draw do
 
     member do
       post :unlock
+      post :custom
     end
   end
 
   root to: "queue_classic_jobs#index"
-end
+end

data/lib/queue_classic_admin/custom_action.rb

@@ -0,0 +1,15 @@
+module QueueClassicAdmin
+  class CustomAction
+    attr_reader :name, :action
+
+    def initialize(name, &block)
+      @name, @action = name, block
+    end
+
+    def slug
+      name.underscore
+    end
+
+  end
+end
+

data/lib/queue_classic_admin/engine.rb

@@ -1,5 +1,13 @@
 module QueueClassicAdmin
   class Engine < ::Rails::Engine
     isolate_namespace QueueClassicAdmin
+
+    initializer :append_migrations do |app|
+      unless app.root.to_s.match root.to_s
+        config.paths["db/migrate"].expanded.each do |expanded_path|
+          app.config.paths["db/migrate"] << expanded_path
+        end
+      end
+    end
   end
 end

data/lib/queue_classic_admin/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicAdmin
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/queue_classic_admin.rb

@@ -1,4 +1,15 @@
 require "queue_classic_admin/engine"
+require "queue_classic_admin/custom_action"
 
 module QueueClassicAdmin
+
+  def self.custom_actions
+    @@custom_actions ||= {}
+  end
+
+  def self.add_custom_action(name, &block)
+    action = CustomAction.new(name, &block)
+    custom_actions[action.slug] = action
+  end
 end
+

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Simon Mathieu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: queue_classic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   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: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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: :development
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An admin interface for QueueClassic
@@ -142,11 +142,13 @@ files:
 - db/migrate/20130626182618_add_id_to_later.rb
 - db/migrate/20130627175128_add_created_column.rb
 - lib/queue_classic_admin.rb
+- lib/queue_classic_admin/custom_action.rb
 - lib/queue_classic_admin/engine.rb
 - lib/queue_classic_admin/version.rb
 - lib/tasks/queue_classic_admin_tasks.rake
 homepage: https://github.com/rainforestapp/queue_classic_admin
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -154,17 +156,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An admin interface for QueueClassic