amqp 0.6.7 → 0.7.0.pre

data/.gitignore

@@ -0,0 +1,6 @@
+*.gem
+*.rbc
+~*
+#*
+.rvmrc
+.bundle

data/CHANGELOG

@@ -0,0 +1,5 @@
+= 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].
+  * [FEATURE] From majek's fork, with some fixes. Example: AMQP.start("amqps://")
+  * [DEVELOP] some em-spec-based specs, bin/irb, Gemfile.

data/Gemfile

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+source "http://gemcutter.org"
+
+gem "eventmachine"
+gem "json"
+
+group(:test) do
+  gem "em-spec"
+  gem "bacon"
+end

data/Gemfile.lock

@@ -0,0 +1,16 @@
+GEM
+  remote: http://gemcutter.org/
+  specs:
+    bacon (1.1.0)
+    em-spec (0.2.1)
+    eventmachine (0.12.10)
+    json (1.4.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bacon
+  em-spec
+  eventmachine
+  json

data/README.md

@@ -0,0 +1,145 @@
+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 set: Thin uses EventMachine under
+the hook.
+
+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.
+
+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)).
+
+AMQP gem mailing list
+==============================
+
+* [AMQP gem mailing list](http://groups.google.com/group/ruby-amqp)
+* [AMQP gem at GitHub](http://github.com/tmm1/amqp)
+* [AMQP gem at Gemcutter](http://rubygems.org/gems/amqp)
+
+Running specifications suite
+============================
+
+To run the test suite make sure you have [bacon](http://gemcutter.org/gems/bacon) gem installed and run:
+
+    rake spec
+
+The lib/amqp/spec.rb file is generated automatically based on the [AMQP specification](http://www.amqp.org/confluence/display/AMQP/AMQP+Specification). To generate it:
+
+    rake codegen
+
+Credits and more information
+============================
+
+(c) 2008—2010 [Aman Gupta](http://github.com/tmm1) (tmm1)
+
+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)
+ * [ZeroMQ](http://www.zeromq.org) (iMatix/FastMQ/Intel, C++, GPL3)
+ * [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)

data/Rakefile

@@ -1,15 +1,20 @@
+desc "Generate AMQP specification classes"
 task :codegen do
   sh 'ruby protocol/codegen.rb > lib/amqp/spec.rb'
   sh 'ruby lib/amqp/spec.rb'
 end
 
+desc "Run spec suite (uses bacon gem)"
 task :spec do
   sh 'bacon lib/amqp.rb'
 end
 
+desc "Build the gem"
 task :gem do
   sh 'gem build *.gemspec'
 end
 
+desc "Synonym for gem"
 task :pkg => :gem
+desc "Synonym for gem"
 task :package => :gem

data/amqp.gemspec

@@ -1,87 +1,39 @@
-require File.expand_path('../lib/amqp/version', __FILE__)
+#!/usr/bin/env gem build
+# encoding: utf-8
 
-spec = Gem::Specification.new do |s|
-  s.name = 'amqp'
+require "base64"
+require File.expand_path("../lib/amqp/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name = "amqp"
   s.version = AMQP::VERSION
-  s.date = '2009-12-29'
-  s.summary = 'AMQP client implementation in Ruby/EventMachine'
-  s.email = "amqp@tmm1.net"
-  s.homepage = "http://amqp.rubyforge.org/"
-  s.rubyforge_project = 'amqp'
-  s.description = "An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker"
+  s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus"]
+  s.homepage = "http://github.com/tmm1/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")
+
+  # files
+  s.files = `git ls-files`.split("\n")
+  s.require_paths = ["lib"]
+
+  # RDoc
   s.has_rdoc = true
   s.rdoc_options = '--include=examples'
+  s.extra_rdoc_files = ["README.md"] + Dir.glob("doc/*")
 
-  # ruby -rpp -e' pp `git ls-files`.split("\n").grep(/^(doc|README)/) '
-  s.extra_rdoc_files = [
-    "README",
-    "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"
-  ]
+  # Dependencies
+  s.add_dependency "eventmachine", ">= 0.12.4"
 
-  s.authors = ["Aman Gupta"]
-  s.add_dependency('eventmachine', '>= 0.12.4')
+  begin
+    require "changelog"
+  rescue LoadError
+    warn "You have to have changelog gem installed for post install message"
+  else
+    s.post_install_message = CHANGELOG.new.version_changes
+  end
 
-  # ruby -rpp -e' pp `git ls-files`.split("\n") '
-  s.files = [
-    "README",
-    "Rakefile",
-    "amqp.gemspec",
-    "amqp.todo",
-    "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",
-    "examples/amqp/simple.rb",
-    "examples/mq/ack.rb",
-    "examples/mq/clock.rb",
-    "examples/mq/pop.rb",
-    "examples/mq/hashtable.rb",
-    "examples/mq/internal.rb",
-    "examples/mq/logger.rb",
-    "examples/mq/multiclock.rb",
-    "examples/mq/pingpong.rb",
-    "examples/mq/primes-simple.rb",
-    "examples/mq/primes.rb",
-    "examples/mq/stocks.rb",
-    "lib/amqp.rb",
-    "lib/amqp/version.rb",
-    "lib/amqp/buffer.rb",
-    "lib/amqp/client.rb",
-    "lib/amqp/frame.rb",
-    "lib/amqp/protocol.rb",
-    "lib/amqp/server.rb",
-    "lib/amqp/spec.rb",
-    "lib/ext/blankslate.rb",
-    "lib/ext/em.rb",
-    "lib/ext/emfork.rb",
-    "lib/mq.rb",
-    "lib/mq/exchange.rb",
-    "lib/mq/header.rb",
-    "lib/mq/logger.rb",
-    "lib/mq/queue.rb",
-    "lib/mq/rpc.rb",
-    "old/README",
-    "old/Rakefile",
-    "old/amqp-0.8.json",
-    "old/amqp_spec.rb",
-    "old/amqpc.rb",
-    "old/codegen.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"
-  ]
+  # RubyForge
+  s.rubyforge_project = "amqp"
 end

data/amqp.pre.gemspec

@@ -0,0 +1,6 @@
+#!/usr/bin/env gem build
+# encoding: utf-8
+
+eval(File.read("amqp.gemspec")).tap do |specification|
+  specification.version = "#{specification.version}.pre"
+end

data/bin/irb

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

data/examples/mq/callbacks.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+
+$:.unshift File.expand_path("../../../lib", __FILE__)
+require "mq"
+
+AMQP.start(:host => "localhost") do
+  @counter = 0
+  amq = MQ.new
+
+  3.times do
+    amq.queue("") do |queue|
+      puts "Queue #{queue.name} declared."
+      puts "All queues: #{amq.queues.map(&:name).inspect}", ""
+
+      @counter += 1
+    end
+  end
+
+  EM.add_periodic_timer(0.1) do
+    EM.stop if @counter == 3
+  end
+end
+
+__END__
+Queue amq.gen-qeaCcyVCG50S6QC4U/zNoA== declared.
+All queues: [nil, nil, "amq.gen-qeaCcyVCG50S6QC4U/zNoA=="]
+
+Queue amq.gen-AinMI7PBa2n1fFRIaGEAog== declared.
+All queues: [nil, "amq.gen-AinMI7PBa2n1fFRIaGEAog==", "amq.gen-qeaCcyVCG50S6QC4U/zNoA=="]
+
+Queue amq.gen-ROdJW1LZJVJulUIh8KZqkw== declared.
+All queues: ["amq.gen-ROdJW1LZJVJulUIh8KZqkw==", "amq.gen-AinMI7PBa2n1fFRIaGEAog==", "amq.gen-qeaCcyVCG50S6QC4U/zNoA=="]

data/examples/mq/clock.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__) + '/../../lib'
 require 'mq'
 
-AMQP.start(:host => 'localhost') do
+AMQP.start(:host => 'localhost', port: 5673) do
 
   def log *args
     p args
@@ -10,6 +10,8 @@ AMQP.start(:host => 'localhost') do
   # AMQP.logging = true
 
   clock = MQ.new.fanout('clock')
+  clock2 = MQ.new.fanout('clock2')
+
   EM.add_periodic_timer(1){
     puts
 
@@ -17,17 +19,24 @@ AMQP.start(:host => 'localhost') do
     clock.publish(Marshal.dump(time))
   }
 
+  EM.add_periodic_timer(1){
+    puts
+
+    log 2, :publishing, time = Time.now
+    clock.publish(Marshal.dump(time))
+  }
+
   amq = MQ.new
-  amq.queue('every second').bind(amq.fanout('clock')).subscribe{ |time|
+  q = amq.queue('every second')
+  q.bind(amq.fanout('clock')).subscribe{ |time|
     log 'every second', :received, Marshal.load(time)
   }
 
-  amq = MQ.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
+  amq.queue!('every second').bind(amq.fanout('clock2')).subscribe{ |time|
+    log 2, 'every second', :received, Marshal.load(time)
   }
 
+
 end
 
 __END__

data/lib/amqp/buffer.rb

@@ -32,7 +32,7 @@ module AMQP
     end
     
     def length
-      @data.length
+      @data.bytesize
     end
     
     def empty?
@@ -155,13 +155,13 @@ module AMQP
         _write([upper, lower], 'NN')
       when :shortstr
         data = (data || '').to_s
-        _write([data.length, data], 'Ca*')
+        _write([data.bytesize, data], 'Ca*')
       when :longstr
         if data.is_a? Hash
           write(:table, data)
         else
           data = (data || '').to_s
-          _write([data.length, data], 'Na*')
+          _write([data.bytesize, data], 'Na*')
         end
       when :timestamp
         write(:longlong, data.to_i)
@@ -180,7 +180,7 @@ module AMQP
                           when Float
                             table.write(:octet, 68) # 'D'
                             # XXX there's gotta be a better way to do this..
-                            exp = value.to_s.split('.').last.length
+                            exp = value.to_s.split('.').last.bytesize
                             num = value * 10**exp
                             table.write(:octet, exp)
                             table.write(:long, num)
@@ -264,7 +264,7 @@ module AMQP
     def _write data, pack = nil
       data = [*data].pack(pack) if pack
       @data[@pos,0] = data
-      @pos += data.length
+      @pos += data.bytesize
     end
   end
 end