queue_classic_admin 0.0.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851415209926f178a6e77e82763e314e39e9d186
-  data.tar.gz: 4e4164c9807cbcafb3d0790aecf996e85bfc235b
+  metadata.gz: af3e82cb0e74c8f07092805d70faac50787c24a1
+  data.tar.gz: a96d62309d29728cebc1431416adadab9518f870
 SHA512:
-  metadata.gz: 628666910f834624a20a69efd19ca3057b503af02ba3b1299502c31359dc94d5c30d6b2dc8f78cbadf8d8489d7de15da1ba0e400a3548e9922d13b3cbed4599d
-  data.tar.gz: dbdb4cef1c9bf9d473fc2b18c267a6e7cbb28665161053ebfc71ad3a7dd47ed70a4ec3a8f056b227f5f067cb865e0b418d41a73b1539ed595dc3bf235bce8aab
+  metadata.gz: 0e3107691428b831903a91f6789019bf1cc1337c0a9be62ffb74efe55f57136efdbe406c5ed7ba83b2eb0b6b0e9c06df6e51b004ff1907b068e3408e14b8a5c9
+  data.tar.gz: 96031b1f2af02a9d50b5c11c21e9a4fef5ded8bc7ab1c8cf82ecd4d8b3268eb74e01e9aeef51b4c76fbbfa0d5abff343e424ce0e9c7439a3bac89fc70afc2a80

data/README.md

@@ -4,6 +4,8 @@
 
 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.
 
+**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.**
+
 ![qc admin](https://f.cloud.github.com/assets/148622/865030/9b1b2610-f62e-11e2-8908-8c271bfe0f6c.png)
 
 
@@ -13,6 +15,7 @@ An admin interface for the [queue_classic](https://github.com/ryandotsmith/queue
 * Support for custom columns
 * Delete entire queues
 * Delete jobs
+* Search
 
 
 # Install
@@ -53,14 +56,21 @@ end
 
 # Development
 
+```bash
+git clone git@github.com:rainforestapp/queue_classic_admin.git
+```
+
 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)
+(cd spec/dummy && bundle exec rake db:create:all db:migrate)
+# 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 && rake db:create:all db:migrate)
+(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/controllers/queue_classic_admin/application_controller.rb

@@ -11,7 +11,7 @@ module QueueClassicAdmin
         @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]}")
+        @queue_classic_jobs = @queue_classic_jobs.reorder("#{params[:sort]} #{params[:dir]} NULLS LAST")
       end
       @queue_classic_jobs
     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, :custom]
+    before_filter :get_job, only: [:destroy, :unlock, :custom, :show]
     def index
       filter_jobs(QueueClassicJob)
       @queue_classic_jobs = @queue_classic_jobs.paginate(page: params[:page])
@@ -29,6 +29,11 @@ module QueueClassicAdmin
       redirect_to :back
     end
 
+    def show
+      query = "SELECT * FROM pg_catalog.pg_locks lock JOIN pg_catalog.pg_stat_activity stat ON lock.pid = stat.pid WHERE lock.pid = #{@queue_classic_job.locked_by.to_i}"
+      @locks = QueueClassicJob.connection.execute(query)
+    end
+
     def custom
       custom_action = QueueClassicAdmin.custom_actions[params[:custom_action]]
       custom_action.action.call(@queue_classic_job)

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"].freeze
+      KNOWN_COLUMN = ["id", "q_name", "method", "args", "locked_at", "created_at", "not_before", "locked_by"].freeze
       SEARCHABLE_COLUMNS = [ :method, :args ].freeze
 
       def queue_counts
@@ -19,18 +19,24 @@ module QueueClassicAdmin
       end
 
       def search(query)
-        sql = searchable_columns.inject([]) do |sql, field|
-          sql << "#{field} LIKE :query"
-        end.join(" OR ")
+        sql = searchable_columns.map do |field|
+          unless field == :args && args_is_json?
+            "#{field} LIKE :query"
+          end
+        end.reject(&:nil?).join(" OR ")
 
         wildcard_query = ["%", query, "%"].join
         relation.where(sql, query: wildcard_query)
       end
+
+      def args_is_json?
+        self.column_types["args"].type == :json
+      end
     end
 
     module InstanceMethods
       def arguments
-        if self.class.column_types["args"].type == :json
+        if self.class.args_is_json?
           args
         else
           MultiJson.decode(args)

