fmq 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,14 @@
+== 0.3.2 2008-08-28
+
+* 3 minor changes:
+  * changed the way of the queue manager  setup
+  * updated rdoc, readme and website documentaition
+  * added a new queue that persists the messages in the file system
+* 3 tiny changes:
+  * fixed the fmq logger creation
+  * some fixes to the queue manager and some queues
+  * refactored testing of fifo based queues
+
 == 0.3.1 2008-08-27
 
 * 2 minor changes:

data/README.txt

@@ -6,8 +6,6 @@ Project github repositiory: git://github.com/threez/fmq.git
 
 == TODO:
 
-* create full rdoc
-* support of logging to file
 * add client apis for other languages
 * complete unit tests
 
@@ -15,21 +13,21 @@ Project github repositiory: git://github.com/threez/fmq.git
 
 The project implements a queue system with a server and some client apis.
 
-The server is a mongrel web server that holds REST-named queues. 
-You can GET, POST, DELETE, HEAD queue messages using the normal HTTP requests. 
-The system itself uses a configuration file (YAML) to setup queues at 
-startup or even at runtime. The queue implementations can be changed using 
-an easy plugin system right from your project directory.
+The server is a rack server that holds REST-named queues, so that the 
+implemention can be changed rapidly. You can GET, POST, DELETE, HEAD queue 
+messages using the normal HTTP requests. The system itself uses a configuration 
+file (*config.ru*) to setup queues at startup or even at runtime. The queue 
+implementations can be changed or you can develep own queues with ease. 
 
-For an simple administration and try out of the system, FMQ has an integrated ajax based web interface.
+For an simple administration try out the integrated ajax based web interface.
 
-The client apis are implemented using the HTTP protocol, so that 
-you can use even curl to receive messages. Ruby is implemented right now, other languages will follow.
+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 an 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. The queue 
-stores it’s internal data in an FIFO in system memory.
+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:
 
@@ -46,16 +44,17 @@ stores it’s internal data in an FIFO in system memory.
 After installing the gem you can start by creating a project:
 
   fmq create my_project_name
+  
 next step is to change to the folder and start the FMQ server:
 
   cd my_project_name
-  fmq
+  rackup -p 5884
 
-The server will start and host a admin interface on http://localhost:5884/admin/index.
+The server will start and host a admin interface on http://localhost:5884/admin/index.html.
 
 == REQUIREMENTS:
 
-* mongrel (as webserver)
+* rack >= 0.4.0 (web server provider)
 
 == INSTALL:
 
@@ -67,4 +66,4 @@ Just install the gem as you expect:
 
 (GNU GENERAL PUBLIC LICENSE, Version 3)
 
-Copyright (c) 2008 Vincent Landgraf
+Copyright (c) 2008 Vincent Landgraf

data/default-server/config.ru

@@ -7,22 +7,13 @@ end
 # load all local queues (from project directory)
 Dir.glob("queues/*.rb").each { |f| require f }
 
-# setup log level of free message queue
-FreeMessageQueue.log_level("info")
-
 # =====================================================
 #        create and configure the queue manager
 # =====================================================
-queue_manager = FreeMessageQueue::QueueManager.new()
 
-queue_manager.setup do |qm|
-  # if someone pushes to a queue that don't exists
-  # the queue manager will create one for you if the option
-  # <em>auto_create_queues</em> is <b>true</b>. This
-  # is a useful option if you are in development,
-  # the queue will be a FreeMessageQueue::SyncronizedQueue by default
-  qm.auto_create_queues = true
-  
+# if someone pushes to a queue that don't exists
+# the queue manager will create one for you if you pass true
+queue_manager = FreeMessageQueue::QueueManager.new(true) do
   # =====================================================
   #      if you want some queues right from startup
   #        define there url and constraints here
@@ -31,7 +22,7 @@ queue_manager.setup do |qm|
   # the path to the queue e.g. /app1/myframe/test1
   # means http://localhost:5884/app1/myframe/test1
   # this parameter is not optional
-  qm.setup_queue "/fmq_test/test1" do |q|
+  setup_queue "/fmq_test/test1" do |q|
     # this defines the maximum count of messages that 
     # can be in the queue, if the queue is full every
     # new message will be rejected with a http error
@@ -46,19 +37,28 @@ queue_manager.setup do |qm|
   
   # if you want you can specify the class of the queue
   # this is interessting if you write your own queues
-  qm.setup_queue "/fmq_test/test2", FreeMessageQueue::LoadBalancedQueue
+  setup_queue "/fmq_test/test2", FreeMessageQueue::LoadBalancedQueue
   
   # if you have special queues include put them into the queues
   # folder and and use them (this MyTestQueue is places in queues/mytest.rb)
-  qm.setup_queue "/fmq_test/test3", MyTestQueue
+  setup_queue "/fmq_test/test3", MyTestQueue
   
   # this is a forwarding queue wich forwards one message
   # to some other queues
-  qm.setup_queue "/fmq_test/forward_to_1_and_2", FreeMessageQueue::ForwardQueue do |q|
+  setup_queue "/fmq_test/forward_to_1_and_2", FreeMessageQueue::ForwardQueue do |q|
     # you can add as may queues as you want
     # but seperate them with a space char
     q.forward_to = ["/fmq_test/test1", "/fmq_test/test2"]
   end
+  
+  # this is a file system queue that will save each method
+  # in the file system until they are polled
+  # the message is useful if you want to have a queue that will
+  # save it's state so that you can reboot the server
+  setup_queue "/fmq_test/file_persistent", FreeMessageQueue::FilePersistentQueue do |q|
+    q.folder = "./tmp/mail_box/threez"
+    q.max_messages = 10_000
+  end
 end
 
 # =====================================================

data/lib/fmq/admin.rb

@@ -16,13 +16,6 @@
 # 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/>.
 #
-begin
-  require "rack"
-rescue LoadError
-  require "rubygems"
-  require "rack"
-end
-
 module FreeMessageQueue
   # This class is dedicated to the AJAX based admin interface.
   class AdminInterface

data/lib/fmq/boot.rb

@@ -29,35 +29,27 @@ module FreeMessageQueue
   # free message queue, so that it is simple to access
   # the logger from somewhere in the project 
   def self.logger
-    $FMQ_GLOBAL_LOGGER ||= create_logger
+    $FMQ_GLOBAL_LOGGER ||= FreeMessageQueue.create_logger
   end
   
   # This method creates the logger instance once (even if it is called twice).
+  # it is by default on fatal
   def self.create_logger(log_to = STDOUT)
     $FMQ_GLOBAL_LOGGER ||= Logger.new(log_to)
+    FreeMessageQueue.log_level(:fatal)
+    return $FMQ_GLOBAL_LOGGER
   end
   
   # This method sets the log level of the fmq logger
   # the level must be a string (either downcase or upcase)
   # that contains one of the following levels:
-  # * FATAL => Server side errors
-  # * ERROR => Server side error backtraces
-  # * WARN  => Client side errors
-  # * INFO  => Setup information (config stuff etc.)
-  # * DEBUG => All operations of the queue manager and others
+  # * :fatal => Server side errors
+  # * :error => Server side error backtraces
+  # * :warn  => Client side errors
+  # * :info  => Setup information (config stuff etc.)
+  # * :debug => All operations of the queue manager and others
   def self.log_level(level)
-    case level
-      when /fatal/i
-        FreeMessageQueue.logger.level = Logger::FATAL
-      when /error/i
-        FreeMessageQueue.logger.level = Logger::ERROR
-      when /warn/i
-        FreeMessageQueue.logger.level = Logger::WARN
-      when /info/i
-        FreeMessageQueue.logger.level = Logger::INFO
-      when /debug/i
-        FreeMessageQueue.logger.level = Logger::DEBUG
-    end
+    FreeMessageQueue.logger.level = eval("Logger::#{level.to_s.upcase}")
     FreeMessageQueue.logger.debug "[Logger] set log level to #{level}"
   end
   

data/lib/fmq/queue_manager.rb

@@ -15,8 +15,7 @@
 # 
 # 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 "ostruct"
+#
 
 # add kb, mb and gb methods for easy use in the config file
 class Fixnum
@@ -64,10 +63,11 @@ module FreeMessageQueue
   
     # setup the queue manager using the configuration from the configuration
     # file (which is basically a hash)
-    def initialize()
+    def initialize(auto_create_queues = true, &block)
       @queues = {}
       @log = FreeMessageQueue.logger
-      @auto_create_queues = true
+      @auto_create_queues = auto_create_queues
+      instance_eval(&block) if block_given?
     end
     
     # returns if the creation of queues should be done on demand
@@ -78,12 +78,10 @@ module FreeMessageQueue
     
     # create a queue using a block. The block can be used to set configuration
     # options for the queue
-    def setup_queue(path, queue_class = DEFAULT_QUEUE_CLASS)
+    def setup_queue(path, queue_class = DEFAULT_QUEUE_CLASS, &block)
       check_queue_name(path)
       queue_object = queue_class.new(self)
-      if block_given? then
-        yield queue_object
-      end
+      block.call(queue_object) if block_given?
       @queues[path] = queue_object
       @log.info("[QueueManager] Create queue '#{path}' {type: #{queue_class}, max_messages: #{queue_object.max_messages}, max_size: #{queue_object.max_size}}")
       return queue_object
@@ -93,7 +91,7 @@ module FreeMessageQueue
     def delete_queue(name)
       if queue_exists? name
         @log.info("[QueueManager] Delete queue '#{name}' with #{queue(name).size} messages")
-        queue(name).clear
+        queue(name).clear if queue(name).respond_to? :clear
         @queues.delete name
         true
       else
@@ -126,7 +124,7 @@ module FreeMessageQueue
       unless queue_exists? name
         # only auto create queues if it is configured
         if auto_create_queues?
-          create_queue(name) 
+          setup_queue(name) 
         else
           raise QueueManagerException.new("[QueueManager] There is no queue '#{name}'", caller)
         end
@@ -152,11 +150,7 @@ module FreeMessageQueue
       !queue(name).nil?
     end
     
-    # setup a this queue manager block need to be passed
-    def setup(&config)
-      config.call(self)
-    end
-    
+    # returns the queue qith the passed name
     def queue(name)
       return @queues[name]
     end
@@ -177,3 +171,4 @@ module FreeMessageQueue
     end
   end
 end
+

data/lib/fmq/queues/README.txt

@@ -4,7 +4,7 @@ Read this simple description on how to create a queue for your special purpose.
 First of all, this template is where you start.
 1. You have to create a class that is meanful and ends up with "Queue" (for naming convention) e.g. "MyTestQueue"
 2. Name your file to the name of the queue. In this example we have the queue "MyTestQueue" 
-   so the file will be "my_test.rb". Save your new file to the queue folder of your projects folder "queues/my_test.rb"
+   so the file will be "my_test.rb". Save your new file to the queue folder of your projects folder "./queues/my_test.rb"
 3. Change the queue implementation to something you like
    * every queue must have an <em>manager</em>. (for this just inherit from FreeMessageQueue::BaseQueue)
    * this manager must be able to read <em>bytes</em> and <em>size</em> (for this just inherit from FreeMessageQueue::BaseQueue)
@@ -21,7 +21,7 @@ First of all, this template is where you start.
   
     def poll
       FreeMessageQueue::Message.new "Hello World", "text/plain" do |m|
-    	m.option["Time"] = Time.now
-  	  end
+        m.option["Time"] = Time.now
+      end
     end
-  end
+  end

data/lib/fmq/queues/base.rb

@@ -136,4 +136,5 @@ module FreeMessageQueue
       end
     end
   end
-end
+end
+

data/lib/fmq/queues/file.rb

@@ -22,23 +22,21 @@ module FreeMessageQueue
   # This queue returns everytime the same file. This is useful during debugging or
   # to serve the admin page.
   # 
