hot_bunnies 1.3.2-java → 1.3.3-java

data/lib/hot_bunnies/queue.rb

@@ -48,21 +48,23 @@ module HotBunnies
       [response.message_count, response.consumer_count]
     end
 
-  private
+    private
 
     def declare!
       response = if @options[:passive]
-      then @channel.queue_declare_passive(@name)
-      else @channel.queue_declare(@name, @options[:durable], @options[:exclusive], @options[:auto_delete], @options[:arguments])
-      end
+                 then @channel.queue_declare_passive(@name)
+                 else @channel.queue_declare(@name, @options[:durable], @options[:exclusive], @options[:auto_delete], @options[:arguments])
+                 end
       @name = response.queue
     end
 
     class Subscription
       def initialize(channel, queue_name, options={})
-        @channel = channel
+        @channel    = channel
         @queue_name = queue_name
-        @ack = options.fetch(:ack, false)
+        @ack        = options.fetch(:ack, false)
+
+        @cancelled  = java.util.concurrent.atomic.AtomicBoolean.new(false)
       end
 
       def each(options={}, &block)
@@ -82,19 +84,35 @@ module HotBunnies
       end
 
       def cancel
-        raise 'Can\'t cancel: the subscriber haven\'t received an OK yet' if !@subscriber || !@subscriber.consumer_tag
+        raise 'Can\'t cancel: the subscriber haven\'t received an OK yet' if !self.active?
         @channel.basic_cancel(@subscriber.consumer_tag)
 
+        # RabbitMQ Java client won't clear consumer_tag from cancelled consumers,
+        # so we have to do this. Sharing consumers
+        # between threads in general is a can of worms but someone somewhere
+        # will almost certainly do it, so. MK.
+        @cancelled.set(true)
+
         maybe_shutdown_executor
       end
 
-    private
+      def active?
+        !@cancelled.get && !@subscriber.nil? && !@subscriber.consumer_tag.nil?
+      end
 
-    def maybe_shutdown_executor
-      if @executor && @shut_down_executor
-         @executor.shutdown
+      def shutdown!
+        if @executor && @shut_down_executor
+          @executor.shutdown_now
+        end
+      end
+
+      private
+
+      def maybe_shutdown_executor
+        if @executor && @shut_down_executor
+          @executor.shutdown
+        end
       end
-    end
 
       def run(&block)
         @subscriber = BlockingSubscriber.new(@channel, self)

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/spec/integration/basic_consume_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe "Queue consumer" do
+  let(:connection) { HotBunnies.connect }
+  let(:channel)    { connection.create_channel }
+
+  after :each do
+    channel.close
+    connection.close
+  end
+
+  it "provides predicates" do
+    queue        = channel.queue("", :auto_delete => true)
+
+    subscription = queue.subscribe(:blocking => false) { |_, _| nil }
+
+    # consumer tag will be sent by the broker, so this happens
+    # asynchronously and we can either add callbacks/use latches or
+    # just wait. MK.
+    sleep(1.0)
+    subscription.should be_active
+
+    subscription.cancel
+    sleep(1.0)
+    subscription.should_not be_active
+
+    subscription.shutdown!
+  end
+end

metadata

@@ -1,34 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hot_bunnies
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.3
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 2
-  version: 1.3.2
 platform: java
-authors: 
+authors:
 - Theo Hultberg
 - Michael S. Klishin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-15 00:00:00 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies: []
-
-description: A object oriented interface to RabbitMQ that uses the Java driver under the hood
-email: 
+description: A object oriented interface to RabbitMQ that uses the Java driver under
+  the hood
+email:
 - theo@burtcorp.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -48,6 +39,7 @@ files:
 - lib/hot_bunnies/queue.rb
 - lib/hot_bunnies/version.rb
 - spec/integration/alternate_exchanges_spec.rb
+- spec/integration/basic_consume_spec.rb
 - spec/integration/exchange_bind_spec.rb
 - spec/integration/exchange_declare_spec.rb
 - spec/integration/publisher_confirmations_spec.rb
@@ -60,36 +52,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/iconara/hot_bunnies
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: hot_bunnies
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the RabbitMQ Java driver
 test_files: []
-