fmq 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,10 @@
+== 0.3.3 2008-09-02
+
+* 1 minor change:
+  * added round robin queue
+* 1 tiny fix:
+  * fixed bug on QueueException handling
+
 == 0.3.2 2008-08-28
 
 * 3 minor changes:

data/README.txt

@@ -25,8 +25,8 @@ The client apis are implemented using the HTTP protocol, so that you can
 use even curl to receive messages. A client library for ruby is implemented 
 right now, other languages will follow.
 
-The queue itself is a RESTful url like @http://localhost:5884/myQueueName/@ 
-or @http://localhost:5884/myApplication/myQueueName/@. If you do a GET request 
+The queue itself is a RESTful url like http://localhost:5884/myQueueName/
+or http://localhost:5884/myApplication/myQueueName/. If you do a GET request 
 to this url with a web browser you will receive one message from the queue.
 
 == FEATURES/PROBLEMS:

data/lib/fmq/queues/round_robin.rb

@@ -0,0 +1,91 @@
+#
+# Copyright (c) 2008 Vincent Landgraf
+#
+# This file is part of the Free Message Queue.
+# 
+# Free Message Queue is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Free Message Queue is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with Free Message Queue.  If not, see <http://www.gnu.org/licenses/>.
+#
+require File.dirname(__FILE__) + '/base'
+
+module FreeMessageQueue
+  # This queue distributes the polls and puts to different queues. It uses a round robin, so each queue
+  # will be called in order every time. E.g. if you have three queues specified in the redirect_to
+  # statement and use the poll method it will poll the first queue. If you poll the second time the RoundRobinQueue
+  # will poll the second queue and if you poll the fourth time the RoundRobinQueue will again poll the first queue.
+  #
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/fmq_test/test1", FreeMessageQueue::RoundRobinQueue do |q|
+  #      q.redirect_to ["/fmq_test/test1", "/fmq_test/test2"]
+  #      # one can optionally configure what methods are allowed
+  #      # by default it is [:put, :poll]
+  #      q.allow :poll
+  #    end
+  #  end
+  class RoundRobinQueue < BaseQueue
+    def initialize(manager)
+      super(manager)
+      @allow = [:poll, :put]
+      @queue_index = -1 # as starting point will be 0 later by using next_queue
+    end
+
+    def poll
+      if allowed? :poll
+        manager.poll(@redirect_to[next_queue])
+      else
+        raise QueueException.new("[RoundRobinQueue] you can't poll from this queue", caller)
+      end
+    end
+
+    def put(message)
+      if allowed? :put
+        manager.put(@redirect_to[next_queue], message)
+      else
+        raise QueueException.new("[RoundRobinQueue] you can't put to this queue", caller)
+      end
+    end
+
+    # *CONFIGURATION* *OPTION*
+    # allow actions *:put* or *:poll*. You can pass and array for both (*[:poll, :put]*) or just one *:put*
+    def allow(val)
+      @allow = val
+    end
+
+    # *CONFIGURATION* *OPTION*
+    # specifiy the queues that should be used (must be an array)
+    def redirect_to(val)
+      @redirect_to = val
+    end
+
+  private
+  
+    # returns the index of the next queue
+    # (this is the round robin)
+    def next_queue
+      if @queue_index + 1 < @redirect_to.size
+        @queue_index += 1
+      else
+        @queue_index = 0
+      end
+    end
+
+    # is this method (put, poll) allowed
+    def allowed? (method)
+      if @allow.respond_to? :each
+        @allow.include method
+      else
+        @allow == method
+      end
+    end
+  end
+end

data/lib/fmq/server.rb

@@ -41,6 +41,8 @@ module FreeMessageQueue
           response = client_exception(request, queue_path, 
             ArgumentError.new("[Server] Method is not supported '#{method}'"))
         end
+      rescue QueueException => ex
+        response = client_exception(request, queue_path, ex)
       rescue QueueManagerException => ex
         response = client_exception(request, queue_path, ex)
       end

data/lib/fmq/version.rb

@@ -20,7 +20,7 @@ module FreeMessageQueue
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fmq
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Vincent Landgraf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 +02:00
+date: 2008-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ files:
 - lib/fmq/queues/load_balanced.rb
 - lib/fmq/queues/syncronized.rb
 - lib/fmq/queues/file_persistent.rb
+- lib/fmq/queues/round_robin.rb
 - lib/fmq/version.rb
 - test/test_basic.rb
 - test/test_fmq_client.rb