sidekiq-dynamic-queues 0.5.6 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e26d8799284d819ada2b3525662f535823158eda
+  data.tar.gz: 4c8675472a38536c7e6c94ef7ed784efe7a9319e
+SHA512:
+  metadata.gz: afee84bcaa102dfa32571f8581058e2255cda9567a747fcfb151c82200814039aeab9611440af2ccf64d7c0218a97c4c8f077d6a636acf988b969e01e3f39c1d
+  data.tar.gz: c5c9f306121ab9560c64d8e540448efe6fdcfb0bce1a26468169cfd57b07b5261553f6cd54d1e01cd96deae3870aa746c0a892fc676b7de8c9e0bc903c9a194e

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.6.0 (03/04/2014)
+------------------
+
+Merge pull request #3 from adstage-david/master <c1f77c5> [Matt Conway]
+Use Sidekiq::Queue.all instead of deprecated registered_queues. <e01c6b0> [David Haslem]
+updated for latest sidekiq: slim -> erb, fix running of jobs in tests <eb7f982> [Matt Conway]
+
 0.5.6 (06/13/2013)
 ------------------
 

data/lib/sidekiq/dynamic_queues/attributes.rb

@@ -10,12 +10,12 @@ module Sidekiq
       def json_encode(data)
         Sidekiq.dump_json(data)
       end
-      
+
       def json_decode(data)
         return nil unless data
         Sidekiq.load_json(data)
       end
-      
+
       def get_dynamic_queue(key, fallback=['*'])
         data = Sidekiq.redis {|r| r.hget(DYNAMIC_QUEUE_KEY, key) }
         queue_names = json_decode(data)
@@ -24,7 +24,7 @@ module Sidekiq
           data = Sidekiq.redis {|r| r.hget(DYNAMIC_QUEUE_KEY, FALLBACK_KEY) }
           queue_names = json_decode(data)
         end
-        
+
         if queue_names.nil? || queue_names.size == 0
           queue_names = fallback
         end
@@ -39,7 +39,7 @@ module Sidekiq
           Sidekiq.redis {|r| r.hset(DYNAMIC_QUEUE_KEY, key, json_encode(values)) }
         end
       end
-      
+
       def set_dynamic_queues(dynamic_queues)
         Sidekiq.redis do |r|
           r.multi do
@@ -58,7 +58,7 @@ module Sidekiq
         result[FALLBACK_KEY] ||= ['*']
         return result
       end
-      
+
       # Returns a list of queues to use when searching for a job.
       #
       # A splat ("*") means you want every queue (in alpha order) - this
@@ -76,7 +76,7 @@ module Sidekiq
       def expand_queues(queues)
         queue_names = queues.dup
 
-        real_queues = Sidekiq::Client.registered_queues
+        real_queues = Sidekiq::Queue.all.map(&:name)
         matched_queues = []
 
         while q = queue_names.shift
@@ -113,6 +113,6 @@ module Sidekiq
       end
 
     end
-    
+
   end
 end

data/lib/sidekiq/dynamic_queues/server.rb

@@ -44,7 +44,7 @@ module Sidekiq
             end
           end
           
-          slim :dynamicqueue
+          erb :dynamicqueue
         end
 
         app.post "/dynamicqueue" do

data/lib/sidekiq/dynamic_queues/server/views/dynamicqueue.erb

@@ -0,0 +1,77 @@
+<div class="row header">
+  <div class="col-sm-7">
+    <h3>Dynamic Queues</h3>
+  </div>
+</div>
+
+<p>
+  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="<%= root_path %>dynamicqueue" method="POST">
+
+  <table class="queues table table-hover table-bordered table-striped table-white">
+    <thead>
+      <th>Name</th>
+      <th>Value</th>
+      <th>Expanded</th>
+      <th></th>
+    </thead>
+    <% @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">
+  function markDirty()
+  {
+    $("input[type=submit]").css({border:"3px orange solid"});
+  }
+  
+  jQuery(function($) {
+
+    $("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);
+      $link.parents("tr").remove();
+      markDirty();
+    });
+
+ 
+  });
+</script>

data/lib/sidekiq/dynamic_queues/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module DynamicQueues
-    VERSION = "0.5.6"
+    VERSION = "0.6.0"
   end
 end

data/sidekiq-dynamic-queues.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('sinatra')
   s.add_development_dependency('slim')
   s.add_development_dependency('rack-test', '~> 0.5.4')
+  s.add_development_dependency('tilt', '~> 1.4')
 
 end
 

data/spec/queues_spec.rb

@@ -242,7 +242,7 @@ describe "Dynamic Queues" do
 
     it "finds work on dynamic queue that doesn't exist till after sidekiq is waiting for jobs" do
       watch_queues(*%w[default])
-      manager = run_queues("*", :async => true)
+      launcher = run_queues("*", :async => true)
       # give run_queues a chance to block on only the default queue given above
       sleep 0.1 
       
@@ -252,8 +252,7 @@ describe "Dynamic Queues" do
       # that for it to re-evaluate the dynamic queues
       sleep 2
       timeout(5) do
-        manager.async.stop(:shutdown => true, :timeout => 1)
-        manager.wait(:shutdown)
+        launcher.stop
       end
       SomeJob.result.should eq [1] 
     end

