fmq 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,8 @@
+== 0.3.5 2009-07-25
+
+* 1 minor change:
+  * ruby 1.9 and rack 1.0.0 compatibility (thanks to John W Higgins <wishdev@gmail.com>)
+
 == 0.3.4 2008-09-06
 
 * 2 minor change:
@@ -15,7 +20,7 @@
 
 * 3 minor changes:
   * changed the way of the queue manager  setup
-  * updated rdoc, readme and website documentaition
+  * updated rdoc, readme and website documentation
   * added a new queue that persists the messages in the file system
 * 3 tiny changes:
   * fixed the fmq logger creation
@@ -26,9 +31,9 @@
 
 * 2 minor changes:
   * refactored the queue manager and remove legacy code (moved constraints stuff to the base queue)
-  * refactored the setup_queue method in the configuration file (sorry you have to change your configs)
+  * refactored the setup_queue method in the configuration file (sorry you have to change your config)
 * 3 tiny changes:
-  * default-server can now be used from within the development repository (no rund trip nessesary)
+  * default-server can now be used from within the development repository (no rund trip necessary)
   * added and replaced some tests for the new interface of the queue manager and the base queue
   * one can now yield and return messages
 
@@ -38,11 +43,11 @@
   * replaced the mongrel handler by rack so that it can be used by many servers and in different configurations
   * removed the old yml style config and replaced it by a new rubyish config style (see config.ru)
 * 5 tiny changes:
-  * seperated the admin interface handler
+  * separated the admin interface handler
   * removed the configuration stuff  that belonged to the old yml file from queue_manager and boot classes
   * removed that the command fmq can be used to start the server (rackup can be used by now)
-  * admin interface is now seperated to several files (javascript, css, ...)
-  * admin interface is validated by W3C validatior for xhtml strict and css 2.1 compliance
+  * admin interface is now separated to several files (javascript, css, ...)
+  * admin interface is validated by W3C validator for xhtml strict and css 2.1 compliance
 
 == 0.2.0 2008-06-28
 

data/PostInstall.txt

@@ -1,3 +1 @@
-================================================================================
- For more information on Free Message Queue (FMQ), see http://fmq.rubyforge.org
-================================================================================
+For more information on Free Message Queue (FMQ), see http://fmq.rubyforge.org

data/README.txt

@@ -44,7 +44,7 @@ The server will start and host a admin interface on http://localhost:5884/admin/
 
 == REQUIREMENTS:
 
-* rack >= 0.4.0 (web server provider)
+* rack >= 1.0.0 (web server provider)
 
 == INSTALL:
 

data/config/hoe.rb

@@ -8,7 +8,7 @@ RUBYFORGE_PROJECT = 'fmq' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
-  ['rack', '>= 0.4.0']
+  ['rack', '>= 1.0.0']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
@@ -63,8 +63,8 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.extra_deps = EXTRA_DEPENDENCIES
 
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"

data/default-server/config.ru

@@ -1,5 +1,5 @@
 begin
-  require File.dirname(__FILE__) + '/../lib/fmq'
+  require ::File.dirname(__FILE__) + '/../lib/fmq'
 rescue LoadError
   require "fmq"
 end

data/lib/fmq/admin.rb

@@ -2,17 +2,17 @@
 # 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/>.
 #
@@ -21,22 +21,22 @@ module FreeMessageQueue
   class AdminInterface
     # rack response for bad requests
     WRONG_METHOD = [400, {"CONTENT-TYPE" => "text/plain", "ERROR" => "Wrong http Method"}, ""]
-    
+
     # rack response for good requests
     OK = [200, {"CONTENT-TYPE" => "text/plain"}, ["ok"]]
-    
+
     # create the admin interface for the passed QueueManager
     def initialize(queue_manager)
       @manager = queue_manager
       @log = FreeMessageQueue.logger
     end
-  
+
     # handle all requests
     def call(env)
       begin
         request = Rack::Request.new(env)
         @log.debug "[AdminInterface] ENV: #{env.inspect}"
-        
+
         if request.get? then
           @log.info "[AdminInterface] list queues"
           # ======= LIST QUEUES
@@ -44,7 +44,7 @@ module FreeMessageQueue
           @manager.queues.each do |queue_name|
             queues_code << queue_to_json(queue_name)
           end
-          
+
           return [200, {"CONTENT-TYPE" => "application/json"}, ["[%s]" % queues_code.join(","), ]]
         elsif request.post? then
           if request["_method"] == "delete" then
@@ -55,9 +55,12 @@ module FreeMessageQueue
           elsif request["_method"] == "create"
             # ======= CREATE QUEUE
             @log.info "[AdminInterface] create queue"
-            @manager.setup_queue request["path"] do |q|
+            @manager.setup_queue(request["path"], request["queue_class"]) do |q|
               q.max_messages = request["max_messages"].to_i
               q.max_size = str_bytes request["max_size"]
+              request.params.each { |k,v|
+                q.send("#{k[3..-1]}=", v) if k.match(/^qm_/)
+              }
             end
             return OK
           else
@@ -70,13 +73,13 @@ module FreeMessageQueue
         return [400, {"CONTENT-TYPE" => "text/plain", "ERROR" => ex.message}, [ex.message]]
       end
     end
-    
+
   private
-  
+
     # converts the data of one queue to json format
     def queue_to_json(queue_name)
       queue = @manager.queue(queue_name)
-    
+
       "[\"%s\", %d, %d, %d, %d]" % [
         queue_name,
         queue.bytes,
@@ -85,14 +88,17 @@ module FreeMessageQueue
         queue.max_messages,
       ]
     end
-    
+
     # Retuns count of bytes to a expression with kb, mb or gb
     # e.g 10kb will return 10240
     def str_bytes(str)
       case str
-        when /([0-9]+)kb/i: $1.to_i.kb
-        when /([0-9]+)mb/i: $1.to_i.mb 
-        when /([0-9]+)gb/i: $1.to_i.gb
+        when /([0-9]+)kb/i
+          $1.to_i.kb
+        when /([0-9]+)mb/i
+          $1.to_i.mb
+        when /([0-9]+)gb/i
+          $1.to_i.gb
         else
           BaseQueue::INFINITE
       end

data/lib/fmq/queue_manager.rb

@@ -78,8 +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, &block)
+    def setup_queue(path, queue_class = nil, &block)
       check_queue_name(path)
+      queue_class ||= DEFAULT_QUEUE_CLASS
+      queue_class = FreeMessageQueue::const_get(queue_class) if queue_class.class == String
       queue_object = queue_class.new(self)
       block.call(queue_object) if block_given?
       @queues[path] = queue_object

data/lib/fmq/server.rb

@@ -17,6 +17,9 @@
 # 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 'yaml'
+
 module FreeMessageQueue
   # This implements server that plugs the free message queue into a rack enviroment
   class Server
@@ -29,7 +32,7 @@ module FreeMessageQueue
     # Process incoming request and send them to the right sub processing method like <em>process_get</em>
     def call(env)
       request = Rack::Request.new(env)
-      queue_path = request.env["REQUEST_PATH"]
+      queue_path = request.env["PATH_INFO"]
       @log.debug("[Server] Request params: #{YAML.dump(request.params)})")
       
       response = nil

data/lib/fmq/version.rb

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

data/test/test_basic.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 
 # This is the default test to the message interface
 class TestMessage < Test::Unit::TestCase

data/test/test_file_persistent.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 require "fileutils"
 
 # This is the default test to the message interface

data/test/test_fmq_client.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 
 class TestFreeMessageQueue < Test::Unit::TestCase
   TEST_URL = "http://localhost:5884/fmq_test/test1"

data/test/test_linked.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 
 # This is the default test to the message interface
 class TestLinkedQueue < Test::Unit::TestCase

data/test/test_queue_manager.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/helper.rb'
 
 # This is the tests the queue manager interface
 class TestQueueManager < Test::Unit::TestCase
@@ -6,7 +6,7 @@ class TestQueueManager < Test::Unit::TestCase
   
   def setup
     @queue_manager = FreeMessageQueue::QueueManager.new(false) do      
-      setup_queue DEFAULT_QUEUE_NAME do |q|
+      setup_queue TestQueueManager::DEFAULT_QUEUE_NAME do |q|
         q.max_messages = 100
         q.max_size = 100.mb
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fmq
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Vincent Landgraf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-06 00:00:00 +02:00
+date: 2009-07-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 2.3.2
     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: 
@@ -76,18 +76,17 @@ files:
 - lib/fmq/queues/file_persistent.rb
 - lib/fmq/queues/round_robin.rb
 - lib/fmq/version.rb
+- test/helper.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: |-
-  ================================================================================
-   For more information on Free Message Queue (FMQ), see http://fmq.rubyforge.org
-  ================================================================================
+licenses: []
+
+post_install_message: For more information on Free Message Queue (FMQ), see http://fmq.rubyforge.org
 rdoc_options: 
 - --main
 - README.txt
@@ -108,14 +107,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fmq
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 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
 - test/test_queue_manager.rb