celldee-bunny 0.0.4 → 0.0.5

data/examples/simple.rb

@@ -1,3 +1,11 @@
+# simple.rb
+
+# 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')
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'bunny'
@@ -15,16 +23,13 @@ end
 # declare a queue
 q = b.queue('test1')
 
-# create a direct exchange
-exch = b.exchange(:direct, 'test_ex')
-
-# bind the queue to the exchange
-q.bind(exch)
-
-# publish a message to the exchange
-exch.publish('Hello everybody!')
+# publish a message to the queue
+q.publish('Hello everybody!')
 
 # get message from the queue
 msg = q.pop
 
-puts 'This is the message: ' + msg + "\n\n"
+puts 'This is the message: ' + msg + "\n\n"
+
+# close the client connection
+b.stop

data/lib/amqp/client.rb

@@ -59,13 +59,13 @@ module AMQP
       send_frame(
         Protocol::Channel::Close.new(:reply_code => 200, :reply_text => 'bye', :method_id => 0, :class_id => 0)
       )
-      puts "Error closing channel #{channel}" unless next_method.is_a?(Protocol::Channel::CloseOk)
+      raise ProtocolError, "Error closing channel #{channel}" unless next_method.is_a?(Protocol::Channel::CloseOk)
 
       self.channel = 0
       send_frame(
         Protocol::Connection::Close.new(:reply_code => 200, :reply_text => 'Goodbye', :class_id => 0, :method_id => 0)
       )
-      puts "Error closing connection" unless next_method.is_a?(Protocol::Connection::CloseOk)
+      raise ProtocolError, "Error closing connection" unless next_method.is_a?(Protocol::Connection::CloseOk)
 
       close_socket
     end
@@ -82,7 +82,7 @@ module AMQP
       @channel = 0
       write(HEADER)
       write([1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4'))
-      raise ProtocolError, 'bad start connection' unless next_method.is_a?(Protocol::Connection::Start)
+      raise ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Protocol::Connection::Start)
 
       send_frame(
         Protocol::Connection::StartOk.new(
@@ -92,8 +92,11 @@ module AMQP
           'en_US'
         )
       )
+			
+			method = next_method
+			raise ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
 
-      if next_method.is_a?(Protocol::Connection::Tune)
+      if method.is_a?(Protocol::Connection::Tune)
         send_frame(
           Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
         )
@@ -114,6 +117,9 @@ module AMQP
       method = next_method
       raise ProtocolError, 'Access denied' unless method.is_a?(Protocol::Access::RequestOk)
       self.ticket = method.ticket
+
+			# return status
+			status
     end
 
   private

data/lib/bunny/queue.rb

@@ -35,11 +35,7 @@
 	    msg    = client.next_payload
 	    raise 'unexpected length' if msg.length < header.size
 
-			if hdr
-				{:header => header, :payload => msg}
-			else
-	    	msg
-			end
+			hdr ? {:header => header, :payload => msg} : msg
 			
 	  end
 

data/spec/bunny_spec.rb

@@ -1,5 +1,11 @@
 # bunny_spec.rb
 
+# 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 File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 
 describe Bunny do

data/spec/exchange_spec.rb

@@ -1,5 +1,11 @@
 # exchange_spec.rb
 
+# 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 File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 
 describe Exchange do
@@ -13,7 +19,7 @@ describe Exchange do
 		@b.stop
 	end
 	
-	it "should be able to be created as a direct exchange" do
+	it "should be able to be instantiated as a direct exchange" do
 		exch = @b.exchange(:direct, 'direct_exchange')
 		exch.should be_an_instance_of Exchange
 		exch.name.should == 'direct_exchange'
@@ -21,7 +27,7 @@ describe Exchange do
 		@b.exchanges.has_key?('direct_exchange').should be true
 	end
 	
-	it "should be able to be created as a topic exchange" do
+	it "should be able to be instantiated as a topic exchange" do
 		exch = @b.exchange(:topic, 'topic_exchange')
 		exch.should be_an_instance_of Exchange
 		exch.name.should == 'topic_exchange'
@@ -29,7 +35,7 @@ describe Exchange do
 		@b.exchanges.has_key?('topic_exchange').should be true
 	end
 	
-	it "should be able to be created as a fanout exchange" do
+	it "should be able to be instantiated as a fanout exchange" do
 		exch = @b.exchange(:fanout, 'fanout_exchange')
 		exch.should be_an_instance_of Exchange
 		exch.name.should == 'fanout_exchange'

data/spec/queue_spec.rb

@@ -1,5 +1,11 @@
 # queue_spec.rb
 
+# 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 File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 
 describe Bunny do
@@ -18,11 +24,21 @@ describe Bunny do
 		q.publish('This is a test message')
 		q.message_count.should == 1
 	end
+	
+	it "should be able to pop a message complete with header" do
+		q = @b.queue('test1')
+		msg = q.pop(:header => true)
+		msg.should be_an_instance_of Hash
+		msg[:header].should be_an_instance_of AMQP::Protocol::Header
+		msg[:payload].should == 'This is a test message'
+		q.message_count.should == 0
+	end
 
-	it "should be able to pop a message" do
+	it "should be able to pop a message and just get the payload" do
 		q = @b.queue('test1')
+		q.publish('This is another test message')
 		msg = q.pop
-		msg.should == 'This is a test message'
+		msg.should == 'This is another test message'
 		q.message_count.should == 0
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celldee-bunny
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,6 @@ files:
 - lib/bunny/exchange.rb
 - lib/amqp/frame.rb
 - lib/bunny/header.rb
-- lib/bunny/logger.rb
 - lib/amqp/protocol.rb
 - lib/bunny/queue.rb
 - lib/amqp/client.rb

data/lib/bunny/logger.rb

@@ -1,89 +0,0 @@
-class MQ
-  class Logger
-    def initialize *args, &block
-      opts = args.pop if args.last.is_a? Hash
-      opts ||= {}
-
-      printer(block) if block
-
-      @prop = opts
-      @tags = ([:timestamp] + args).uniq
-    end
-
-    attr_reader :prop
-    alias :base :prop
-
-    def log severity, *args
-      opts = args.pop if args.last.is_a? Hash and args.size != 1
-      opts ||= {}
-      opts = @prop.clone.update(opts)
-
-      data = args.shift
-
-      data = {:type => :exception,
-              :name => data.class.to_s.intern,
-              :backtrace => data.backtrace,
-              :message => data.message} if data.is_a? Exception
-
-      (@tags + args).each do |tag|
-        tag = tag.to_sym
-        case tag
-        when :timestamp
-          opts.update :timestamp => Time.now
-        when :hostname
-          @hostname ||= { :hostname => `hostname`.strip }
-          opts.update @hostname
-        when :process
-          @process_id ||= { :process_id => Process.pid,
-                            :process_name => $0,
-                            :process_parent_id => Process.ppid,
-                            :thread_id => Thread.current.object_id }
-          opts.update :process => @process_id
-        else
-          (opts[:tags] ||= []) << tag
-        end
-      end
-
-      opts.update(:severity => severity,
-                  :msg => data)
-
-      print(opts)
-      unless Logger.disabled?
-        MQ.fanout('logging', :durable => true).publish Marshal.dump(opts)
-      end
-
-      opts
-    end
-    alias :method_missing :log
-
-    def print data = nil, &block
-      if block
-        @printer = block
-      elsif data.is_a? Proc
-        @printer = data
-      elsif data
-        (pr = @printer || self.class.printer) and pr.call(data)
-      else
-        @printer
-      end
-    end
-    alias :printer :print
-    
-    def self.printer &block
-      @printer = block if block
-      @printer
-    end
-
-    def self.disabled?
-      !!@disabled
-    end
-    
-    def self.enable
-      @disabled = false
-    end
-    
-    def self.disable
-      @disabled = true
-    end
-  end
-end