amq-client 0.7.0.alpha35 → 0.8.0

data/lib/amq/client/callbacks.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "amq/client/async/callbacks"
 
 module AMQ

data/lib/amq/client/consumer_tag_generator.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module AMQ
+  module Client
+    class ConsumerTagGenerator
+
+      #
+      # API
+      #
+
+      # @return [String] Generated consumer tag
+      def generate
+        "#{Kernel.rand}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+      end # generate
+
+      # @return [String] Generated consumer tag
+      def generate_for(queue)
+        raise ArgumentError, "argument must respond to :name" unless queue.respond_to?(:name)
+
+        "#{queue.name}-#{Time.now.to_i * 1000}-#{Kernel.rand(999_999_999_999)}"
+      end # generate_for(queue)
+    end # ConsumerTagGenerator
+  end # Client
+end # AMQ

data/lib/amq/client/exceptions.rb

@@ -51,12 +51,6 @@ module AMQ
     # Client
     #
 
-    class MissingInterfaceMethodError < NotImplementedError
-      def initialize(method_name)
-        super("Method #{method_name} is supposed to be overriden by adapter")
-      end
-    end
-
     class MissingHandlerError < StandardError
       def initialize(frame)
         super("No callback registered for #{frame.method_class}")
@@ -97,5 +91,15 @@ module AMQ
       end # initialize(settings)
     end # PossibleAuthenticationFailureError
 
+
+
+    class UnknownExchangeTypeError < StandardError
+      BUILTIN_TYPES = [:fanout, :direct, :topic, :headers].freeze
+
+      def initialize(types, given)
+        super("#{given.inspect} exchange type is unknown. Standard types are #{BUILTIN_TYPES.inspect}, custom exchange types must begin with x-, for example: x-recent-history")
+      end
+    end
+
   end # Client
 end # AMQ

data/lib/amq/client/handlers_registry.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module AMQ
   module Client
     class HandlersRegistry

data/lib/amq/client/queue.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "amq/client/async/queue"
 
 module AMQ

data/lib/amq/client/server_named_entity.rb

@@ -7,17 +7,10 @@ module AMQ
 
       # @return [Boolean] true if this entity is anonymous (server-named)
       def server_named?
-        @name.nil? or @name.empty?
+        @server_named || @name.nil? || @name.empty?
       end
       # backwards compabitility. MK.
       alias anonymous? server_named?
-
-      def dup
-        if server_named?
-          raise RuntimeError.new("You can't clone anonymous queue until it receives back the name in Queue.Declare-Ok response. Move the code with #dup to the callback for the #declare method.") # TODO: that's not true in all cases, imagine the user didn't call #declare yet.
-        end
-        super
-      end
     end # ServerNamedEntity
   end # Client
 end # AMQ

data/lib/amq/client/settings.rb

@@ -1,11 +1,18 @@
 # encoding: utf-8
 
 require "amq/protocol/client" # TODO: "amq/protocol/constants"
+require "uri"
 
 module AMQ
   module Client
     # @see AMQ::Client::Settings.configure
     module Settings
+      # @private
+      AMQP_PORTS = {"amqp" => 5672, "amqps" => 5671}.freeze
+
+      # @private
+      AMQPS = "amqps".freeze
+
       # Default connection settings used by AMQ clients
       #
       # @see AMQ::Client::Settings.configure
@@ -86,8 +93,63 @@ module AMQ
         end
       end
 
