bunny 0.7.2 → 0.7.3

data/lib/bunny/client08.rb

@@ -51,8 +51,8 @@ Sets up a Bunny::Client object ready for connection to a broker/server. _Client_
     def initialize(connection_string_or_opts = Hash.new, opts = Hash.new)
       super
       @spec = '0-8'
-      @port = opts[:port] || (opts[:ssl] ? Qrack::Protocol::SSL_PORT : Qrack::Protocol::PORT)
-      @insist = opts[:insist]
+      @port = self.__opts__[:port] || (self.__opts__[:ssl] ? Qrack::Protocol::SSL_PORT : Qrack::Protocol::PORT)
+      @insist = self.__opts__[:insist]
     end
 
 =begin rdoc

data/lib/bunny/client09.rb

@@ -33,7 +33,7 @@ module Bunny
     def initialize(connection_string_or_opts = Hash.new, opts = Hash.new)
       super
       @spec = '0-9-1'
-      @port = opts[:port] || (opts[:ssl] ? Qrack::Protocol09::SSL_PORT : Qrack::Protocol09::PORT)
+      @port = self.__opts__[:port] || (self.__opts__[:ssl] ? Qrack::Protocol09::SSL_PORT : Qrack::Protocol09::PORT)
     end
 
     # Checks response from AMQP methods and takes appropriate action

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/lib/qrack/client.rb

@@ -16,6 +16,9 @@ module Qrack
     attr_reader   :status, :host, :vhost, :port, :logging, :spec, :heartbeat
     attr_accessor :channel, :logfile, :exchanges, :queues, :channels, :message_in, :message_out, :connecting
 
+    # Temporary hack to make Bunny 0.7 work with port number in AMQP URL.
+    # This is not necessary on Bunny 0.8 as it removes support of AMQP 0.8.
+    attr_reader :__opts__
 
     def initialize(connection_string_or_opts = Hash.new, opts = Hash.new)
       opts = case connection_string_or_opts
@@ -27,6 +30,11 @@ module Qrack
         Hash.new
       end.merge(opts)
 
+      # Temporary hack to make Bunny 0.7 work with port number in AMQP URL.
+      # This is not necessary on Bunny 0.8 as it removes support of AMQP 0.8.
+      @__opts__ = opts
+
+
       @host   = opts[:host] || 'localhost'
       @user   = opts[:user]  || 'guest'
       @pass   = opts[:pass]  || 'guest'

data/spec/spec_09/amqp_url_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+# Assumes that target message broker/server has a user called 'guest' with a password 'guest'
+# and that it is running on 'localhost'.
+
+# If this is not the case, please change the 'Bunny.new' call below to include
+# the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
+
+require "bunny"
+
+describe Bunny do
+  context "AMQP URL parsing" do
+    it "handles port properly" do
+      bunny = Bunny.new("amqp://dev.rabbitmq.com:1212")
+      bunny.port.should eql(1212)
+    end
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Chris Duncan
@@ -19,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 +04:00
+date: 2011-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -98,6 +93,7 @@ files:
 - spec/spec_08/connection_spec.rb
 - spec/spec_08/exchange_spec.rb
 - spec/spec_08/queue_spec.rb
+- spec/spec_09/amqp_url_spec.rb
 - spec/spec_09/bunny_spec.rb
 - spec/spec_09/connection_spec.rb
 - spec/spec_09/exchange_spec.rb
@@ -117,18 +113,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
@@ -142,6 +132,7 @@ test_files:
 - spec/spec_08/connection_spec.rb
 - spec/spec_08/exchange_spec.rb
 - spec/spec_08/queue_spec.rb
+- spec/spec_09/amqp_url_spec.rb
 - spec/spec_09/bunny_spec.rb
 - spec/spec_09/connection_spec.rb
 - spec/spec_09/exchange_spec.rb