amqp 0.8.0.rc1 → 0.8.0.rc2

data/CHANGELOG

@@ -1,14 +1,26 @@
 = Version 0.8.0
 
+  * [API] AMQP::Exchange#initialize now accepts :arguments option that takes a hash. Brokers
+          may implement AMQP extensions using (usually x-prefixed) declaration arguments.
+  * [API] AMQP::Queue#initialize now accepts :arguments option that takes a hash. RabbitMQ
+          recognizes x-message-ttl argument and uses it as message TTL in milliseconds for
+	  queue that is being declared.
+  * [API] AMQP#Logger is deprecated. It will be removed before 1.0 release.
+  * [API] AMQP#fork is deprecated. It will be removed before 1.0 release.
+  * [API] AMQP::RPC is deprecated. It will be removed before 1.0 release.
+  * [FEATURE] Significant improvements to the documentation
+  * [FEATURE] Support for RabbitMQ extensions to AMQP 0.9.1
+  * [API] AMQP::Exchange#publish now accepts (an optional) block that is called as soon as message
+          is considered published (EventMachine loop has pushed payload down the network stack).
   * [API] AMQP::Channel.new now accepts (an optional) block and yields newly opened channel to it as soon as
           channel.open-ok arrives from the broker.
   * [API] AMQP::Header#ack now can acknowledge multiple deliveries
   * [API] AMQP::Exchange#delete now takes (an optional) block that is called when exchange.delete-ok response arrives.
   * [API] AMQP::Header now implements #to_hash
-  * [API] AMQP::Queue#pop block now can take 1, 2 or 7 (that's right) arguments.
+  * [API] AMQP::Queue#pop block now can take 1, 2 or 3 arguments.
           1 argument means handler is only interested in content payload
-	  2 arguments means handler is interested in headers and the content
-	  7 arguments means handlers wants all the properties get-ok (or get-empty) carries
+	  2 arguments mean handler is interested in headers and the content
+	  3 arguments mean handler is interested in headers, content and AMQP method instance
   * [API] AMQP::Queue#purge  now takes an optional block which is called when queue.purge-ok response arrives.
   * [API] AMQP::Queue#delete now takes an optional block which is called when queue.delete-ok response arrives.
   * [API] AMQP::Queue#delete now accepts :nowait option.

data/README.textile

@@ -52,9 +52,7 @@ h3. Install RabbitMQ
 
 Please refer to "RabbitMQ installation guide":http://www.rabbitmq.com/install.html
 Note that for Ubuntu and Debian we strongly advice that you use "RabbitMQ apt repository":http://www.rabbitmq.com/debian.html#apt
-that has recent versions of RabbitMQ. Ubuntu (even 10.10) and Debian both "ship with old RabbitMQ version":http://packages.ubuntu.com/maverick/rabbitmq-server,
-that only supports AMQP protocol 0.8. amqp gem 0.8.0 and later *will not work with RabbitMQ versions
-before 2.0*.
+that has recent versions of RabbitMQ. Learn more in {file:docs/RabbitMQVersions.textile RabbitMQ versions} section.
 
 
 h3. Install the gem
@@ -146,7 +144,7 @@ gem "amqp", :git => "git://github.com/ruby-amqp/amqp.git", :branch => "master"
 h2. Examples
 
 You can find many examples (both real-world cases and simple demonstrations)
-"under examples directory":https://github.com/ruby-amqp/amqp/tree/master/examples in the repository.
+under "examples directory":https://github.com/ruby-amqp/amqp/tree/master/examples in the repository.
 
 
 
@@ -183,7 +181,8 @@ h2. Community
 
 h2. License
 
-AMQP gem is licensed under the "Ruby License:"http://www.ruby-lang.org/en/LICENSE.txt.
+AMQP gem is licensed under the "Ruby License":http://www.ruby-lang.org/en/LICENSE.txt.
+
 
 
 h2. Credits and copyright information

data/amqp.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine", "~> 0.12.10"
-  s.add_dependency "amq-client"
+  s.add_dependency "amq-client", ">= 0.7.0.alpha2"
 
   begin
     require "changelog"

data/docs/RabbitMQVersions.textile

@@ -0,0 +1,21 @@
+h1. amqp gem and RabbitMQ versions compatibility
+
+h2. Using recent versions on Debian and Ubuntu
+
+Ubuntu (even 10.10) and Debian both "ship with old RabbitMQ version":http://packages.ubuntu.com/maverick/rabbitmq-server,
+that only supports AMQP protocol 0.8. amqp gem 0.8.0 and later *will not work with RabbitMQ versions
+before 1.8.0*.
+
+We strongly recommend that you use "RabbitMQ apt repository":http://www.rabbitmq.com/debian.html#apt that has recent versions of RabbitMQ.
+
+
+
+h2. TLS (SSL) support
+
+Note that "before 1.7.0, RabbitMQ did not support TLS":http://www.rabbitmq.com/ssl.html. In order to have TLS
+support, RabbitMQ 1.7.0 requires
+
+ * Erlang/OTP R13B or later
+ * Erlang SSL 3.10 or later
+
+and recommends using Erlang R141B that ships with Erlang SSL 4.0.1.

data/examples/extensions/rabbitmq/per_queue_message_ttl.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../../lib", __FILE__))
+require 'amqp'
+require "amqp/extensions/rabbitmq"
+
+AMQP.start do |connection|
+  puts "Connected!"
+  AMQP::Channel.new(connection) do |channel, open_ok|
+    puts "Channel #{channel.id} is now open"
+
+    channel.on_error do
+      puts "Oops, there is a channel-levle exceptions!"
+    end
+
+    x = channel.fanout("amq.fanout")
+    channel.queue("", :auto_delete => true, :arguments => { "x-message-ttl" => 1000 }) do |q|
+      puts "Declared a new server-named qeueue: #{q.name}"
+      q.bind(x)
+
+
+      EventMachine.add_timer(0.3) do
+        10.times do |i|
+          puts "Publishing message ##{i}"
+          x.publish("Message ##{i}")
+        end
+      end
+
+      EventMachine.add_timer(0.7) do
+        q.pop do |headers, payload|
+          raise "x-message-ttl didn't seem to work (timeout is up)" if payload.nil?
+        end
+      end
+
+      EventMachine.add_timer(1.5) do
+        q.pop do |headers, payload|
+          raise "x-message-ttl didn't seem to work (timeout isn't up)" if payload
+        end
+      end
+    end
+  end
+
+  show_stopper = Proc.new {
+    AMQP.stop do
+      EM.stop
+    end
+  }
+
+
+  EM.add_timer(3, show_stopper)
+  Signal.trap('INT',  show_stopper)
+  Signal.trap('TERM', show_stopper)
+end

data/examples/tls_certificates/client/cert.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5DCCAcygAwIBAgIBAjANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
+c3RDQTAeFw0xMTA0MTcyMDE4MzNaFw0xMjA0MTYyMDE4MzNaMCcxFDASBgNVBAMT
+C2dpb3ZlLmxvY2FsMQ8wDQYDVQQKEwZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/4CSqBjpmNXoDt5xU0D4ONG3bQXBV4bJid/nmzIvV67pb
+v/VpqKxM+UqoV9d09u/H+f/jAKu0of1e1d+1o09JtjJshX4sYREh2/n0umENH1xC
+yvWnP0eFTithj9qmVcK5UOvoZKSKYT4gtCIpYhRUQZkEhPYKhvxePztjRIeUghkK
+Qc9Qi0/eARm8d3Zdo0ORnnNNIP+G7BjecmJvTLCP/PBDIGG6r1eybNeulNWddgLg
+cUq0ACFepxCJW6RdGVrMXhWomScvKssIUMAdDfwM9ffq64MYE2ZLG1OBBPefNI47
+wz8h9ak15T2ZpKFU9biXLr/SnGhdhNR31d16pAtLAgMBAAGjLzAtMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEB
+BQUAA4IBAQCVBpz3gZRr1s48SVF4+C9YLzrSaWsvzKZNDKH7RJ4f1VR//ZY5zsYi
+RqSlzSfLM76Y6Y/Eq0iFshtKmuXHKyA4r/Gp+iiCw4U9Htk91rg98wAPc8wOBgn1
+OmomH65JpLwxYvUwyt91opGppcqZHWhruhI0fFTFtPIlGKK3KOmJLPpaSvY0YTJ+
+vaI3D6yQEMQoZ/mcXk928ofJJvOpUEmvjTW4Orz+T8NmiffLb64P50h86bdV+8tw
+FJx6ix6vLF41LU2iPEYHuuXkA7+M5e+POGscJJCb1p6JKxzI6D/UVDnrbhOlqBa5
+U45f0oXQ/ndOYUrBRu3BPFdNAjvpa0ld
+-----END CERTIFICATE-----

data/examples/tls_certificates/client/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAv+AkqgY6ZjV6A7ecVNA+DjRt20FwVeGyYnf55syL1eu6W7/1
+aaisTPlKqFfXdPbvx/n/4wCrtKH9XtXftaNPSbYybIV+LGERIdv59LphDR9cQsr1
+pz9HhU4rYY/aplXCuVDr6GSkimE+ILQiKWIUVEGZBIT2Cob8Xj87Y0SHlIIZCkHP
+UItP3gEZvHd2XaNDkZ5zTSD/huwY3nJib0ywj/zwQyBhuq9XsmzXrpTVnXYC4HFK
+tAAhXqcQiVukXRlazF4VqJknLyrLCFDAHQ38DPX36uuDGBNmSxtTgQT3nzSOO8M/
+IfWpNeU9maShVPW4ly6/0pxoXYTUd9XdeqQLSwIDAQABAoIBAQC1hScqcpns98pm
+md2bnyYV6iPDuTS9Crfnz/jrD7d6uXekNQXG33uhlnW6rN94F+TgGvKpnojSai14
++nyZKdZotaUeZWvoMCw1DBZ8H5aRA4oU5k1f282dn0YLFjyT/64oAxYq1IuVHknY
+RpHK9K6mxygrzl21t94oi0lzr/FT29t8mSlcCQiHxAZWyGE55HvqSS4625P5pvh1
+Bh4bZGT285XvlA1qbKbEn8M1IsCZmhPU87U+k6lCvEpBG32cdg9Ykt+BA33OCJj0
+OrC6vKjLsIKEfbq8xoTjm7+fofv78B2/zobK7dFMVTAdnju8Tpwu/IDcHnLuKtt2
+Vd8GOwGBAoGBAPBO/EeHSvlT46F3jT8ygIhB2rGQ8LBZwQmiejOdfhJ5EPs8KC7U
+i9Wfo2Mktn7gr+X9nsY5ZHZoTFaFV1YSoIrsaWFd0RmuQKBcka+A9WPWEgRL0KrG
+Km9pHjlYK6WAu+XzKnGlHzasxxLW48mvuMQApE5U5nVbZWonGBA2psRNAoGBAMxn
+jHWH51SN5R/ldPvmNPEG8McR1XmzTM9M40snrj6UV8mLMH+KRHgoj664nhm1dnMa
+rolKzoFQtS5unwjCGX+Lx9AnwUDDak2Q6LsqedO0PhIwUEtcaLnt8Zf3KWi4v4Es
+eAHnYXZ1I7sqjCZ7pAwNBlCfE4Ai1XMH7syv5bn3AoGAYhbrlUrdSJ58eQkyp4w2
+uOegnABcrq9EQ2mF1hHAR0wRqWtpv4vUtFMgPzTaJToTsp5us9zza/2ww1RUTPb3
+fx12+l5wHrpo+MwwT2IlSCY2XniP6VVQNv/CbYfW8Qx2Jiu2tILBFfE6pS7/9fB7
+S84zQyIWm+q9n7HreZrFQbUCgYB4BnnY7eOtp+CaGS/XVrdRrOSn0FYNL3bz5080
+a2mKv6rI4x2oVrWb5R1x2GCl8gNK1akVX0LhdlXdnQFvsCIu3hKHrUByWg1K3MN8
+XBXLdXRZU9tiVTH9s7YAqRa8sndpT4Zsf8SgPWqs1fAUDNgoZ2GE59QYktvJvye/
+M65uwwKBgDnuu0PZ6tn7dKZWYhfBeQT21DsaQglvY3kQ4RHHlHiQnyALKnZqbLu9
+wlAZIvRIltWeeQ+oT/Bxq9cD7GrdX8VmZ2xo/gYkJQoduT3AtyLrau8aZFWpiREH
+2pDcznE7+DWcKKwr/Z2eQEOoE2KikeuAbMd2SG4vVTLG9w+N2e5I
+-----END RSA PRIVATE KEY-----

