Merge pull request #2 from jfahrer/master

Return queues in order they were defined/matched

Author: JoeMcB

lib/resque/plugins/dynamic_queues/queues.rb

@@ -24,7 +24,7 @@ def queues_with_dynamic
 
           return queues_without_dynamic if queue_names.grep(dynamic_pattern).size == 0
 
-          real_queues = Resque.queues
+          real_queues = Resque.queues.sort
           matched_queues = []
 
           while q = queue_names.shift
@@ -57,7 +57,7 @@ def queues_with_dynamic
             end
           end
 
-          return matched_queues.uniq.sort
+          return matched_queues.uniq
         end
 
 

spec/queues_spec.rb

@@ -139,14 +139,25 @@
       worker.queues.should == ["foo"]
     end
 
+    it "respects the order in which queue patterns are defined" do
+      worker = Resque::Worker.new("h*", "f*")
+      worker.queues.should == ["high_x", "high_y", "foo"]
+
+      worker = Resque::Worker.new("*", "!f*")
+      worker.queues.should == ["high_x", "high_y", "superhigh_z"]
+
+      worker = Resque::Worker.new("*high*_z", "*", "!f*")
+      worker.queues.should == ["superhigh_z", "high_x", "high_y"]
+    end
+
   end
 
   context "redis backed queues" do
 
     it "can dynamically lookup queues" do
       Resque.set_dynamic_queue("mykey", ["foo", "bar"])
       worker = Resque::Worker.new("@mykey")
-      worker.queues.should == ["bar", "foo"]
+      worker.queues.should == ["foo", "bar"]
     end
 
     it "can blacklist dynamic queues" do
@@ -185,7 +196,7 @@
       host = `hostname`.chomp
       Resque.set_dynamic_queue(host, ["foo", "bar"])
       worker = Resque::Worker.new("@")
-      worker.queues.should == ["bar", "foo"]
+      worker.queues.should == ["foo", "bar"]
     end
 
     it "can use wildcards in dynamic queues" do
@@ -202,7 +213,7 @@
     it "falls back to default queues when missing" do
       Resque.set_dynamic_queue("default", ["foo", "bar"])
       worker = Resque::Worker.new("@mykey")
-      worker.queues.should == ["bar", "foo"]
+      worker.queues.should == ["foo", "bar"]
     end
 
     it "falls back to all queues when missing and no default" do