amq-client 0.7.0.alpha35 → 0.8.0

data/.rspec

@@ -1,2 +1 @@
 --colour
---format nested

data/.travis.yml

@@ -1,14 +1,20 @@
+# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
 bundler_args: --without development
 script: "bundle exec rspec spec"
 before_script: ./bin/ci/before_build.sh
 rvm:
   - 1.8.7
-  - 1.8.7-p174
+  - 1.8.7-p249
   - ree
-  - rbx
+  - rbx-2.0
   - 1.9.2
-  - jruby
   - ruby-head
+  - jruby
 gemfile:
   - Gemfile
   - gemfiles/eventmachine-pre
+notifications:
+  recipients:
+    - jakub@rabbitmq.com
+    - michaelklishin@me.com
+    - markizko@gmail.com

data/Gemfile

@@ -4,20 +4,26 @@ source :rubygems
 
 # Use local clones if possible.
 # If you want to use your local copy, just symlink it to vendor.
-def custom_gem(name, options = Hash.new)
-  local_path = File.expand_path("../vendor/#{name}", __FILE__)
-  if File.exist?(local_path)
-    gem name, options.merge(:path => local_path).delete_if { |key, _| [:git, :branch].include?(key) }
-  else
-    gem name, options
+# See http://blog.101ideas.cz/posts/custom-gems-in-gemfile.html
+extend Module.new {
+  def gem(name, *args)
+    options = args.last.is_a?(Hash) ? args.last : Hash.new
+
+    local_path = File.expand_path("../vendor/#{name}", __FILE__)
+    if File.exist?(local_path)
+      super name, options.merge(:path => local_path).
+        delete_if { |key, _| [:git, :branch].include?(key) }
+    else
+      super name, *args
+    end
   end
-end
+}
 
-custom_gem "eventmachine"
+gem "eventmachine"
 # cool.io uses iobuffer that won't compile on JRuby
 # (and, probably, Windows)
 gem "cool.io", :platform => :ruby
-custom_gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
+gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
 
 group :development do
   gem "yard"
@@ -25,8 +31,6 @@ group :development do
   gem "RedCloth", :platform => :mri
 
   gem "nake",          :platform => :ruby_19
-  gem "contributors",  :platform => :ruby_19
-
   # excludes Windows and JRuby
   gem "perftools.rb",  :platform => :mri
 end
@@ -34,5 +38,11 @@ end
 group :test do
   gem "rspec", ">=2.0.0"
   gem "autotest"
-  custom_gem "evented-spec", :git => "git://github.com/ruby-amqp/evented-spec.git", :branch => "master"
+  gem "evented-spec", :git => "git://github.com/ruby-amqp/evented-spec.git", :branch => "master"
+  gem "effin_utf8"
+
+  gem "multi_json"
+
+  gem "json",      :platform => :jruby
+  gem "yajl-ruby", :platform => :ruby_18
 end

data/amq-client.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-protocol", ">= 0.7.0.alpha6"
+  s.add_dependency "amq-protocol", ">= 0.8.0"
 
 
   # RubyForge

data/examples/coolio_adapter/example_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "bundler"
 
 Bundler.setup

data/examples/eventmachine_adapter/basic_consume_with_acknowledgements.rb

@@ -18,10 +18,10 @@ amq_client_example "Acknowledge a message using basic.ack" do |client|
   end
 
   queue.consume do |consumer_tag|
-    queue.on_delivery do |method, header, payload|
-      puts "Got a delivery: #{payload} (delivery tag: #{method.delivery_tag}), ack-ing..."
+    queue.on_delivery do |basic_deliver, header, payload|
+      puts "Got a delivery: #{payload} (delivery tag: #{basic_deliver.delivery_tag}), ack-ing..."
 
-      queue.acknowledge(method.delivery_tag)
+      queue.acknowledge(basic_deliver.delivery_tag)
     end
 
     exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)

data/examples/eventmachine_adapter/{connection_failure_callback.rb → error_handling/connection_failure_callback.rb}

@@ -2,21 +2,17 @@
 # encoding: utf-8
 
 __dir = File.join(File.dirname(File.expand_path(__FILE__)))
-require File.join(__dir, "example_helper")
+require File.join(__dir, "..", "example_helper")
 
 EM.run do
 
-  show_stopper = Proc.new {
-    EM.stop
-  }
-
-  Signal.trap "INT",  show_stopper
+  show_stopper = Proc.new { EventMachine.stop }
   Signal.trap "TERM", show_stopper
-
   EM.add_timer(4, show_stopper)
 
+
   AMQ::Client::EventMachineClient.connect(:port     => 9689,
-                                          :vhost    => "/amq_client_testbed",
+                                          :vhost    => "amq_client_testbed",
                                           :user     => "amq_client_gem",
                                           :password => "amq_client_gem_password",
                                           :timeout        => 0.3,

data/examples/eventmachine_adapter/{connection_failure_exception.rb → error_handling/connection_failure_exception.rb}

@@ -2,22 +2,18 @@
 # encoding: utf-8
 
 __dir = File.join(File.dirname(File.expand_path(__FILE__)))
-require File.join(__dir, "example_helper")
+require File.join(__dir, "..", "example_helper")
 
 begin
   EventMachine.run do
 
-    show_stopper = Proc.new {
-      EM.stop
-    }
-
-    Signal.trap "INT",  show_stopper
+    show_stopper = Proc.new { EventMachine.stop }
     Signal.trap "TERM", show_stopper
-
     EventMachine.add_timer(4, show_stopper)
 
+
     AMQ::Client::EventMachineClient.connect(:port     => 9689,
-                                            :vhost    => "/amq_client_testbed",
+                                            :vhost    => "amq_client_testbed",
                                             :user     => "amq_client_gem",
                                             :password => "amq_client_gem_password",
                                             :timeout        => 0.3) do |client|
@@ -27,4 +23,4 @@ begin
 rescue AMQ::Client::TCPConnectionFailed => e
   puts "TCP connection has failed, as expected. Shutting down…"
   EventMachine.stop if EventMachine.reactor_running?
-end
+end

data/examples/eventmachine_adapter/{connection_loss_handler.rb → error_handling/connection_loss_handler_that_fails_over.rb}

@@ -2,32 +2,32 @@
 # encoding: utf-8
 
 __dir = File.join(File.dirname(File.expand_path(__FILE__)))
-require File.join(__dir, "example_helper")
+require File.join(__dir, "..", "example_helper")
 
 
 EM.run do
   AMQ::Client::EventMachineClient.connect(:port     => 5672,
-                                          :vhost    => "/amq_client_testbed",
+                                          :vhost    => "amq_client_testbed",
                                           :user     => "amq_client_gem",
                                           :password => "amq_client_gem_password",
                                           :timeout        => 0.3,
-                                          :on_tcp_connection_failure => Proc.new { |settings| puts "Failed to connect, this was NOT expected"; EM.stop }) do |client|
+                                          :on_tcp_connection_failure => Proc.new { |settings| puts "Failed to connect, this was NOT expected"; EM.stop }) do |connection|
 
-    client.on_tcp_connection_loss do |cl, settings|
-      puts "tcp_connection_loss handler kicks in"
-      cl.reconnect(false, 2)
+    connection.on_tcp_connection_loss do |conn, settings|
+      puts "Trying to reconnect..."
+      conn.reconnect_to(:host => "dev.rabbitmq.com")
+    end
+
+    connection.on_recovery do |conn, settings|
+      puts "Connection recovered"
     end
 
     show_stopper = Proc.new {
-      client.disconnect {
-        puts "Disconnected. Exiting…"
-        EM.stop
-      }
+      connection.disconnect { puts "Disconnected. Exiting…"; EventMachine.stop }
     }
 
-    Signal.trap "INT",  show_stopper
     Signal.trap "TERM", show_stopper
-
+    Signal.trap "INT",  show_stopper
     EM.add_timer(30, show_stopper)
 
 

data/examples/eventmachine_adapter/error_handling/connection_loss_handler_with_automatic_recovery.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+__dir = File.join(File.dirname(File.expand_path(__FILE__)))
+require File.join(__dir, "..", "example_helper")
+
+
+EM.run do
+  AMQ::Client::EventMachineClient.connect(:port     => 5672,
+                                          :vhost    => "amq_client_testbed",
+                                          :user     => "amq_client_gem",
+                                          :password => "amq_client_gem_password",
+                                          :timeout        => 0.3,
+                                          :on_tcp_connection_failure => Proc.new { |settings| puts "Failed to connect, this was NOT expected"; EM.stop }) do |connection|
+
+    if connection.auto_recovering?
+      puts "Connection is auto-recovering..."
+    end
+
+    ch1 = AMQ::Client::Channel.new(connection, 1, :auto_recovery => true)
+    ch1.on_error do |ch, channel_close|
+      raise channel_close.reply_text
+    end
+    ch1.open do
+      puts "Channel 1 open now"
+    end
+    if ch1.auto_recovering?
+      puts "Channel 1 is auto-recovering"
+    end
+    ch1.on_recovery do |c|
+      puts "Channel #{c.id} has recovered"
+    end
+
+    ch2 = AMQ::Client::Channel.new(connection, 2, :auto_recovery => true)
+    ch2.on_error do |ch, channel_close|
+      raise channel_close.reply_text
+    end
+    ch2.open do
+      puts "Channel 2 open now"
+    end
+    if ch2.auto_recovering?
+      puts "Channel 2 is auto-recovering"
+    end
+
+
+    queues = Array.new(4) do
+      q = AMQ::Client::Queue.new(connection, ch1, AMQ::Protocol::EMPTY_STRING)
+      q.declare(false, false, false, true) do
+        q.consume { puts "Added a consumer on #{q.name}"; q.on_delivery { |*args| puts(args.inspect) } }
+      end
+
+      q.on_recovery { |_| puts "Queue #{q.name} has recovered" }
+
+      q
+    end
+
+    x  = AMQ::Client::Exchange.new(connection, ch1, "amqclient.examples.exchanges.fanout", :fanout)
+    x2 = AMQ::Client::Exchange.new(connection, ch1, "amq.fanout", :fanout)
+    x.declare(false, false, true)
+    x.after_connection_interruption { |x| puts "Exchange #{x.name} has reacted to connection interruption" }
+    x.after_recovery { |x| puts "Exchange #{x.name} has recovered" }
+    queues.each { |q| q.bind(x) }
+
+
+    connection.on_tcp_connection_loss do |conn, settings|
+      puts "Trying to reconnect..."
+      conn.reconnect(false, 2)
+    end
+
+    connection.on_recovery do |conn, settings|
+      puts "Connection recovered"
+    end
+
+    show_stopper = Proc.new {
+      connection.disconnect { puts "Disconnected. Exiting…"; EventMachine.stop }
+    }
+
+    Signal.trap "TERM", show_stopper
+    Signal.trap "INT",  show_stopper
+    EM.add_timer(30, show_stopper)
+
+
+    puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 30 seconds."
+  end
+end

data/examples/eventmachine_adapter/error_handling/connection_loss_handler_with_manual_recovery.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+__dir = File.join(File.dirname(File.expand_path(__FILE__)))
+require File.join(__dir, "..", "example_helper")
+
+
+EM.run do
+  AMQ::Client::EventMachineClient.connect(:port     => 5672,
+                                          :vhost    => "amq_client_testbed",
+                                          :user     => "amq_client_gem",
+                                          :password => "amq_client_gem_password",
+                                          :timeout        => 0.3,
+                                          :on_tcp_connection_failure => Proc.new { |settings| puts "Failed to connect, this was NOT expected"; EM.stop }) do |connection|
+
+    if connection.auto_recovering?
+      puts "Connection is auto-recovering..."
+    end
+
+    ch1 = AMQ::Client::Channel.new(connection, 1)
+    ch1.on_error do |ch, channel_close|
+      raise channel_close.reply_text
+    end
+    ch1.open do
+      puts "Channel 1 open now"
+    end
+    if ch1.auto_recovering?
+      puts "Channel 1 is auto-recovering"
+    end
+    ch1.on_recovery do |c|
+      puts "Channel #{c.id} has recovered"
+    end
+
+    ch2 = AMQ::Client::Channel.new(connection, 2)
+    ch2.on_error do |ch, channel_close|
+      raise channel_close.reply_text
+    end
+    ch2.open do
+      puts "Channel 2 open now"
+    end
+    if ch2.auto_recovering?
+      puts "Channel 2 is auto-recovering"
+    end
+
+
+    queues = Array.new(4) do
+      q = AMQ::Client::Queue.new(connection, ch1, AMQ::Protocol::EMPTY_STRING)
+      q.declare(false, false, false, true) do
+        q.consume { puts "Added a consumer on #{q.name}"; q.on_delivery { |*args| puts(args.inspect) } }
+      end
+
+      q.on_recovery { |_| puts "Queue #{q.name} has recovered" }
+
+      q
+    end
+
+    x  = AMQ::Client::Exchange.new(connection, ch1, "amqclient.examples.exchanges.fanout", :fanout)
+    x2 = AMQ::Client::Exchange.new(connection, ch1, "amq.fanout", :fanout)
+    x.declare(false, false, true)
+    x.after_connection_interruption { |x| puts "Exchange #{x.name} has reacted to connection interruption" }
+    x.after_recovery { |x| puts "Exchange #{x.name} has recovered" }
+    queues.each { |q| q.bind(x) }
+
+
+    connection.on_tcp_connection_loss do |conn, settings|
+      puts "Trying to reconnect..."
+      conn.reconnect(false, 2)
+    end
+
+    connection.on_recovery do |conn, settings|
+      puts "Connection recovered"
+    end
+
+    show_stopper = Proc.new {
+      connection.disconnect { puts "Disconnected. Exiting…"; EventMachine.stop }
+    }
+
+    Signal.trap "TERM", show_stopper
+    Signal.trap "INT",  show_stopper
+    EM.add_timer(30, show_stopper)
+
+
+    puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 30 seconds."
+  end
+end

data/examples/eventmachine_adapter/error_handling/handling_a_channel_level_exception.rb

@@ -4,7 +4,7 @@
 __dir = File.dirname(File.expand_path(__FILE__))
 require File.join(__dir, "..", "example_helper")
 
-amq_client_example "Declare a new fanout exchange" do |connection|
+amq_client_example "Handling a channel-level exception" do |connection|
   channel = AMQ::Client::Channel.new(connection, 1)
   channel.open do
     puts "Channel #{channel.id} is now open!"
@@ -30,10 +30,7 @@ amq_client_example "Declare a new fanout exchange" do |connection|
 
   show_stopper = Proc.new do
     $stdout.puts "Stopping..."
-
-    connection.close {
-      EM.stop { exit }
-    }
+    connection.close { EventMachine.stop }
   end
 
   Signal.trap "INT", show_stopper

data/examples/eventmachine_adapter/example_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "bundler"
 
 Bundler.setup

data/examples/eventmachine_adapter/server_capabilities.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+__dir = File.dirname(File.expand_path(__FILE__))
+require File.join(__dir, "example_helper")
+
+amq_client_example "Inspecting server information & capabilities" do |client|
+  puts client.server_capabilities.inspect
+  puts client.server_properties.inspect
+
+  client.disconnect { EventMachine.stop }
+end

data/examples/eventmachine_adapter/tls/tls_without_peer_verification.rb

@@ -10,7 +10,7 @@ client_private_key_file_path = File.join(examples_dir, "tls_certificates", "clie
 
 EM.run do
   AMQ::Client::EventMachineClient.connect(:port     => 5671,
-                                          :vhost    => "/amq_client_testbed",
+                                          :vhost    => "amq_client_testbed",
                                           :user     => "amq_client_gem",
                                           :password => "amq_client_gem_password",
                                           :ssl => {
@@ -33,4 +33,4 @@ EM.run do
   # TLS connections take forever and a day
   # (compared to non-TLS connections) to estabilish.
   EM.add_timer(8, show_stopper)
-end
+end