data/app/views/queue_classic_admin/queue_classic_jobs/show.html.erb

@@ -0,0 +1,15 @@
+<h1>Details for job #<%= @queue_classic_job.id %></h1>
+<% @queue_classic_job.attributes.each do |attr, value| %>
+  <p>
+    <strong><%= attr %></strong>: <%= value %>
+  </p>
+<% end %>
+
+<h2>Locks</h2>
+<% if @locks.count == 0 %>
+  There are no locks related.
+<% end %>
+<% @locks.each do |lock| %>
+  <hr>
+  <%= lock %>
+<% end %>

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

@@ -23,6 +23,7 @@
       <%= sortable_column :id, "ID" %>
       <%= sortable_column :created_at, "Enqueued At" %>
       <%= sortable_column :locked_at, "Locked At" %>
+      <%= sortable_column :locked_by, "Locked By" %>
       <%= sortable_column :method, "Method" %>
       <%= sortable_column :args, "Arguments" %>
       <% if @klass.columns_hash['not_before'] %>
@@ -48,25 +49,32 @@
   <% @queue_classic_jobs.each do |queue_classic_job| %>
     <tr>
       <td><%= queue_classic_job.q_name  %></td>
-      <td><%= queue_classic_job.id  %></td>
+      <td><%= link_to queue_classic_job.id, queue_classic_job  %></td>
       <td>
-        <%= time_ago_in_words queue_classic_job.created_at %>
-        <br/>
-        <small>
-          (<%= queue_classic_job.created_at %>)
-        </small>
+        <% if queue_classic_job.respond_to?(:created_at) %>
+          <%= time_ago_in_words queue_classic_job.created_at %>
+          <br/>
+          <small>
+            (<%= queue_classic_job.created_at %>)
+          </small>
+        <% else %>
+          &mdash;
+        <% end %>
       </td>
       <td>
         <% if queue_classic_job[:locked_at].nil? %>
-        &mdash;
+          &mdash;
         <% else %>
-        <%= time_ago_in_words queue_classic_job.locked_at %>
-        <br/>
-        <small>
-          (<%= queue_classic_job.locked_at %>)
-        </small>
+          <%= time_ago_in_words queue_classic_job.locked_at %>
+          <br/>
+          <small>
+            (<%= queue_classic_job.locked_at %>)
+          </small>
         <% end %>
       </td>
+      <td>
+        <%= queue_classic_job[:locked_by] %>
+      </td>
       <td><%= queue_classic_job.method  %></td>
       <td><%= queue_classic_job.arguments.inspect%></td>
       <% if @klass.columns_hash['not_before'] %>
@@ -78,10 +86,12 @@
       <% end %>
 
       <td>
+        <%= link_to 'Details', queue_classic_job_path(queue_classic_job), class: 'btn btn-info' %>
         <%= link_to 'Destroy', queue_classic_job, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
         <% 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 %>

data/config/routes.rb

@@ -14,6 +14,7 @@ QueueClassicAdmin::Engine.routes.draw do
     member do
       post :unlock
       post :custom
+      get :show
     end
   end
 

data/db/migrate/20130627175128_add_created_column.rb

@@ -1,14 +1,16 @@
 class AddCreatedColumn < ActiveRecord::Migration
   def up
-    %w(queue_classic_later_jobs queue_classic_jobs).each do |table|
-      if ActiveRecord::Base.connection.table_exists?(:table)
+    %w(queue_classic_later_jobs).each do |table|
+      if ActiveRecord::Base.connection.table_exists?(table)
         execute "ALTER TABLE #{table} ADD COLUMN created_at TIMESTAMP NOT NULL DEFAULT now();"
+      else
+        say "Skiping migration because table #{table} does not exist"
       end
     end
   end
 
   def down
-    %w(queue_classic_later_jobs queue_classic_jobs).each do |table|
+    %w(queue_classic_later_jobs).each do |table|
       remove_column table, :created_at
     end
   end

data/lib/queue_classic_admin/version.rb

@@ -1,3 +1,3 @@
 module QueueClassicAdmin
-  VERSION = "0.0.13"
+  VERSION = "0.2.0"
 end

data/lib/queue_classic_admin.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Mathieu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.0.9
 - !ruby/object:Gem::Dependency
   name: queue_classic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -136,6 +136,7 @@ files:
 - 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/shared/_job_list.html.erb
 - config/routes.rb