data/spec/server_spec.rb

@@ -94,10 +94,10 @@ describe "Dynamic Queues pages" do
       set_dynamic_queue("key_two", ["bar", "baz"])
       get "/dynamicqueue"
 
-      last_response.body.should match /<input id="input-0-name" name="queues\[\]\[name\]" type="text" value="key_one"/
-      last_response.body.should match /<input id="input-0-value" name="queues\[\]\[value\]" type="text" value="foo"/
-      last_response.body.should match /<input id="input-1-name" name="queues\[\]\[name\]" type="text" value="key_two"/
-      last_response.body.should match /<input id="input-1-value" name="queues\[\]\[value\]" type="text" value="bar, baz"/
+      last_response.body.should include '<input type="text" id="input-0-name" name="queues[][name]" value="key_one" />'
+      last_response.body.should include '<input type="text" id="input-0-value" name="queues[][value]" value="foo" />'
+      last_response.body.should include '<input type="text" id="input-1-name" name="queues[][name]" value="key_two" />'
+      last_response.body.should include '<input type="text" id="input-1-value" name="queues[][value]" value="bar, baz" />'
     end
 
     it "should delete queues on empty queue submit" do

data/spec/spec_helper.rb

@@ -2,9 +2,7 @@ require 'rspec'
 require 'sidekiq-dynamic-queues'
 require 'celluloid'
 require 'sidekiq'
-require 'sidekiq/fetch'
-require 'sidekiq/cli'
-require 'sidekiq/manager'
+require 'sidekiq/launcher'
 
 Sidekiq.logger.level = Logger::DEBUG
 Celluloid.logger = Sidekiq.logger = nil
@@ -73,23 +71,20 @@ end
 def run_queues(*queues)
   options = queues.last.is_a?(Hash) ? queues.pop : {}
   options = {:async => false, :timeout => 5}.merge(options)
-  Sidekiq::Fetcher.instance_eval { @done = false }
-  manager = Sidekiq::Manager.new({:queues=>queues, :concurrency=>1, :timeout=>1})
 
-  manager.start
-  
+  sidekiq_opts = {:queues=>queues, :concurrency=>1, :timeout=>1}
+  Sidekiq::Fetcher.reset
+  launcher = Sidekiq::Launcher.new(sidekiq_opts)
+  launcher.run
+
   unless options[:async]
     # give up control so jobs can start running before we call stop
     # Manager.when_done only gets called for jobs that succeed, not jobs that raise
     sleep 0.1
-    manager.async.stop(:shutdown => true, :timeout => 1)
-
-    timeout(options[:timeout]) do
-      manager.wait(:shutdown)
-    end
+    launcher.stop
   end
   
-  manager
+  launcher
 end
 
 class SomeJob

metadata

@@ -1,119 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-dynamic-queues
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Conway
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-    none: false
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
-  type: :development
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: slim
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
-  prerelease: false
+        version: 0.5.4
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rack-test
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
-    none: false
+- !ruby/object:Gem::Dependency
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
-    none: false
-  prerelease: false
+        version: '1.4'
   type: :development
-description: A sidekiq plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+description: A sidekiq plugin for specifying the queues a worker pulls from with wildcards,
+  negations, or dynamic look up from redis
 email:
 - matt@conwaysplace.com
 executables: []
@@ -135,7 +131,7 @@ files:
 - lib/sidekiq/dynamic_queues/attributes.rb
 - lib/sidekiq/dynamic_queues/fetch.rb
 - lib/sidekiq/dynamic_queues/server.rb
-- lib/sidekiq/dynamic_queues/server/views/dynamicqueue.slim
+- lib/sidekiq/dynamic_queues/server/views/dynamicqueue.erb
 - lib/sidekiq/dynamic_queues/version.rb
 - sidekiq-dynamic-queues.gemspec
 - spec/queues_spec.rb
@@ -144,7 +140,8 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -152,25 +149,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: sidekiq-dynamic-queues
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
-summary: A sidekiq plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: A sidekiq plugin for specifying the queues a worker pulls from with wildcards,
+  negations, or dynamic look up from redis
 test_files:
 - spec/queues_spec.rb
 - spec/redis-test.conf
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc:

data/lib/sidekiq/dynamic_queues/server/views/dynamicqueue.slim

@@ -1,63 +0,0 @@
-h3 Dynamic Queues
-
-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 '*'
-
-form action="#{root_path}dynamicqueue" method="POST"
-
-  table class="queues table table-hover table-bordered table-striped table-white"
-    thead
-      th Name
-      th Value
-      th Expanded
-      th
-    - @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
-          input type="text" id="input-#{{i}}-value" name="queues[][value]" value="#{{data['value']}}"
-        td class="expanded"
-          = data['expanded']
-        td
-          a href="#remove" class="remove" Remove
-
-  a href="#add" class="add" Add
-
-  input type="submit" value="Save"
-
-javascript:                    
-  function markDirty()
-  {
-    $("input[type=submit]").css({border:"3px orange solid"});
-  }
-  
-  jQuery(function($) {
-
-    $("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);
-      $link.parents("tr").remove();
-      markDirty();
-    });
-
- 
-  });