-      def self.parse_amqp_url(string)
-        raise NotImplementedError.new
+      # Parses AMQP connection URI and returns its components as a hash.
+      #
+      # h2. vhost naming schemes
+      #
+      # It is convenient to be able to specify the AMQP connection
+      # parameters as a URI string, and various "amqp" URI schemes
+      # exist.  Unfortunately, there is no standard for these URIs, so
+      # while the schemes share the basic idea, they differ in some
+      # details.  This implementation aims to encourage URIs that work
+      # as widely as possible.
+      #
+      # The URI scheme should be "amqp", or "amqps" if SSL is required.
+      #
+      # The host, port, username and password are represented in the
+      # authority component of the URI in the same way as in http URIs.
+      #
+      # The vhost is obtained from the first segment of the path, with the
+      # leading slash removed.  The path should contain only a single
+      # segment (i.e, the only slash in it should be the leading one).
+      # If the vhost is to include slashes or other reserved URI
+      # characters, these should be percent-escaped.
+      #
+      # @example How vhost is parsed
+      #
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com")            # => vhost is nil, so default (/) will be used
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/")           # => vhost is an empty string
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/%2Fvault")   # => vhost is /vault
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/production") # => vhost is production
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/a.b.c")      # => vhost is a.b.c
+      #   AMQ::Client::Settings.parse_amqp_url("amqp://dev.rabbitmq.com/foo/bar")    # => ArgumentError
+      #
+      #
+      # @param [String] connection_string AMQP connection URI, à la JDBC connection string. For example: amqp://bus.megacorp.internal:5877.
+      # @return [Hash] Connection parameters (:username, :password, :vhost, :host, :port, :ssl)
+      #
+      # @raise [ArgumentError] When connection URI schema is not amqp or amqps, or the path contains multiple segments
+      #
+      # @see http://bit.ly/ks8MXK Connecting to The Broker documentation guide
+      # @api public
+      def self.parse_amqp_url(connection_string)
+        uri = URI.parse(connection_string)
+        raise ArgumentError.new("Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK") unless %w{amqp amqps}.include?(uri.scheme)
+
+        opts = {}
+
+        opts[:scheme] = uri.scheme
+        opts[:user]   = URI.unescape(uri.user) if uri.user
+        opts[:pass]   = URI.unescape(uri.password) if uri.password
+        opts[:host]   = uri.host if uri.host
+        opts[:port]   = uri.port || AMQ::Client::Settings::AMQP_PORTS[uri.scheme]
+        opts[:ssl]    = uri.scheme == AMQ::Client::Settings::AMQPS
+        if uri.path =~ %r{^/(.*)}
+          raise ArgumentError.new("#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris") if $1.index('/')
+          opts[:vhost] = URI.unescape($1)
+        end
+
+        opts
       end
     end
   end

data/lib/amq/client/version.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha35"
+    VERSION = "0.8.0"
   end
 end

data/spec/benchmarks/adapters.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Bundler.setup
 Bundler.require(:default)
 $LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))

data/spec/client/framing/io_frame_spec.rb

@@ -45,13 +45,16 @@ describe AMQ::Client::Framing::IO do
     subject.decode(@io).payload.should eql("\x00\n\x00(\x01/\x00\x00")
   end
 
-  it "should raise an error if the frame length is miscalculated" do
-    pending "How to do that with socket?"
+  context "if the frame length is miscalculated" do
+    it "should raise an error"
   end
 
-  it "should raise an error if the frame doesn't end with FINAL_OCTET" do
-    data = @io.read[0..-2] + "too long" + "\xCE"
-    io   = StringIO.new(data)
-    lambda { subject.decode(io) }.should raise_error(AMQ::Client::NoFinalOctetError)
+
+  context "if frame doesn't end with FINAL_OCTET" do
+    it "should raise an error" do
+      data = @io.read[0..-2] + "too long" + "\xCE"
+      io   = StringIO.new(data)
+      lambda { subject.decode(io) }.should raise_error(AMQ::Client::NoFinalOctetError)
+    end
   end
 end

data/spec/integration/coolio/basic_ack_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/basic_cancel_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/basic_consume_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
@@ -87,3 +89,59 @@ describe "AMQ::Client::CoolioClient", "Basic.Consume", :nojruby => true do
     end # it "should not leave messages in the queues with noack=true"
   end # context "sending 100 messages"
 end # describe AMQ::Client::CoolioClient, "Basic.Consume"
+
+
+describe "Multiple", AMQ::Client::Async::Consumer, :nojruby => true do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  context "sharing the same queue with equal prefetch levels" do
+    let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+    it "have messages distributed to them in the round-robin manner" do
+      @consumer1_mailbox = []
+      @consumer2_mailbox = []
+      @consumer3_mailbox = []
+
+      coolio_amqp_connect do |client|
+        channel = AMQ::Client::Channel.new(client, 1)
+        channel.open do
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
+
+          consumer1 = AMQ::Client::Async::Consumer.new(channel, queue, "#{queue.name}-consumer-#{Time.now}")
+          consumer2 = AMQ::Client::Async::Consumer.new(channel, queue)
+          consumer3 = AMQ::Client::Async::Consumer.new(channel, queue, "#{queue.name}-consumer-#{rand}-#{Time.now}", false, true)
+
+
+          consumer1.consume.on_delivery do |method, header, payload|
+            @consumer1_mailbox << payload
+          end
+
+          consumer2.consume(true).on_delivery do |method, header, payload|
+            @consumer2_mailbox << payload
+          end
+
+          consumer3.consume(false) do
+            puts "Consumer 3 is ready"
+          end
+          consumer3.on_delivery do |method, header, payload|
+            @consumer3_mailbox << payload
+          end
+
+
+          exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+          messages.each do |message|
+            exchange.publish(message)
+          end
+        end
+
+        done(1.5) {
+          @consumer1_mailbox.size.should == 34
+          @consumer2_mailbox.size.should == 33
+          @consumer3_mailbox.size.should == 33
+        }
+      end
+    end # it
+  end # context
+end # describe

data/spec/integration/coolio/basic_get_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/basic_return_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/channel_close_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/channel_flow_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/connection_close_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/connection_start_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 

data/spec/integration/coolio/exchange_declare_spec.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
 describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
   include EventedSpec::SpecHelper
-  default_timeout 1
+  default_timeout 2
   let(:exchange_name) { "amq-client.testexchange.#{Time.now.to_i}" }
   it "should create an exchange and trigger a callback" do
     coolio_amqp_connect do |client|
@@ -12,7 +14,7 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
         exchange = AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout)
         exchange.declare do
           exchange.delete
-          done(0.2)
+          done(0.5)
         end
       end
     end
@@ -33,7 +35,7 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
                 @callback_fired = true
               end
               delayed(0.1) { exchange.delete }
-              done(0.3)
+              done(0.5)
             end
           end
 
@@ -55,7 +57,7 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
                 end
               end
               delayed(0.1) { exchange.delete }
-              done(0.3)
+              done(0.5)
             end
           end
 
@@ -77,7 +79,7 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
                 @callback_fired = true
               end
               delayed(0.1) { exchange.delete }
-              done(0.3)
+              done(0.5)
             end
           end
 
@@ -99,7 +101,7 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
                 end
               end
               delayed(0.1) { exchange.delete }
-              done(0.3)
+              done(0.5)
             end
           end
 

data/spec/integration/coolio/spec_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 begin
   require "amq/client/adapters/coolio"
 rescue LoadError => e

data/spec/integration/coolio/tx_commit_spec.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
+
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
 describe "AMQ::Client::CoolioClient", "Tx.Commit", :nojruby => true do
   include EventedSpec::SpecHelper
-  default_timeout 2
+  default_timeout 4
   let(:message) { "Hello, world!" }
 
 

data/spec/integration/coolio/tx_rollback_spec.rb

@@ -4,7 +4,7 @@ require 'integration/coolio/spec_helper'
 
 describe "AMQ::Client::CoolioClient", "Tx.Rollback", :nojruby => true do
   include EventedSpec::SpecHelper
-  default_timeout 2
+  default_timeout 4
 
   let(:message) { "Hello, world!" }
 

data/spec/integration/eventmachine/basic_ack_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 require 'integration/eventmachine/spec_helper'
 
@@ -28,7 +30,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Ack" do
             end
           end
 
-          done(2.5) {
+          done(3.5) {
             @received_messages =~ messages
           }
         end