sidekiq-redislog 0.0.3 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 0.0.5
+  * Made compatible with Sidekiq 2.14 (changed admin page structure around breaking it).
 ## 0.0.3
   * Fixed licensing issue and updated description
 ## 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq-redislog (0.0.3)
+    sidekiq-redislog (0.0.5)
       sidekiq (>= 2.2.1)
       sinatra
       slim
@@ -10,8 +10,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+    celluloid (0.15.0)
+      timers (~> 1.1.0)
     connection_pool (1.1.0)
     hike (1.2.3)
     json (1.8.0)
@@ -23,27 +23,27 @@ GEM
       rack (>= 1.0)
     rake (10.0.4)
     redis (3.0.4)
-    redis-namespace (1.3.0)
+    redis-namespace (1.3.1)
       redis (~> 3.0.0)
-    sidekiq (2.13.0)
+    sidekiq (2.14.0)
       celluloid (>= 0.14.1)
       connection_pool (>= 1.0.0)
       json
-      redis (>= 3.0)
+      redis (>= 3.0.4)
       redis-namespace
     sinatra (1.4.3)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slim (2.0.0)
-      temple (~> 0.6.5)
-      tilt (~> 1.3, >= 1.3.3)
+    slim (2.0.1)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    temple (0.6.5)
+    temple (0.6.6)
     tilt (1.4.1)
     timers (1.1.0)
 

data/lib/sidekiq/redislog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module RedisLog
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

data/lib/sidekiq/redislog/views/sidekiq_redis_log.erb

@@ -0,0 +1,29 @@
+<header>
+    <h3>Redis Log</h3>
+</header>
+<textarea id="logger" style="width: 100%;" rows="20" cols="50" readonly="true"></textarea>
+
+<script>
+  var show_logs_for = function(event_channel, event_id, log_id) {
+
+    if (!!window.EventSource) {
+      source = new EventSource(event_channel); // match routes.rb
+
+      element = document.getElementById(log_id); // match template
+
+      source.addEventListener(event_id, function(e) {
+        //firefox has no 'data'
+        if (e.data) data = e.data; else data = e;
+
+        element.innerHTML += data + "\n";
+        element.scrollTop = element.scrollHeight;
+      });
+    }
+    else {
+      // Result to xhr polling :(  TODO
+    }
+  };
+
+  show_logs_for('/sidekiq/redis_log_stream', 'redis_log', 'logger')
+
+</script>

data/lib/sidekiq/redislog/views/sidekiq_redis_log.slim

@@ -25,7 +25,5 @@ javascript:
     }
   };
 
-  $(function() {
-    show_logs_for('/sidekiq/redis_log_stream', 'redis_log', 'logger')
-  });
+  show_logs_for('/sidekiq/redis_log_stream', 'redis_log', 'logger')
 

data/lib/sidekiq/redislog/web_extension.rb

@@ -8,7 +8,13 @@ module Sidekiq
 
         app.get "/redis" do
           view_path = File.join(File.expand_path("..", __FILE__), "views")
-          render(:slim, File.read(File.join(view_path, "sidekiq_redis_log.slim")))
+
+          if Sidekiq::VERSION < "2.14.0"
+            render(:slim, File.read(File.join(view_path, "sidekiq_redis_log.slim")))
+          else
+            render(:erb, File.read(File.join(view_path, "sidekiq_redis_log.erb")))
+          end
+
         end
 
         app.get "/redis_log_stream", provides: 'text/event-stream' do

data/lib/sidekiq/redislog.rb

@@ -10,9 +10,11 @@ end
 
 Sidekiq::Web.register Sidekiq::RedisLog::WebExtension
 
-if Sidekiq::Web.tabs.is_a?(Array)
-  # For sidekiq < 2.5
-  Sidekiq::Web.tabs << "redis"
-else
-  Sidekiq::Web.tabs["Redis"] = "redis"
+if defined?(Sidekiq::Web)
+  if Sidekiq::Web.tabs.is_a?(Array)
+    # For sidekiq < 2.5
+    Sidekiq::Web.tabs << "redis"
+  else
+    Sidekiq::Web.tabs["Redis"] = "redis"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-redislog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -125,6 +125,7 @@ files:
 - lib/sidekiq/redislog.rb
 - lib/sidekiq/redislog/redis_log_helper.rb
 - lib/sidekiq/redislog/version.rb
+- lib/sidekiq/redislog/views/sidekiq_redis_log.erb
 - lib/sidekiq/redislog/views/sidekiq_redis_log.slim
 - lib/sidekiq/redislog/web_extension.rb
 - sidekiq-redis-log.gemspec
@@ -145,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -564681486513256759
+      hash: 726951028716243062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -564681486513256759
+      hash: 726951028716243062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25