amqp 0.6.6 → 0.6.7

data/amqp.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path('../lib/amqp/version', __FILE__)
+
 spec = Gem::Specification.new do |s|
   s.name = 'amqp'
-  s.version = '0.6.6'
+  s.version = AMQP::VERSION
   s.date = '2009-12-29'
   s.summary = 'AMQP client implementation in Ruby/EventMachine'
   s.email = "amqp@tmm1.net"
@@ -51,6 +53,7 @@ spec = Gem::Specification.new do |s|
     "examples/mq/primes.rb",
     "examples/mq/stocks.rb",
     "lib/amqp.rb",
+    "lib/amqp/version.rb",
     "lib/amqp/buffer.rb",
     "lib/amqp/client.rb",
     "lib/amqp/frame.rb",

data/lib/amqp.rb

@@ -1,16 +1,11 @@
-module AMQP
-  VERSION = '0.5.9'
-
-  DIR = File.expand_path(File.dirname(File.expand_path(__FILE__)))
-  $:.unshift DIR
-  
-  require 'ext/em'
-  require 'ext/blankslate'
+require File.expand_path('../ext/em', __FILE__)
+require File.expand_path('../ext/blankslate', __FILE__)
   
-  %w[ buffer spec protocol frame client ].each do |file|
-    require "amqp/#{file}"
-  end
+%w[ version buffer spec protocol frame client ].each do |file|
+  require File.expand_path("../amqp/#{file}", __FILE__)
+end
 
+module AMQP
   class << self
     @logging = false
     attr_accessor :logging

data/lib/amqp/client.rb

@@ -1,4 +1,4 @@
-require 'amqp/frame'
+require File.expand_path('../frame', __FILE__)
 
 module AMQP
   class Error < StandardError; end

data/lib/amqp/frame.rb

@@ -1,6 +1,6 @@
-require 'amqp/spec'
-require 'amqp/buffer'
-require 'amqp/protocol'
+require File.expand_path('../spec', __FILE__)
+require File.expand_path('../buffer', __FILE__)
+require File.expand_path('../protocol', __FILE__)
 
 module AMQP
   class Frame #:nodoc: all
@@ -121,4 +121,4 @@ if $0 =~ /bacon/ or $0 == __FILE__
       copy.should == orig
     end
   end
-end
+end

data/lib/amqp/protocol.rb

@@ -1,5 +1,5 @@
-require 'amqp/spec'
-require 'amqp/buffer'
+require File.expand_path('../spec', __FILE__)
+require File.expand_path('../buffer', __FILE__)
 
 module AMQP
   module Protocol
@@ -209,4 +209,4 @@ if $0 =~ /bacon/ or $0 == __FILE__
       Protocol::Header.new(orig.to_binary).should == orig
     end
   end
-end
+end

data/lib/amqp/server.rb

@@ -1,4 +1,4 @@
-require 'amqp/frame'
+require File.expand_path('../frame', __FILE__)
 
 module AMQP
   module Server
@@ -96,4 +96,4 @@ if __FILE__ == $0
   EM.run{
     AMQP::Server.start
   }
-end
+end

data/lib/amqp/version.rb

@@ -0,0 +1,3 @@
+module AMQP
+  VERSION = '0.6.7'
+end

data/lib/mq.rb

@@ -740,6 +740,7 @@ class MQ
   end
 
   def prefetch(size)
+    @prefetch_size = size
     send Protocol::Basic::Qos.new(:prefetch_size => 0, :prefetch_count => size, :global => false)
     self
   end
@@ -807,6 +808,8 @@ class MQ
     qus = @queues
     @queues = {}
     qus.each{ |_,q| q.reset } if qus
+
+    prefetch(@prefetch_size) if @prefetch_size
   end
 
   private

data/lib/mq/rpc.rb

@@ -30,14 +30,14 @@ class MQ
     #
     # Marshalling and unmarshalling the objects is handled internally. This
     # marshalling is subject to the same restrictions as defined in the
-    # Marshal[http://ruby-doc.org/core/classes/Marshal.html] standard 
+    # Marshal[http://ruby-doc.org/core/classes/Marshal.html] standard
     # library. See that documentation for further reference.
     #
-    # When the optional object is not passed, the returned rpc reference is 
-    # used to send messages and arguments to the queue. See #method_missing 
-    # which does all of the heavy lifting with the proxy. Some client 
-    # elsewhere must call this method *with* the optional block so that 
-    # there is a valid destination. Failure to do so will just enqueue 
+    # When the optional object is not passed, the returned rpc reference is
+    # used to send messages and arguments to the queue. See #method_missing
+    # which does all of the heavy lifting with the proxy. Some client
+    # elsewhere must call this method *with* the optional block so that
+    # there is a valid destination. Failure to do so will just enqueue
     # marshalled messages that are never consumed.
     #
     def initialize mq, queue, obj = nil
@@ -53,7 +53,7 @@ class MQ
                else
                  obj
                end
-        
+
         @mq.queue(queue).subscribe(:ack=>true){ |info, request|
           method, *args = ::Marshal.load(request)
           ret = @obj.__send__(method, *args)
@@ -67,7 +67,7 @@ class MQ
       else
         @callbacks ||= {}
         # XXX implement and use queue(nil)
-        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}").subscribe{|info, msg|
+        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}", :auto_delete => true).subscribe{|info, msg|
           if blk = @callbacks.delete(info.message_id)
             blk.call ::Marshal.load(msg)
           end
@@ -97,4 +97,4 @@ class MQ
       @remote.publish(::Marshal.dump([meth, *args]), :reply_to => blk ? @name : nil, :message_id => message_id)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors: 
 - Aman Gupta
@@ -62,6 +62,7 @@ files:
 - examples/mq/primes.rb
 - examples/mq/stocks.rb
 - lib/amqp.rb
+- lib/amqp/version.rb
 - lib/amqp/buffer.rb
 - lib/amqp/client.rb
 - lib/amqp/frame.rb