hot_bunnies 1.4.0.pre3-java → 1.4.0.pre4-java

data/lib/hot_bunnies/queue.rb

@@ -1,5 +1,15 @@
 # encoding: utf-8
 
+module JavaConcurrent
+  java_import 'java.lang.Thread'
+  java_import 'java.lang.InterruptedException'
+  java_import 'java.util.concurrent.Executors'
+  java_import 'java.util.concurrent.LinkedBlockingQueue'
+  java_import 'java.util.concurrent.ArrayBlockingQueue'
+  java_import 'java.util.concurrent.TimeUnit'
+  java_import 'java.util.concurrent.atomic.AtomicBoolean'
+end
+
 module HotBunnies
   class Queue
     attr_reader :name, :channel
@@ -59,8 +69,7 @@ module HotBunnies
     end
 
     class Subscription
-      import 'java.util.concurrent.TimeUnit'
-      import 'java.util.concurrent.atomic.AtomicBoolean'
+      include JavaConcurrent
 
       attr_reader :channel, :queue_name, :consumer_tag
 
@@ -133,7 +142,7 @@ module HotBunnies
             @executor = options[:executor]
           else
             @shut_down_executor = true
-            @executor = java.util.concurrent.Executors.new_single_thread_executor
+            @executor = Executors.new_single_thread_executor
           end
           AsyncCallbackConsumer.new(@channel, callback, @executor)
         end
@@ -207,10 +216,7 @@ module HotBunnies
     end
 
     class BlockingCallbackConsumer < CallbackConsumer
-      import 'java.util.concurrent.LinkedBlockingQueue'
-      import 'java.util.concurrent.ArrayBlockingQueue'
-      import 'java.util.concurrent.TimeUnit'
-      import 'java.lang.InterruptedException'
+      include JavaConcurrent
 
       def initialize(channel, buffer_size, callback)
         super(channel, callback)
@@ -222,27 +228,31 @@ module HotBunnies
       end
 
       def start
-        until @cancelled
+        interrupted = false
+        until @cancelled || JavaConcurrent::Thread.current_thread.interrupted?
           begin
             pair = @internal_queue.take
             callback(*pair) if pair
           rescue InterruptedException => e
-            # time to stop
+            interrupted = true
           end
         end
         while (pair = @internal_queue.poll)
           callback(*pair)
         end
+        if interrupted
+          JavaConcurrent::Thread.current_thread.interrupt
+        end
       end
 
       def deliver(*pair)
-        if @cancelling || @cancelled
+        if @cancelling || @cancelled || JavaConcurrent::Thread.current_thread.interrupted?
           @internal_queue.offer(pair)
         else
           begin
             @internal_queue.put(pair)
           rescue InterruptedException => e
-            # time to stop
+            JavaConcurrent::Thread.current_thread.interrupt
           end
         end
       end

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = '1.4.0.pre3'
+  VERSION = '1.4.0.pre4'
 end

data/lib/hot_bunnies.rb

@@ -6,13 +6,11 @@ require 'ext/rabbitmq-client'
 
 
 module HotBunnies
-  import com.rabbitmq.client.ConnectionFactory
-  import com.rabbitmq.client.Connection
-  import com.rabbitmq.client.Channel
-  import com.rabbitmq.client.DefaultConsumer
-  import com.rabbitmq.client.QueueingConsumer
-
-  import com.rabbitmq.client.AMQP
+  java_import 'com.rabbitmq.client.ConnectionFactory'
+  java_import 'com.rabbitmq.client.Connection'
+  java_import 'com.rabbitmq.client.Channel'
+  java_import 'com.rabbitmq.client.DefaultConsumer'
+  java_import 'com.rabbitmq.client.AMQP'
 
   def self.connect(options={})
     cf = ConnectionFactory.new
@@ -31,7 +29,6 @@ module HotBunnies
     cf.new_connection
   end
 
-
   protected
 
   def self.hostname_from(options)

metadata

@@ -1,91 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hot_bunnies
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.4.0.pre3
+  version: 1.4.0.pre4
 platform: java
-authors: 
-  - Theo Hultberg
-  - Michael S. Klishin
-autorequire: 
+authors:
+- Theo Hultberg
+- Michael S. Klishin
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-06-29 00:00:00 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies: []
-
 description: A object oriented interface to RabbitMQ that uses the Java driver under the hood
-email: 
-  - theo@burtcorp.com
+email:
+- theo@burtcorp.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - .rvmrc
-  - .travis.yml
-  - Gemfile
-  - LICENSE
-  - README.md
-  - Rakefile
-  - examples/blocking_subscription.rb
-  - examples/non_blocking_subscription.rb
-  - examples/non_blocking_subscription_with_executor.rb
-  - hot_bunnies.gemspec
-  - lib/ext/commons-io.jar
-  - lib/ext/rabbitmq-client.jar
-  - lib/hot_bunnies.rb
-  - lib/hot_bunnies/channel.rb
-  - lib/hot_bunnies/exchange.rb
-  - lib/hot_bunnies/queue.rb
-  - lib/hot_bunnies/version.rb
-  - spec/integration/alternate_exchanges_spec.rb
-  - spec/integration/basic_consume_spec.rb
-  - spec/integration/connection_spec.rb
-  - spec/integration/error_handling_by_consumers_spec.rb
-  - spec/integration/exchange_bind_spec.rb
-  - spec/integration/exchange_declare_spec.rb
-  - spec/integration/message_metadata_access_spec.rb
-  - spec/integration/publisher_confirmations_spec.rb
-  - spec/integration/queue_bind_spec.rb
-  - spec/integration/queue_declare_spec.rb
-  - spec/integration/queue_delete_spec.rb
-  - spec/integration/queue_purge_spec.rb
-  - spec/integration/queue_unbind_spec.rb
-  - spec/integration/sender_selected_distribution_spec.rb
-  - spec/spec_helper.rb
+files:
+- .gitignore
+- .rvmrc
+- .travis.yml
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- examples/blocking_subscription.rb
+- examples/non_blocking_subscription.rb
+- examples/non_blocking_subscription_with_executor.rb
+- hot_bunnies.gemspec
+- lib/ext/commons-io.jar
+- lib/ext/rabbitmq-client.jar
+- lib/hot_bunnies.rb
+- lib/hot_bunnies/channel.rb
+- lib/hot_bunnies/exchange.rb
+- lib/hot_bunnies/queue.rb
+- lib/hot_bunnies/version.rb
+- spec/integration/alternate_exchanges_spec.rb
+- spec/integration/basic_consume_spec.rb
+- spec/integration/connection_spec.rb
+- spec/integration/error_handling_by_consumers_spec.rb
+- spec/integration/exchange_bind_spec.rb
+- spec/integration/exchange_declare_spec.rb
+- spec/integration/message_metadata_access_spec.rb
+- spec/integration/publisher_confirmations_spec.rb
+- spec/integration/queue_bind_spec.rb
+- spec/integration/queue_declare_spec.rb
+- spec/integration/queue_delete_spec.rb
+- spec/integration/queue_purge_spec.rb
+- spec/integration/queue_unbind_spec.rb
+- spec/integration/sender_selected_distribution_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/iconara/hot_bunnies
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: '0'
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
   none: false
-  requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 1.3.1
 requirements: []
-
 rubyforge_project: hot_bunnies
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Ruby wrapper for the RabbitMQ Java driver
 test_files: []
-
+...