resque-bus 0.2.3 → 0.2.4

data/lib/resque_bus/application.rb

@@ -67,7 +67,7 @@ module ResqueBus
     def event_display_tuples
       out = []
       subscriptions.all.each do |sub|
-        out << [sub.event_name, sub.queue_name]
+        out << [sub.class_name, sub.queue_name, sub.matcher.filters]
       end
       out
     end

data/lib/resque_bus/server/views/bus.erb

@@ -14,6 +14,7 @@ else
 
 <%
   app_hash = {}
+  class_hash = {}
   event_hash = {}
   
   # collect each differently
@@ -22,16 +23,25 @@ else
     
     app_hash[app_key] ||= []
     app.event_display_tuples.each do |tuple|
-      event, queue = tuple
-      app_hash[app_key] << [event, queue]
+      class_name, queue, filters = tuple
+      if filters["bus_event_type"]
+        event = filters["bus_event_type"]
+      else
+        event = "see filter"
+      end
+      
+      app_hash[app_key] << [event, class_name, queue, filters]
       
+      class_hash[class_name] ||= []
+      class_hash[class_name] << [app_key, event, queue, filters]
+
       event_hash[event] ||= []
-      event_hash[event] << [app_key, queue]
+      event_hash[event] << [app_key, class_name, queue, filters]
     end
   end
   
   # sort each list item by secondary label
-  event_hash.each do |_, array|
+  class_hash.each do |_, array|
     array.sort!{ |a,b| a.first <=> b.first }
   end
   event_hash.each do |_, array|
@@ -49,8 +59,9 @@ else
     if !val
       out = "<td>&nbsp;</td><td>&nbsp;</td>"
     else
-      detail, queue = val
-      out = "<td>#{h(detail)}</td><td><a href='#{u("queues/#{queue}")}'>#{h(queue)}</a></td>"
+      one, two, queue, filters = val
+      out = "<td>#{h(one)}</td><td>#{h(two)}</td><td><a href='#{u("queues/#{queue}")}'>#{h(queue)}</a></td>"
+      out << "<td>#{h(Resque.encode(filters).gsub(/\"bus_special_value_(\w+)\"/){ "(#{$1})" }).gsub(" ", "&nbsp;").gsub('&quot;,&quot;', '&quot;, &quot;')}</td>"
     end
     
     if first
@@ -77,25 +88,46 @@ else
 
 
 <h1 class='wi'>Applications</h1>
-<p class='intro'>The apps below have registered the given event types and queues.</p>
+<p class='intro'>The apps below have registered the given classes and queues.</p>
 <table class='queues'>
   <tr>
     <th>App Key</th>
     <th>Event Type</th>
+    <th>Class Name</th>
     <th>Queue</th>
+    <th>Filters</th>
   </tr>
   <%= output_hash(app_hash, ["Unsubscribe", "bus/unsubscribe"]) %>
 </table>
 
 <p>&nbsp;</p>
-  
+
 <h1 class='wi'>Events</h1>
-<p class='intro'>The event types below have been registered by the given applications and queues.</p>
+<p class='intro'>The events below have been registered by the given applications and queues.</p>
 <table class='queues'>
   <tr>
     <th>Event Type</th>
     <th>App Key</th>
+    <th>Class Name</th>
     <th>Queue</th>
+    <th>Filters</th>
   </tr>
   <%= output_hash(event_hash, false) %>
 </table>
+
+
+
+<p>&nbsp;</p>
+  
+<h1 class='wi'>Classes</h1>
+<p class='intro'>The classes below have been registered by the given applications and queues.</p>
+<table class='queues'>
+  <tr>
+    <th>Class Name</th>
+    <th>App Key</th>
+    <th>Event Type</th>
+    <th>Queue</th>
+    <th>Filters</th>
+  </tr>
+  <%= output_hash(class_hash, false) %>
+</table>

data/lib/resque_bus/server.rb

@@ -1,5 +1,6 @@
 require 'resque-bus'
 require 'resque/server'
+require 'erb'
 
 # Extend Resque::Server to add tabs.
 module ResqueBus

data/lib/resque_bus/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Bus
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-bus
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors: