resque-dynamic-queues 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.6.1
+-----
+
+fix typo <c80635a> [Matt Conway]
+make settnig of fallback more explicit in web ui <e85f6a0> [Matt Conway]
+
 0.6.0
 -----
 

data/Rakefile

@@ -41,7 +41,7 @@ task :changelog do
   end
 
   # Generate changelog from repo
-  log=`git log --pretty='format:%s <%h> [%cn]' #{newest_tag}..#{HEAD}`
+  log=`git log --pretty='format:%s <%h> [%cn]' #{newest_tag}..HEAD`
 
   # Strip out maintenance entries
   log = log.lines.to_a.delete_if do |l|

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

@@ -1,13 +1,17 @@
 module Resque
   module Plugins
     module DynamicQueues
+
+      KEY_PREFIX = "dynamic_queue"
+      FALLBACK_KEY = "default"
+
       module Attributes
 
         def get_dynamic_queue(key)
-          queue_names = redis.lrange("dynamic_queue:#{key}", 0, -1)
+          queue_names = redis.lrange("#{KEY_PREFIX}:#{key}", 0, -1)
 
           if queue_names.nil? || queue_names.size == 0
-            queue_names = redis.lrange("dynamic_queue:default", 0, -1)
+            queue_names = redis.lrange("#{KEY_PREFIX}:#{FALLBACK_KEY}", 0, -1)
           end
           
           if queue_names.nil? || queue_names.size == 0
@@ -18,15 +22,20 @@ module Resque
         end
 
         def set_dynamic_queue(key, values)
-          k = "dynamic_queue:#{key}"
-          redis.del(k)
-          Array(values).each do |v|
-             redis.rpush(k, v)
+          k = "#{KEY_PREFIX}:#{key}"
+          redis.multi do
+            redis.del(k)
+            Array(values).each do |v|
+               redis.rpush(k, v)
+            end
           end
         end
 
         def get_dynamic_queues
-          (redis.keys("dynamic_queue:*") || []).collect{|q| q.gsub('dynamic_queue:', '')}
+          dqueues = redis.keys("#{KEY_PREFIX}:*") || []
+          dqueues = dqueues.collect{|q| q.gsub('dynamic_queue:', '')}
+          dqueues << FALLBACK_KEY unless dqueues.include?(FALLBACK_KEY)
+          return dqueues
         end
 
       end

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

@@ -18,14 +18,6 @@
       </td>
     </tr>
   <% end %>
-  <tr>
-    <td>Fallback</td>
-    <td>-</td>
-    <td><%= Resque::Worker.new("@---").queues.join(', ') %></td>
-    <td></td>
-    <td>
-    </td>
-  </tr>
 </table>
 
 
@@ -47,7 +39,7 @@
       e.preventDefault();
       var $link = $(this),
           url = $link.attr('href'),
-          confirmed = confirm("Are you sure you want to kill this job? There is no undo.");
+          confirmed = confirm("Are you sure you want to remove this dynamic queue? There is no undo.");
       if (confirmed) {
         $link.animate({opacity: 0.5});
         $.ajax({

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-dynamic-queues
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2156532920 !ruby/object:Gem::Requirement
+  requirement: &2176833480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2156532920
+  version_requirements: *2176833480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156532420 !ruby/object:Gem::Requirement
+  requirement: &2176808620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2156532420
+  version_requirements: *2176808620
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156531960 !ruby/object:Gem::Requirement
+  requirement: &2176798820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +43,7 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2156531960
+  version_requirements: *2176798820
 description: A resque plugin for specifying the queues a worker pulls from with wildcards,
   negations, or dynamic look up from redis
 email:
@@ -71,7 +70,6 @@ files:
 - spec/redis-test.conf
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -92,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: resque-dynamic-queues
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A resque plugin for specifying the queues a worker pulls from with wildcards,
@@ -102,3 +100,4 @@ test_files:
 - spec/redis-test.conf
 - spec/server_spec.rb
 - spec/spec_helper.rb
+has_rdoc: