bunny 0.6.3.rc2 → 0.7

data/lib/qrack/protocol/protocol09.rb

@@ -1,133 +1,135 @@
+# encoding: utf-8
+
 module Qrack
-	module Protocol09
-	  #:stopdoc:
-	  class Class::Method
-	    def initialize *args
-	      opts = args.pop if args.last.is_a? Hash
-	      opts ||= {}
-      
-	      if args.size == 1 and args.first.is_a? Transport09::Buffer
-	        buf = args.shift
-	      else
-	        buf = nil
-	      end
-
-	      self.class.arguments.each do |type, name|
-	        val = buf ? buf.read(type) :
-	                    args.shift || opts[name] || opts[name.to_s]
-	        instance_variable_set("@#{name}", val)
-	      end
-	    end
-
-	    def arguments
-	      self.class.arguments.inject({}) do |hash, (type, name)|
-	        hash.update name => instance_variable_get("@#{name}")
-	      end
-	    end
-
-	    def to_binary
-	      buf = Transport09::Buffer.new
-	      buf.write :short, self.class.parent.id
-	      buf.write :short, self.class.id
-
-	      bits = []
-
-	      self.class.arguments.each do |type, name|
-	        val = instance_variable_get("@#{name}")
-	        if type == :bit
-	          bits << (val || false)
-	        else
-	          unless bits.empty?
-	            buf.write :bit, bits
-	            bits = []
-	          end
-	          buf.write type, val
-	        end
-	      end
-
-	      buf.write :bit, bits unless bits.empty?
-	      buf.rewind
-
-	      buf
-	    end
-    
-	    def to_s
-	      to_binary.to_s
-	    end
-    
-	    def to_frame channel = 0
-	      Transport09::Method.new(self, channel)
-	    end
-	  end
-
-	  class Header
-	    def initialize *args
-	      opts = args.pop if args.last.is_a? Hash
-	      opts ||= {}
-      
-	      first = args.shift
-      
-	      if first.is_a? ::Class and first.ancestors.include? Protocol09::Class
-	        @klass = first
-	        @size = args.shift || 0
-	        @weight = args.shift || 0
-	        @properties = opts
-
-	      elsif first.is_a? Transport09::Buffer or first.is_a? String
-	        buf = first
-	        buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
-        
-	        @klass = Protocol09.classes[buf.read(:short)]
-	        @weight = buf.read(:short)
-	        @size = buf.read(:longlong)
-
-	        props = buf.read(:properties, *klass.properties.map{|type,_| type })
-	        @properties = Hash[*klass.properties.map{|_,name| name }.zip(props).reject{|k,v| v.nil? }.flatten]
-
-	      else
-	        raise ArgumentError, 'Invalid argument'
-	      end
-      
-	    end
-	    attr_accessor :klass, :size, :weight, :properties
-    
-	    def to_binary
-	      buf = Transport09::Buffer.new
-	      buf.write :short, klass.id
-	      buf.write :short, weight # XXX rabbitmq only supports weight == 0
-	      buf.write :longlong, size
-	      buf.write :properties, (klass.properties.map do |type, name|
-	                               [ type, properties[name] || properties[name.to_s] ]
-	                             end)
-	      buf.rewind
-	      buf
-	    end
-    
-	    def to_s
-	      to_binary.to_s
-	    end
-
-	    def to_frame channel = 0
-	      Transport09::Header.new(self, channel)
-	    end
-
-	    def == header
-	      [ :klass, :size, :weight, :properties ].inject(true) do |eql, field|
-	        eql and __send__(field) == header.__send__(field)
-	      end
-	    end
-
-	    def method_missing meth, *args, &blk
-	      @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
-	                                                                                     super
-	    end
-	  end
-
-	  def self.parse buf
-	    buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
-	    class_id, method_id = buf.read(:short, :short)
-	    classes[class_id].methods[method_id].new(buf)
-	  end
-
-	end
+  module Protocol09
+    #:stopdoc:
+    class Class::Method
+      def initialize *args
+        opts = args.pop if args.last.is_a? Hash
+        opts ||= {}
+
+        if args.size == 1 and args.first.is_a? Transport09::Buffer
+          buf = args.shift
+        else
+          buf = nil
+        end
+
+        self.class.arguments.each do |type, name|
+          val = buf ? buf.read(type) :
+            args.shift || opts[name] || opts[name.to_s]
+          instance_variable_set("@#{name}", val)
+        end
+      end
+
+      def arguments
+        self.class.arguments.inject({}) do |hash, (type, name)|
+          hash.update name => instance_variable_get("@#{name}")
+        end
+      end
+
+      def to_binary
+        buf = Transport09::Buffer.new
+        buf.write :short, self.class.parent.id
+        buf.write :short, self.class.id
+
+        bits = []
+
+        self.class.arguments.each do |type, name|
+          val = instance_variable_get("@#{name}")
+          if type == :bit
+            bits << (val || false)
+          else
+            unless bits.empty?
+              buf.write :bit, bits
+              bits = []
+            end
+            buf.write type, val
+          end
+        end
+
+        buf.write :bit, bits unless bits.empty?
+        buf.rewind
+
+        buf
+      end
+
+      def to_s
+        to_binary.to_s
+      end
+
+      def to_frame channel = 0
+        Transport09::Method.new(self, channel)
+      end
+    end
+
+    class Header
+      def initialize *args
+        opts = args.pop if args.last.is_a? Hash
+        opts ||= {}
+
+        first = args.shift
+
+        if first.is_a? ::Class and first.ancestors.include? Protocol09::Class
+          @klass = first
+          @size = args.shift || 0
+          @weight = args.shift || 0
+          @properties = opts
+
+        elsif first.is_a? Transport09::Buffer or first.is_a? String
+          buf = first
+          buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
+
+          @klass = Protocol09.classes[buf.read(:short)]
+          @weight = buf.read(:short)
+          @size = buf.read(:longlong)
+
+          props = buf.read(:properties, *klass.properties.map{|type,_| type })
+          @properties = Hash[*klass.properties.map{|_,name| name }.zip(props).reject{|k,v| v.nil? }.flatten]
+
+        else
+          raise ArgumentError, 'Invalid argument'
+        end
+
+      end
+      attr_accessor :klass, :size, :weight, :properties
+
+      def to_binary
+        buf = Transport09::Buffer.new
+        buf.write :short, klass.id
+        buf.write :short, weight # XXX rabbitmq only supports weight == 0
+        buf.write :longlong, size
+        buf.write :properties, (klass.properties.map do |type, name|
+                                  [ type, properties[name] || properties[name.to_s] ]
+                                end)
+        buf.rewind
+        buf
+      end
+
+      def to_s
+        to_binary.to_s
+      end
+
+      def to_frame channel = 0
+        Transport09::Header.new(self, channel)
+      end
+
+      def == header
+        [ :klass, :size, :weight, :properties ].inject(true) do |eql, field|
+          eql and __send__(field) == header.__send__(field)
+        end
+      end
+
+      def method_missing meth, *args, &blk
+        @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
+          super
+      end
+    end
+
+    def self.parse buf
+      buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
+      class_id, method_id = buf.read(:short, :short)
+      classes[class_id].methods[method_id].new(buf)
+    end
+
+  end
 end

