amqp 0.7.5 → 0.8.0.beta1

data/spec/unit/amqp/connection_spec.rb

@@ -14,15 +14,19 @@ describe AMQP, 'class object' do
   #
 
   its(:settings) do
+    # TODO: rewrite using key should eql value,
+    # it's not very wise to check frame_max etc.
     should == {
-      :host    => "127.0.0.1",
-      :port    => 5672,
-      :user    => "guest",
-      :pass    => "guest",
-      :vhost   => "/",
-      :timeout => nil,
-      :logging => false,
-      :ssl     => false
+      :host      => "127.0.0.1",
+      :port      => 5672,
+      :user      => "guest",
+      :pass      => "guest",
+      :vhost     => "/",
+      :timeout   => nil,
+      :logging   => false,
+      :ssl       => false,
+      :broker    => nil,
+      :frame_max => 131072
     }
   end
 
@@ -65,8 +69,6 @@ describe AMQP, 'class object' do
           @block_fired = true
 
           AMQP.connection.should be_connected
-          AMQP.channel.should_not be_nil
-          AMQP.channel.connection.should == AMQP.connection
         end
         done(0.1) { @block_fired.should be_true }
       end
@@ -79,7 +81,10 @@ describe AMQP, 'class object' do
   describe '.stop' do
     context "when connection is not established" do
       it 'is a no-op' do
-        expect { @res = AMQP.stop }.to_not raise_error
+        AMQP.stop
+        AMQP.stop
+
+        @res = AMQP.stop
         @res.should be_nil
       end # it
     end # context
@@ -91,26 +96,25 @@ describe AMQP, 'class object' do
       #
       #
 
-      include EventedSpec::AMQPSpec
-      after           { AMQP.cleanup_state; done }
+      include EventedSpec::EMSpec
       default_options AMQP_OPTS
-
       #
       # Examples
       #
 
       it 'properly closes AMQP broker connection and fires a callback. Mind the delay!' do
-        AMQP.start(AMQP_OPTS)
-        AMQP.connection.should be_connected
+        AMQP.start(AMQP_OPTS) do
+          AMQP.connection.should be_connected
 
-        @block_has_fired = false
+          @block_has_fired = false
 
-        AMQP.stop do
-          @block_has_fired = true
-        end
-        AMQP.connection.should_not be_nil
-        done(0.1) do
-          @block_has_fired.should be_true
+          AMQP.stop do
+            @block_has_fired = true
+          end
+          AMQP.connection.should_not be_nil
+          done(0.1) do
+            @block_has_fired.should be_true
+          end
         end
       end # it
     end # context

data/tasks.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env 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,49 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amqp
-version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 5
-  version: 0.7.5
+version: !ruby/object:Gem::Version
+  version: 0.8.0.beta1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Aman Gupta
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
 autorequire: 
 bindir: bin
-cert_chain: []
-
-date: 2011-08-31 00:00:00 +04:00
+cert_chain: 
+date: 2011-04-17 00:00:00.000000000 +04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
+  requirement: &2168991900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2168991900
+- !ruby/object:Gem::Dependency
+  name: amq-client
+  requirement: &2168991480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2168991480
 description: Asynchronous AMQP 0.9.1 client for Ruby. Built on top of Eventmachine.
-email: 
+email:
 - michael@novemberain.com
 - stastny@101ideas.cz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.md
+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
@@ -51,20 +54,28 @@ extra_rdoc_files:
 - doc/EXAMPLE_05_ACK
 - doc/EXAMPLE_05_POP
 - doc/EXAMPLE_06_HASHTABLE
-files: 
+- 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
 - .travis.yml
+- .yardopts
 - CHANGELOG
 - CONTRIBUTORS
 - Gemfile
-- README.md
+- README.textile
 - Rakefile
-- TODO
 - amqp.gemspec
-- amqp.pre.gemspec
 - bin/cleanify.rb
 - bin/irb
+- bin/jenkins.sh
 - bin/set_test_suite_realms_up.sh
 - doc/EXAMPLE_01_PINGPONG
 - doc/EXAMPLE_02_CLOCK
@@ -73,106 +84,124 @@ files:
 - doc/EXAMPLE_05_ACK
 - doc/EXAMPLE_05_POP
 - doc/EXAMPLE_06_HASHTABLE
-- examples/ack.rb
-- examples/automatic_binding_for_default_direct_exchange.rb
-- examples/callbacks.rb
-- examples/clock.rb
-- examples/default_channel.rb
-- examples/hashtable.rb
-- examples/immediately_bind_a_server_named_queue.rb
-- examples/internal.rb
-- examples/issues/issue_75.rb
-- examples/issues/issue_94.rb
-- examples/logger.rb
-- examples/multiclock.rb
-- examples/pingpong.rb
-- examples/pop.rb
-- examples/primes-simple.rb
-- examples/primes.rb
-- examples/simple.rb
-- examples/stocks.rb
-- gemfiles/eventmachine-pre
+- docs/VendorSpecificExtensions.textile
+- 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/various/ack.rb
+- examples/various/automatic_binding_for_default_direct_exchange.rb
+- examples/various/basic_get.rb
+- examples/various/callbacks.rb
+- examples/various/clock.rb
+- examples/various/declare_a_queue_without_assignment.rb
+- examples/various/declare_an_exchange_without_assignment.rb
+- examples/various/hashtable.rb
+- examples/various/logger.rb
+- examples/various/multiclock.rb
+- examples/various/open_channel_without_assignment.rb
+- examples/various/pingpong.rb
+- examples/various/primes-simple.rb
+- examples/various/primes.rb
+- examples/various/pubsub.rb
+- examples/various/queue_status.rb
+- examples/various/stocks.rb
+- examples/various/weather_updates.rb
 - lib/amqp.rb
 - lib/amqp/basic_client.rb
-- lib/amqp/buffer.rb
 - lib/amqp/channel.rb
 - lib/amqp/client.rb
-- lib/amqp/collection.rb
 - lib/amqp/connection.rb
+- lib/amqp/deprecated/fork.rb
+- lib/amqp/deprecated/logger.rb
+- lib/amqp/deprecated/mq.rb
+- lib/amqp/deprecated/rpc.rb
 - lib/amqp/exceptions.rb
 - lib/amqp/exchange.rb
 - lib/amqp/ext/em.rb
 - lib/amqp/ext/emfork.rb
-- lib/amqp/frame.rb
+- lib/amqp/extensions/rabbitmq.rb
 - lib/amqp/header.rb
 - lib/amqp/logger.rb
-- lib/amqp/protocol.rb
 - lib/amqp/queue.rb
 - lib/amqp/rpc.rb
-- lib/amqp/server.rb
-- lib/amqp/spec.rb
 - lib/amqp/version.rb
 - lib/mq.rb
-- protocol/amqp-0.8.json
-- protocol/amqp-0.8.xml
-- protocol/codegen.rb
-- protocol/doc.txt
-- research/api.rb
-- research/primes-forked.rb
-- research/primes-processes.rb
-- research/primes-threaded.rb
+- lib/mq/logger.rb
+- lib/mq/rpc.rb
 - spec/integration/authentication_spec.rb
 - spec/integration/automatic_binding_for_default_direct_exchange_spec.rb
+- spec/integration/basic_get_spec.rb
 - spec/integration/channel_close_spec.rb
 - spec/integration/exchange_declaration_spec.rb
+- spec/integration/extensions/basic_return_spec.rb
 - spec/integration/queue_declaration_spec.rb
 - spec/integration/queue_exclusivity_spec.rb
-- spec/integration/queue_status_spec.rb
 - spec/integration/reply_queue_communication_spec.rb
 - spec/integration/store_and_forward_spec.rb
 - spec/integration/topic_subscription_spec.rb
 - spec/integration/workload_distribution_spec.rb
 - spec/spec_helper.rb
 - spec/unit/amqp/basic_spec.rb
-- spec/unit/amqp/buffer_spec.rb
-- spec/unit/amqp/client_spec.rb
-- spec/unit/amqp/collection_spec.rb
 - spec/unit/amqp/connection_spec.rb
-- spec/unit/amqp/frame_spec.rb
-- spec/unit/amqp/protocol_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: 
-rdoc_options: 
-- --include=examples --main README.md
-require_paths: 
+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
+  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"
+rdoc_options:
+- --include=examples --main README.textile
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: amqp
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine.
 test_files: []
-

data/README.md

@@ -1,156 +0,0 @@
-What AMQP gem is
-===================
-
-Simple asynchronous AMQP driver for Ruby/EventMachine
-This library works with Ruby 1.8, Ruby 1.9, JRuby and Rubinius, and is licensed under [the Ruby License](http://www.ruby-lang.org/en/LICENSE.txt).
-
-This library was tested primarily with RabbitMQ, although it should be compatible with any
-server implementing the [AMQP 0-8 spec](http://www.amqp.org/confluence/download/attachments/720900/amqp0-8.pdf).
-
-Getting started
-===============
-
-To use examples with RabbitMQ, first [install the broker](http://www.rabbitmq.com/install.html). If you have Mercurial
-and Erlang/OTP installed, here is how to do it in 4 lines:
-
-    hg clone http://hg.rabbitmq.com/rabbitmq-codegen
-    hg clone http://hg.rabbitmq.com/rabbitmq-server
-    cd rabbitmq-server
-    make run
-
-Then have a look at the various bundled examples:
-
-    ruby examples/mq/pingpong.rb   # 1-1 communication using amq.direct
-    ruby examples/mq/clock.rb      # 1-N communication using amq.fanout
-    ruby examples/mq/stocks.rb     # 1-subscriber communication using amq.topic
-
-    ruby examples/mq/multiclock.rb # header based routing (new rabbitmq feature)
-    ruby examples/mq/ack.rb        # using ack
-    ruby examples/mq/pop.rb        # pop off messages one at a time
-
-    ruby examples/mq/hashtable.rb  # simple async rpc layer
-    ruby examples/mq/primes.rb 4   # parallelized prime number generation
-    ruby examples/mq/logger.rb     # simple logging api
-
-For high level API documentation see MQ class.
-For more details into the lower level AMQP client API, run the simple client example:
-
-    ruby examples/amqp/simple.rb   # low-level AMQP api
-    ruby examples/mq/internal.rb   # low-level Queue/Exchange api
-
-Or refer to protocol/doc.txt, which enumerates packets sent between a server and client
-during a typical session, in both binary and decoded formats.
-
-How to use AMQP gem with Ruby on Rails, Merb, Sinatra and other web frameworks
-==============================================================================
-
-To use AMQP gem from web applications, you would need to have EventMachine reactor running.
-If you use [Thin](http://code.macournoyer.com/thin/), you are all set: Thin uses EventMachine under
-the hood.
-
-With other web servers, you need to start EventMachine reactor in it's own thread like this:
-
-    Thread.new { EM.run }
-
-because otherwise EventMachine will block current thread. Then connect to AMQP broker:
-
-    AMQP.connect(:host => "localhost", :user => "guest", :pass => "guest", :vhost => "/")
-
-In a Ruby on Rails app, probably the best place for this code is initializer
-(like config/initializers/amqp.rb). For Merb apps, it is config/init.rb. For
-Sinatra and pure Rack applications, place it next to other configuration
-code.
-
-If you want to integrate AMQP with Thin or another EventMachine-based software which already runs an event loop, you might want to use following code:
-
-    EM.next_tick { AMQP.connect(...) }
-
-So in case the reactor isn't running yet (which seems to be the case with Ruby on Rails 3.x and Thin combination), it won't fail, but wait when the reactor is started (see [issue #21](https://github.com/tmm1/amqp/issues/21)).
-
-Same separate thread technique can be used to make EventMachine play nicely with other
-libraries that would block current thread (like [File::Tail](http://rubygems.org/gems/file-tail)).
-
-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
-============================
-
-All the dependencies are specified in <code>Gemfile</code>, so if you have [Bundler](http://gembundler.com), you can just run <code>bundle install</code>.
-
-The <code>lib/amqp/spec.rb</code> file is generated automatically based on the [AMQP specification](http://www.amqp.org/confluence/display/AMQP/AMQP+Specification). To generate it:
-
-    rake codegen
-
-For running specs, use <code>rake spec</code>.
-
-Credits and more information
-============================
-
-* The Original Code is tmm1/amqp.
-* The Initial Developer of the Original Code is Aman Gupta.
-* Copyright (c) 2008 - 2010 [Aman Gupta](http://github.com/tmm1) (tmm1).
-* Contributions from Jakub Stastny are Copyright (c) 2011 VMware, Inc.
-
-Current maintainer: [Jakub Stastny](http://github.com/botanicus) aka [botanicus](http://twitter.com/botanicus).
-
-This project was inspired by [py-amqplib](http://barryp.org/software/py-amqplib/), [rabbitmq](http://rabbitmq.com), [qpid](http://qpid.apache.org/) and [rubbyt](http://github.com/rubbyt/rubbyt).
-Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
-
-AMQP brokers
-------------
-
- * [RabbitMQ](http://rabbitmq.com) (Rabbit Technologies, Erlang/OTP, MPL)
- * [OpenAMQ](http://openamq.org) (iMatix, C, GPL2)
- * [ActiveMQ](http://activemq.apache.org) (Apache Foundation, Java, Apache2)
-
-AMQP resources
---------------
-
- * Steve Vinoski [explains AMQP](http://steve.vinoski.net/pdf/IEEE-Advanced_Message_Queuing_Protocol.pdf) in his column, Towards Integration
-
- * John O'Hara on [the history of AMQP](http://www.acmqueue.org/modules.php?name=Content&pa=showpage&pid=485)
-
- * Dmitriy's [presentation on RabbitMQ/AMQP](http://somic-org.homelinux.org/blog/2008/07/31/slides-for-my-amqprabbitmq-talk/)
-
- * ZeroMQ's [analysis of the messaging technology market](http://www.zeromq.org/whitepapers:market-analysis)
-
- * Pieter Hintjens's [background to AMQP](http://www.openamq.org/doc:amqp-background)
-
- * Barry Pederson's [py-amqplib](http://barryp.org/software/py-amqplib/)
-
- * Ben Hood on [writing an AMQP client](http://hopper.squarespace.com/blog/2008/6/21/build-your-own-amqp-client.html)
-
- * Dmitriy Samovskiy introduces [Ruby + QPid + RabbitMQ](http://somic-org.homelinux.org/blog/2008/06/24/ruby-amqp-rabbitmq-example/)
-
- * Ben Hood's [as3-amqp](http://github.com/0x6e6562/as3-amqp) ([two](http://hopper.squarespace.com/blog/2008/7/4/server-side-as3.html), [three](http://hopper.squarespace.com/blog/2008/3/24/as3-amqp-client-first-cut.html))
-
- * RabbitMQ's [AMQP protocol code generator](http://hg.rabbitmq.com/rabbitmq-codegen/)
-
- * Erlang Exchange [presentation on the implementation of RabbitMQ](http://skillsmatter.com/podcast/erlang/presenting-rabbitmq-an-erlang-based-implementatio-nof-amqp) (and on the [LShift blog](http://www.lshift.net/blog/2008/07/01/slides-from-our-erlang-exchange-talk))
-
- * Jonathan Conway's series on RabbitMQ and using it with Ruby and Merb: [One](http://jaikoo.com/2007/9/4/didn-t-you-get-the-memo), [Two](http://jaikoo.com/2008/2/29/friday-round-up-2008-02-29), [Three](http://jaikoo.com/2008/3/14/oh-hai-rabbitmq), [Four](http://jaikoo.com/2008/3/20/daemonize-rabbitmq)
-
- * Open Enterprise's series on messaging middleware and AMQP: [Part 1](http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-1.html), [Part 2](http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-2.html), [Part 3](http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-3.html)
-
-Messaging and distributed systems resources
--------------------------------------------
-
- * [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)
-
- * [Metaprotocol Taxonomy and Communications Patterns](http://hessian.caucho.com/doc/metaprotocol-taxonomy.xtp)
-
- * Joe Armstrong on [Erlang messaging vs RPC](http://armstrongonsoftware.blogspot.com/2008/05/road-we-didnt-go-down.html)
-
- * [SEDA: scalable internet services using message queues](http://www.eecs.harvard.edu/~mdw/papers/seda-sosp01.pdf)