amqp 0.7.0 → 0.7.1

data/.gitignore

@@ -1,4 +1,4 @@
-*.gem
+/*.gem
 *.rbc
 ~*
 #*
@@ -7,4 +7,5 @@
 .bundle
 Gemfile.lock
 
-spec/amqp.yml
+spec/amqp.yml
+vendor/cache

data/CHANGELOG

@@ -1,3 +1,28 @@
+= Version 0.7.1
+
+  * [BUG] AMQP gem no longer conflicts with Builder 2.1.2 on Ruby 1.9.
+          All Ruby on Rails 3 users who run Ruby 1.9 are highly recommended
+	  to upgrade!
+
+  * [API] AMQP::Exchange.default no longer caches exchange object between calls
+          because it may lead to very obscure issues when channel that exchange was
+	  using is closed (due to connection loss, as part of test suite teardown
+	  or in any other way).
+
+  * [API] AMQP::Exchange.default now accepts channel as a parameter.
+  * [API] AMQP::Exchange#channel
+  * [BUG] Basic.Return is not supported by amqp gem yet, but it should not result in obscure exceptions
+  * [API] AMQP::Exchange#publish now supports content type overriding.
+  * [API] Introduce AMQP::Exchange #durable?, #transient?, #auto_deleted? and #passive?
+  * [API] Introduce AMQP::Channel#open?
+  * [BUG] AMQP connection was considered established prematurely.
+  * [API] MQ.logging is removed; please use AMQP.logging from now on.
+  * [API] MQ::Queue class is deprecated; please use AMQP::Queue from now on.
+  * [API] MQ::Exchange class is deprecated; please use AMQP::Exchange from now on.
+  * [API] MQ class is deprecated; please use AMQP::Channel from now on.
+  * [API] require "mq" is deprecated; please use require "amqp" from now on.
+
+
 = Version 0.7
   * [BUG] Sync API for queues and exchanges, support for server-generated queues & exchange names (via semi-lazy collection).
   * [BUG] Sync API for MQ#close (Channel.Close) [issue #34].

data/Gemfile

@@ -3,9 +3,11 @@
 source "http://gemcutter.org"
 
 gem "eventmachine"
-gem "json" if RUBY_VERSION < "1.9"
+gem "json" if RUBY_VERSION < "1.9" || ARGV.first == "install"
+gem "amq-client", :git => "git://github.com/ruby-amqp/amq-client.git", :branch => "master"
 
 group(:test) do
   gem "rspec", ">=2.0.0"
-  gem "amqp-spec", ">=0.3.7"
+
+  gem "amqp-spec", :git => "git://github.com/ruby-amqp/amqp-spec.git", :branch => "master"
 end

data/README.md

@@ -73,10 +73,12 @@ libraries that would block current thread (like [File::Tail](http://rubygems.org
 Links
 ==============================
 
+* [RDoc](http://rubydoc.info/github/ruby-amqp/amqp/master/file/README.md)
 * Jabber chat [amqp-dev@conf.netlab.cz](xmpp://amqp-dev@conf.netlab.cz)
 * [AMQP gem mailing list](http://groups.google.com/group/ruby-amqp)
 * [AMQP gem at GitHub](http://github.com/amqp-dev/amqp)
 * [AMQP gem at Gemcutter](http://rubygems.org/gems/amqp)
+* [Jenkins CI Server](http://jenkins.101ideas.cz/job/AMQP)
 
 Contributions
 ============================

data/{amqp.todo → TODO}

@@ -1,8 +1,6 @@
 - breaks with header values that are nil
 - breaks with header values that are ruby objects (convert to strings?)
-- sending utf8 data in 1.9 breaks
 
-- generate amqp/spec.rb from original xml spec
 - add peek and pop to queues
 - use rabbitmq generated consumer tag from basic.consume-ok reply
 
@@ -29,4 +27,4 @@
 - handle connection.redirect during connect (for rabbitmq in distributed mode) [or just set insist to true]
 
 - add amq.queue('name').size{ |num| "#{num} messages in the queue" } (send declare passive, look at declare-ok response)
-- clean up MQ.default on disconnect
+- clean up AMQP::Channel.default on disconnect

data/amqp.gemspec

@@ -7,12 +7,12 @@ require File.expand_path("../lib/amqp/version", __FILE__)
 Gem::Specification.new do |s|
   s.name = "amqp"
   s.version = AMQP::VERSION
-  s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus"]
+  s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus", "Michael S. Klishin"]
   s.homepage = "http://github.com/ruby-amqp/amqp"
   s.summary = "AMQP client implementation in Ruby/EventMachine."
   s.description = "An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker."
   s.cert_chain = nil
-  s.email = Base64.decode64("c3Rhc3RueUAxMDFpZGVhcy5jeg==\n")
+  s.email = ["bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n", "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n"].map { |i| Base64.decode64(i) }
 
   # files
   s.files = `git ls-files`.split("\n")
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # RDoc
   s.has_rdoc = true
-  s.rdoc_options = '--include=examples'
+  s.rdoc_options = '--include=examples --main README.md'
   s.extra_rdoc_files = ["README.md"] + Dir.glob("doc/*")
 
   # Dependencies

data/bin/irb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 
 require "irb"
-require "mq"
+require "amqp"
 
 IRB.start(__FILE__)

data/bin/jenkins.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+echo -e "\n\n==== Setup ===="
+source /etc/profile
+git fetch && git reset origin/master --hard
+
+# FIXME: Jenkins user doesn't have permissions to run it.
+# PATH=/usr/sbin:$PATH ./bin/set_test_suite_realms_up.sh
+echo "~ NOT running ./bin/set_test_suite_realms_up.sh"
+
+echo -e "\n\n==== Ruby 1.9.2 Head ===="
+rvm use 1.9.2-head@ruby-amqp
+gem install bundler --no-ri --no-rdoc
+bundle install --local; echo
+bundle exec rspec spec
+return_status=$?
+
+echo -e "\n\n==== Ruby 1.8.7 ===="
+rvm use 1.8.7@ruby-amqp
+gem install bundler --no-ri --no-rdoc
+bundle install --local; echo
+bundle exec rspec spec
+return_status=$(expr $return_status + $?)
+
+test $return_status -eq 0

data/bin/set_test_suite_realms_up.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# guest:guest has full access to /
+
+rabbitmqctl add_vhost /
+rabbitmqctl add_user guest guest
+rabbitmqctl set_permissions -p / guest ".*" ".*" ".*"
+
+
+# amqp_gem:amqp_gem_password has full access to /amqp_gem_testbed
+
+rabbitmqctl add_vhost /amqp_gem_testbed
+rabbitmqctl add_user amqp_gem amqp_gem_password
+rabbitmqctl set_permissions -p /amqp_gem_testbed amqp_gem ".*" ".*" ".*"
+
+
+# amqp_gem_reader:reader_password has read access to /amqp_gem_testbed
+
+rabbitmqctl add_user amqp_gem_reader reader_password
+rabbitmqctl clear_permissions -p /amqp_gem_testbed guest
+rabbitmqctl set_permissions -p /amqp_gem_testbed amqp_gem_reader "^---$" "^---$" ".*"

data/doc/EXAMPLE_01_PINGPONG

@@ -1,2 +1,2 @@
 == Ping Pong Example
-  :include: mq/pingpong.rb
+  :include: pingpong.rb

data/doc/EXAMPLE_02_CLOCK

@@ -1,2 +1,2 @@
 == Clock Example
-  :include: mq/clock.rb
+  :include: clock.rb

data/doc/EXAMPLE_03_STOCKS

@@ -1,2 +1,2 @@
 == Stocks Example
-  :include: mq/stocks.rb
+  :include: stocks.rb

data/doc/EXAMPLE_04_MULTICLOCK

@@ -1,2 +1,2 @@
 == Muti-format Clock Example
-  :include: mq/multiclock.rb
+  :include: multiclock.rb

data/doc/EXAMPLE_05_ACK

@@ -1,2 +1,2 @@
 == Ack Example
-  :include: mq/ack.rb
+  :include: ack.rb

data/doc/EXAMPLE_05_POP

@@ -1,2 +1,2 @@
 == Pop Example
-  :include: mq/pop.rb
+  :include: pop.rb

data/doc/EXAMPLE_06_HASHTABLE

@@ -1,2 +1,2 @@
 == HashTable RPC Example
-  :include: mq/hashtable.rb
+  :include: hashtable.rb

data/examples/{mq/ack.rb → ack.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 
 # For ack to work appropriately you must shutdown AMQP gracefully,
 # otherwise all items in your queue will be returned
@@ -9,14 +9,14 @@ Signal.trap('INT') { AMQP.stop { EM.stop } }
 Signal.trap('TERM') { AMQP.stop { EM.stop } }
 
 AMQP.start(:host => 'localhost') do
-  MQ.queue('awesome').publish('Totally rad 1')
-  MQ.queue('awesome').publish('Totally rad 2')
-  MQ.queue('awesome').publish('Totally rad 3')
+  AMQP::Channel.queue('awesome').publish('Totally rad 1')
+  AMQP::Channel.queue('awesome').publish('Totally rad 2')
+  AMQP::Channel.queue('awesome').publish('Totally rad 3')
 
   i = 0
 
   # Stopping after the second item was acked will keep the 3rd item in the queue
-  MQ.queue('awesome').subscribe(:ack => true) do |h, m|
+  AMQP::Channel.queue('awesome').subscribe(:ack => true) do |h, m|
     if (i += 1) == 3
       puts 'Shutting down...'
       AMQP.stop { EM.stop }

data/examples/{mq/automatic_binding_for_default_direct_exchange.rb → automatic_binding_for_default_direct_exchange.rb}

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
+$:.unshift(File.expand_path("../../lib", __FILE__))
 
-require 'mq'
+require 'amqp'
 
 if RUBY_VERSION == "1.8.7"
   module ArrayExtensions
@@ -20,7 +20,7 @@ end
 
 EM.run do
   connection = AMQP.connect
-  mq         = MQ.new(connection)
+  mq         = AMQP::Channel.new(connection)
 
   show_stopper = Proc.new do
     $stdout.puts "Stopping..."
@@ -42,7 +42,7 @@ EM.run do
   queues    = [queue1, queue2, queue3]
 
   # Rely on default direct exchange binding, see section 2.1.2.4 Automatic Mode in AMQP 0.9.1 spec.
-  exchange = MQ::Exchange.default
+  exchange = AMQP::Channel::Exchange.default
 
   queue1.subscribe do |payload|
     puts "Got #{payload} for #{queue1.name}"

data/examples/{mq/callbacks.rb → callbacks.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 $:.unshift File.expand_path("../../../lib", __FILE__)
-require "mq"
+require "amqp"
 
 AMQP.start(:host => "localhost") do |connection|
 
@@ -13,7 +13,7 @@ AMQP.start(:host => "localhost") do |connection|
   end
 
   @counter = 0
-  amq = MQ.new
+  amq = AMQP::Channel.new
 
   3.times do
     amq.queue("") do |queue|

data/examples/{mq/clock.rb → clock.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 
 AMQP.start(:host => 'localhost') do |connection|
 
@@ -18,7 +18,7 @@ AMQP.start(:host => 'localhost') do |connection|
 
   # AMQP.logging = true
 
-  clock = MQ.new.fanout('clock')
+  clock = AMQP::Channel.new.fanout('clock')
   EM.add_periodic_timer(1) {
     puts
 
@@ -26,12 +26,12 @@ AMQP.start(:host => 'localhost') do |connection|
     clock.publish(Marshal.dump(time))
   }
 
-  amq = MQ.new
+  amq = AMQP::Channel.new
   amq.queue('every second').bind(amq.fanout('clock')).subscribe { |time|
     log 'every second', :received, Marshal.load(time)
   }
 
-  amq = MQ.new
+  amq = AMQP::Channel.new
   amq.queue('every 5 seconds').bind(amq.fanout('clock')).subscribe { |time|
     time = Marshal.load(time)
     log 'every 5 seconds', :received, time if time.strftime('%S').to_i % 5 == 0

data/examples/{mq/hashtable.rb → hashtable.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 
 AMQP.start(:host => 'localhost') do |connection|
 
@@ -35,9 +35,9 @@ AMQP.start(:host => 'localhost') do |connection|
     end
   end
 
-  server = MQ.new.rpc('hash table node', HashTable.new)
+  server = AMQP::Channel.new.rpc('hash table node', HashTable.new)
 
-  client = MQ.new.rpc('hash table node')
+  client = AMQP::Channel.new.rpc('hash table node')
   client.set(:now, time = Time.now)
   client.get(:now) do |res|
     log 'client', :now => res, :eql? => res == time

data/examples/{mq/internal.rb → internal.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 require 'pp'
 
 EM.run do
@@ -10,13 +10,13 @@ EM.run do
   connection = AMQP.connect(:host => 'localhost', :logging => false)
 
   # open a channel on the AMQP connection
-  channel = MQ.new(connection)
+  channel = AMQP::Channel.new(connection)
 
   # declare a queue on the channel
-  queue = MQ::Queue.new(channel, 'queue name')
+  queue = AMQP::Channel::Queue.new(channel, 'queue name')
 
   # create a fanout exchange
-  exchange = MQ::Exchange.new(channel, :fanout, 'all queues')
+  exchange = AMQP::Channel::Exchange.new(channel, :fanout, 'all queues')
 
   # bind the queue to the exchange
   queue.bind(exchange)

data/examples/{mq/logger.rb → logger.rb}

@@ -1,15 +1,15 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
-require 'mq/logger'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
+require 'amqp/logger'
 
-Logger = MQ::Logger
+Logger = AMQP::Channel::Logger
 
 AMQP.start(:host => 'localhost') do
   if ARGV[0] == 'server'
 
-    MQ.queue('logger').bind(MQ.fanout('logging', :durable => true)).subscribe { |msg|
+    AMQP::Channel.queue('logger').bind(AMQP::Channel.fanout('logging', :durable => true)).subscribe { |msg|
       msg = Marshal.load(msg)
       require 'pp'
       pp(msg)

data/examples/{mq/multiclock.rb → multiclock.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 require 'time'
 
 AMQP.start(:host => 'localhost') do |connection|
@@ -19,7 +19,7 @@ AMQP.start(:host => 'localhost') do |connection|
 
   #AMQP.logging = true
 
-  clock = MQ.new.headers('multiformat_clock')
+  clock = AMQP::Channel.new.headers('multiformat_clock')
   EM.add_periodic_timer(1) {
     puts
 
@@ -32,7 +32,7 @@ AMQP.start(:host => 'localhost') do |connection|
   }
 
   ["iso8601", "rfc2822"].each do |format|
-    amq = MQ.new
+    amq = AMQP::Channel.new
     amq.queue(format.to_s).bind(amq.headers('multiformat_clock'), :arguments => {"format" => format}).subscribe { |time|
       log "received #{format}", time
     }

data/examples/{mq/pingpong.rb → pingpong.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mq'
+$:.unshift(File.expand_path("../../lib", __FILE__))
+require 'amqp'
 
 AMQP.start(:host => 'localhost') do |connection|
 
@@ -18,7 +18,7 @@ AMQP.start(:host => 'localhost') do |connection|
 
   # AMQP.logging = true
 
-  amq = MQ.new
+  amq = AMQP::Channel.new
   EM.add_periodic_timer(1) {
     puts
 
@@ -26,13 +26,13 @@ AMQP.start(:host => 'localhost') do |connection|
     amq.queue('one').publish('ping')
   }
 
-  amq = MQ.new
+  amq = AMQP::Channel.new
   amq.queue('one').subscribe { |msg|
     log 'one', :received, msg, :sending, 'pong'
     amq.queue('two').publish('pong')
   }
 
-  amq = MQ.new
+  amq = AMQP::Channel.new
   amq.queue('two').subscribe { |msg|
     log 'two', :received, msg
   }