data/examples/tls_certificates/client/req.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICbDCCAVQCAQAwJzEUMBIGA1UEAxMLZ2lvdmUubG9jYWwxDzANBgNVBAoTBmNs
+aWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/gJKoGOmY1egO3
+nFTQPg40bdtBcFXhsmJ3+ebMi9Xrulu/9WmorEz5SqhX13T278f5/+MAq7Sh/V7V
+37WjT0m2MmyFfixhESHb+fS6YQ0fXELK9ac/R4VOK2GP2qZVwrlQ6+hkpIphPiC0
+IiliFFRBmQSE9gqG/F4/O2NEh5SCGQpBz1CLT94BGbx3dl2jQ5Gec00g/4bsGN5y
+Ym9MsI/88EMgYbqvV7Js166U1Z12AuBxSrQAIV6nEIlbpF0ZWsxeFaiZJy8qywhQ
+wB0N/Az19+rrgxgTZksbU4EE9580jjvDPyH1qTXlPZmkoVT1uJcuv9KcaF2E1HfV
+3XqkC0sCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQAOpwkzMe1xYgYz8GOp5xF7
+xJtfeh5z9JTt8ogvjS34mri2vNUPQd35H3y6Dhh9ZjLqC03mMV/KOtRCf7oJXpgZ
+S8C/NyJWNXB7/QNf9/EWEyOxoWYuvhTxqc0MhLPWrJRjgBKvvCGszBj2kWxDn7OO
+//TRq4ao2wQWHIlaP5htsr+rD4IJZqZC8lgptv0u9O/O8vruPUg3k6dnuiKdUyTL
+2CDsiKSc6vZKJKL0TguBHSQj/sybAw1lyxIlpxiDcTCbM5FsER6jFydLly+ov3+x
+sqMOTieWU3qnaqOwK2ENqQfRMAk3FXEuDzvW4t7oxHB2gJfUJXfEVUWv7Kol25VT
+-----END CERTIFICATE REQUEST-----

data/examples/tls_certificates/server/cert.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5DCCAcygAwIBAgIBATANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
+c3RDQTAeFw0xMTA0MTcyMDE3MjdaFw0xMjA0MTYyMDE3MjdaMCcxFDASBgNVBAMT
+C2dpb3ZlLmxvY2FsMQ8wDQYDVQQKEwZzZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDdBEpnl+BRcIzZ4M6pB649cT/YUxebTekUq0HhFXATba44
+XkSx81Nn5dMVnKgJgJVRhBxU0ZpBt4/wogKaaYI4/OAEgbUcH03OnEXHNLB586eJ
+GdaFHkSQOfnUbBIzpQKlQjGLfjmn6mXkLW5lLP5OrN+npuEI4Wq/jgbIQQp9t7Kw
+g+Pb9VdJGw0dmMlVfPP8FVCRpGB9lJc1Ayw8gKHg4mi/uyKKFdLV9IWf+DXlvRQ2
+vljmQEhSq4bvxnCtm4p5B7AFHefTnldSgGRUZuyI5/4vFMypB3deV+lku95514uN
+F0gg66eDAfoNjEmca09P+GBy8LfJsuiBeFV4irtjAgMBAAGjLzAtMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgUgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEB
+BQUAA4IBAQCCmvsAQ1GaPfoKMqCWxyrQ2BNVPWm9J65thZKxZQF01gLox9cpv6+X
+QERcD71HStxbzh2B8Hebbk9OplGuyrdgfvzUxcn88kObj6udipDx4YxTJvtff/9w
+xeD5OWDVgef0GkB1Rjj3C3W/sfmTZBYfdKuWuwxMG/NxISkQP4aFHwJnPrzNx9ON
+bHoKVNrQ2iKAiMysjnFeA/4QuhBQRf41h9SBWwJEW3Ts91TzbgcjCL46Dq29QB9A
+4v8t6K/nibP6n53zHbVzdxIEJ2hFKm+vuqaHRW3048Xgww1xkdxrVbyGp9si92i1
+KJ5SDIOR8bQ7OXvdvpiyy6p9fIG0Z6w0
+-----END CERTIFICATE-----

data/examples/tls_certificates/server/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA3QRKZ5fgUXCM2eDOqQeuPXE/2FMXm03pFKtB4RVwE22uOF5E
+sfNTZ+XTFZyoCYCVUYQcVNGaQbeP8KICmmmCOPzgBIG1HB9NzpxFxzSwefOniRnW
+hR5EkDn51GwSM6UCpUIxi345p+pl5C1uZSz+Tqzfp6bhCOFqv44GyEEKfbeysIPj
+2/VXSRsNHZjJVXzz/BVQkaRgfZSXNQMsPICh4OJov7siihXS1fSFn/g15b0UNr5Y
+5kBIUquG78ZwrZuKeQewBR3n055XUoBkVGbsiOf+LxTMqQd3XlfpZLveedeLjRdI
+IOungwH6DYxJnGtPT/hgcvC3ybLogXhVeIq7YwIDAQABAoIBAEu0+YussZET/Ztw
+bznlQKEZVuZR6Ccxs+J5m1JvlnmBO4lheSR/lhVj2z9u7vx6SCupFk9TkQRrzWl/
+BWdBNvMwY8gHajNc4bkhPKG1AbJ0bPIAoMPuj0vcICDMeBuqrVJQb0o6DaPgHdDg
+Yw1TMTVf8CiseC8jj/5XtykHZoGTNTKzusvTjL8hTXFaWQfHQaN3WC1qwrFU2+x6
+AJeoSz5F1Q/lykqVAdl2B1L39kiSCAkbVE1GI2qjftCff3ycufYV/fxXeyZwZx9B
+NGWUJFyZte8EcrAUoo9B/gvALGDbJsSUsbri+HsRsdOQT3K/giafUipX2FB8Bnxm
+nasEfskCgYEA74PrKYo13mTUWRJ2FQTBRHLsMR53PK83RpRRs8361/uCJrjpqfdD
+2fUt8kH0rmm2vaWYsllucJoYdYSC9CQdECLzpOZS907PJHXCOsFsBjw74fvjZ+gY
+9EXIENZSOSR1PQCWZm+5lL4xi/T+beWBfz0YksErj2GM7dyJeQjkIz8CgYEA7Dpx
+ANgrgO9WTu51NIlKt3P7+t6q6MHQcWuzkWMBmVU4zxeyggux+ucMj+l3KLyw7fLT
+jRz03eGpqjQT8Yl676uYONhTDC9VOBbLgjShuVOX7lleMLxVFJWqL1FphNghxysF
+HVCq1WH0Qu4keirPEotBxkNZRaRYHwRYlVPKMt0CgYEApIHSAj0IlNBiPS995R/X
+8sCQU4heU1LxP0vd9gZy1OfNU/VLoE7RzqEkxrDgcu7u8cEMaOsd/L8KL6UtIKyx
+PYUUHV2I/I2nnp43Io35OSsj4ipU3eg/Q3+uU0oxPUg6MgT2SDNSnsQnWb6TBj5N
+PGxlNV7yIU/aMQF5dqVRtJcCgYEArC4Mn6jwTJImPnHgS+Kl6wFG8JvLxss9uu3d
+fGLFj5VmSsvi+Ja9qzstFNf+WlruOwF64KfycqdAmyZKQwsJ6BcSZJyIK6F0Y+V5
+f/YMyp/7ZWcOGEetW8uat9KHLqS6OglJOQzK96zl9MLPI5yAQevujSwZrYEUGcd5
+KZ5hCqECgYBExYSDJOuSMvKFw66jrLiBedLPuzh1iznwd6e4idpqIUkdhbEuXhHG
++35HeN5cGwjbjXtIjxJsAddTbjvSqaPukmBKLm1ABqF3r0irbNaPcK1xfG9a5L28
+/enwipaSWjGovfDXWqmmCvWC8M7iGiqFChI87WlzbvaAapOW0D576Q==
+-----END RSA PRIVATE KEY-----

data/examples/tls_certificates/server/req.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICbDCCAVQCAQAwJzEUMBIGA1UEAxMLZ2lvdmUubG9jYWwxDzANBgNVBAoTBnNl
+cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0ESmeX4FFwjNng
+zqkHrj1xP9hTF5tN6RSrQeEVcBNtrjheRLHzU2fl0xWcqAmAlVGEHFTRmkG3j/Ci
+Apppgjj84ASBtRwfTc6cRcc0sHnzp4kZ1oUeRJA5+dRsEjOlAqVCMYt+OafqZeQt
+bmUs/k6s36em4Qjhar+OBshBCn23srCD49v1V0kbDR2YyVV88/wVUJGkYH2UlzUD
+LDyAoeDiaL+7IooV0tX0hZ/4NeW9FDa+WOZASFKrhu/GcK2binkHsAUd59OeV1KA
+ZFRm7Ijn/i8UzKkHd15X6WS73nnXi40XSCDrp4MB+g2MSZxrT0/4YHLwt8my6IF4
+VXiKu2MCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA4IBAQC2aRbyq5pJ34M8jsaEjcks
+iov5KP17jfnHnz517/rKxKYRaoxftXVvUbtDLKMQNMAA9K65jetg6/6zqi3QTJwd
+52Pn6OYTpzyFov42KRh1OSiRRa5CNXzDlHhosuVnVEOo2rdQggWZTY1clAbjEJmU
+N6bn6NSL4B/Vn8GAVxXhRGGoHj26LupdoI6GS2S3xuExw0xiS3usq6xYthpxHQ/L
+pQI2Ijk+IJZPnJR2RZji/7P3nWHWQX+HrCagCu4oyY4o7inWPVJpxD+1LmagRhv5
+RyMdQKoY+6x3/r+tWATTNOVqbGzfuKj6TQSkCYvOZOejlRBsMhyYlpldVMCRmaoh
+-----END CERTIFICATE REQUEST-----

data/examples/tls_certificates/testca/cacert.pem

@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICxjCCAa6gAwIBAgIJAOF/re9e0JhgMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
+BAMTCE15VGVzdENBMB4XDTExMDQxNzIwMDcxN1oXDTEyMDQxNjIwMDcxN1owEzER
+MA8GA1UEAxMITXlUZXN0Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDK8ZdVo1llXXrS7ed5Luel1VRq0DmJG1TZ8bAgovK9fx6WsgzeJ17zYwAEheUz
+B8PogkNqU3ZIa4T51VCtamoiG6bbKYpco4lutKM7aNGNJNcUfDhwyt/NYOxXM3xf
+ahMWjrbH0e4qKJgEjnJLpoeEa+YquDG2NXzocZY5+upy0pX6Reh1EQbju69j9f5Q
+Z6u4cvraScyN5IYuq3lKTmc2TxVyINVkpK9DlGJZUBAOBLSbFxGZDRoY0D3b1aeS
+/XMfVvcrJi48Ns2ZvT+CAy0KVeKBeQ9+6kD/YAizcxDGLRvqOZXOHYaE2L51DabL
+QTxk9NFPgIxrYtGS7RtQ7dUhAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0P
+BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAzFtKwsrCBaIAf1/VCJZh4+gzs/UW+
+UXeC17GRzazb0O0drm9aMOtwE48NGVTwBjqmnPzFg56FYyll3oVZHz/fgkQZ+6iu
+qAbwlmY2H+L9RyC9Mv3B+Ew/o3MNCQQ3rgxbA7hb0k8mwDplxS5GBRROwZl/zHks
+gb4yPR6G83+zrgn6JIybdEGUySc1XDx+p6fVXvQG/1fsmExN9/ZuC6ulgBF7e+R5
+d7l1AluGL4kS7GMDRZnU9QcXkhnlUyPXIDr/Jd1HFKtwgrXtVl5YIWTaRdWOXGwX
+Q8BpM3Vk/NQFoTHO4Na3y8JY6iJzYTIXWHjI6RJdUffsEPtBoysHFHYv
+-----END CERTIFICATE-----

data/examples/tls_certificates/testca/certs/01.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5DCCAcygAwIBAgIBATANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
+c3RDQTAeFw0xMTA0MTcyMDE3MjdaFw0xMjA0MTYyMDE3MjdaMCcxFDASBgNVBAMT
+C2dpb3ZlLmxvY2FsMQ8wDQYDVQQKEwZzZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDdBEpnl+BRcIzZ4M6pB649cT/YUxebTekUq0HhFXATba44
+XkSx81Nn5dMVnKgJgJVRhBxU0ZpBt4/wogKaaYI4/OAEgbUcH03OnEXHNLB586eJ
+GdaFHkSQOfnUbBIzpQKlQjGLfjmn6mXkLW5lLP5OrN+npuEI4Wq/jgbIQQp9t7Kw
+g+Pb9VdJGw0dmMlVfPP8FVCRpGB9lJc1Ayw8gKHg4mi/uyKKFdLV9IWf+DXlvRQ2
+vljmQEhSq4bvxnCtm4p5B7AFHefTnldSgGRUZuyI5/4vFMypB3deV+lku95514uN
+F0gg66eDAfoNjEmca09P+GBy8LfJsuiBeFV4irtjAgMBAAGjLzAtMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgUgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEB
+BQUAA4IBAQCCmvsAQ1GaPfoKMqCWxyrQ2BNVPWm9J65thZKxZQF01gLox9cpv6+X
+QERcD71HStxbzh2B8Hebbk9OplGuyrdgfvzUxcn88kObj6udipDx4YxTJvtff/9w
+xeD5OWDVgef0GkB1Rjj3C3W/sfmTZBYfdKuWuwxMG/NxISkQP4aFHwJnPrzNx9ON
+bHoKVNrQ2iKAiMysjnFeA/4QuhBQRf41h9SBWwJEW3Ts91TzbgcjCL46Dq29QB9A
+4v8t6K/nibP6n53zHbVzdxIEJ2hFKm+vuqaHRW3048Xgww1xkdxrVbyGp9si92i1
+KJ5SDIOR8bQ7OXvdvpiyy6p9fIG0Z6w0
+-----END CERTIFICATE-----

data/examples/tls_certificates/testca/certs/02.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC5DCCAcygAwIBAgIBAjANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhNeVRl
+c3RDQTAeFw0xMTA0MTcyMDE4MzNaFw0xMjA0MTYyMDE4MzNaMCcxFDASBgNVBAMT
+C2dpb3ZlLmxvY2FsMQ8wDQYDVQQKEwZjbGllbnQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/4CSqBjpmNXoDt5xU0D4ONG3bQXBV4bJid/nmzIvV67pb
+v/VpqKxM+UqoV9d09u/H+f/jAKu0of1e1d+1o09JtjJshX4sYREh2/n0umENH1xC
+yvWnP0eFTithj9qmVcK5UOvoZKSKYT4gtCIpYhRUQZkEhPYKhvxePztjRIeUghkK
+Qc9Qi0/eARm8d3Zdo0ORnnNNIP+G7BjecmJvTLCP/PBDIGG6r1eybNeulNWddgLg
+cUq0ACFepxCJW6RdGVrMXhWomScvKssIUMAdDfwM9ffq64MYE2ZLG1OBBPefNI47
+wz8h9ak15T2ZpKFU9biXLr/SnGhdhNR31d16pAtLAgMBAAGjLzAtMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEB
+BQUAA4IBAQCVBpz3gZRr1s48SVF4+C9YLzrSaWsvzKZNDKH7RJ4f1VR//ZY5zsYi
+RqSlzSfLM76Y6Y/Eq0iFshtKmuXHKyA4r/Gp+iiCw4U9Htk91rg98wAPc8wOBgn1
+OmomH65JpLwxYvUwyt91opGppcqZHWhruhI0fFTFtPIlGKK3KOmJLPpaSvY0YTJ+
+vaI3D6yQEMQoZ/mcXk928ofJJvOpUEmvjTW4Orz+T8NmiffLb64P50h86bdV+8tw
+FJx6ix6vLF41LU2iPEYHuuXkA7+M5e+POGscJJCb1p6JKxzI6D/UVDnrbhOlqBa5
+U45f0oXQ/ndOYUrBRu3BPFdNAjvpa0ld
+-----END CERTIFICATE-----

data/examples/tls_certificates/testca/index.txt

@@ -0,0 +1,2 @@
+V	120416201727Z		01	unknown	/CN=giove.local/O=server
+V	120416201833Z		02	unknown	/CN=giove.local/O=client

data/examples/tls_certificates/testca/index.txt.attr

@@ -0,0 +1 @@
+unique_subject = yes

data/examples/tls_certificates/testca/index.txt.attr.old

@@ -0,0 +1 @@
+unique_subject = yes

data/examples/tls_certificates/testca/index.txt.old

@@ -0,0 +1 @@
+V	120416201727Z		01	unknown	/CN=giove.local/O=server

data/examples/tls_certificates/testca/openssl.cnf

@@ -0,0 +1,53 @@
+[ ca ]                                                     
+default_ca = testca                                        
+
+[ testca ]                                                 
+dir = .                                                    
+certificate = $dir/cacert.pem                              
+database = $dir/index.txt                                  
+new_certs_dir = $dir/certs                                 
+private_key = $dir/private/cakey.pem                       
+serial = $dir/serial                                       
+
+default_crl_days = 7                                       
+default_days = 365                                         
+default_md = sha1                                          
+
+policy = testca_policy                                     
+x509_extensions = certificate_extensions                   
+
+[ testca_policy ]                                          
+commonName = supplied                                      
+stateOrProvinceName = optional                             
+countryName = optional                                     
+emailAddress = optional                                    
+organizationName = optional                                
+organizationalUnitName = optional                          
+
+[ certificate_extensions ]                                 
+basicConstraints = CA:false                                
+
+[ req ]                                                    
+default_bits = 2048                                        
+default_keyfile = ./private/cakey.pem                      
+default_md = sha1                                          
+prompt = yes                                               
+distinguished_name = root_ca_distinguished_name            
+x509_extensions = root_ca_extensions                       
+
+[ root_ca_distinguished_name ]                             
+commonName = hostname                                      
+
+[ root_ca_extensions ]                                     
+basicConstraints = CA:true                                 
+keyUsage = keyCertSign, cRLSign                            
+
+[ client_ca_extensions ]                                   
+basicConstraints = CA:false                                
+keyUsage = digitalSignature                                
+extendedKeyUsage = 1.3.6.1.5.5.7.3.2                       
+
+[ server_ca_extensions ]                                   
+basicConstraints = CA:false                                
+keyUsage = keyEncipherment                                 
+extendedKeyUsage = 1.3.6.1.5.5.7.3.1

data/examples/tls_certificates/testca/private/cakey.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyvGXVaNZZV160u3neS7npdVUatA5iRtU2fGwIKLyvX8elrIM
+3ide82MABIXlMwfD6IJDalN2SGuE+dVQrWpqIhum2ymKXKOJbrSjO2jRjSTXFHw4
+cMrfzWDsVzN8X2oTFo62x9HuKiiYBI5yS6aHhGvmKrgxtjV86HGWOfrqctKV+kXo
+dREG47uvY/X+UGeruHL62knMjeSGLqt5Sk5nNk8VciDVZKSvQ5RiWVAQDgS0mxcR
+mQ0aGNA929Wnkv1zH1b3KyYuPDbNmb0/ggMtClXigXkPfupA/2AIs3MQxi0b6jmV
+zh2GhNi+dQ2my0E8ZPTRT4CMa2LRku0bUO3VIQIDAQABAoIBAQDJoXiDHFVgUZ0L
+XlUBYKnEaIyDxzey0hXep7Me6eaUgW0JugLw4VsEI9NLqyBKMCfjpTCHvj6huzmV
+4utSMI0cMC76Rm5ylgSgmhYnm3+/ZN/QOY71+YqcCfUmuj+SqNgoLEjLhPbEqipH
+NKO4J88ysOUwgmrZppDgfKIOHw66Xlx0WtyFksozLve5pqxzs2gNZDmT5YdlGt+w
+X2zaUr7GholPGUVzhZSlpBpPkloSNYyGPX7O25bc63Ev92m3vnroJZYFiaUaKcFE
+M2RVVd3m8J47uoSwxl2ppnIgwodTWe20swc3d4cXK30U4USLsvWesthnfUc65QWa
+KfeanOrBAoGBAOvxGM9ufV1EFyV3D4kDB2UGp2ccv2t+rJ+urpl7JLCw1Aetpc3v
+Qg/QsbBfOhfI650zOZgzE5bG6B6wNYVLAC/UusrYgeLkyqKVbQgDTP+djD61jYjy
+IG5RP7EumN07Gvja59B4Kw5zN6TB3MKGz9Qv3a2MOvyg/3TRnssHOkQ5AoGBANwy
+V822s149G46tIbESw5ICcY8HorP1kD2syMeBQWKJcEgiSXL8Q3TIKdqaim8Q1Bqu
+fSYwISUVsFDaTyvRl25hLfkQ0t+qsul7EcjNFHf9L7dJx7z/dj8lVTQWGYse5iVQ
+aplx7fYQHgXdC7NjtpIrxUZkJ7bAl+0cpavdcCgpAoGAetCbO46mDyBcdBIPsiAz
+fzEBfrkGIyxjKxPAqv/gz2CcXgrT3eiHGLhnZgmLscnSa5e4iTM9JSUQuri6g1HR
+HRS8zs34fmTd3deuU5d0QzJ9SD81F24B16rPXqmExNP5bER2mpuSvgjXlBmdklye
+XjM0TxxJsCsWDnb3E3QFrnECgYBSpXqbNZXBK0JqnMTmh1psNQqWWpFQ5jxLScza
+RMNbzqYcDPJwfAp9jJtY92Q6J6DUmuVSLgJivu88iZPpqHMj9MmikBP160XXqF+W
+dJLYLml4a/LSFzg0nziJojnYI7LSEorQKRjdoFMEdGDt5eEin9cdgn39c/ASCQyN
+o0FzcQKBgHifRoEEyyHzepXiv2osPsOV9cEoWROLRaooE7boPISimJ1PCFGON0XT
+20PmWJL3j3/f2Eqk47x4WpzLOp/OwUqqpaDpImtQX7GD7C+/PbAdbT1Q1Kc9kxc9
+a5FJg85oJqDPB1yEmYG5nWIlqB3LOX/IdOfYSOUFvRiomwJJoxys
+-----END RSA PRIVATE KEY-----

data/examples/tls_certificates/testca/serial

@@ -0,0 +1 @@
+03

data/examples/tls_certificates/testca/serial.old

@@ -0,0 +1 @@
+02

data/lib/amqp/channel.rb

@@ -118,12 +118,17 @@ module AMQP
       # only send channel.open when connection is actually open. Makes it possible to
       # do c = AMQP.connect; AMQP::Channel.new(c) that is what some people do. MK.
       @connection.on_open do
-        self.open do |*args|
+        self.open do |ch, open_ok|
           @channel_is_open_deferrable.succeed
 
-          block.call(*args) if block
-        end
-      end
+          if block
+            case block.arity
+            when 1 then block.call(ch)
+            else block.call(ch, open_ok)
+            end # case
+          end # if
+        end # self.open
+      end # @connection.on_open
     end
 
 

data/lib/amqp/exchange.rb

@@ -294,6 +294,9 @@ module AMQP
     # @option opts [String] :default_routing_key (nil)  Default routing key that will be used by {Exchange#publish} when no routing key is not passed explicitly.
     #                                                   It is perfectly fine for applications to always specify routing key to {Exchange#publish}.
     #
+    # @option opts [Hash] :arguments (nil)  A hash of optional arguments with the declaration. Some brokers implement
+    #                                          AMQP extensions using x-prefixed declaration arguments.
+    #
     #
     # @raise [AMQP::Error] Raised when exchange is redeclared with parameters different from original declaration.
     # @raise [AMQP::Error] Raised when exchange is declared with :passive => true and the exchange does not exist.
@@ -357,7 +360,7 @@ module AMQP
 
         unless @opts[:no_declare]
           @channel.once_open do
-            self.declare(passive = @opts[:passive], durable = @opts[:durable], exclusive = @opts[:exclusive], auto_delete = @opts[:auto_delete], nowait = @opts[:nowait], nil, &shim)
+            self.declare(passive = @opts[:passive], durable = @opts[:durable], exclusive = @opts[:exclusive], auto_delete = @opts[:auto_delete], nowait = @opts[:nowait], @opts[:arguments], &shim)
           end
         end
       else

data/lib/amqp/queue.rb

@@ -148,6 +148,12 @@ module AMQP
     #                                        method it will raise a channel or connection exception.
     #
     #
+    # @option opts [Hash] :arguments (nil)  A hash of optional arguments with the declaration. Some brokers implement
+    #                                          AMQP extensions using x-prefixed declaration arguments. For example, RabbitMQ
+    #                                          recognizes x-message-ttl declaration arguments that defines TTL of messages in
+    #                                          the queue.
+    #
+    #
     # @yield [queue, declare_ok] Yields successfully declared queue instance and AMQP method (queue.declare-ok) instance. The latter is optional.
     # @yieldparam [Queue] queue Queue that is successfully declared and is ready to be used.
     # @yieldparam [AMQP::Protocol::Queue::DeclareOk] declare_ok AMQP queue.declare-ok) instance.
@@ -179,9 +185,9 @@ module AMQP
 
       @channel.once_open do
         if block
-          self.declare(@opts[:passive], @opts[:durable], @opts[:exclusive], @opts[:auto_delete], @opts[:nowait], nil, &shim)
+          self.declare(@opts[:passive], @opts[:durable], @opts[:exclusive], @opts[:auto_delete], @opts[:nowait], @opts[:arguments], &shim)
         else
-          self.declare(@opts[:passive], @opts[:durable], @opts[:exclusive], @opts[:auto_delete], @opts[:nowait], nil)
+          self.declare(@opts[:passive], @opts[:durable], @opts[:exclusive], @opts[:auto_delete], @opts[:nowait], @opts[:arguments])
         end
       end
     end

data/lib/amqp/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module AMQP
-  VERSION = '0.8.0.rc1'
+  VERSION = '0.8.0.rc2'
 end

data/spec/integration/automatic_binding_for_default_direct_exchange_spec.rb

@@ -15,9 +15,12 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
   amqp_before do
     @channel   = AMQP::Channel.new
     @channel.should be_open
+    @channel.on_error do |*args|
+      puts "Channel-level error!"
+    end
 
-    @queue1    = @channel.queue("queue1")
-    @queue2    = @channel.queue("queue2")
+    @queue1    = @channel.queue("queue1", :auto_delete => true)
+    @queue2    = @channel.queue("queue2", :auto_delete => true)
 
     # Rely on default direct exchange binding, see section 2.1.2.4 Automatic Mode in AMQP 0.9.1 spec.
     @exchange = AMQP::Exchange.default(@channel)
@@ -55,7 +58,12 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
       @exchange.publish("some white noise", :routing_key => "killa key")
     end
 
-    done(0.2) {
+    delayed(0.3) {
+      # We never subscribe to it, hence, need to delete manually
+      @queue2.delete
+    }
+
+    done(0.5) {
       number_of_received_messages.should == expected_number_of_messages
     }
   end # it

data/spec/integration/basic_get_spec.rb

@@ -47,7 +47,7 @@ describe AMQP::Queue, "#pop" do
 
         @queue.pop do |payload|
           callback_has_fired = true
-
+          @queue.delete
           payload.should be_nil
         end
 
@@ -58,7 +58,7 @@ describe AMQP::Queue, "#pop" do
     end
   end
 
-  context "when THERE ARE messages in the queue" do  
+  context "when THERE ARE messages in the queue" do
     it "yields message payload to the callback" do
       number_of_received_messages = 0
       expected_number_of_messages = 300
@@ -71,7 +71,7 @@ describe AMQP::Queue, "#pop" do
         expected_number_of_messages.times do
           @queue.pop do |headers, payload|
             payload.should_not be_nil
-            number_of_received_messages += 1            
+            number_of_received_messages += 1
             headers.message_count.should == (expected_number_of_messages - number_of_received_messages)
 
             if RUBY_VERSION =~ /^1.9/
@@ -83,6 +83,10 @@ describe AMQP::Queue, "#pop" do
         end # do
       end
 
+      delayed(1.3) {
+        # Queue.Get doesn't qualify for subscription, hence, manual deletion is required
+        @queue.delete
+      }
       done(1.5) {
         number_of_received_messages.should == expected_number_of_messages
       }

data/spec/integration/queue_declaration_spec.rb

@@ -28,14 +28,12 @@ describe AMQP do
       it "declares a new queue with that name" do
         queue = @channel.queue(name)
         queue.name.should == name
-
         done
       end
 
       it "caches that queue" do
         queue = @channel.queue(name)
         @channel.queue(name).object_id.should == queue.object_id
-
         done
       end
     end # context
@@ -44,29 +42,68 @@ describe AMQP do
       it "uses server-assigned queue name" do
         @channel.queue("") do |queue, *args|
           queue.name.should_not be_empty
-          done
+          queue.delete
+          done(0.3)
         end
       end
     end # context
 
 
+    context "when queue is redeclared with different attributes" do
+      let(:name) { "amqp-gem.nondurable.queue" }
+      let(:options) { {:durable => false, :passive => false} }
+      let(:different_options) { {:durable => true, :passive => false} }
+      amqp_before do
+        @queue       = @channel.queue(name, options)
+        delayed(0.25) { @queue.delete }
+      end
+
+      context "on the same channel" do
+        it "should raise ruby exception" do
+          expect {
+            @other_queue = @channel.queue(name, different_options)
+          }.to raise_error(AMQP::IncompatibleOptionsError)
+          @queue.delete
+          done(0.2)
+        end
+      end
 
+      context "on different channels (or even in different processes)" do
+        amqp_before { @other_channel = AMQP::Channel.new }
+
+        it "should not raise ruby exception" do
+          expect {
+            @other_queue = @other_channel.queue(name, different_options)
+          }.to_not raise_error
+          done
+        end
+
+        it "should trigger channel-level #on_error callback" do
+          @other_channel.on_error {|*args| @callback_fired = true }
+          @other_queue = @other_channel.queue(name, different_options)
+          done(0.35) {
+            @callback_fired.should be_true
+            @other_channel.should be_closed
+          }
+        end
+      end
+    end
 
     context "when passive option is used" do
-      context "and exchange with given name already exists" do
+      context "and queue with given name already exists" do
         it "silently returns" do
           name = "a_new_queue declared at #{Time.now.to_i}"
 
-          original_exchange = @channel.queue(name)
-          exchange          = @channel.queue(name, :passive => true)
+          original_queue = @channel.queue(name)
+          queue          = @channel.queue(name, :passive => true)
 
-          exchange.should == original_exchange
+          queue.should == original_queue
 
           done
         end # it
       end
 
-      context "and exchange with given name DOES NOT exist" do
+      context "and queue with given name DOES NOT exist" do
         it "raises an exception" do
           pending "Not yet supported"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 0.8.0.rc1
+  version: 0.8.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-04-17 00:00:00.000000000 +04:00
+date: 2011-04-18 00:00:00.000000000
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2164608620 !ruby/object:Gem::Requirement
+  requirement: &2168550180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,18 +24,18 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2164608620
+  version_requirements: *2168550180
 - !ruby/object:Gem::Dependency
   name: amq-client
-  requirement: &2164608200 !ruby/object:Gem::Requirement
+  requirement: &2168549540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0.alpha2
   type: :runtime
   prerelease: false
-  version_requirements: *2164608200
+  version_requirements: *2168549540
 description: Asynchronous AMQP 0.9.1 client for Ruby. Built on top of Eventmachine.
 email:
 - michael@novemberain.com
@@ -44,24 +44,6 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.textile
-- doc/_index.html
-- doc/AMQP.html
-- doc/class_list.html
-- doc/EXAMPLE_01_PINGPONG
-- doc/EXAMPLE_02_CLOCK
-- doc/EXAMPLE_03_STOCKS
-- doc/EXAMPLE_04_MULTICLOCK
-- doc/EXAMPLE_05_ACK
-- doc/EXAMPLE_05_POP
-- doc/EXAMPLE_06_HASHTABLE
-- doc/file.README.html
-- doc/file.VendorSpecificExtensions.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/method_list.html
-- doc/MQ.html
-- doc/top-level-namespace.html
 files:
 - .gitignore
 - .rspec
@@ -77,19 +59,34 @@ files:
 - bin/irb
 - bin/jenkins.sh
 - bin/set_test_suite_realms_up.sh
-- doc/EXAMPLE_01_PINGPONG
-- doc/EXAMPLE_02_CLOCK
-- doc/EXAMPLE_03_STOCKS
-- doc/EXAMPLE_04_MULTICLOCK
-- doc/EXAMPLE_05_ACK
-- doc/EXAMPLE_05_POP
-- doc/EXAMPLE_06_HASHTABLE
+- docs/RabbitMQVersions.textile
 - docs/VendorSpecificExtensions.textile
+- examples/extensions/rabbitmq/per_queue_message_ttl.rb
 - examples/extensions/rabbitmq/publisher_confirmations_with_transient_messages.rb
 - examples/hello_world.rb
 - examples/real-world/task-queue/README.textile
 - examples/real-world/task-queue/consumer.rb
 - examples/real-world/task-queue/producer.rb
+- examples/tls_certificates/client/cert.pem
+- examples/tls_certificates/client/key.pem
+- examples/tls_certificates/client/keycert.p12
+- examples/tls_certificates/client/req.pem
+- examples/tls_certificates/server/cert.pem
+- examples/tls_certificates/server/key.pem
+- examples/tls_certificates/server/keycert.p12
+- examples/tls_certificates/server/req.pem
+- examples/tls_certificates/testca/cacert.cer
+- examples/tls_certificates/testca/cacert.pem
+- examples/tls_certificates/testca/certs/01.pem
+- examples/tls_certificates/testca/certs/02.pem
+- examples/tls_certificates/testca/index.txt
+- examples/tls_certificates/testca/index.txt.attr
+- examples/tls_certificates/testca/index.txt.attr.old
+- examples/tls_certificates/testca/index.txt.old
+- examples/tls_certificates/testca/openssl.cnf
+- examples/tls_certificates/testca/private/cakey.pem
+- examples/tls_certificates/testca/serial
+- examples/tls_certificates/testca/serial.old
 - examples/various/ack.rb
 - examples/various/automatic_binding_for_default_direct_exchange.rb
 - examples/various/basic_get.rb
@@ -146,42 +143,40 @@ files:
 - spec/unit/amqp/basic_spec.rb
 - spec/unit/amqp/connection_spec.rb
 - tasks.rb
-- doc/_index.html
-- doc/AMQP.html
-- doc/class_list.html
-- doc/file.README.html
-- doc/file.VendorSpecificExtensions.html
-- doc/file_list.html
-- doc/frames.html
-- doc/index.html
-- doc/method_list.html
-- doc/MQ.html
-- doc/top-level-namespace.html
 has_rdoc: true
 homepage: http://github.com/ruby-amqp/amqp
 licenses: []
-post_install_message: ! "[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel.new now accepts
-  (an optional) block and yields newly opened channel to it as soon as\n[\e[32mVersion
+post_install_message: ! "[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#initialize
+  now accepts :arguments option that takes a hash. Brokers\n[\e[32mVersion 0.8.0\e[0m]
+  [API] AMQP::Queue#initialize now accepts :arguments option that takes a hash. RabbitMQ\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\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) block that is
+  called as soon as message\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel.new now
+  accepts (an optional) block and yields newly opened channel to it as soon as\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 7 (that's right) 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\n[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel#recover
-  now takes (an optional) callback that is called when\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] [FEATURE] AMQP gem is now AMQP 0.9.1 compatible: it runs atop of amq-client
-  gem\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"
+  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\n[\e[32mVersion
+  0.8.0\e[0m] [API] AMQP::Channel#recover now takes (an optional) callback that is
+  called when\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] [FEATURE] AMQP gem is now
+  AMQP 0.9.1 compatible: it runs atop of amq-client gem\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:
 - --include=examples --main README.textile
 require_paths: