ap4r 0.3.3 → 0.3.4

data/History.txt

@@ -1,6 +1,13 @@
 == 0.3.x
 
-=== 0.3.3 (June ?, 2007)
+=== 0.3.4 (October 31, 2007)
+* Added: Support ActiveRecord as reliable RDBMS persistence.
+* Added: Capistrano recipes.
+* Added: A dispatcher via druby.
+         Based on a patch from Kouhei Sutou <kou at cozmixng.org>.
+* Added: Support memory queue which is volatile.
+
+=== 0.3.3 (September 19, 2007)
 * Added: Support with hoe.
 * Added: Support PostgreSQL as reliable RDBMS persistence.
 * Added: Test supports, stub of queueing and service controls.

data/Manifest.txt

@@ -7,11 +7,13 @@ bin/ap4r_setup
 config/ap4r_settings.rb
 config/log4r.yaml
 config/queues.cfg
+config/queues_ar.cfg
 config/queues_disk.cfg
 config/queues_mysql.cfg
 config/queues_pgsql.cfg
 lib/ap4r.rb
 lib/ap4r/carrier.rb
+lib/ap4r/db/migrate/001_reliable_msg_queue_and_topic.rb
 lib/ap4r/dispatcher.rb
 lib/ap4r/message_store_ext.rb
 lib/ap4r/mongrel.rb
@@ -20,6 +22,9 @@ lib/ap4r/multi_queue.rb
 lib/ap4r/postgresql.sql
 lib/ap4r/queue_manager_ext.rb
 lib/ap4r/queue_manager_ext_debug.rb
+lib/ap4r/recipes.rb
+lib/ap4r/reliable_msg_queue.rb
+lib/ap4r/reliable_msg_topic.rb
 lib/ap4r/retention_history.rb
 lib/ap4r/script/base.rb
 lib/ap4r/script/queue_manager_control.rb

data/Rakefile

@@ -1,85 +1,98 @@
 require 'rubygems'
 require 'hoe'
+require 'erb'
+require 'active_record'
 require File.join(File.dirname(__FILE__), 'lib/ap4r', 'version')
 
-HelloWorld = '../samples/HelloWorld'
+namespace :hoe do
+  hoe = Hoe.new('ap4r', Ap4r::VERSION::STRING) do |p|
+    p.author = ["Shunichi Shinohara", "Kiwamu Kato"]
+    p.changes = p.paragraphs_of('History.txt', 1..2).join("\n\n")
+    #p.clean_globs = 
+    p.description = <<-EOF
+      Asynchronous Processing for Ruby.
+    EOF
+    p.email = %q{shinohara.shunichi@future.co.jp, kato.kiwamu@future.co.jp}
+
+    p.extra_deps << ['reliable-msg', '=1.1.0']
+    p.extra_deps << ['activesupport']
+    p.extra_deps << ['mongrel']
+    p.extra_deps << ['rake']
+    p.extra_deps << ['hoe']
+
+    p.name = 'ap4r'
+    p.need_tar = false
+    p.need_zip = false
+    p.rdoc_pattern = /^(lib|bin|ext|rails_plugin)|txt$/
+
+    #p.remote_rdoc_dir = 
+    #p.rsync = 
+    p.rubyforge_name = 'ap4r'
+    #p.spec_extra = 
+    p.summary = 'Asynchronous Processing for Ruby.'
+    p.test_globs = 'spec/**/*_spec.rb'
+    p.url = 'http://ap4r.rubyforge.org/wiki/wiki.pl?HomePage'
+    p.version = Ap4r::VERSION::STRING
+  end
+  hoe.spec.dependencies.delete_if {|dep| dep.name == "hoe"}
+
+end
+task :pkg => "release:copy_plugin"
 
 # AP4R release tasks --------------------------------------------------------
 
-# copy rails plugin from sample before gem build
-FileUtils.mkdir_p('./rails_plugin/ap4r/lib')
-FileUtils.cp(HelloWorld + '/db/migrate/001_create_table_for_saf.rb', './lib/ap4r/xxx_create_table_for_saf.rb')
-FileUtils.cp_r(Dir.glob(HelloWorld + '/vendor/plugins/ap4r/*').reject{|f| f =~ /tmp$|CVS|\.svn/}, './rails_plugin/ap4r')
-
-Hoe.new('ap4r', Ap4r::VERSION::STRING) do |p|
-  p.author = ["Shunichi Shinohara", "Kiwamu Kato"]
-  p.changes = p.paragraphs_of('History.txt', 1..2).join("\n\n")
-  #p.clean_globs = 
-  p.description = <<-EOF
-    Asynchronous Processing for Ruby.
-  EOF
-  p.email = %q{shinohara.shunichi@future.co.jp, kato.kiwamu@future.co.jp}
-
-  p.extra_deps << ['reliable-msg', '=1.1.0']
-  p.extra_deps << ['activesupport']
-  p.extra_deps << ['mongrel']
-  p.extra_deps << ['rake']
-  p.extra_deps << ['hoe']
-
-  p.name = 'ap4r'
-  p.need_tar = false
-  p.need_zip = false
-  #p.rdoc_pattern =
-  #p.remote_rdoc_dir = 
-  #p.rsync = 
-  p.rubyforge_name = 'ap4r'
-  #p.spec_extra = 
-  p.summary = 'Asynchronous Processing for Ruby.'
-  p.test_globs = 'spec/**/*_spec.rb'
-  p.url = 'http://ap4r.rubyforge.org/wiki/wiki.pl?HomePage'
-  p.version = Ap4r::VERSION::STRING
-end.spec.dependencies.delete_if {|dep| dep.name == "hoe"}
-
-
-desc 'Create Manifest.txt'
-task :create_manifest do
-
-  path_list = []
-  Find.find('.') do |path|
-    next unless File.file? path
-    next if path =~ /\.svn|tmp$|CVS|.rb\~/
-    path_list << path
+HelloWorld = '../samples/HelloWorld'
+
+namespace :release do
+  desc "copy rails plugin from sample before gem build" 
+  task :copy_plugin do
+    # TODO: Should use file task ? 2007/09/27 by shino
+    FileUtils.rm_rf('./rails_plugin/ap4r')
+    FileUtils.mkdir_p('./rails_plugin/ap4r/lib')
+    FileUtils.cp(HelloWorld + '/db/migrate/001_create_table_for_saf.rb',
+                 './lib/ap4r/xxx_create_table_for_saf.rb')
+    FileUtils.cp_r(Dir.glob(HelloWorld + '/vendor/plugins/ap4r/*').reject{|f| f =~ /tmp$|CVS|\.svn/},
+                   './rails_plugin/ap4r')
+    # TODO: dot files and tilde files are copied 2007/09/20 by shino
   end
 
-  File.open('Manifest.txt', 'w') do |manifest|
-    path_list.sort.each do |path|
-      /.\// =~ path
-      manifest.puts($~.post_match)
+  desc "Create Manifest.txt"
+  task :create_manifest => [:copy_plugin] do
+    path_list = []
+    Find.find('.') do |path|
+      next unless File.file?(path)
+      next if path =~ /^\.\/doc\//
+      next if path =~ /\.svn|tmp$|CVS|\~$/
+      path_list << path
     end
-  end
-  
-end
 
+    File.open('Manifest.txt', 'w') do |manifest|
+      path_list.sort.each do |path|
+        /.\// =~ path
+        manifest.puts($~.post_match)
+      end
+    end
+  end
 
+  # Sample release tasks ------------------------------------------------------
+  desc 'Make sample tarball (Now only one sample "HelloWorld").'
+  task :sample do
+    FileUtils.mkdir_p('./pkg/samples')
+    FileUtils.rm_rf('./pkg/samples/HelloWorld')
+    
+    FileUtils.cp_r(HelloWorld, './pkg/samples/')
+    Find.find('./pkg/samples') do |path|
+      next unless File.file? path
+      FileUtils.rm_rf(path) if path =~ /\.svn|tmp$|CVS|.rb\~/
+    end
 
-# Sample release tasks ------------------------------------------------------
-desc 'Make samle tarball (Now only HelloWorld sample).'
-task :sample do
-  FileUtils.mkdir_p('./pkg/samples')
-  FileUtils.rm_rf('./pkg/samples/HelloWorld')
-  
-  FileUtils.cp_r(HelloWorld, './pkg/samples/')
-  Find.find('./pkg/samples') do |path|
-    next unless File.file? path
-    FileUtils.rm_rf(path) if path =~ /\.svn|tmp$|CVS|.rb\~/
+    Dir.chdir('./pkg/samples/HelloWorld')
+    `rake db:migrate`
+    Dir.chdir('../../')
+    
+    `tar czf HelloWorld-#{Ap4r::VERSION::STRING}.tar.gz ./samples/HelloWorld/`
+    Dir.chdir('../')
   end
-
-  Dir.chdir('./pkg/samples/HelloWorld')
-  `rake db:migrate`
-  Dir.chdir('../../')
-  
-  `tar czvf HelloWorld-#{Ap4r::VERSION::STRING}.tar.gz ./samples/HelloWorld/`
-  Dir.chdir('../')
 end
 
 
@@ -112,11 +125,11 @@ end
 
 # AP4R misc tools ----------------------------------------------------------------
 
+require 'active_support'
+require 'code_statistics'
+
 desc "display code statistics"
-task :stats do
-  require 'rubygems'
-  require 'active_support'
-  require 'code_statistics'
+task :stats => "release:copy_plugin" do
   CodeStatistics::TEST_TYPES.concat(["Local specs"])
   CodeStatistics.new(
                      ["Core Sources", "lib"],
@@ -125,3 +138,24 @@ task :stats do
                      ["Local specs", "spec/local"]
                      ).to_s
 end
+
+namespace :qdb do
+  desc "Make queue and topic tables through scripts in lib/ap4r/db/migrate." 
+  task :migrate do
+
+    # Todo: configurable file name, 2007/10/01 kiwamu
+    ap4r_config_file = "config/queues_ar.cfg"
+    ap4r_config = YAML::load(ERB.new(IO.read(ap4r_config_file)).result)
+    database_config = ap4r_config["store"]
+    if "activerecord" == database_config["type"].downcase
+      database_config["adapter"] = database_config["adapter"].downcase
+    else
+      # Todo
+    end
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection(database_config)
+
+    ActiveRecord::Migrator.migrate("lib/ap4r/db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+  end
+end
+

data/config/queues_ar.cfg

@@ -0,0 +1,20 @@
+--- 
+store:
+  type: activerecord
+  adapter: sqlite3
+  host: localhost
+  database: reliable_msg.db
+  username: ap4r
+  password: ap4r
+drb: 
+  host: 
+  port: 6438
+  acl: allow 127.0.0.1 allow ::1 allow 10.0.0.0/8
+dispatchers:
+  -
+    targets: queue.*
+    threads: 1
+#carriers:
+#  - 
+#    source_uri: druby://another.host.local:6438
+#    threads: 1

data/lib/ap4r/db/migrate/001_reliable_msg_queue_and_topic.rb

@@ -0,0 +1,22 @@
+class ReliableMsgQueueAndTopic < ActiveRecord::Migration
+
+  def self.up
+    create_table :reliable_msg_queues do |t|
+      t.column "message_id", :string
+      t.column "queue", :string
+      t.column "headers", :binary
+      t.column "object", :binary 
+    end
+    
+    create_table :reliable_msg_topics do |t|
+      t.column "topic", :string
+      t.column "headers", :binary
+      t.column "object", :binary 
+    end
+  end
+
+  def self.down
+    drop_table :reliable_msg_queues
+    drop_table :reliable_msg_topics
+  end
+end

data/lib/ap4r/dispatcher.rb

@@ -54,7 +54,7 @@ module Ap4r
 
     # Starts every dispatcher.
     # If an exception is detected, this method raise it through with logging.
-    # 
+    #
     def start
       begin
         logger.info{ "about to start dispatchers with config\n#{@config.to_yaml}" }
@@ -98,7 +98,7 @@ module Ap4r
       klass.new(message, conf_per_targets)
     end
 
-    # Defines the general structure for each dispatcher thread 
+    # Defines the general structure for each dispatcher thread
     # from begging to end.
     def dispatching_loop(group, conf, index)
       group.add(Thread.current)
@@ -112,7 +112,7 @@ module Ap4r
         begin
           mq.get{|m|
             unless m
-              logger.debug{"message is nul"} 
+              logger.debug{"message is nul"}
               break
             end
             logger.debug{"dispatcher get message\n#{m.to_yaml}"}
@@ -148,7 +148,7 @@ module Ap4r
         ::Ap4r::Dispatchers.register_dispatcher_class(mode_symbol, self)
       end
 
-      # Takes 
+      # Takes
       # * +message+: from a queue
       # * +conf+: configuration from dispatchers section
       #--
@@ -217,7 +217,7 @@ module Ap4r
     # <tt>options[:target_method]</tt>.
     #
     # Determination of "success" is two fold:
-    # * status code should be exactly 200, other codes (including 201-2xx) are 
+    # * status code should be exactly 200, other codes (including 201-2xx) are
     #   treated as error, and
     # * body should include a string "true"
     #
@@ -231,12 +231,12 @@ module Ap4r
         @response = nil
         uri = URI.parse(@message[:target_url])
         headers = make_header
-        
+
         Net::HTTP.start(uri.host, uri.port) do |http|
           @response, = http.post(uri.path, @message.object, headers)
         end
       end
-      
+
       def make_header
         headers = { }
         @message.headers.map do |k,v|
@@ -246,7 +246,7 @@ module Ap4r
         end
         headers
       end
-      
+
       def validate_response
         logger.debug{"response status [#{@response.code} #{@response.message}]"}
         validate_response_status(Net::HTTPOK)
@@ -322,5 +322,20 @@ module Ap4r
       end
     end
 
+    # Dispatches via druby protocol with the implementation DRb.
+    #
+    # The call result is judged as
+    # * "success" if finishes normally (without an exception)
+    # * "failuer" if finishes with an exception
+    #
+    class Druby < Base
+      dispatch_mode :druby
+        
+      def invoke
+        object = DRbObject.new_with_uri(@message[:target_url])
+        object.method_missing(@message[:target_method].to_sym, @message.object)
+      end
+    end
+
   end
 end

data/lib/ap4r/message_store_ext.rb

@@ -30,6 +30,23 @@ module ReliableMsg #:nodoc:
         }
         queue_and_created ? queue_and_created[0] : nil
       end
+      
+      # Returns a message store from the specified configuration (previously
+      # created with configure).
+      #
+      # :call-seq:
+      #   Base::configure(config, logger) -> store
+      #
+      def self.configure config, logger
+        if config["type"].downcase.starts_with?("activerecord")
+          type = config["type"].downcase.split("_").first
+        else
+          type = config["type"].downcase
+        end
+        cls = @@stores[type]
+        raise RuntimeError, format(ERROR_INVALID_MESSAGE_STORE, type) unless cls
+        cls.new config, logger
+      end
 
     end
 
@@ -200,11 +217,243 @@ module ReliableMsg #:nodoc:
         end
 
       end
+      
+    rescue LoadError
+      # do nothing
+    end
+
+    
+    begin
+      # ActiveRecord
+      # Make sure we have a ActiveRecord library before creating this class,
+      # worst case we end up with a disk-based message store. 
+      begin
+        require 'active_record'
+        require 'ap4r/reliable_msg_queue'
+        require 'ap4r/reliable_msg_topic'
+      rescue LoadError
+        require 'rubygems'
+        require 'activerecord'
+        require 'ap4r/reliable_msg_queue'
+        require 'ap4r/reliable_msg_topic'
+      end
+
+      class ActiveRecordStore < Base #:nodoc:
+
+        TYPE = "activerecord"
+
+        @@stores[TYPE] = self
+
+        # Default prefix for tables in the database.
+        DEFAULT_PREFIX = 'reliable_msg_';
+
+        # Reference to an open ActiveRecord connection held in the current thread.
+        THREAD_CURRENT_ACTIVE_RECORD = :reliable_msg_active_record #:nodoc:
+
+
+        def initialize config, logger
+          super logger
+          @config = { :adapter=>config['adapter'],
+            :host=>config['host'], :username=>config['username'], :password=>config['password'],
+            :database=>config['database'], :port=>config['port'], :socket=>config['socket'] }
+          @prefix = config['prefix'] || DEFAULT_PREFIX
+          @queues_table = "#{@prefix}queues"
+          @topics_table = "#{@prefix}topics"
+          establish_connection
+        end
+
+
+        def type
+          "#{TYPE} (#{@config[:adapter]})"
+        end
+
+
+        # Todo: implement calling migration logic. 2007/10/01 kiwamu
+        def setup
+        end
+
+
+        def configuration
+          config = { "type"=>TYPE, "adapter"=>@config[:adapter], "host"=>@config[:host], 
+            "username"=>@config[:username], "password"=>@config[:password], "database"=>@config[:database] }
+          config["port"] = @config[:port] if @config[:port]
+          config["socket"] = @config[:socket] if @config[:socket]
+          config["prefix"] = @config[:prefix] if @config[:prefix]
+          config
+        end
+
+
+        def activate
+          super
+          load_index
+        end
+
+
+        def deactivate
+          Thread.list.each do |thread|
+            if conn = thread[THREAD_CURRENT_ACTIVE_RECORD]
+              thread[THREAD_CURRENT_ACTIVE_RECORD] = nil
+              conn.close
+            end
+          end
+          super
+        end
+
+
+        protected
+
+        def update inserts, deletes, dlqs
+          begin
+            inserts.each do |insert|
+              if insert[:queue]
+                ::Ap4r::ReliableMsgQueue.new(
+                                             :message_id => insert[:id],
+                                             :queue => insert[:queue],
+                                             :headers => Marshal::dump(insert[:headers]),
+                                             :object => insert[:message]).save!
+              else
+                ::Ap4r::ReliableMsgTopic.new(
+                                             :topic => insert[:topic],
+                                             :headers => Marshal::dump(insert[:headers]),
+                                             :object => insert[:message]).save!
+              end
+            end
+            ids = deletes.inject([]) do |array, delete|
+              delete[:queue] ? array << "#{delete[:id]}" : array
+            end
+            if !ids.empty?
+              # TODO: Use IN clause 2007/10/01 kiwamu
+              ids.each do |id|
+                ::Ap4r::ReliableMsgQueue.delete_all(:message_id => id)
+              end
+            end
+            dlqs.each do |dlq|
+              dlq_message = ::Ap4r::ReliableMsgQueue.find(:first, :conditions => { :message_id => dlq[:id] })
+              dlq_message.queue = Queue::DLQ
+              dlq_message.save!
+            end
+          rescue Exception=>error
+            raise error
+          end
+          super            
+
+        end
+
+
+        def load_index
+          ::Ap4r::ReliableMsgQueue.find(:all).each do |message|
+            queue = @queues[message[:queue]] ||= []
+            headers = Marshal::load(message[:headers])
+            # Add element based on priority, higher priority comes first.
+            priority = headers[:priority]
+            added = false
+            queue.each_index do |idx|
+              if queue[idx][:priority] < priority
+                queue[idx, 0] = headers
+                added = true
+                break
+              end
+            end
+            queue << headers unless added
+          end
+          
+          ::Ap4r::ReliableMsgTopic.find(:all).each do |message|
+            @topocs[message[:topic]] = Marshal::load(message[:headers])
+          end
+        end
+
+
+        def load id, type, queue_or_topic
+          object = nil
+          if type == :queue
+            message = ::Ap4r::ReliableMsgQueue.find(:first, :conditions => { :message_id => id })
+            object = message.object
+          else
+            message = ::Ap4r::ReliableMsgTopic.find(:first, :conditions => { :topic => queue_or_topic })
+            object = message.object
+          end
+          object
+        end
+
+
+        def establish_connection
+          ActiveRecord::Base.establish_connection(
+                                                  :adapter  => @config[:adapter],
+                                                  :host     => @config[:host],
+                                                  :username => @config[:username],
+                                                  :password => @config[:password],
+                                                  :database => @config[:database]
+                                                  )
+        end
+
+      end
 
     rescue LoadError
       # do nothing
     end
     
+    
+    class Memory < Base #:nodoc:
+
+      TYPE = self.name.split('::').last.downcase
+
+      @@stores[TYPE] = self
+
+      DEFAULT_CONFIG = {
+        "type"=>TYPE,
+      }
+
+      def initialize config, logger
+        super logger
+        # memory_map maps messages (by ID) to memory. The value is messege object.
+        @memory_map = {}
+      end
+
+
+      def type
+        TYPE
+      end
+
+
+      def setup
+        # do nothing
+      end
+
+
+      def configuration
+        { "type"=>TYPE }
+      end
+
+
+      def activate
+        super
+      end
+
+
+      def deactivate
+        @memory_map = nil
+        super
+      end
+
+
+      protected
+
+      def update inserts, deletes, dlqs
+        inserts.each do |insert|
+          @mutex.synchronize do
+            @memory_map[insert[:id]] = insert[:message]
+          end
+        end        
+        super
+        @mutex.synchronize do
+          deletes.each do |delete|
+            @memory_map.delete(delete[:id])
+          end
+        end
+      end
+
+    end
+
   end
 end
 

data/lib/ap4r/recipes.rb

@@ -0,0 +1,124 @@
+config = Capistrano::Configuration.respond_to?(:instance) ?
+  Capistrano::Configuration.instance(:must_exist) :
+  Capistrano.configuration(:must_exist)
+
+config.load do
+  namespace :ap4r do
+    desc <<-DESC
+      Deploys your project. This calls both 'deploy:update' and 'ap4r:restart'.
+      Note that this will generally only work for applications that have
+      already been deployed once. For a "cold" deploy, you will want to take
+      a look at the 'ap4r:cold' task, which handles the cold start
+      specifically.
+    DESC
+    task :default do
+      update
+      restart
+    end
+
+    desc <<-DESC
+      Setups your project space. This make some shared directories (by 'deploy.update')
+      and additionallly make uuid.state in the shared/ direcotory.
+    DESC
+    task :setup do
+      deploy.setup
+      run <<-CMD
+        ruby -e 'require "rubygems"; require "uuid"; Dir.chdir("#{shared_path}"){UUID.new}' > /dev/null
+      CMD
+    end
+    
+    desc <<-DESC
+      Deploys and starts a "cold" application. This is useful if you have not
+      deployed your application before, or if your application is (for some
+      other reason) not currently running. It will deploy the code, and
+      invoke 'ap4r:start' to fire up the AP4R servers.
+    DESC
+    task :cold do
+      update
+      start
+    end
+
+    desc <<-DESC
+      Start AP4R process on the ap4r server.  This uses the :use_sudo variable
+      to determine whether to use sudo or not. By default, :use_sudo is
+      set to true.
+    DESC
+    task :start, :roles => :ap4r do
+      run_mongrel_ap4r("start", "-d -A #{ap4r_conf}")
+    end
+
+    desc <<-DESC
+      Restart the AP4R process on the ap4r server by starting and stopping the
+      AP4R. This uses the :use_sudo variable to determine whether to use sudo
+      or not. By default, :use_sudo is set to true.
+    DESC
+    task :restart, :roles => :ap4r do
+      stop
+      start
+    end
+
+    desc <<-DESC
+      Stop the AP4R process on the ap4r server.  This uses the :use_sudo
+      variable to determine whether to use sudo or not. By default, :use_sudo is
+      set to true.
+    DESC
+    task :stop, :roles => :ap4r do
+      run_mongrel_ap4r("stop")
+    end
+
+    desc <<-DESC
+      Rolls back to a previous version and restarts.
+    DESC
+    task :rollback do
+      deploy.rollback_code
+      restart
+    end
+
+    desc <<-DESC
+      Updates your code from repository and makes symlinks for shared resourses.
+    DESC
+    task :update do
+      transaction do
+        deploy.update_code
+        deploy.symlink
+
+        finalize_update
+      end
+    end
+
+    # Makes some symlinks.
+    # One for the queues dir of disk message store.
+    # And one for the uuid.state file.
+    task :finalize_update do
+      require 'ap4r'
+      set_ap4r_conf
+
+      # TODO: This logic needs the config file at local to be synchronized to svn 2007/10/12 by shino
+      config = ReliableMsg::Config.new(ap4r_conf)
+      config.load_no_create
+      if config.store["type"] == "disk"
+        queue_path = config.store["path"] || ReliableMsg::Config::DEFAULT_STORE["path"]
+        latest_queue_path = "#{latest_release}/#{queue_path}"
+        shared_queue_path = "#{shared_path}/#{queue_path}"
+        # mkdir -p is making sure that the directories are there for some SCM's that don't
+        # save empty folders
+        run "umask 02 && mkdir -p #{shared_queue_path}/"
+        run <<-CMD
+          rm -rf #{latest_queue_path} &&
+          ln -s #{shared_queue_path} #{latest_queue_path} &&
+          ln -s #{shared_path}/uuid.state #{latest_release}/uuid.state
+        CMD
+      end
+    end
+
+    def run_mongrel_ap4r(command, options="")
+      set_ap4r_conf
+      send(run_method, "ruby #{current_path}/script/mongrel_ap4r #{command} -c  #{current_path} #{options}")
+    end
+    
+    def set_ap4r_conf
+      set :ap4r_conf, "#{application}/config/queues.cfg" unless ap4r_conf
+    end
+  end
+
+end

data/lib/ap4r/reliable_msg_queue.rb

@@ -0,0 +1,4 @@
+module Ap4r
+  class ReliableMsgQueue < ActiveRecord::Base
+  end
+end

data/lib/ap4r/reliable_msg_topic.rb

@@ -0,0 +1,4 @@
+module Ap4r
+  class ReliableMsgTopic < ActiveRecord::Base
+  end
+end

data/lib/ap4r/version.rb

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

data/rails_plugin/ap4r/lib/async_helper.rb

@@ -86,12 +86,6 @@ module Ap4r
           logger.debug(rm_options.inspect)
         end
 
-        # TODO: clone it, 2006/10/16 shino
-        url_options ||= {}
-        url_options[:controller] ||= @controller.controller_path.gsub("/", ".")
-        url_options[:url] ||= {:controller => url_options[:controller], :action => url_options[:action]}
-        url_options[:url][:controller] ||= url_options[:controller] if url_options[:url].kind_of?(Hash)
-
         rm_options = @@default_rm_options.merge(rm_options || {})
 
         # Only async_params is not cloned. options and rm_options are cloned before now.
@@ -99,7 +93,7 @@ module Ap4r
         converter = Converters[rm_options[:dispatch_mode]].new(url_options, async_params, rm_options, self)
         logger.debug{"druby uri for queue-manager : #{DRUBY_URI}"}
 
-        queue_name = __get_queue_name(url_options, rm_options)
+        queue_name = converter.queue_name
         queue_message = converter.make_params
         queue_headers = converter.make_rm_options
 
@@ -141,17 +135,6 @@ module Ap4r
         q.put(queue_message, queue_headers)
       end
 
-      def __get_queue_name(options, rm_options)
-        if options[:url].kind_of?(Hash)
-          rm_options[:queue] ||=
-            @@default_queue_prefix.clone.concat(options[:url][:controller].to_s).concat('.').concat(options[:url][:action].to_s)
-        else
-          rm_options[:queue] ||=
-            @@default_queue_prefix.clone.chomp(".").concat(URI::parse(options[:url]).path.gsub("/", "."))
-        end
-        rm_options[:queue]
-      end
-
     end
 
     module Converters #:nodoc:
@@ -176,6 +159,12 @@ module Ap4r
           @url_for_handler = url_for_handler
         end
 
+        # Returns a queue name to which a message will be queued.
+        # Should be implemented by subclasses.
+        def queue_name
+          raise 'must be implemented in subclasses'
+        end
+
         # Returns a object which passed to <tt>ReliableMsg::Queue.put(message, headers)</tt>'s
         # first argument +message+.
         # Should be implemented by subclasses.
@@ -199,7 +188,35 @@ module Ap4r
 
       end
 
-      class Http < Base
+      class ToRailsBase < Base
+        def initialize(url_options, async_params, rm_options, url_for_handler)
+          super
+
+          @url_options ||= {}
+          @url_options[:controller] ||= @controller.controller_path.gsub("/", ".")
+          @url_options[:url] ||= {:controller => url_options[:controller], :action => url_options[:action]}
+          @url_options[:url][:controller] ||= url_options[:controller] if url_options[:url].kind_of?(Hash)
+        end
+
+        def queue_name
+          queue_name = @rm_options[:queue]
+          return queue_name if queue_name
+
+          queue_prefix = ::Ap4r::AsyncHelper::Base.default_queue_prefix
+          queue_prefix = queue_prefix.chomp(".")
+          url = @url_options[:url]
+          if url.kind_of?(Hash)
+            @rm_options[:queue] ||=
+              [queue_prefix, url[:controller].to_s, url[:action].to_s].join(".")
+          else
+            @rm_options[:queue] ||=
+              "#{queue_prefix}.#{URI.parse(url).path.gsub("/", ".")}"
+          end
+          @rm_options[:queue]
+        end
+      end
+
+      class Http < ToRailsBase
         dispatch_mode :HTTP
 
         def make_params
@@ -214,7 +231,7 @@ module Ap4r
         end
       end
 
-      class WebService < Base
+      class WebService < ToRailsBase
         def make_params
           message_obj = {}
           @async_params.each_pair{|k,v| message_obj[k.to_sym]=v}
@@ -264,6 +281,45 @@ module Ap4r
         end
       end
 
+      class Druby < Base
+        OPTION_KEY = :receiver
+        dispatch_mode :druby
+
+        @@default_url = "druby://localhost:9999"
+        cattr_accessor :default_url
+
+        def initialize(url_options, async_params, rm_options, url_for_handler)
+          super
+          @url_options[:url] ||= @@default_url
+        end
+
+        def queue_name
+          queue_name = @rm_options[:queue]
+          return queue_name if queue_name
+
+          @rm_options[:queue] =
+            [AsyncHelper::Base.default_queue_prefix.chomp("."),
+             @url_options[OPTION_KEY].to_s || "druby",
+             @url_options[:message].to_s].join(".")
+          @rm_options[:queue]
+        end
+
+        def make_params
+          @async_params
+        end
+
+        def make_rm_options
+          @rm_options[:target_url] ||=
+            if @url_options[OPTION_KEY]
+              "#{@url_options[:url]}?#{@url_options[OPTION_KEY]}"
+            else
+              @url_options[:url]
+            end
+          @rm_options[:target_method] = @url_options[:message]
+          @rm_options
+        end
+      end
+
     end
   end
 end

data/rails_plugin/ap4r/lib/message_builder.rb

@@ -77,7 +77,7 @@ module Ap4r #:nodoc:
       when :text
         set_content_type("text/plain")
       when :xml
-        set_content_type("text/xml application/x-xml")
+        set_content_type("application/xml")
       when :json
         set_content_type("application/json")
       when :yaml

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ap4r
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2007-09-19 00:00:00 +09:00
+  version: 0.3.4
+date: 2007-10-31 00:00:00 +09:00
 summary: Asynchronous Processing for Ruby.
 require_paths: 
 - lib
@@ -39,11 +39,13 @@ files:
 - config/ap4r_settings.rb
 - config/log4r.yaml
 - config/queues.cfg
+- config/queues_ar.cfg
 - config/queues_disk.cfg
 - config/queues_mysql.cfg
 - config/queues_pgsql.cfg
 - lib/ap4r.rb
 - lib/ap4r/carrier.rb
+- lib/ap4r/db/migrate/001_reliable_msg_queue_and_topic.rb
 - lib/ap4r/dispatcher.rb
 - lib/ap4r/message_store_ext.rb
 - lib/ap4r/mongrel.rb
@@ -52,6 +54,9 @@ files:
 - lib/ap4r/postgresql.sql
 - lib/ap4r/queue_manager_ext.rb
 - lib/ap4r/queue_manager_ext_debug.rb
+- lib/ap4r/recipes.rb
+- lib/ap4r/reliable_msg_queue.rb
+- lib/ap4r/reliable_msg_topic.rb
 - lib/ap4r/retention_history.rb
 - lib/ap4r/script/base.rb
 - lib/ap4r/script/queue_manager_control.rb