sidekiq_monitor 0.0.5 → 0.0.6

data/app/assets/javascripts/sidekiq/monitor/abstract_jobs_table.js.coffee

@@ -101,8 +101,11 @@ class SidekiqMonitor.AbstractJobsTable
         </pre>
       """
     else if result?
-      rows_html = "<tr><td>#{key}</td><td>#{value}</td></tr>" for key, value in result
+      rows_html = ''
+      for key, value of result
+        rows_html += "<tr><td>#{key}</td><td>#{JSON.stringify(value, null, 2)}</td></tr>"
       result_html = """
+        <h4>Result</h4>
         <table class="table table-striped">
           #{rows_html}
         </table>
@@ -116,6 +119,10 @@ class SidekiqMonitor.AbstractJobsTable
         </div>
         <div class="modal-body">
           <table class="table table-striped">
+            <tr>
+              <th>ID</th>
+              <td>#{id}</td>
+            </tr>
             <tr>
               <th>JID</th>
               <td>#{jid}</td>

data/app/datatables/sidekiq/monitor/jobs_datatable.rb

@@ -3,6 +3,16 @@ module Sidekiq
     class JobsDatatable < AjaxDatatablesRails
       include ActionView::Helpers::DateHelper
 
+      @search_filters = []
+
+      class << self
+        attr_reader :search_filters
+
+        def add_search_filter(search_filter)
+          @search_filters << search_filter
+        end
+      end
+
       def initialize(view)
         @model_name = Sidekiq::Monitor::Job
         @columns = [
@@ -71,6 +81,50 @@ module Sidekiq
       def simplified_distance_of_time_in_words(from_time, to_time)
         distance_of_time_in_words(from_time, to_time, true).gsub('less than ', '').gsub('about ', '')
       end
+
+      def search_records(records)
+        if params[:sSearch].present?
+          records = apply_search_value_to_records(params[:sSearch], records)
+        end
+        conditions = @columns.each_with_index.map do |column, index|
+          value = params[:"sSearch_#{index}"]
+          search_condition(column, value) if value.present?
+        end
+        conditions = conditions.compact.reduce(:and)
+        records = records.where(conditions) if conditions.present?
+        records
+      end
+
+      def apply_search_value_to_records(search_value, records)
+        search_terms = []
+        search_value.split.each do |search_term|
+          filter_applied = false
+          self.class.search_filters.each do |search_filter|
+            if search_term =~ search_filter[:pattern]
+              records = search_filter[:filter].call(search_term, records)
+              filter_applied = true
+              break
+            end
+          end
+          search_terms << search_term unless filter_applied
+        end
+        value = search_terms.join(' ')
+        conditions = @searchable_columns.map do |column|
+          search_condition(column, value)
+        end
+        conditions = conditions.reduce(:or)
+        records = records.where(conditions)
+        records
+      end
+
+      def search_condition(column, value)
+        column = column.split('.').last
+        column_hash = @model_name.columns_hash[column]
+        if column_hash && [:string, :text].include?(column_hash.type)
+          return @model_name.arel_table[column].matches("%#{value}%")
+        end
+        @model_name.arel_table[column].eq(value)
+      end
     end
   end
 end

data/lib/sidekiq/monitor.rb

@@ -4,6 +4,8 @@ require 'ajax-datatables-rails'
 
 directory = File.dirname(File.absolute_path(__FILE__))
 Dir.glob("#{directory}/monitor/**/*.rb") { |file| require file }
+# Require JobsDatatable to expose JobsDatatable.add_search_filter
+Dir.glob("#{directory}/../../app/datatables/sidekiq/monitor/jobs_datatable.rb") { |file| require file }
 
 module Sidekiq
   module Monitor

data/lib/sidekiq/monitor/processor.rb

@@ -45,6 +45,7 @@ module Sidekiq
           backtrace: exception.backtrace
         }
         job = find_job(msg)
+        return unless job
         job.update_attributes(
           finished_at: DateTime.now,
           status: 'failed',
@@ -54,6 +55,7 @@ module Sidekiq
 
       def complete(worker, msg, queue, return_value)
         job = find_job(msg)
+        return unless job
         job.update_attributes(
           finished_at: DateTime.now,
           status: 'complete',

data/lib/sidekiq/monitor/server/middleware.rb

@@ -15,6 +15,7 @@ module Sidekiq
             raise exception
           end
           @processor.complete(worker, msg, queue, return_value)
+          return_value
         end
       end
     end

data/lib/sidekiq/monitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Monitor
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -84,18 +84,10 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/sidekiq/monitor/abstract_jobs_table.js.coffee
 - app/assets/javascripts/sidekiq/monitor/application.js.coffee
-- app/assets/javascripts/sidekiq/monitor/bootstrap-select.min.js
-- app/assets/javascripts/sidekiq/monitor/bootstrap.min.js
-- app/assets/javascripts/sidekiq/monitor/datatables.bootstrap.js
-- app/assets/javascripts/sidekiq/monitor/datatables.js
-- app/assets/javascripts/sidekiq/monitor/datatables.standing_redraw.js.coffee
 - app/assets/javascripts/sidekiq/monitor/initialize.js.coffee.erb
 - app/assets/javascripts/sidekiq/monitor/jobs_table.js.coffee
-- app/assets/javascripts/sidekiq/monitor/jquery.timeago.js
 - app/assets/javascripts/sidekiq/monitor/queue_jobs_table.js.coffee
 - app/assets/stylesheets/sidekiq/monitor/application.css.sass
-- app/assets/stylesheets/sidekiq/monitor/bootstrap-select.min.css
-- app/assets/stylesheets/sidekiq/monitor/bootstrap.min.css
 - app/assets/stylesheets/sidekiq/monitor/jobs_table.css.sass
 - app/assets/stylesheets/sidekiq/monitor/layout.css.sass
 - app/controllers/sidekiq/monitor/api/jobs_controller.rb
@@ -122,6 +114,14 @@ files:
 - lib/sidekiq/monitor/version.rb
 - lib/sidekiq/monitor.rb
 - lib/sidekiq_monitor.rb
+- vendor/assets/javascripts/sidekiq/monitor/bootstrap-select.min.js
+- vendor/assets/javascripts/sidekiq/monitor/bootstrap.min.js
+- vendor/assets/javascripts/sidekiq/monitor/datatables.bootstrap.js
+- vendor/assets/javascripts/sidekiq/monitor/datatables.js
+- vendor/assets/javascripts/sidekiq/monitor/datatables.standing_redraw.js.coffee
+- vendor/assets/javascripts/sidekiq/monitor/jquery.timeago.js
+- vendor/assets/stylesheets/sidekiq/monitor/bootstrap-select.min.css
+- vendor/assets/stylesheets/sidekiq/monitor/bootstrap.min.css
 - MIT-LICENSE
 - Rakefile
 - README.md