-  # configuration sample:
-  #  queue-manager:
-  #    auto-create-queues: true
-  #    defined-queues:
-  #      admin-page-index:
-  #      path: /admin/index
-  #      class: FreeMessageQueue::FileQueue
-  #      file: admin-interface/index.html
-  #      content-type: text/html
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/dummy/file", FreeMessageQueue::FileQueue do |q|
+  #      q.file = "tmp/default_message.yml"
+  #      q.content_type = "text/yaml"
+  #    end
+  #  end
   #
   # *NOTE* the put method is not implemented in this queue. It is a poll only queue.
   class FileQueue < BaseQueue
     # Return the file and content type
-    def poll()
-      f = open(@file_path, "rb")
-      file_content = f.read
-      f.close
+    def poll()
+      file_content = ""
+      File.open(@file_path, "rb") do |f|
+        file_content = f.read
+      end
       
       @bytes = file_content.size
       Message.new(file_content, @content_type)
@@ -57,4 +55,4 @@ module FreeMessageQueue
       @content_type = type
     end
   end
-end
+end

data/lib/fmq/queues/file_persistent.rb

@@ -0,0 +1,86 @@
+#
+# 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'
+require "fileutils"
+
+module FreeMessageQueue
+  # This a FIFO queue that stores messages in the file system
+  # 
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/mail_box/threez", FreeMessageQueue::FilePersistentQueue do |q|
+  #      q.folder = "./tmp/mail_box/threez"
+  #      q.max_messages = 10000
+  #    end
+  #  end
+  #
+  # *NOTE* the put method is not implemented in this queue. It is a poll only queue.
+  class FilePersistentQueue < BaseQueue
+    # Return the 
+    def poll()
+      check_folder_name
+      messages = all_messages.sort!
+      return nil if messages.size == 0
+      
+      msg_bin = File.open(messages.first, "rb") { |f| f.read }
+      FileUtils.rm messages.first
+      remove_message(Marshal.load(msg_bin))
+    end
+    
+    # add one message to the queue (will be saved in file system)
+    def put(message)
+      check_folder_name
+      return false if message.nil?
+      
+      add_message(message) # check constraints and update stats
+      
+      msg_bin = Marshal.dump(message)
+      File.open(@folder_path + "/#{Time.now.to_f}.msg", "wb") do |f|
+        f.write msg_bin
+      end
+      return true
+    end
+    
+    # *CONFIGURATION* *OPTION*
+    # sets the path to the folder that holds all messages, this will
+    # create the folder if it doesn't exist
+    def folder=(path)
+      FileUtils.mkdir_p path unless File.exist? path
+      @folder_path = path
+    end
+  
+    # remove all items from the queue
+    def clear
+      FileUtils.rm all_messages
+      @size = 0
+      @bytes = 0
+    end
+    
+  private
+    
+    # returns an array with all paths to queue messages
+    def all_messages
+      Dir[@folder_path + "/*.msg"]
+    end
+    
+    # raise an exceptin if the folder name is not set
+    def check_folder_name
+      raise QueueException.new("[FilePersistentQueue] The folder_path need to be specified", caller) if @folder_path.nil?
+    end 
+  end
+end

data/lib/fmq/queues/forward.rb

@@ -20,14 +20,12 @@ require File.dirname(__FILE__) + '/base'
 
 module FreeMessageQueue
   # This queue returns sends one message to several queues at a time.
-  # 
-  # configuration sample:
-  #  queue-manager:
-  #    auto-create-queues: true
-  #    defined-queues:
-  #      path: /fmq_test/forward_to_1_and_2
-  #      class: FreeMessageQueue::ForwardQueue
-  #      forward_to: /fmq_test/test1 /fmq_test/test2
+  # 
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/fmq_test/forward_to_1_and_2", FreeMessageQueue::ForwardQueue do |q|
+  #      q.forward_to = ["/fmq_test/test1", "/fmq_test/test2"]
+  #    end
+  #  end
   #
   # *NOTE* the poll method is not implemented in this queue. It is a put only queue.
   class ForwardQueue < BaseQueue

data/lib/fmq/queues/linked.rb

@@ -35,7 +35,7 @@ module FreeMessageQueue
   
     # Put an item to the queue
     def put(message)
-      return false if message == nil
+      return false if message.nil?
       
       add_message(message) # update stats and check constraints
       

data/lib/fmq/queues/load_balanced.rb

@@ -22,16 +22,12 @@ module FreeMessageQueue
   # This queue is an approach to the issue that you want to have
   # multiple threads at one queue at a time. Currently this is not
   # considered to be a stable queue. Just use it for experimental things.
-  #
-  # configuration sample:
-  #  queue-manager:
-  #    auto-create-queues: true
-  #    defined-queues:
-  #      test-queue-1:
-  #        path: /fmq_test/test1
-  #        max-messages: 1000000
-  #        max-size: 10kb
-  #        class: FreeMessageQueue::LoadBalancedQueue
+  #
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/fmq_test/test1", FreeMessageQueue::LoadBalancedQueue do |q|
+  #      q.forward_to = ["/fmq_test/test1", "/fmq_test/test2"]
+  #    end
+  #  end
   class LoadBalancedQueue    
     # QueueManager refrence
     attr_accessor :manager
@@ -71,8 +67,8 @@ module FreeMessageQueue
     end
     
     # Put an item to one of the queues
-    def put(data)
-      @queues[next_put_index].put(data)
+    def put(message)
+      @queues[next_put_index].put(message)
     end
     
     # queue has infinite count

data/lib/fmq/queues/syncronized.rb

@@ -22,15 +22,13 @@ require File.dirname(__FILE__) + '/linked'
 module FreeMessageQueue
   # The SyncronizedQueue implements a little wrapper around the 
   # LinkedQueue to make it thread safe
-  #
-  # configuration sample:
-  #  queue-manager:
-  #    auto-create-queues: true
-  #    defined-queues:
-  #      test-queue-1:
-  #        path: /fmq_test/test1
-  #        max-messages: 1000000
-  #        max-size: 10kb
+  #
+  #  queue_manager = FreeMessageQueue::QueueManager.new(true) do
+  #    setup_queue "/fmq_test/test1" do |q|
+  #      q.max_messages = 1000000
+  #      q.max_size = 10.kb
+  #    end
+  #  end
   class SyncronizedQueue < LinkedQueue
     
     def initialize(manager)
@@ -45,11 +43,11 @@ module FreeMessageQueue
       }
     end
     
-    # Puts one item to the queue
-    def put(data)
+    # Puts one message to the queue
+    def put(message)
       @semaphore.synchronize {
-        super(data)
+        super(message)
       }
     end
   end
-end
+end

data/lib/fmq/server.rb

@@ -17,13 +17,6 @@
 # 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/>.
 #
-begin
-  require "rack"
-rescue LoadError
-  require "rubygems"
-  require "rack"
-end
-
 module FreeMessageQueue
   # This implements server that plugs the free message queue into a rack enviroment
   class Server

data/lib/fmq/version.rb

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

data/lib/fmq.rb

@@ -17,6 +17,14 @@
 # along with Free Message Queue.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+# load the rack enviroment
+begin
+  require "rack"
+rescue LoadError
+  require "rubygems"
+  require "rack"
+end
+
 # load all queues and manager and server
 Dir.glob(File.dirname(__FILE__) + "/fmq/queues/*.rb").each do |file|
   require file

data/test/test_basic.rb

@@ -27,19 +27,21 @@ end
 
 class BaseQueue < Test::Unit::TestCase
   def setup
-    @manager = FreeMessageQueue::QueueManager.new()
-    
-    @manager.setup do |m|
-      @queue1 = m.setup_queue "/dummy1"
-      @queue2 = m.setup_queue "/dummy2" do |q|
+    @manager = FreeMessageQueue::QueueManager.new() do 
+      setup_queue "/dummy1"
+      setup_queue "/dummy2" do |q|
         q.max_messages = 100
         q.max_size = 100.kb
       end
-      @queue3 = m.setup_queue "/dummy3" do |q|
+      setup_queue "/dummy3" do |q|
         q.max_size = 0
         q.max_messages = -10
       end
     end
+    
+    @queue1 = @manager.queue "/dummy1"
+    @queue2 = @manager.queue "/dummy2"
+    @queue3 = @manager.queue "/dummy3"
   end
   
   def test_creating
@@ -83,4 +85,4 @@ class BaseQueue < Test::Unit::TestCase
       @queue2.put(new_msg("X" * 10.kb))
     end
   end
-end
+end

data/test/test_file_persistent.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require "fileutils"
+
+# This is the default test to the message interface
+class TestFilePersistentQueue < Test::Unit::TestCase
+  include FifoQueueTests
+  
+  def setup
+    manager = nil # the manager is not needed in this test
+    @queue = FreeMessageQueue::FilePersistentQueue.new(manager)
+    @queue.folder = "/tmp/fmq/FilePersistentQueue/testqueue"
+  end
+  
+  def teardown
+    # remove the test data
+    FileUtils.rm_rf "/tmp/fmq"
+  end
+end

data/test/test_helper.rb

@@ -3,4 +3,62 @@ require File.dirname(__FILE__) + '/../lib/fmq'
 
 def new_msg(payload)
   FreeMessageQueue::Message.new(payload)
-end
+end
+
+module FifoQueueTests
+  def test_basic_get_poll
+  	assert_nil @queue.poll
+	  assert_equal 0, @queue.size
+	  assert @queue.put(nil) == false
+	  assert_nil @queue.poll
+	  td_1 = new_msg("asdasd")
+	  assert @queue.put(td_1)
+	  assert_equal 1, @queue.size
+	  assert_equal td_1.payload, @queue.poll.payload
+  end
+  
+  def test_n_messages
+    n = 20
+    byte_size = 0
+    n.times { |t| byte_size += t.to_s.size }
+    
+	  assert_equal 0, @queue.bytes
+	  assert_nil @queue.poll
+	  n.times do |i|
+	    assert @queue.put(new_msg(i.to_s))
+	  end
+	  assert_equal byte_size, @queue.bytes
+	  assert_equal n, @queue.size
+	  n.times do |i|
+	    assert_equal i.to_s, @queue.poll.payload
+	  end
+	  assert_equal 0, @queue.bytes
+	  assert_nil @queue.poll
+  end
+  
+  def test_mam_messages
+    @queue.put(new_msg("asd"))
+    @queue.put(new_msg("asd"))
+    @queue.poll()
+    @queue.put(new_msg("asd"))
+    @queue.put(new_msg("asd"))
+    @queue.poll()
+    @queue.put(new_msg("asd"))
+    @queue.poll()
+    assert_equal 2, @queue.size
+    @queue.put(new_msg("asd"))
+    @queue.put(new_msg("asd"))
+    assert_equal 4, @queue.size
+    @queue.clear
+    assert_equal 0, @queue.size
+  end
+  
+  def test_queue_bytes
+    @queue.put(new_msg("XX" * 40))
+    @queue.put(new_msg("X" * 40))
+    @queue.put(new_msg("XX888" * 40))
+    assert_equal 2*40+40+5*40, @queue.bytes
+    @queue.clear
+    assert_equal 0, @queue.bytes
+  end
+end

data/test/test_linked.rb

@@ -2,64 +2,10 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 # This is the default test to the message interface
 class TestLinkedQueue < Test::Unit::TestCase
+  include FifoQueueTests
+  
   def setup
     manager = nil # the manager is not needed in this test
     @queue = FreeMessageQueue::LinkedQueue.new(manager)
   end