data/lib/qrack/protocol/spec08.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 
 #:stopdoc:
 # this file was autogenerated on 2009-12-13 13:40:20 +0000

data/lib/qrack/protocol/spec09.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 
 #:stopdoc:
 # this file was autogenerated on 2009-12-13 13:38:22 +0000

data/lib/qrack/qrack08.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $: << File.expand_path(File.dirname(__FILE__))
 
 require 'protocol/spec08'
@@ -9,15 +11,10 @@ require 'transport/frame08'
 require 'qrack/client'
 require 'qrack/channel'
 require 'qrack/queue'
-require 'qrack/subscription'
+require 'bunny/consumer'
+require 'qrack/errors'
 
 module Qrack
-	
-	include Protocol
-	include Transport
-	
-	# Errors
-	class BufferOverflowError < StandardError; end
-  class InvalidTypeError < StandardError; end
-
-end
+  include Protocol
+  include Transport
+end

data/lib/qrack/qrack09.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $: << File.expand_path(File.dirname(__FILE__))
 
 require 'protocol/spec09'
@@ -9,15 +11,10 @@ require 'transport/frame09'
 require 'qrack/client'
 require 'qrack/channel'
 require 'qrack/queue'
-require 'qrack/subscription'
+require 'bunny/consumer'
+require 'qrack/errors'
 
 module Qrack
-	
-	include Protocol09
-	include Transport09
-	
-	# Errors
-	class BufferOverflowError < StandardError; end
-  class InvalidTypeError < StandardError; end
-
-end
+  include Protocol09
+  include Transport09
+end

data/lib/qrack/queue.rb

@@ -1,53 +1,40 @@
-module Qrack
-	
-	# Queue ancestor class
-	class Queue
-		
-		attr_reader :name, :client
-	  attr_accessor :delivery_tag, :subscription
-	
-=begin rdoc
-
-=== DESCRIPTION:
-
-Returns consumer count from Queue#status.
+# encoding: utf-8
 
-=end
-
-	  def consumer_count
-	    s = status
-			s[:consumer_count]
-	  end
-
-=begin rdoc
+module Qrack
 
-=== DESCRIPTION:
+  # Queue ancestor class
+  class Queue
 
-Returns message count from Queue#status.
+    # @return [AMQ::Client::Consumer] Default consumer (registered with {Queue#subscribe}).
+    attr_accessor :default_consumer
 
-=end
+    attr_reader :name, :client
 
-	  def message_count
-	    s = status
-			s[:message_count]
-	  end
+    attr_accessor :delivery_tag
 
-=begin rdoc
 
-=== DESCRIPTION:
+    # Returns consumer count from {Queue#status}.
+    def consumer_count
+      s = status
+      s[:consumer_count]
+    end
 
-Publishes a message to the queue via the default nameless '' direct exchange.
+    # Returns message count from {Queue#status}.
+    def message_count
+      s = status
+      s[:message_count]
+    end
 
-==== RETURNS:
+    # Publishes a message to the queue via the default nameless '' direct exchange.
 
-nil
+    # @return [NilClass] nil
+    # @deprecated
+    # @note This method will be removed before 0.8 release.
+    def publish(data, opts = {})
+      Bunny.deprecation_warning("Qrack::Queue#publish", "0.8")
+      exchange.publish(data, opts)
+    end
 
-=end
+  end
 
-	  def publish(data, opts = {})
-	    exchange.publish(data, opts)
-	  end
-		
-	end
-	
 end

data/lib/qrack/subscription.rb

@@ -1,102 +1,103 @@
+# encoding: utf-8
+
+#################################################
+# WARNING: THIS CLASS IS DEPRECATED, DO NOT     #
+# USE IT DIRECTLY! USE BUNNY::CONSUMER INSTEAD! #
+#################################################
+
 module Qrack
-	# Subscription ancestor class
-	class Subscription
-		
-		attr_accessor :consumer_tag, :delivery_tag, :message_max, :timeout, :ack, :exclusive
-		attr_reader :client, :queue, :message_count
-	
-		def initialize(client, queue, opts = {})
-			@client = client
-			@queue = queue
-		
-			# Get timeout value
-			@timeout = opts[:timeout] || nil
-		
-			# Get maximum amount of messages to process
-			@message_max = opts[:message_max] || nil
-
-			# If a consumer tag is not passed in the server will generate one
-			@consumer_tag = opts[:consumer_tag] || nil
-
-			# Ignore the :nowait option if passed, otherwise program will hang waiting for a
-			# response from the server causing an error.
-			opts.delete(:nowait)
-
-			# Do we want to have to provide an acknowledgement?
-			@ack = opts[:ack] || nil
-			
-			# Does this consumer want exclusive use of the queue?
-			@exclusive = opts[:exclusive] || false
-		
-			# Initialize message counter
-			@message_count = 0
-			
-			# Give queue reference to this subscription
-			@queue.subscription = self
-			
-			# Store options
-			@opts = opts
-		
-		end
-		
-		def start(&blk)
-			
-			# Do not process any messages if zero message_max
-			if message_max == 0
-				return
-			end
-			
-			# Notify server about new consumer
-			setup_consumer
-
-			# Start subscription loop
-			loop do
-			
-				begin
-					method = client.next_method(:timeout => timeout)
-				rescue Qrack::ClientTimeout
-					queue.unsubscribe()
-					break
-				end
-				
-				# Increment message counter
-				@message_count += 1
-		
-				# get delivery tag to use for acknowledge
-				queue.delivery_tag = method.delivery_tag if @ack
-		
-				header = client.next_payload
-
-			  # If maximum frame size is smaller than message payload body then message
-				# will have a message header and several message bodies				
-			  msg = ''
-				while msg.length < header.size
-					msg += client.next_payload
-				end
-
-				# If block present, pass the message info to the block for processing		
-				blk.call({:header => header, :payload => msg, :delivery_details => method.arguments}) if !blk.nil?
-
-				# Exit loop if message_max condition met
-				if (!message_max.nil? and message_count == message_max)
-					# Stop consuming messages
-					queue.unsubscribe()				
-					# Acknowledge receipt of the final message
-					queue.ack() if @ack
-					# Quit the loop
-					break
-				end
-			
-				# Have to do the ack here because the ack triggers the release of messages from the server
-				# if you are using Client#qos prefetch and you will get extra messages sent through before
-				# the unsubscribe takes effect to stop messages being sent to this consumer unless the ack is
-				# deferred.
-				queue.ack() if @ack
-		
-			end
-		
-		end
-		
-	end
-	
-end
+  # Subscription ancestor class
+  # @deprecated
+  class Subscription
+
+    attr_accessor :consumer_tag, :delivery_tag, :message_max, :timeout, :ack, :exclusive
+    attr_reader :client, :queue, :message_count
+
+    def initialize(client, queue, opts = {})
+      @client = client
+      @queue = queue
+
+      # Get timeout value
+      @timeout = opts[:timeout] || nil
+
+      # Get maximum amount of messages to process
+      @message_max = opts[:message_max] || nil
+
+      # If a consumer tag is not passed in the server will generate one
+      @consumer_tag = opts[:consumer_tag] || nil
+
+      # Ignore the :nowait option if passed, otherwise program will hang waiting for a
+      # response from the server causing an error.
+      opts.delete(:nowait)
+
+      # Do we want to have to provide an acknowledgement?
+      @ack = opts[:ack] || nil
+
+      # Does this consumer want exclusive use of the queue?
+      @exclusive = opts[:exclusive] || false
+
+      # Initialize message counter
+      @message_count = 0
+
+      # Store options
+      @opts = opts
+    end
+
+    def start(&blk)
+      # Do not process any messages if zero message_max
+      if message_max == 0
+        return
+      end
+
+      # Notify server about new consumer
+      setup_consumer
+
+      # Start subscription loop
+      loop do
+
+        begin
+          method = client.next_method(:timeout => timeout)
+        rescue Qrack::ClientTimeout
+          queue.unsubscribe
+          break
+        end
+
+        # Increment message counter
+        @message_count += 1
+
+        # get delivery tag to use for acknowledge
+        queue.delivery_tag = method.delivery_tag if @ack
+
+        header = client.next_payload
+
+        # If maximum frame size is smaller than message payload body then message
+        # will have a message header and several message bodies
+        msg = ''
+        while msg.length < header.size
+          msg << client.next_payload
+        end
+
+        # If block present, pass the message info to the block for processing
+        blk.call({:header => header, :payload => msg, :delivery_details => method.arguments}) if !blk.nil?
+
+        # Exit loop if message_max condition met
+        if (!message_max.nil? and message_count == message_max)
+          # Stop consuming messages
+          queue.unsubscribe()
+          # Acknowledge receipt of the final message
+          queue.ack() if @ack
+          # Quit the loop
+          break
+        end
+
+        # Have to do the ack here because the ack triggers the release of messages from the server
+        # if you are using Client#qos prefetch and you will get extra messages sent through before
+        # the unsubscribe takes effect to stop messages being sent to this consumer unless the ack is
+        # deferred.
+        queue.ack() if @ack
+      end
+    end
+
+  end
+
+end