resque-dynamic-queues 0.6.1 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.7.0
+-----
+
+api breaking refactor, web ui improvements <51948a0> [Matt Conway]
+add rackup config for testing web ui <009ccda> [Matt Conway]
+
 0.6.1
 -----
 

data/config.ru

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require 'logger'
+
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
+require 'resque/server'
+require 'resque-dynamic-queues-server'
+
+use Rack::ShowExceptions
+run Resque::Server.new

data/lib/resque-dynamic-queues-server.rb

@@ -1,2 +1,4 @@
 require 'resque-dynamic-queues'
-require 'resque/plugins/dynamic_queues/server'
+require 'resque/plugins/dynamic_queues/server'
+
+Resque::Server.register Resque::Plugins::DynamicQueues::Server

data/lib/resque/plugins/dynamic_queues/attributes.rb

@@ -2,40 +2,50 @@ module Resque
   module Plugins
     module DynamicQueues
 
-      KEY_PREFIX = "dynamic_queue"
+      DYNAMIC_QUEUE_KEY = "dynamic_queue"
       FALLBACK_KEY = "default"
 
       module Attributes
 
-        def get_dynamic_queue(key)
-          queue_names = redis.lrange("#{KEY_PREFIX}:#{key}", 0, -1)
+        def get_dynamic_queue(key, fallback=['*'])
+          data = redis.hget(DYNAMIC_QUEUE_KEY, key)
+          queue_names = Resque.decode(data)
 
           if queue_names.nil? || queue_names.size == 0
-            queue_names = redis.lrange("#{KEY_PREFIX}:#{FALLBACK_KEY}", 0, -1)
+            data = redis.hget(DYNAMIC_QUEUE_KEY, FALLBACK_KEY)
+            queue_names = Resque.decode(data)
           end
           
           if queue_names.nil? || queue_names.size == 0
-            queue_names = Resque.queues
+            queue_names = fallback
           end
 
           return queue_names
         end
 
         def set_dynamic_queue(key, values)
-          k = "#{KEY_PREFIX}:#{key}"
+          if values.nil? or values.size == 0
+            redis.hdel(DYNAMIC_QUEUE_KEY, key)
+          else
+            redis.hset(DYNAMIC_QUEUE_KEY, key, Resque.encode(values))
+          end
+        end
+        
+        def set_dynamic_queues(dynamic_queues)
           redis.multi do
-            redis.del(k)
-            Array(values).each do |v|
-               redis.rpush(k, v)
+            redis.del(DYNAMIC_QUEUE_KEY)
+            dynamic_queues.each do |k, v|
+              set_dynamic_queue(k, v)
             end
           end
         end
 
         def get_dynamic_queues
-          dqueues = redis.keys("#{KEY_PREFIX}:*") || []
-          dqueues = dqueues.collect{|q| q.gsub('dynamic_queue:', '')}
-          dqueues << FALLBACK_KEY unless dqueues.include?(FALLBACK_KEY)
-          return dqueues
+          result = {}
+          queues = redis.hgetall(DYNAMIC_QUEUE_KEY)
+          queues.each {|k, v| result[k] = Resque.decode(v) }
+          result[FALLBACK_KEY] ||= ['*']
+          return result
         end
 
       end

data/lib/resque/plugins/dynamic_queues/server.rb

@@ -9,25 +9,46 @@ module Resque
 
         def self.registered(app)
           app.get "/dynamicqueues" do
-            @queues = Resque.get_dynamic_queues
-            dq_view :queues
+            @queues = []
+            dqueues = Resque.get_dynamic_queues
+            dqueues.each do |k, v|
+              view_data = {
+                  'name' => k,
+                  'value' => Array(v).join(", "),
+                  'expanded' => Resque::Worker.new("@#{k}").queues.join(", ")
+              }
+              @queues << view_data
+            end
+            
+            @queues.sort! do |a, b|
+              an = a['name']
+              bn = b['name']
+              if an == 'default'
+                1
+              elsif bn == 'default'
+                -1
+              else
+                an <=> bn
+              end
+            end
+            
+            plugin_view :queues
           end
 
           app.post "/dynamicqueues" do
-            key    = params['name']
-            values = params['queues'].to_s.split.collect{|q| q.gsub(/\s/, '')}
-            Resque.set_dynamic_queue(key, values)
-            redirect url(:dynamicqueues)
-          end
-
-          app.post "/dynamicqueues/:key/remove" do
-            key    = params['key']
-            Resque.set_dynamic_queue(key, [])
+            dynamic_queues = Array(params['queues'])
+            queues = {}
+            dynamic_queues.each do |queue|
+              key = queue['name']
+              values = queue['value'].to_s.split(',').collect{|q| q.gsub(/\s/, '') }
+              queues[key] = values
+            end
+            Resque.set_dynamic_queues(queues)
             redirect url(:dynamicqueues)
           end
 
           app.helpers do
-            def dq_view(filename, options = {}, locals = {})
+            def plugin_view(filename, options = {}, locals = {})
               erb(File.read(File.join(::Resque::Plugins::DynamicQueues::Server::VIEW_PATH, "#{filename}.erb")), options, locals)
             end
           end
@@ -38,5 +59,3 @@ module Resque
     end
   end
 end
-
-Resque::Server.register Resque::Plugins::DynamicQueues::Server

data/lib/resque/plugins/dynamic_queues/server/views/queues.erb

@@ -1,58 +1,61 @@
 <h1>Dynamic Queues</h1>
-<table class='workers'>
-  <tr>
-    <th>Name</th>
-    <th>Value</th>
-    <th>Result</th>
-    <th>Workers</th>
-    <th></th>
-  </tr>
-  <% @queues.each do |queue| %>
+<p class="intro">
+  The list below shows the dynamic queues currently defined.  When you start a worker with a dynamic queue key (@key_name), that key is looked up from the list below to determine the actual queues the worker should pull from.  Wildcards (*) and negation (leading !) can be used to select the queues the worker should process. There is always a fallback key - @default, which workers will use if the key for that worker is empty.  If both the key and the fallback are empty, the worker defaults to processing '*'
+</p>
+
+<form action="<%= url(:dynamicqueues) %>" method="POST" style="float:none; margin-top:10px">
+
+  <table class='queues'>
     <tr>
-      <td><%= queue %></td>
-      <td><%= Resque.get_dynamic_queue(queue).join(", ") %></td>
-      <td><%= Resque::Worker.new("@#{queue}").queues.join(", ") %></td>
-      <td></td>
-      <td>
-        <a href="<%= url(:dynamicqueues) %>/<%= queue %>/remove" class="remove">Remove</a>
-      </td>
+      <th>Name</th>
+      <th>Value</th>
+      <th>Expanded</th>
+      <th></th>
     </tr>
-  <% end %>
-</table>
-
-
-<h1>Make a new queue</h1>
-<form action="<%= url(:dynamicqueues) %>" method="post" accept-charset="utf-8">
-  <p><input type="text" name="name"></p>
-  <p>
-    <textarea name="queues"></textarea>
-    Separate new queues by lines
-  </p>
-  <p><input type="submit" value="Create or Update"></p>
-</form>
+    <% @queues.each_with_index do |data, i| %>
+      <tr class="line">
+        <td><input type="text" id="input-<%= i %>-name" name="queues[][name]" value="<%= data['name'] %>" /></td>
+        <td><input type="text" id="input-<%= i %>-value" name="queues[][value]" value="<%= data['value'] %>" /></td>
+        <td class="expanded"><%= data['expanded'] %></td>
+        <td>
+          <a href="#remove" class="remove">Remove</a>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+
+  <a href="#add" class="add">Add</a>
+  <input type="submit" value="Save"/>
 
+</form>
 
 <script type="text/javascript" charset="utf-8">
+  function markDirty()
+  {
+    $("input[type=submit]").css({border:"3px orange solid"});
+  }
+  
   jQuery(function($) {
 
-    $('a.remove').click(function(e) {
+    $("input").live("keypress", markDirty);
+    
+    $("a.add").live("click", function(e) {
+      e.preventDefault();
+      var $table = $("table.queues");
+      var $newRow = $table.find("tr.line:first").clone();
+      $newRow.find("input[type=text]").attr("value", "");
+      $newRow.find("td.expanded").html("")
+      $newRow.appendTo($table);
+      markDirty();
+    });
+
+    $("a.remove").live("click", function(e) {
       e.preventDefault();
-      var $link = $(this),
-          url = $link.attr('href'),
-          confirmed = confirm("Are you sure you want to remove this dynamic queue? There is no undo.");
-      if (confirmed) {
-        $link.animate({opacity: 0.5});
-        $.ajax({
-          url: url,
-          type: 'post',
-          success: function() {
-            $link.parents('tr').remove();
-          }
-        });
-      } else {
-        return false
-      }
+      var $link = $(this);
+      $link.parents("tr").remove();
+      markDirty();
     });
 
+ 
   });
 </script>

data/lib/resque/plugins/dynamic_queues/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module DynamicQueues
-      VERSION = "0.6.1"
+      VERSION = "0.7.0"
     end
   end
 end

data/spec/queues_spec.rb

@@ -55,6 +55,42 @@ describe "Dynamic Queues" do
 
   end
 
+  context "attributes" do
+    it "should always have a fallback pattern" do
+      Resque.get_dynamic_queues.should == {'default' => ['*']}
+    end
+    
+    it "should allow setting single patterns" do
+      Resque.get_dynamic_queue('foo').should == ['*']
+      Resque.set_dynamic_queue('foo', ['bar'])
+      Resque.get_dynamic_queue('foo').should == ['bar']
+    end
+    
+    it "should allow setting multiple patterns" do
+      Resque.set_dynamic_queues({'foo' => ['bar'], 'baz' => ['boo']})
+      Resque.get_dynamic_queues.should == {'foo' => ['bar'], 'baz' => ['boo'], 'default' => ['*']}
+    end
+    
+    it "should remove mapping when setting empty value" do
+      Resque.get_dynamic_queues
+      Resque.set_dynamic_queues({'foo' => ['bar'], 'baz' => ['boo']})
+      Resque.get_dynamic_queues.should == {'foo' => ['bar'], 'baz' => ['boo'], 'default' => ['*']}
+      
+      Resque.set_dynamic_queues({'foo' => [], 'baz' => ['boo']})
+      Resque.get_dynamic_queues.should == {'baz' => ['boo'], 'default' => ['*']}
+      Resque.set_dynamic_queues({'baz' => nil})
+      Resque.get_dynamic_queues.should == {'default' => ['*']}
+      
+      Resque.set_dynamic_queues({'foo' => ['bar'], 'baz' => ['boo']})
+      Resque.set_dynamic_queue('foo', [])
+      Resque.get_dynamic_queues.should == {'baz' => ['boo'], 'default' => ['*']}
+      Resque.set_dynamic_queue('baz', nil)
+      Resque.get_dynamic_queues.should == {'default' => ['*']}
+    end
+    
+    
+  end
+  
   context "basic queue patterns" do
 
     before(:each) do

data/spec/server_spec.rb

@@ -37,6 +37,12 @@ describe "Dynamic Queues pages" do
 
   context "show dynamic queues table" do
 
+    it "should shows default queue when nothing set" do
+      get "/dynamicqueues"
+
+      last_response.body.should include 'default'
+    end
+
     it "should shows names of queues" do
       Resque.set_dynamic_queue("key_one", ["foo"])
       Resque.set_dynamic_queue("key_two", ["bar"])
@@ -61,23 +67,18 @@ describe "Dynamic Queues pages" do
 
   context "remove queue link" do
 
-
-    it "should shows remove link for queue" do
+    it "should show remove link for queue" do
       Resque.set_dynamic_queue("key_one", ["foo"])
 
       get "/dynamicqueues"
 
-      last_response.body.should match /<a .*href=['"]http:\/\/example.org\/dynamicqueues\/key_one\/remove['"].*>/
+      last_response.body.should match /<a .*href=['"]#remove['"].*>/
     end
 
-    it "should remove queue when remove link clicked" do # JS will do the post
-      Resque.set_dynamic_queue("key_one", ["foo"])
-
-      post "/dynamicqueues/key_one/remove"
+    it "should show add link" do
+      get "/dynamicqueues"
 
-      last_response.should be_redirect
-      last_response['Location'].should match /dynamicqueues/
-      Resque.get_dynamic_queue("key_two").should be_empty
+      last_response.body.should match /<a .*href=['"]#add['"].*>/
     end
 
   end
@@ -87,22 +88,31 @@ describe "Dynamic Queues pages" do
     it "should have form to edit queues" do
       get "/dynamicqueues"
 
-      last_response.body.should match /<form .*action=['"]http:\/\/example.org\/dynamicqueues['"].*>/
-      last_response.body.should match /<input .*name=['"]name['"].*>/
-      last_response.body.should match /<textarea .*name=['"]queues['"].*>/
+      last_response.body.should match /<form action="http:\/\/example.org\/dynamicqueues"/
+    end
+    
+    it "should show input fields" do
+      Resque.set_dynamic_queue("key_one", ["foo"])
+      Resque.set_dynamic_queue("key_two", ["bar", "baz"])
+      get "/dynamicqueues"
+
+      last_response.body.should match /<input type="text" id="input-0-name" name="queues\[\]\[name\]" value="key_one"/
+      last_response.body.should match /<input type="text" id="input-0-value" name="queues\[\]\[value\]" value="foo"/
+      last_response.body.should match /<input type="text" id="input-1-name" name="queues\[\]\[name\]" value="key_two"/
+      last_response.body.should match /<input type="text" id="input-1-value" name="queues\[\]\[value\]" value="bar, baz"/
     end
 
     it "should delete queues on empty queue submit" do
       Resque.set_dynamic_queue("key_two", ["bar", "baz"])
-      post "/dynamicqueues", {'name' => "key_two", "queues" => ""}
+      post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => ""}]}
 
       last_response.should be_redirect
       last_response['Location'].should match /dynamicqueues/
-      Resque.get_dynamic_queue("key_two").should be_empty
+      Resque.get_dynamic_queue("key_two", []).should be_empty
     end
 
     it "should create queues" do
-      post "/dynamicqueues", {'name' => "key_two", "queues" => "foo\n\rbar\n\rbaz"}
+      post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => " foo, bar ,baz "}]}
 
       last_response.should be_redirect
       last_response['Location'].should match /dynamicqueues/
@@ -111,7 +121,7 @@ describe "Dynamic Queues pages" do
 
     it "should update queues" do
       Resque.set_dynamic_queue("key_two", ["bar", "baz"])
-      post "/dynamicqueues", {'name' => "key_two", "queues" => "foo\n\rbar\n\rbaz"}
+      post "/dynamicqueues", {'queues' => [{'name' => "key_two", "value" => "foo,bar,baz"}]}
 
       last_response.should be_redirect
       last_response['Location'].should match /dynamicqueues/
@@ -120,4 +130,4 @@ describe "Dynamic Queues pages" do
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-dynamic-queues
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2176833480 !ruby/object:Gem::Requirement
+  requirement: &2236617460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2176833480
+  version_requirements: *2236617460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2176808620 !ruby/object:Gem::Requirement
+  requirement: &2236616960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2176808620
+  version_requirements: *2236616960
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2176798820 !ruby/object:Gem::Requirement
+  requirement: &2236616500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2176798820
+  version_requirements: *2236616500
 description: A resque plugin for specifying the queues a worker pulls from with wildcards,
   negations, or dynamic look up from redis
 email:
@@ -57,6 +57,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- config.ru
 - init.rb
 - lib/resque-dynamic-queues-server.rb
 - lib/resque-dynamic-queues.rb