-  
-  def test_basic_get_poll
-  	assert_nil @queue.poll
-	  assert_equal 0, @queue.size
-	  assert @queue.put(nil) == false
-	  assert_nil @queue.poll
-	  td_1 = new_msg("asdasd")
-	  assert @queue.put(td_1)
-	  assert_equal 1, @queue.size
-	  assert_equal td_1.payload, @queue.poll.payload
-  end
-  
-  def test_n_messages
-    n = 20
-    byte_size = 0
-    n.times { |t| byte_size += t.to_s.size }
-    
-	  assert_equal 0, @queue.bytes
-	  assert_nil @queue.poll
-	  n.times do |i|
-	    assert @queue.put(new_msg(i.to_s))
-	  end
-	  assert_equal byte_size, @queue.bytes
-	  assert_equal n, @queue.size
-	  n.times do |i|
-	    assert_equal i.to_s, @queue.poll.payload
-	  end
-	  assert_equal 0, @queue.bytes
-	  assert_nil @queue.poll
-  end
-  
-  def test_mam_messages
-    @queue.put(new_msg("asd"))
-    @queue.put(new_msg("asd"))
-    @queue.poll()
-    @queue.put(new_msg("asd"))
-    @queue.put(new_msg("asd"))
-    @queue.poll()
-    @queue.put(new_msg("asd"))
-    @queue.poll()
-    assert_equal 2, @queue.size
-    @queue.put(new_msg("asd"))
-    @queue.put(new_msg("asd"))
-    assert_equal 4, @queue.size
-    @queue.clear
-    assert_equal 0, @queue.size
-  end
-  
-  def test_queue_bytes
-    @queue.put(new_msg("XX" * 40))
-    @queue.put(new_msg("X" * 40))
-    @queue.put(new_msg("XX888" * 40))
-    assert_equal 2*40+40+5*40, @queue.bytes
-    @queue.clear
-    assert_equal 0, @queue.bytes
-  end
-end
+end

data/test/test_queue_manager.rb

@@ -5,34 +5,22 @@ class TestQueueManager < Test::Unit::TestCase
   DEFAULT_QUEUE_NAME = "/fmq_test/test1"
   
   def setup
-    FreeMessageQueue.log_level "fatal"
-
-    @queue_manager = FreeMessageQueue::QueueManager.new()
-    
-    @queue_manager.setup do |qm|
-      qm.auto_create_queues = false
-      
-      qm.setup_queue DEFAULT_QUEUE_NAME do |q|
+    @queue_manager = FreeMessageQueue::QueueManager.new(false) do      
+      setup_queue DEFAULT_QUEUE_NAME do |q|
         q.max_messages = 100
         q.max_size = 100.mb
       end
       
-      qm.setup_queue "/second_test_queue"
-      qm.setup_queue "/third_test_queue"
+      setup_queue "/second_test_queue"
+      setup_queue "/third_test_queue"
     end
   end
   
-  def test_config
-    # check that the simple config will work
-    FreeMessageQueue::QueueManager.new()
-    @queue_manager.setup do |qm|
-      qm.auto_create_queues = false
-    end
-    
+  def test_config        
     # check if all queues are available
     assert_equal 3, @queue_manager.queues.size
     [DEFAULT_QUEUE_NAME, "/second_test_queue", "/third_test_queue"].each do |e|
-      assert @queue_manager.queues.include? e
+      assert @queue_manager.queues.include?(e)
     end
   end
   
@@ -84,4 +72,5 @@ class TestQueueManager < Test::Unit::TestCase
       @queue_manager.put(url, new_msg("Test"))
     }
   end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fmq
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Vincent Landgraf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-27 00:00:00 +02:00
+date: 2008-08-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: The project implements a queue system with a server and some client apis. This project wants to be a fast and lightweight implementation with most of the features of MQS or ActiveMQ.
 email: 
 - fmq-3z@gmx.net
@@ -63,12 +73,14 @@ files:
 - lib/fmq/queues/linked.rb
 - lib/fmq/queues/load_balanced.rb
 - lib/fmq/queues/syncronized.rb
+- lib/fmq/queues/file_persistent.rb
 - lib/fmq/version.rb
 - test/test_basic.rb
 - test/test_fmq_client.rb
 - test/test_helper.rb
 - test/test_linked.rb
 - test/test_queue_manager.rb
+- test/test_file_persistent.rb
 has_rdoc: true
 homepage: http://fmq.rubyforge.org
 post_install_message: |-
@@ -101,6 +113,7 @@ specification_version: 2
 summary: The project implements a queue system with a server and some client apis. This project wants to be a fast and lightweight implementation with most of the features of MQS or ActiveMQ.
 test_files: 
 - test/test_basic.rb
+- test/test_file_persistent.rb
 - test/test_fmq_client.rb
 - test/test_helper.rb
 - test/test_linked.rb