amqp 0.8.0.rc7 → 0.8.0.rc8

data/CHANGELOG

@@ -1,5 +1,6 @@
 = Version 0.8.0
 
+  * [WIP] AMQP::Utilities::EventLoopHelper detects app server (if any) being used and starts EventMachine reactor in an optimal way.
   * [FEATURE] AMQP 0.9.1 support, including tx.* operations class.
   * [API] Default authentication handler now raises AMQP::PossibleAuthenticationFailureError
   * [API] AMQP::Channel#initialize now takes 3rd (optional) options hash.

data/examples/guides/getting_started/02_hello_world_dslified.rb

@@ -18,6 +18,6 @@ EventMachine.run do
       }
     end
 
-    channel.direct("").publish "Hello, world!", :routing_key => queue.name
+    channel.direct("").publish "Hello, world!", :routing_key => "amqpgem.examples.helloworld"
   end
 end

data/examples/publishing/simplistic_scatter_gather.rb

@@ -0,0 +1,70 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+require 'amqp'
+
+
+AMQP.start do |session|
+  ch             = AMQP::Channel.new(session)
+  exchange       = ch.fanout("amq.fanout")
+  reply_exchange = ch.default_exchange
+
+  ch.queue("", :exclusive => true) do |q1|
+    q1.bind(exchange).subscribe do |header, payload|
+      v = rand
+
+      puts "Replying to #{header.message_id} with #{v}"
+      reply_exchange.publish(v, :routing_key => header.reply_to, :message_id => header.message_id)
+    end
+  end
+  ch.queue("", :exclusive => true) do |q2|
+    q2.bind(exchange).subscribe do |header, payload|
+      v = rand
+
+      puts "Replying to #{header.message_id} with #{v}"
+      reply_exchange.publish(v, :routing_key => header.reply_to, :message_id => header.message_id)
+    end
+  end
+  ch.queue("", :exclusive => true) do |q3|
+    q3.bind(exchange).subscribe do |header, payload|
+      v = rand
+
+      puts "Replying to #{header.message_id} with #{v}"
+      reply_exchange.publish(v, :routing_key => header.reply_to, :message_id => header.message_id)
+    end
+  end
+
+
+  requests = Hash.new
+
+  EventMachine.add_timer(0.5) do
+    ch.queue("", :exlusive => true) do |q|
+      q.subscribe do |header, payload|
+        requests[header.message_id].push(payload)
+
+        puts "Got a reply for #{header.message_id}"
+
+        if requests[header.message_id].size == 3
+          puts "Gathered all 3 responses: #{requests[header.message_id].join(', ')}"
+          requests[header.message_id].clear
+        end
+      end
+
+
+      message_id           = "__message #{rand}__"
+      requests[message_id] = Array.new
+
+      exchange.publish("a request", :reply_to => q.name, :message_id => message_id)
+    end
+  end
+
+
+  EventMachine.add_timer(2) do
+    session.close { EventMachine.stop }
+  end
+end

data/lib/amqp/exchange.rb

@@ -331,17 +331,21 @@ module AMQP
       unless name == "amq.#{type}" or name.empty? or opts[:no_declare]
         @status = :opening
 
-        shim = Proc.new do |exchange, declare_ok|
-          case block.arity
-          when 1 then block.call(exchange)
-          else
-            block.call(exchange, declare_ok)
-          end
-        end
-
         unless @opts[:no_declare]
           @channel.once_open do
-            self.declare(passive = @opts[:passive], durable = @opts[:durable], auto_delete = @opts[:auto_delete], nowait = @opts[:nowait], @opts[:arguments], &shim)
+            if block
+              shim = Proc.new do |exchange, declare_ok|
+                case block.arity
+                when 1 then block.call(exchange)
+                else
+                  block.call(exchange, declare_ok)
+                end
+              end
+
+              self.declare(passive = @opts[:passive], durable = @opts[:durable], auto_delete = @opts[:auto_delete], nowait = @opts[:nowait], @opts[:arguments], &shim)
+            else
+              self.declare(passive = @opts[:passive], durable = @opts[:durable], auto_delete = @opts[:auto_delete], nowait = @opts[:nowait], @opts[:arguments])
+            end
           end
         end
       else

data/lib/amqp/utilities/event_loop_helper.rb

@@ -0,0 +1,48 @@
+require "eventmachine"
+require "amqp/utilities/server_type"
+
+module AMQP
+  module Utilities
+    class EventLoopHelper
+
+      def self.eventmachine_thread
+        @eventmachine_thread
+      end # self.eventmachine_thread
+
+      def self.reactor_running?
+        EventMachine.reactor_running?
+      end # self.reactor_running?
+
+      def self.server_type
+        @server_type ||= ServerType.detect
+      end # self.server_type
+
+      def self.run(in_a_worker_process = false)
+        # TODO: make reentrant
+
+        @eventmachine_thread  = case self.server_type
+                                when :thin, :goliath, :evented_mongrel then
+                                  Thread.current
+                                when :unicorn, :passenger then
+                                  EventMachine.stop if in_a_worker_process
+
+                                  t = Thread.new { EventMachine.run }
+                                  # give EventMachine reactor some time to start
+                                  sleep(0.25)
+
+                                  t
+                                when :mongrel, :scgi, :webrick, nil then
+                                  t = Thread.new { EventMachine.run }
+                                  # give EventMachine reactor some time to start
+                                  sleep(0.25)
+
+                                  t
+                                end
+      end # self.run
+
+      def self.stop
+        EventMachine.stop
+      end
+    end # EventLoopHelper
+  end # Utilities
+end # AMQP

data/lib/amqp/utilities/server_type.rb

@@ -0,0 +1,50 @@
+# Original version is from Qusion project by Daniel DeLeo.
+#
+# Copyright (c) 2009 Daniel DeLeo
+# Copyright (c) 2011 Michael Klishin
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module AMQP
+  module Utilities
+    class ServerType
+      def self.detect
+        if defined?(::PhusionPassenger)
+          :passenger
+        elsif defined?(::Unicorn)
+          :unicorn
+        elsif defined?(::Thin)
+          :thin
+        elsif defined?(::Goliath)
+          :goliath
+        elsif defined?(::Mongrel) && defined?(::Mongrel::MongrelProtocol)
+          :evented_mongrel
+        elsif defined?(::Mongrel)
+          :mongrel
+        elsif defined?(::SCGI)
+          :scgi
+        elsif defined?(::WEBrick)
+          :webrick
+        else
+          nil
+        end # if
+      end # self.detect
+    end # ServerType
+  end # Utilities
+end # AMQP

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '0.8.0.rc7'
+  VERSION = '0.8.0.rc8'
 end

metadata

@@ -1,49 +1,65 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amqp
-version: !ruby/object:Gem::Version
-  version: 0.8.0.rc7
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 977940489
+  prerelease: true
+  segments: 
+  - 0
+  - 8
+  - 0
+  - rc8
+  version: 0.8.0.rc8
 platform: ruby
-authors:
+authors: 
 - Aman Gupta
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-05-06 00:00:00.000000000 +04:00
+date: 2011-05-09 00:00:00 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &2156551420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156551420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: amq-client
-  requirement: &2156550900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1369095468
+        segments: 
+        - 0
+        - 7
+        - 0
+        - alpha20
         version: 0.7.0.alpha20
   type: :runtime
-  prerelease: false
-  version_requirements: *2156550900
-description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries
-  included
-email:
+  version_requirements: *id002
+description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included
+email: 
 - michael@novemberain.com
 - stastny@101ideas.cz
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
 - docs/08Migration.textile
 - docs/Bindings.textile
@@ -59,7 +75,7 @@ extra_rdoc_files:
 - docs/RabbitMQVersions.textile
 - docs/Routing.textile
 - docs/VendorSpecificExtensions.textile
-files:
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -129,6 +145,7 @@ files:
 - examples/legacy/primes.rb
 - examples/legacy/stocks.rb
 - examples/publishing/publishing_and_immediately_stopping_event_loop.rb
+- examples/publishing/simplistic_scatter_gather.rb
 - examples/queues/automatic_binding_for_default_direct_exchange.rb
 - examples/queues/basic_get.rb
 - examples/queues/declare_a_queue_without_assignment.rb
@@ -177,6 +194,8 @@ files:
 - lib/amqp/queue.rb
 - lib/amqp/rpc.rb
 - lib/amqp/session.rb
+- lib/amqp/utilities/event_loop_helper.rb
+- lib/amqp/utilities/server_type.rb
 - lib/amqp/version.rb
 - lib/mq.rb
 - lib/mq/logger.rb
@@ -204,68 +223,38 @@ files:
 has_rdoc: true
 homepage: http://github.com/ruby-amqp/amqp
 licenses: []
-post_install_message: ! "[\e[32mVersion 0.8.0\e[0m] [FEATURE] AMQP 0.9.1 support,
-  including tx.* operations class.\n[\e[32mVersion 0.8.0\e[0m] [API] Default authentication
-  handler now raises AMQP::PossibleAuthenticationFailureError\n[\e[32mVersion 0.8.0\e[0m]
-  [API] AMQP::Channel#initialize now takes 3rd (optional) options hash.\n[\e[32mVersion
-  0.8.0\e[0m] [API] Broker connection class is now AMQP::Session.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Error instance now may carry cause, an exception that caused
-  exception in question to be raised.\n[\e[32mVersion 0.8.0\e[0m] [API] When initial
-  TCP connection fails, default action is now to raise AMQP::TCPConnectionFailed.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::BasicClient#reconnect now takes 2nd optional argument, period
-  of waiting in seconds.\n[\e[32mVersion 0.8.0\e[0m] [FEATURE] Handlers for initial
-  connection failure, connection loss; channel-level exceptions handlers on Channel
-  instances.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#initialize now accepts
-  :arguments option that takes a hash.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#initialize
-  now accepts :arguments option that takes a hash.\n[\e[32mVersion 0.8.0\e[0m] [API]
-  AMQP#Logger is deprecated. It will be removed before 1.0 release.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP#fork is deprecated. It will be removed before 1.0 release.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::RPC is deprecated. It will be removed before 1.0 release.\n[\e[32mVersion
-  0.8.0\e[0m] [FEATURE] Significant improvements to the documentation. From now on
-  lack of/poor documentation is considered a severe bug.\n[\e[32mVersion 0.8.0\e[0m]
-  [FEATURE] Support for RabbitMQ extensions to AMQP 0.9.1\n[\e[32mVersion 0.8.0\e[0m]
-  [API] AMQP::Exchange#publish now accepts (an optional) callback.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Channel.new now accepts (an optional) callback.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Header#ack now can acknowledge multiple deliveries\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Exchange#delete now takes (an optional) block that is called
-  when exchange.delete-ok response arrives.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Header
-  now implements #to_hash\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#pop block
-  now can take 1, 2 or 3 arguments.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#purge
-  \ now takes an optional block which is called when queue.purge-ok response arrives.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Queue#delete now takes an optional block which is called
-  when queue.delete-ok response arrives.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#delete
-  now accepts :nowait option.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#unbind
-  now takes an optional block which is called when queue.unbind-ok response arrives.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Queue#unbind now accepts :routing_key as alias to :key.
-  we believe it is a good idea to use AMQP terms.\n[\e[32mVersion 0.8.0\e[0m] [API]
-  AMQP::Channel#prefetch now takes (an optional) 2nd parameter that specifies that
-  QoS settings should be applied to underlying connection, as well as optional callback.\n[\e[32mVersion
-  0.8.0\e[0m] [API] AMQP::Channel#recover now takes (an optional) callback that is
-  called when basic.recover-ok is received.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Frame
-  is gone.\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Buffer is gone. Serialization &
-  framing are now handled primarily by amq-protocol.\n[\e[32mVersion 0.8.0\e[0m] [API]
-  AMQP::Queue#publish is deprecated.\n[\e[32mVersion 0.8.0\e[0m] [API] Name argument
-  for AMQP::Queue.new and Channel#queue is optional.\n"
-rdoc_options:
+
+post_install_message: 
+rdoc_options: 
 - --include=examples --main README.textile
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: amqp
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine.
 test_files: []
+