amqp 0.7.0.pre → 0.7.0

data/.gitignore

@@ -2,5 +2,9 @@
 *.rbc
 ~*
 #*
+*~
 .rvmrc
 .bundle
+Gemfile.lock
+
+spec/amqp.yml

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format nested

data/CHANGELOG

@@ -1,5 +1,11 @@
 = 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.
+  * [FEATURE] AMQP URL from majek's fork, with some fixes. Example: AMQP.start("amqps://")
+  * [DEVELOP] Added some em-spec-based specs, bin/irb, Gemfile.
+  * [FEATURE] Added MQ::Exchange.default for the default exchange.
+  * [FEATURE] Raise an exception if we're trying to use Basic.Reject with RabbitMQ.
+  * [FEATURE] Fail if an entity is re-declared with different options.
+  * [BUG] Don't reconnect if the credentials are wrong.
+  * [BUG] Fixed an exception which occurred when Queue#bind was called synchronously with a callback.
+  * [DEVELOPMENT] Added a lot of specs (Bacon replaced by rSpec 2).

data/CONTRIBUTORS

@@ -0,0 +1,22 @@
+Aman Gupta: 232
+Jakub Šťastný aka Botanicus: 57
+arvicco: 26
+Michael S. Klishin: 17
+Chuck Remes: 7
+Marek Majkowski: 4
+Chris Van Pelt: 3
+Jake Douglas: 3
+Doug Barth: 2
+coderrr: 2
+binary42: 1
+Daniel Neighman: 1
+Brendan Ribera: 1
+dan: 1
+Dane Jensen: 1
+Tony Garnock-Jones: 1
+Phil Smith: 1
+Kasper Bjørn Nielsen: 1
+Simon Horne: 1
+Cliff Moon: 1
+Coda Hale: 1
+John Richmond: 1

data/Gemfile

@@ -3,9 +3,9 @@
 source "http://gemcutter.org"
 
 gem "eventmachine"
-gem "json"
+gem "json" if RUBY_VERSION < "1.9"
 
 group(:test) do
-  gem "em-spec"
-  gem "bacon"
+  gem "rspec", ">=2.0.0"
+  gem "amqp-spec", ">=0.3.7"
 end

data/README.md

@@ -45,8 +45,8 @@ 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.
+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:
 
@@ -61,31 +61,41 @@ In a Ruby on Rails app, probably the best place for this code is initializer
 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)).
 
-AMQP gem mailing list
+Links
 ==============================
 
+* 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/tmm1/amqp)
+* [AMQP gem at GitHub](http://github.com/amqp-dev/amqp)
 * [AMQP gem at Gemcutter](http://rubygems.org/gems/amqp)
 
-Running specifications suite
+Contributions
 ============================
 
-To run the test suite make sure you have [bacon](http://gemcutter.org/gems/bacon) gem installed and run:
+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>.
 
-    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:
+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
 ============================
 
-(c) 2008—2010 [Aman Gupta](http://github.com/tmm1) (tmm1)
+* 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).
 
@@ -96,7 +106,6 @@ 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)
 

data/Rakefile

@@ -1,14 +1,20 @@
+require 'rspec/core/rake_task'
+
+desc "Run spec suite (uses Rspec2)"
+RSpec::Core::RakeTask.new(:spec) { |t|}
+
+desc "Run specs with RCov"
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
 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'
@@ -17,4 +23,22 @@ end
 desc "Synonym for gem"
 task :pkg => :gem
 desc "Synonym for gem"
-task :package => :gem
+task :package => :gem
+
+
+desc "Regenerate contributors file."
+task :contributors do
+  authors = %x{git log | grep ^Author:}.split("\n")
+  results = authors.reduce(Hash.new) do |results, line|
+    name = line.sub(/^Author: (.+) <.+>$/, '\1')
+    results[name] ||= 0
+    results[name] += 1
+    results
+  end
+  results = results.sort_by { |_, count| count }.reverse
+  File.open("CONTRIBUTORS", "w") do |file|
+    results.each do |name, count|
+      file.puts "#{name}: #{count}"
+    end
+  end
+end

data/amqp.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.name = "amqp"
   s.version = AMQP::VERSION
   s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus"]
-  s.homepage = "http://github.com/tmm1/amqp"
+  s.homepage = "http://github.com/ruby-amqp/amqp"
   s.summary = "AMQP client implementation in Ruby/EventMachine."
   s.description = "An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker."
   s.cert_chain = nil

data/bin/cleanify.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby -i
+# encoding: utf-8
+
+# Usage:
+# find . | egrep '\.rb$' | egrep -v cleanify.rb | xargs ./bin/cleanify.rb
+
+# \n at the end of the file
+# def foo a, b, &block
+# no trailing whitespace
+# encoding declaration
+
+ENCODING = "utf-8"
+
+while line = ARGF.gets
+  # whitespace
+  # line.chomp!
+  line.gsub!(/\t/, "  ")
+  line.rstrip!
+
+  # encoding
+  if line.length == (ARGF.pos - 1) && ! line.match(/^#.*coding/)
+    puts "# encoding: #{ENCODING}\n\n"
+  end
+
+  # def
+  regexp = /^(\s*def \w[\w\d]*)\s+(.+)$/
+  if line.match(regexp)
+    line.gsub!(regexp, '\1(\2)')
+  end
+
+  # foo{} => foo {}
+  line.gsub!(/([^%][^#( ])(\{)/, '\1 \2')
+
+  # a=foo => a = foo
+  line.gsub!(/([^ ])(\+=)/, '\1 \2')
+  line.gsub!(/(\+=)([^ ])/, '\1 \2')
+  line.gsub!(/([^ :])(<<)/, '\1 \2')
+  line.gsub!(/(<<)([^ ])/, '\1 \2')
+
+  # foo=>bar
+  line.gsub!(/([^\s])=>/, '\1 =>')
+  line.gsub!(/=>([^\s])/, '=> \1')
+
+  line.gsub!(/\{\|/, '{ |')
+
+  line.gsub!(/,\s*/, ', ')
+  line.rstrip!
+
+  puts line
+end

data/examples/amqp/simple.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 $:.unshift File.dirname(__FILE__) + '/../../lib'
 require 'amqp'
 
 module SimpleClient
-  def process_frame frame
+  def process_frame(frame)
     case frame
     when Frame::Body
       EM.stop_event_loop
@@ -12,7 +14,7 @@ module SimpleClient
       when Protocol::Connection::Start
         send Protocol::Connection::StartOk.new({:platform => 'Ruby/EventMachine',
                                                 :product => 'AMQP',
-                                                :information => 'http://github.com/tmm1/amqp',
+                                                :information => 'http://github.com/ruby-amqp/amqp',
                                                 :version => '0.1.0'},
                                                'AMQPLAIN',
                                                {:LOGIN => 'guest',
@@ -72,8 +74,8 @@ module SimpleClient
   end
 end
 
-EM.run{
+EM.run {
   AMQP.logging = true
   AMQP.client = SimpleClient
   AMQP.start
-}
+}

data/examples/mq/ack.rb

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

data/examples/mq/automatic_binding_for_default_direct_exchange.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+
+require 'mq'
+
+if RUBY_VERSION == "1.8.7"
+  module ArrayExtensions
+    def sample
+      self.choice
+    end # sample
+  end
+
+  class Array
+    include ArrayExtensions
+  end
+end
+
+
+
+EM.run do
+  connection = AMQP.connect
+  mq         = MQ.new(connection)
+
+  show_stopper = Proc.new do
+    $stdout.puts "Stopping..."
+    # now change this to just EM.stop and it
+    # unbinds instantly
+    connection.close {
+      EM.stop { exit }
+    }
+  end
+
+  Signal.trap "INT", &show_stopper
+
+  $stdout.puts "Bound! Running #{AMQP::VERSION} version of the gem."
+
+  queue1    = mq.queue("queue1")
+  queue2    = mq.queue("queue2")
+  queue3    = mq.queue("queue3")
+
+  queues    = [queue1, queue2, queue3]
+
+  # Rely on default direct exchange binding, see section 2.1.2.4 Automatic Mode in AMQP 0.9.1 spec.
+  exchange = MQ::Exchange.default
+
+  queue1.subscribe do |payload|
+    puts "Got #{payload} for #{queue1.name}"
+  end
+
+  queue2.subscribe do |payload|
+    puts "New message to queue #{queue2.name}"
+  end
+
+  queue3.subscribe do |payload|
+    puts "There is a message for #{queue3.name}"
+  end
+
+  EM.add_periodic_timer(1) do
+    q = queues.sample
+
+    $stdout.puts "Publishing to default exchange with routing key = #{q.name}..."
+    exchange.publish "Some payload", :routing_key => q.name
+  end
+end

data/examples/mq/callbacks.rb

@@ -3,7 +3,15 @@
 $:.unshift File.expand_path("../../../lib", __FILE__)
 require "mq"
 
-AMQP.start(:host => "localhost") do
+AMQP.start(:host => "localhost") do |connection|
+
+  # Send Connection.Close on Ctrl+C
+  trap(:INT) do
+    unless connection.closing?
+      connection.close { exit! }
+    end
+  end
+
   @counter = 0
   amq = MQ.new
 

data/examples/mq/clock.rb

@@ -1,42 +1,42 @@
+# encoding: utf-8
+
 $:.unshift File.dirname(__FILE__) + '/../../lib'
 require 'mq'
 
-AMQP.start(:host => 'localhost', port: 5673) do
+AMQP.start(:host => 'localhost') do |connection|
+
+  # Send Connection.Close on Ctrl+C
+  trap(:INT) do
+    unless connection.closing?
+      connection.close { exit! }
+    end
+  end
 
-  def log *args
+  def log(*args)
     p args
   end
 
   # AMQP.logging = true
 
   clock = MQ.new.fanout('clock')
-  clock2 = MQ.new.fanout('clock2')
-
-  EM.add_periodic_timer(1){
+  EM.add_periodic_timer(1) {
     puts
 
     log :publishing, time = Time.now
     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
-  q = amq.queue('every second')
-  q.bind(amq.fanout('clock')).subscribe{ |time|
+  amq.queue('every second').bind(amq.fanout('clock')).subscribe { |time|
     log 'every second', :received, Marshal.load(time)
   }
 
-  amq.queue!('every second').bind(amq.fanout('clock2')).subscribe{ |time|
-    log 2, '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
   }
 
-
 end
 
 __END__