sidekiq-history 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e711beba2411f9370535f25a55b155b4d0a8c9e3
-  data.tar.gz: 4faacedaa5eea21af2f434241a347204399e4d99
+  metadata.gz: 6706f6114baf8bd2857f5a026db7c2a10a1e8b28
+  data.tar.gz: 551c77a01e74c87c36d954c6935fa157a1030146
 SHA512:
-  metadata.gz: e6683e24506da4e4ee7ee784a56a898efc1d168b1cad95cfc2ba8c6a30f9026c2c992dfb94bf3b6ea316205a0cdf49380cb340f3207649566786125b37abad9b
-  data.tar.gz: f999ee580abacebe22811b5b057eb6cb1c84a5c92977d0b44c35f10612728342da7e8ce7a167863575f296ad1668fe41149aed25fa50b635ac786915e7dc4d26
+  metadata.gz: 1ca66b193bd21ac805c9eccbb12094d7558e0858bd064fa7fda76d2171fc58e32e0741351665ab60fb32b7424c9ccabbaf43d62b7f55c1085dc90e3973d50a01
+  data.tar.gz: 02fef2c9d2aa38a22e497d0a94eb6d536ae30df0281c68574dade96773093276975bdb4a1f4cf233291e380ff4ec549f88a924b19ced1a04e3bd8cba5663aad1

data/lib/sidekiq/history.rb

@@ -26,9 +26,17 @@ module Sidekiq
     end
 
     def self.count
-      Sidekiq.redis { |r| r.llen(LIST_KEY) }
+      Sidekiq.redis { |r| r.zcard(LIST_KEY) }
     end
+
+    class HistorySet < Sidekiq::JobSet
+      def initialize
+        super LIST_KEY
+      end
+    end
+
   end
+
 end
 
 Sidekiq.configure_server do |config|

data/lib/sidekiq/history/middleware.rb

@@ -19,9 +19,21 @@ module Sidekiq
         }
 
         Sidekiq.redis do |conn|
-          conn.lpush(LIST_KEY, Sidekiq.dump_json(data))
+          # migration of list to set for backwards compatibility after v0.0.4
+          if conn.type(LIST_KEY) == 'list'
+            length = conn.llen(LIST_KEY)
+            list = conn.lrange(LIST_KEY, 0, length)
+            conn.del(LIST_KEY)
+            list.each do |entry|
+              migrated_data = JSON.parse(entry)
+              conn.zadd(LIST_KEY, data[:started_at].to_f, Sidekiq.dump_json(migrated_data))
+            end
+          end
+
+          # regular storage of history
+          conn.zadd(LIST_KEY, data[:started_at].to_f, Sidekiq.dump_json(data))
           unless Sidekiq.history_max_count == false
-            conn.ltrim(LIST_KEY, 0, Sidekiq.history_max_count - 1)
+            conn.zremrangebyrank(LIST_KEY, 0, -(Sidekiq.history_max_count + 1))
           end
         end
 

data/lib/sidekiq/history/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module History
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/sidekiq/history/web_extension.rb

@@ -12,11 +12,25 @@ module Sidekiq
           render(:erb, File.read("#{ROOT}/views/history.erb"))
         end
 
-        app.post "/history/remove" do
+        app.post '/history/remove' do
           Sidekiq::History.reset_history(counter: params['counter'])
           redirect("#{root_path}history")
         end
 
+        app.get '/filter/history' do
+          return redirect "#{root_path}history" unless params[:substr]
+
+          @messages = search(HistorySet.new, params[:substr])
+          render(:erb, File.read("#{ROOT}/views/history.erb"))
+        end
+
+        app.post '/filter/history' do
+          return redirect "#{root_path}history" unless params[:substr]
+
+          @messages = search(HistorySet.new, params[:substr])
+          render(:erb, File.read("#{ROOT}/views/history.erb"))
+        end
+
         app.settings.locales << File.expand_path('locales', ROOT)
       end
     end

data/web/views/history.erb

@@ -7,6 +7,7 @@
       <%= erb :_paging, :locals => { :url => "#{root_path}history" } %>
     </div>
   <% end %>
+  <%= filtering('history') %>
 </header>
 
 <% if @messages.size > 0 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-history
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Russ Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq