amqp 0.8.0.rc12 → 0.8.0.rc13

data/spec/integration/topic_subscription_spec.rb

@@ -67,7 +67,7 @@ describe "Topic-based subscription" do
         @exchange.publish(626 + rand(1000)/400.0, :key => "nasdaq.goog")
       end # do
 
-      done(0.2) {
+      done(0.4) {
         received_messages.should == expected_messages
         @aapl_queue.unsubscribe
         @amzn_queue.unsubscribe

data/spec/unit/amqp/client_spec.rb

@@ -53,33 +53,6 @@ describe AMQP::Client do
     end
 
 
-    context "when URI ends in two consecutive slashes (//)" do
-      it "parses vhost as /" do
-        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com//")
-
-        val[:host].should == "dev.rabbitmq.com"
-        val[:port].should == 5672
-        val[:scheme].should == "amqp"
-        val[:ssl].should be_false
-        val[:vhost].should == "/"
-      end
-    end
-
-
-    context "when URI ends in //vault" do
-      it "parses vhost as /vault" do
-        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com//vault")
-
-        val[:host].should == "dev.rabbitmq.com"
-        val[:port].should == 5672
-        val[:scheme].should == "amqp"
-        val[:ssl].should be_false
-        val[:vhost].should == "/vault"
-      end
-    end
-
-
-
     context "when URI ends in /%2Fvault" do
       it "parses vhost as /vault" do
         val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/%2Fvault")
@@ -93,41 +66,21 @@ describe AMQP::Client do
     end
 
 
-    context "when URI is amqp://dev.rabbitmq.com/i.am.a.vhost.without.slashes" do
-      it "parses vhost as i.am.a.vhost.without.slashes" do
-        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/i.am.a.vhost.without.slashes")
-
-        val[:host].should == "dev.rabbitmq.com"
-        val[:port].should == 5672
-        val[:scheme].should == "amqp"
-        val[:ssl].should be_false
-        val[:vhost].should == "i.am.a.vhost.without.slashes"
-      end
-    end
-
-
-    context "when URI is amqp://dev.rabbitmq.com/production" do
-      it "parses vhost as production" do
-        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/production")
+    context "when URI is amqp://dev.rabbitmq.com/a.path.without.slashes" do
+      it "parses vhost as a.path.without.slashes" do
+        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com/a.path.without.slashes")
 
         val[:host].should == "dev.rabbitmq.com"
         val[:port].should == 5672
         val[:scheme].should == "amqp"
         val[:ssl].should be_false
-        val[:vhost].should == "production"
+        val[:vhost].should == "a.path.without.slashes"
       end
     end
 
-
-    context "when URI is amqp://dev.rabbitmq.com///a/b/c/d" do
-      it "parses vhost as ///a/b/c/d" do
-        val = described_class.parse_connection_uri("amqp://dev.rabbitmq.com///a/b/c/d")
-
-        val[:host].should == "dev.rabbitmq.com"
-        val[:port].should == 5672
-        val[:scheme].should == "amqp"
-        val[:ssl].should be_false
-        val[:vhost].should == "//a/b/c/d"
+    context "when URI is amqp://dev.rabbitmq.com/a/path/with/slashes" do
+      it "raises an ArgumentError" do
+        lambda { described_class.parse_connection_uri("amqp://dev.rabbitmq.com/a/path/with/slashes") }.should raise_error(ArgumentError)
       end
     end
 

data/tasks.rb

@@ -1,11 +1,4 @@
-#!/usr/bin/env nake
+#!/usr/bin/env bundle exec nake
 # encoding: utf-8
 
-if RUBY_VERSION =~ /^1.9/
-  Encoding.default_internal = Encoding::UTF_8
-  Encoding.default_external = Encoding::UTF_8
-end
-
-
-require "contributors"
 load "contributors.nake"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 15424141
+  hash: 15424143
   prerelease: 6
   segments: 
   - 0
   - 8
   - 0
   - rc
-  - 12
-  version: 0.8.0.rc12
+  - 13
+  version: 0.8.0.rc13
 platform: ruby
 authors: 
 - Aman Gupta
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-06-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -43,17 +43,35 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -3702664418
+        hash: -3702664344
         segments: 
         - 0
         - 7
         - 0
         - alpha
-        - 25
-        version: 0.7.0.alpha25
+        - 34
+        version: 0.7.0.alpha34
   type: :runtime
   version_requirements: *id002
-description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included
+- !ruby/object:Gem::Dependency 
+  name: amq-protocol
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: -3702664416
+        segments: 
+        - 0
+        - 7
+        - 0
+        - alpha
+        - 6
+        version: 0.7.0.alpha6
+  type: :runtime
+  version_requirements: *id003
+description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included.
 email: 
 - michael@novemberain.com
 - stastny@101ideas.cz
@@ -62,7 +80,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
+- README.md
 - docs/08Migration.textile
 - docs/Bindings.textile
 - docs/Clustering.textile
@@ -76,6 +94,8 @@ extra_rdoc_files:
 - docs/Queues.textile
 - docs/RabbitMQVersions.textile
 - docs/Routing.textile
+- docs/RunningTests.textile
+- docs/Troubleshooting.textile
 - docs/VendorSpecificExtensions.textile
 files: 
 - .gitignore
@@ -85,7 +105,7 @@ files:
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
-- README.textile
+- README.md
 - Rakefile
 - amqp.gemspec
 - bin/cleanify.rb
@@ -104,6 +124,8 @@ files:
 - docs/Queues.textile
 - docs/RabbitMQVersions.textile
 - docs/Routing.textile
+- docs/RunningTests.textile
+- docs/Troubleshooting.textile
 - docs/VendorSpecificExtensions.textile
 - examples/channels/open_channel_with_one_arity_callback.rb
 - examples/channels/open_channel_without_assignment.rb
@@ -114,6 +136,7 @@ files:
 - examples/deprecated/default_thread_local_channel_instance.rb
 - examples/error_handling/channel_level_exception.rb
 - examples/error_handling/channel_level_exception_with_multiple_channels_involved.rb
+- examples/error_handling/connection_level_exception.rb
 - examples/error_handling/connection_loss_handler.rb
 - examples/error_handling/global_channel_level_exception_handler.rb
 - examples/error_handling/handling_authentication_failure_with_a_callback.rb
@@ -121,24 +144,37 @@ files:
 - examples/error_handling/handling_vhost_misconfiguration_with_a_rescue_block.rb
 - examples/error_handling/tcp_connection_failure_handling_with_a_rescue_block.rb
 - examples/error_handling/tcp_connection_failure_with_a_callback.rb
+- examples/exchanges/autodeletion_of_exchanges.rb
 - examples/exchanges/declare_an_exchange_without_assignment.rb
 - examples/extensions/rabbitmq/per_queue_message_ttl.rb
 - examples/extensions/rabbitmq/publisher_confirmations_with_transient_messages.rb
 - examples/guides/getting_started/01_hello_world.rb
 - examples/guides/getting_started/02_hello_world_dslified.rb
-- examples/guides/getting_started/03_babblr.rb
+- examples/guides/getting_started/03_blabbr.rb
 - examples/guides/getting_started/04_weathr.rb
-- examples/guides/queues/05_binding_a_queue_using_exchange_instance.rb
-- examples/guides/queues/06_biding_a_queue_using_exchange_name_string.rb
-- examples/guides/queues/07_subscribing_to_receive_messages.rb
-- examples/guides/queues/08_poll_for_messages.rb
-- examples/guides/queues/09_unsubscribing_a_consumer.rb
-- examples/guides/queues/10_unbinding_from_exchange.rb
-- examples/guides/queues/11_purge_a_queue.rb
-- examples/guides/queues/12_deleting_a_queue.rb
+- examples/guides/queues/01a_declaring_a_server_named_queue_using_queue_constructor.rb
+- examples/guides/queues/01b_declaring_a_queue_using_queue_constructor.rb
+- examples/guides/queues/02a_declaring_a_durable_shared_queue.rb
+- examples/guides/queues/02b_declaring_a_durable_shared_queue.rb
+- examples/guides/queues/03a_declaring_a_temporary_exclusive_queue.rb
+- examples/guides/queues/03b_declaring_a_temporary_exclusive_queue.rb
+- examples/guides/queues/04_bind_a_queue_using_exchange_instance.rb
+- examples/guides/queues/05_bind_a_queue_using_exchange_name.rb
+- examples/guides/queues/06_subscribe_to_receive_messages.rb
+- examples/guides/queues/07_fetch_a_message_from_the_queue.rb
+- examples/guides/queues/08_unsubscribing_a_consumer.rb
+- examples/guides/queues/09_unbinding_from_exchange.rb
+- examples/guides/queues/10_purge_a_queue.rb
+- examples/guides/queues/11_deleting_a_queue.rb
 - examples/hello_world.rb
+- examples/hello_world_with_an_empty_string.rb
 - examples/hello_world_with_eventmachine_in_a_separate_thread.rb
 - examples/hello_world_with_large_payload.rb
+- examples/issues/amq_client_issue_7.rb
+- examples/issues/amq_protocol_issue_14.rb
+- examples/issues/issue_75.rb
+- examples/issues/issue_79.rb
+- examples/issues/issue_80.rb
 - examples/legacy/ack.rb
 - examples/legacy/callbacks.rb
 - examples/legacy/clock.rb
@@ -149,18 +185,23 @@ files:
 - examples/legacy/primes-simple.rb
 - examples/legacy/primes.rb
 - examples/legacy/stocks.rb
-- examples/publishing/publishing_and_immediately_stopping_event_loop.rb
+- examples/publishing/publishing_a_one_off_message.rb
+- examples/publishing/publishing_callback.rb
 - examples/publishing/returned_messages.rb
 - examples/publishing/simplistic_scatter_gather.rb
+- examples/queues/accessing_message_metadata.rb
 - examples/queues/automatic_binding_for_default_direct_exchange.rb
 - examples/queues/basic_get.rb
 - examples/queues/declare_a_queue_without_assignment.rb
 - examples/queues/declare_and_bind_a_server_named_queue.rb
 - examples/queues/queue_status.rb
+- examples/queues/rejecting_messages_without_requeueuing.rb
+- examples/queues/using_explicit_acknowledgements.rb
 - examples/rack/publish_a_message_on_request/thin.ru
 - examples/real-world/task-queue/README.textile
 - examples/real-world/task-queue/consumer.rb
 - examples/real-world/task-queue/producer.rb
+- examples/routing/headers_routing.rb
 - examples/routing/pubsub.rb
 - examples/routing/weather_updates.rb
 - examples/tls_certificates/client/cert.pem
@@ -269,7 +310,7 @@ post_install_message: "[\e[32mVersion 0.8.0\e[0m] [API] Connection URI (string)
   [\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
+- --include=examples --main README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -295,9 +336,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amqp
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: AMQP client implementation in Ruby/EventMachine.
+summary: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included
 test_files: []
 

data/README.textile

@@ -1,229 +0,0 @@
-h1. About amqp gem "!http://travis-ci.org/ruby-amqp/amqp.png!":http://travis-ci.org/ruby-amqp/amqp
-
-amqp gem is a widely used, feature-rich, well-maintained asynchronous AMQP 0.9.1 client with batteries included.
-This library works with Ruby 1.8.7 (p174 and p334), Ruby 1.9.2, JRuby, REE and Rubinius, and is
-licensed under the "Ruby License":http://www.ruby-lang.org/en/LICENSE.txt.
-Versions 0.8.0 and later of amqp gem implement "AMQP 0.9.1":http://bit.ly/hw2ELX.
-
-
-h2. I know what AMQP is, how do I get started?
-
-See "Getting started with amqp gem" and "Documentation: tutorials, guides & API reference" sections below.
-
-
-h2. What is AMQP?
-
-AMQP is an "open standard for messaging middleware":http://www.amqp.org/confluence/display/AMQP/About+AMQP that
-emphasizes interoperability between different technologies (for example, Java, .NET,
-Ruby, Python, C and so on).
-
-Key features of AMQP are very flexible yet simple routing and binary protocol
-efficiency.
-
-
-h2. What is amqp gem good for?
-
-One can use amqp gem to make Ruby applications interoperate with other
-applications (both Ruby and not). Complexity and size may vary from
-simple work queues to complex multi-stage data processing workflows that involve
-dozens or hundreds of applications built with all kinds of technologies.
-
-Specific examples:
-
- * A Web application may route messages to a Java app that works
-   with SMS delivery gateways.
-
- * Periodically run (Cron-driven) application may notify other systems that
-   there are some new results.
-
- * Content aggregators may update full-text search and geospatial search indexes
-         by delegating actual indexing work to other applications over AMQP.
-
- * Companies may provide "Firehose-like" push APIs to their customers, partners
-   or just general public.
-
- * A new shiny Ruby-based system may be integrated with an existing C++-based component
-   using AMQP.
-
- * An application that watches updates from a real-time stream (be it markets data
-   or Twitter stream) can propagate updates to interested parties, including
-         Web applications that display that information in the real time.
-
-
-
-h2(Getting_started_with_amqp_gem). Getting started with amqp gem
-
-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. Learn more in {file:docs/RabbitMQVersions.textile RabbitMQ versions} section.
-
-
-h3. Install the gem
-
-<pre>gem install amqp</pre>
-
-
-h3. "Hello, World" example
-
-<pre><code>
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require "rubygems"
-# or
-#
-# require "bundler"
-# Bundler.setup
-#
-# if you use Bundler
-
-require 'amqp'
-
-EventMachine.run do
-  connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
-
-  channel  = AMQP::Channel.new(connection)
-  queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)
-  exchange = channel.direct("")
-
-  queue.subscribe do |payload|
-    puts "Received a message: #{payload}. Disconnecting..."
-
-    connection.close {
-      EM.stop { exit }
-    }
-  end
-
-  exchange.publish "Hello, world!", :routing_key => queue.name
-end
-</code></pre>
-
-(see "as a Gist":https://gist.github.com/910211)
-
-"Getting started guide":http://rdoc.info/github/ruby-amqp/amqp/master/file/docs/GettingStarted.textile explains this and two more examples in detail,
-and is written in a form of a tutorial.
-
-
-
-h2. Documentation: tutorials, guides & API reference
-
-We believe that in order to be the best Ruby AMQP client out there, we need to care about documentation as much as
-code readability, API beauty and autotomated testing across 5 Ruby implementations on 3 operating systems.
-
-
-h3. Tutorials
-
-We have written and maintain "Getting started guide":http://rdoc.info/github/ruby-amqp/amqp/master/file/docs/GettingStarted.textile that is written in form of a tutorial.
-Check it out! If something isn't clear, every guide explains how to contact documentation authors.
-
-
-h3. 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.
-Note that those examples are written against version 0.8.0.rc1 and later. 0.6.x and 0.7.x
-may not support certain AMQP protocol or "DSL syntax" features.
-
-
-h3. Guides
-
-"Documentation guides":http://rdoc.info/github/ruby-amqp/amqp/master/file/docs/DocumentationGuidesIndex.textile describe
-the library itself as well as AMQP usage scenarios, routing, error handing & recovery, broker-specific extensions, TLS support  and so on.
-
-
-h3. API reference
-
-"Reference documentation":http://rdoc.info/github/ruby-amqp/amqp/master/frames is up on rdoc.info and is updated daily.
-
-*If you don't find your answer in documentation, we consider it a high severity bug* that you should "file to us":http://github.com/ruby-amqp/amqp/issues.
-
-
-h2. How to use AMQP gem with Ruby on Rails, Merb, Sinatra and other web frameworks
-
-We cover this subject for multiple Ruby application servers in "Connecting to the broker guide":http://bit.ly/kFCVQU, take a look and let us know
-what wasn't clear.
-
-
-h2. How does amqp gem relate to amq-client gem, amq-protocol and libraries like bunny?
-
-See "this page about AMQP gems family":https://github.com/ruby-amqp/amq-client/blob/master/README.textile
-
-
-h2. How can I learn more?
-
-h3. AMQP resources
-
- * "RabbitMQ tutorials":http://www.rabbitmq.com/getstarted.html that demonstrate interoperability
- * "Wikipedia page on AMQP":http://en.wikipedia.org/wiki/Advanced_Message_Queuing_Protocol
- * "AMQP quick reference":http://www.rabbitmq.com/amqp-0-9-1-quickref.html
- * John O'Hara on the "history of AMQP":http://www.acmqueue.org/modules.php?name=Content&pa=showpage&pid=485
-
-h3. Messaging and distributed systems resources
-
- * "Enterprise Integration Patterns":http://www.eaipatterns.com/, a book about messaging and use of messaging in systems integration.
-
- * "A Critique of the Remote Procedure Call Paradigm":http://www.cs.vu.nl/~ast/publications/euteco-1988.pdf
- * "A Note on Distributed Computing":http://research.sun.com/techrep/1994/smli_tr-94-29.pdf
- * "Convenience Over Correctness":http://steve.vinoski.net/pdf/IEEE-Convenience_Over_Correctness.pdf
- * Joe Armstrong on "Erlang messaging vs RPC":http://armstrongonsoftware.blogspot.com/2008/05/road-we-didnt-go-down.html
-
-
-h2. Community
-
- * "Ruby AMQP mailing list":http://groups.google.com/group/ruby-amqp
- * "RabbitMQ mailing list":https://lists.rabbitmq.com/cgi-bin/mailman/listinfo/rabbitmq-discuss (AMQP community epicenter).
- * "Jabber room for contributors":xmpp://amqp-dev@conf.netlab.cz
-
-
-h2. License
-
-AMQP gem is licensed under the "Ruby License":http://www.ruby-lang.org/en/LICENSE.txt.
-
-
-
-h2. Credits and copyright information
-
-* The Original Code is "tmm1/amqp":http://github.com/tmm1/amqp.
-* The Initial Developer of the Original Code is Aman Gupta.
-* Copyright (c) 2008 - 2010 "Aman Gupta":http://github.com/tmm1.
-* Contributions from "Jakub Stastny":http://github.com/botanicus are Copyright (c) 2011 VMware, Inc.
-* Copyright (c) 2010 — 2011 "ruby-amqp":https://github.com/ruby-amqp group members.
-
-Currently maintained by "ruby-amqp":https://github.com/ruby-amqp group members
-Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
-
-
-
-h2. FAQ
-
-h3. So, does amqp gem only work with RabbitMQ?
-
-This library was tested primarily with "RabbitMQ":http://rabbitmq.com, although it should be compatible with any
-server implementing the "AMQP 0.9.1 spec":http://bit.ly/hw2ELX. For AMQP 0.8.0 brokers,
-use version 0.7.
-
-h3. Why isn't Ruby 1.8.7.-p249 supported?
-
-Because there is absolutely no way we can both make code like the following (pseudo-synchronous) work
-
-<pre>
-<code>
-conn = AMQP.connect
-ch   = AMQP::Channel.new(conn)
-
-ex   = ch.default_exchange
-ex.publish(some_data)
-</code>
-</pre>
-
-and not be affected by this "Ruby 1.8.7-p249-specific bug (super called outside of method)":http://bit.ly/iONBmH
-
-h2. Links
-
-* "API reference":http://rdoc.info/github/ruby-amqp/amqp/master/frames
-* "Examples":https://github.com/ruby-amqp/amq-protocol/tree/master/examples/
-* "Issue tracker":http://github.com/ruby-amqp/amqp/issues
-* "Continous integration server":http://travis-ci.org/#!/ruby-amqp/amqp