bunny 0.7.13 → 0.8.0

data/.gitignore

@@ -4,9 +4,9 @@
 *.rbc
 *.gem
 /doc/
-/debug/
 .yardoc
 .rvmrc
 Gemfile.lock
 .rbx/*
-tmp/*
+.tags
+.tags_sorted_by_file

data/.travis.yml

@@ -1,20 +1,11 @@
-language: ruby
 bundler_args: --without development
-cache: bundler
-before_script: "./bin/ci/before_build"
 script: "bundle exec rspec spec"
-dist: trusty
 rvm:
-  - "2.4.1"
-  - "2.3.4"
-  - "2.2.7"
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  # - rbx-19mode
 notifications:
-  email:
-    - skaes@railsexpress.de
-services:
-  - rabbitmq
-branches:
-  only:
-    - 0.7.x-stable
-env:
-  - CI=true
+  email: false

data/CHANGELOG

@@ -1,26 +1,7 @@
-= Version 0.7.11
+= Version 0.8.0
 
- * support boolean values in message headers
+  * AMQP 0.8 client is removed. Bunny is an AMQP 0.9.1 client only now.
 
-= Version 0.7.10
-
- * handle messages larger than frame_max correctly
-
-= Version 0.7.9
-
- * parse a few more AMQ datatypes (related to federation plugin)
-
-= Version 0.7.8
-
- * test suite cleanup (eliminated some race conditions related to queue.message_count)
-
-= Version 0.7.7
-
- * avoid warnings caused by duplicating code from the amq-client gem
-
-= Version 0.7.6
-
- * API mismatch between Timer/SystemTimer on Ruby 1.9 vs Ruby 1.8 is resolved.
 
 = Version 0.7.3
 
@@ -37,3 +18,4 @@
 
 = Version 0.6.3
   * Encoding of source files is set to UTF-8 on Ruby 1.9.
+  * Queue#publish deprecated.

data/Gemfile

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-source 'https://rubygems.org'
+source :rubygems
 
 # Use local clones if possible.
 # If you want to use your local copy, just symlink it to vendor.
@@ -30,12 +30,10 @@ group :development do
   gem "RedCloth",  :platform => :mri
 
   gem "changelog"
-
-  gem "byebug"
 end
 
 group :test do
-  gem "rspec"
+  gem "rspec", "~> 2.6.0"
 end
 
 gemspec

data/README.textile

@@ -1,16 +1,31 @@
-h1. About
+h1. About bunny
 
-Bunny is a synchronous "AMQP":http://bit.ly/hw2ELX client. It supports Ruby 1.9.2, 1.8.7, Ruby Enterprise Edition and JRuby. Protocol-wise, Bunny supports AMQP 0.9.1 and 0.8. Support for AMQP 0.8 will be dropped in the next version of Bunny (0.7) because most of popular AMQP brokers such as RabbitMQ already stopped or planning to stop supporting it in the near future.
+Bunny is a synchronous "AMQP 0.8.0":http://bit.ly/amqp-model-explained client. It supports Ruby 1.9.2, 1.8.7, Ruby Enterprise Edition and JRuby. Protocol-wise, Bunny supports AMQP 0.9.1 and 0.8. Support for AMQP 0.8 will be dropped in the next version of Bunny (0.8) because most of popular AMQP brokers such as RabbitMQ have already stopped or are planning to stop supporting it in the near future.
 
-Bunny is based on a great deal of useful code from the "amqp Ruby gem":http://github.com/ruby-amqp/amqp and "Carrot":http://github.com/famoseagle/carrot.
+h2. Limited Functionality Disclaimer
+
+Bunny is very simplistic and does not support many features
 
 You can use Bunny to:
 
 * Create and delete exchanges
 * Create and delete queues
-* Publish and consume messages
+* Publish and synchronously consume (basic.get) messages
+
+But it does not support
+
+* Arrays, hashes or even symbols in message headers
+* Framing of large messages
+* Many AMQP operations
+* RabbitMQ extensions
+* AMQP 0.9.1-only brokers
+
+h2. Bunny is NOT actively maintained
+
+Bunny is also **not actively maintained**. Consider using Hot Bunnies (JRuby) or amqp gem instead.
 
-h1. Quick Start
+
+h2. Quick Start
 
 <pre>
 require "bunny"
@@ -23,8 +38,11 @@ b.start
 # declare a queue
 q = b.queue("test1")
 
-# publish a message to the queue
-q.publish("Hello everybody!")
+# declare default direct exchange which is bound to all queues
+e = b.exchange("")
+
+# publish a message to the exchange which then gets routed to the queue
+e.publish("Hello, everybody!", :key => 'test1')
 
 # get message from the queue
 msg = q.pop[:payload]
@@ -46,9 +64,13 @@ Bunny.run { |c| c.queue("my_testq") }
 
 Please see the @examples@ directory for additional usage information.
 
-h1. Links
+h2. AMQP Resources
+
+* "AMQP 0.9.1 model explained":http://bit.ly/amqp-model-explained - Introductory explanation of the AMQP v0.9.1 specification with particular reference to RabbitMQ
+
+h2. Links
 
 * "Source code":http://github.com/ruby-amqp/bunny
-* "@rubyamqp":http://twitter.com/rubyamqp at Twitter
+* "Follow @rubyamqp":http://twitter.com/rubyamqp on Twitter
 * "Ruby AMQP Google Group":http://groups.google.com/group/ruby-amqp
 * "Blog":http://bunnyamqp.wordpress.com

data/Rakefile

@@ -2,12 +2,12 @@
 
 require "bundler/gem_tasks"
 
-desc "Run rspec tests"
+desc "Run AMQP rspec tests"
 task :spec do
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new("spec") do |t|
-    t.pattern = "spec/spec_*/*_spec.rb"
-    t.rspec_opts = ['--color', '--format doc']
+    t.pattern = "spec/spec_09/*_spec.rb"
+    t.rspec_opts = ['--color']
   end
 end
 

data/bunny.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |s|
   s.name = "bunny"
   s.version = Bunny::VERSION.dup
   s.homepage = "http://github.com/ruby-amqp/bunny"
-  s.summary = "Synchronous Ruby AMQP 0.9.1 client"
+  s.summary = "Synchronous Ruby AMQP 0.8.0 client"
   s.description = "A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers."
-  s.license = "MIT"
 
   # Sorted alphabetically.
   s.authors = [
@@ -29,9 +28,10 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Files.
+  s.has_rdoc = true
   s.extra_rdoc_files = ["README.textile"]
   s.rdoc_options = ["--main", "README.rdoc"]
-  s.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^bin/ci/}) }
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
@@ -40,4 +40,7 @@ Gem::Specification.new do |s|
     s.post_install_message = CHANGELOG.new.version_changes
   rescue LoadError
   end
+
+  # RubyForge
+  s.rubyforge_project = "bunny-amqp"
 end

data/examples/{simple_08.rb → simple.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_08.rb
+# simple.rb
 
 # Assumes that target message broker/server has a user called 'guest' with a password 'guest'
 # and that it is running on 'localhost'.

data/examples/{simple_ack_08.rb → simple_ack.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_ack_08.rb
+# simple_ack.rb
 
 # Assumes that target message broker/server has a user called 'guest' with a password 'guest'
 # and that it is running on 'localhost'.

data/examples/{simple_consumer_08.rb → simple_consumer.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_consumer_08.rb
+# simple_consumer.rb
 
 # N.B. To be used in conjunction with simple_publisher.rb
 
@@ -15,11 +15,11 @@
 #
 # Open up two console windows start this program in one of them by typing -
 #
-# ruby simple_consumer_08.rb
+# ruby simple_consumer.rb
 #
 # Then switch to the other console window and type -
 #
-# ruby simple_publisher_08.rb
+# ruby simple_publisher.rb
 #
 # A message will be printed out by the simple_consumer and it will wait for the next message
 # until the timeout interval is reached.
@@ -48,7 +48,7 @@ q.bind(exch, :key => 'fred')
 
 # subscribe to queue
 q.subscribe(:consumer_tag => 'testtag1', :timeout => 30) do |msg|
-  puts "#{q.subscription.message_count}: #{msg[:payload]}"
+  puts "#{q.default_consumer.message_count}: #{msg[:payload]}"
 end
 
 # Close client

data/examples/{simple_fanout_08.rb → simple_fanout.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_fanout_08.rb
+# simple_fanout.rb
 
 # Assumes that target message broker/server has a user called 'guest' with a password 'guest'
 # and that it is running on 'localhost'.

data/examples/{simple_headers_08.rb → simple_headers.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_headers_08.rb
+# simple_headers.rb
 
 # Assumes that target message broker/server has a user called 'guest' with a password 'guest'
 # and that it is running on 'localhost'.
@@ -12,7 +12,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'bunny'
 
-b = Bunny.new
+b = Bunny.new(:logging => true)
 
 # start a communication session with the amqp server
 b.start

data/examples/{simple_publisher_09.rb → simple_publisher.rb}

@@ -14,7 +14,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'bunny'
 
-b = Bunny.new(:logging => true, :spec => '09')
+b = Bunny.new(:logging => true)
 
 # start a communication session with the amqp server
 b.start

data/examples/{simple_topic_09.rb → simple_topic.rb}

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# simple_topic_09.rb
+# simple_topic.rb
 
 # Assumes that target message broker/server has a user called 'guest' with a password 'guest'
 # and that it is running on 'localhost'.
@@ -12,7 +12,7 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'bunny'
 
-b = Bunny.new(:spec => '09')
+b = Bunny.new(:logging => true)
 
 # start a communication session with the amqp server
 b.start

data/ext/amqp-0.9.1.json

@@ -4,6 +4,7 @@
     "minor-version": 9,
     "revision": 1,
     "port": 5672,
+    "ssl_port": 5671,
     "copyright": [
         "Copyright (C) 2008-2009 LShift Ltd, Cohesive Financial Technologies LLC,\n",
         "and Rabbit Technologies Ltd\n",

data/ext/config.yml

@@ -1,4 +1,4 @@
 ---
-:spec_out: '../lib/qrack/protocol/spec08.rb'
-:frame_out: '../lib/qrack/transport/frame08.rb'
-:spec_in: 'amqp-0.8.json'
+:spec_out: '../lib/qrack/protocol/spec.rb'
+:frame_out: '../lib/qrack/transport/frame.rb'
+:spec_in: 'amqp-0.9.1.json'

data/ext/qparser.rb

@@ -5,17 +5,14 @@ require 'erb'
 require 'pathname'
 require 'yaml'
 
-def spec_v8_0_0?(spec)
-  spec['major'] == '8' && spec['minor'] == '0' && spec['revision'] == '0'
-end
-
 def spec_details(spec)
   meta = {}
 
   meta['major']     = spec['major-version']
   meta['minor']     = spec['minor-version']
-  meta['revision']  = spec['revision'] || '0'
+  meta['revision']  = spec['revision']
   meta['port']      = spec['port']
+  meta['ssl_port']  = spec['ssl_port']
   meta['comment']   = "AMQ Protocol version #{meta['major']}.#{meta['minor']}.#{meta['revision']}"
 
   meta
@@ -41,9 +38,7 @@ end
 
 def domain_types(spec, major, minor, revision)
   # AMQP domain types
-
-  # add types that may be missing in the spec version
-  dt_arr = add_types(spec)
+  dt_arr = []
   spec["domains"].each do |domain|
     # JSON spec gives domain types as two element arrays like ["channel-id", "longstr"]
     dt_arr << domain.last
@@ -63,12 +58,8 @@ def classes(spec, major, minor, revision)
     cls_hash[:fields] = fields(amqp_class) # are these amqp_class["properties"] ?
     # Get methods for class
     meth_arr          = class_methods(amqp_class)
-    # Add missing methods
-    add_arr =[]
-    add_arr = add_methods(spec) if cls_hash[:name] == 'queue'
-    method_arr = meth_arr + add_arr
     # Add array to class hash
-    cls_hash[:methods] = method_arr
+    cls_hash[:methods] = meth_arr
     cls_hash
   end
 end
@@ -102,41 +93,6 @@ def fields(element)
   end
 end
 
-def add_types(spec)
-  spec_v8_0_0?(spec) ? ['long', 'longstr', 'octet', 'timestamp'] : []
-end
-
-def add_methods(spec)
-  meth_arr = []
-
-  if spec_v8_0_0?(spec)
-    # Add Queue Unbind method
-    meth_hash = {:name => 'unbind',
-                 :index => '50',
-                 :fields => [{:name => 'ticket', :domain => 'short'},
-                             {:name => 'queue', :domain => 'shortstr'},
-                             {:name => 'exchange', :domain => 'shortstr'},
-                             {:name => 'routing_key', :domain => 'shortstr'},
-                             {:name => 'arguments', :domain => 'table'}
-                            ]
-                }
-
-    meth_arr << meth_hash
-
-    # Add Queue Unbind-ok method
-    meth_hash = {:name => 'unbind-ok',
-                 :index => '51',
-                 :fields => []
-                }
-
-    meth_arr << meth_hash
-  end
-
-  # Return methods
-  meth_arr
-
-end
-
 def convert_type(name)
   type_arr = @type_conversion.select {|k,v| k == name}.flatten
 end
@@ -219,7 +175,7 @@ spec_rb.puts(
 ERB.new(%q[
   # encoding: utf-8
   
-  
+
   #:stopdoc:
   # this file was autogenerated on <%= Time.now.to_s %>
   # using <%= specfile.ljust(16) %> (mtime: <%= File.mtime(specpath) %>)
@@ -233,6 +189,7 @@ ERB.new(%q[
       VERSION_MINOR = <%= spec_info['minor'] %>
       REVISION      = <%= spec_info['revision'] %>
       PORT          = <%= spec_info['port'] %>
+      SSL_PORT      = <%= spec_info['ssl_port'] %>
 
       RESPONSES = {
         <%- other_constants.each do |value, name| -%>
@@ -369,7 +326,7 @@ frame_rb.puts(
 ERB.new(%q[
   # encoding: utf-8
   
-
+  
   #:stopdoc:
   # this file was autogenerated on <%= Time.now.to_s %>
   #
@@ -418,10 +375,10 @@ ERB.new(%q[
           end
         end
 
-        def self.parse buf
+        def self.parse(buf, cancellator = nil)
           buf = Transport::Buffer.new(buf) unless buf.is_a? Transport::Buffer
           buf.extract do
-            id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
+            id, channel, payload, footer = buf.read(cancellator, :octet, :short, :longstr, :octet)
             Qrack::Transport.const_get(@types[id]).new(payload, channel) if footer == FOOTER
           end
         end