march_hare 2.0.0.rc2-java → 2.0.0.rc3-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8fef0a21e9108bc602820f6a9c5ac0754fef75f9
+  data.tar.gz: f53168edd0513906f9903fe6d79276b8baaed8b1
+SHA512:
+  metadata.gz: b5012f3a6b060f7c253f378af70a9dbe2fb3618b54afc4d968261893ce56cb00b0db1474f94df5dae90c2dea7a78a7046f26833b2a72d30812bbc7cd42b12774
+  data.tar.gz: 8a24a42c39d26a514278682cb1e55981f5f1b9a3c6ef0c1e76a990a90208dccb8f752d05f16f0c201510ecd58d07d2bec253026f7f31fc84652fc31877277d26

data/lib/march_hare/session.rb

@@ -74,10 +74,12 @@ module MarchHare
 
     # @private
     def initialize(connection_factory, opts = {})
-      @cf = connection_factory
-      @executor_factory = opts[:executor_factory]
-      @connection = self.new_connection
-      @channels = JavaConcurrent::ConcurrentHashMap.new
+      @cf               = connection_factory
+      # executors cannot be restarted after shutdown,
+      # so we really need a factory here. MK.
+      @executor_factory = opts[:executor_factory] || build_executor_factory_from(opts)
+      @connection       = self.new_connection
+      @channels         = JavaConcurrent::ConcurrentHashMap.new
 
       # should automatic recovery from network failures be used?
       @automatically_recover = if opts[:automatically_recover].nil? && opts[:automatic_recovery].nil?
@@ -238,7 +240,7 @@ module MarchHare
 
     # @private
     def self.hostname_from(options)
-      options[:host] || options[:hostname] || ConnectionFactory.DEFAULT_HOST
+      options[:host] || options[:hostname] || ConnectionFactory::DEFAULT_HOST
     end
 
     # @private
@@ -248,7 +250,7 @@ module MarchHare
 
     # @private
     def self.vhost_from(options)
-      options[:virtual_host] || options[:vhost] || ConnectionFactory.DEFAULT_VHOST
+      options[:virtual_host] || options[:vhost] || ConnectionFactory::DEFAULT_VHOST
     end
 
     # @private
@@ -268,17 +270,17 @@ module MarchHare
 
     # @private
     def self.username_from(options)
-      options[:username] || options[:user] || ConnectionFactory.DEFAULT_USER
+      options[:username] || options[:user] || ConnectionFactory::DEFAULT_USER
     end
 
     # @private
     def self.heartbeat_from(options)
-      options[:heartbeat_interval] || options[:requested_heartbeat] || ConnectionFactory.DEFAULT_HEARTBEAT
+      options[:heartbeat_interval] || options[:requested_heartbeat] || ConnectionFactory::DEFAULT_HEARTBEAT
     end
 
     # @private
     def self.connection_timeout_from(options)
-      options[:connection_timeout_interval] || options[:connection_timeout] || ConnectionFactory.DEFAULT_CONNECTION_TIMEOUT
+      options[:connection_timeout_interval] || options[:connection_timeout] || ConnectionFactory::DEFAULT_CONNECTION_TIMEOUT
     end
 
     # @private
@@ -288,7 +290,7 @@ module MarchHare
 
     # @private
     def self.password_from(options)
-      options[:password] || options[:pass] || ConnectionFactory.DEFAULT_PASS
+      options[:password] || options[:pass] || ConnectionFactory::DEFAULT_PASS
     end
 
     # @private
@@ -343,5 +345,16 @@ module MarchHare
         end
       end
     end
+
+    # Makes it easier to construct executor factories.
+    # @private
+    def build_executor_factory_from(opts)
+      # if we are given a thread pool size, construct
+      # a callable that createa a fixed size executor
+      # of that size. MK.
+      if n = opts[:thread_pool_size]
+        return Proc.new { MarchHare::ThreadPools.fixed_of_size(n) }
+      end
+    end
   end
 end

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.0.rc3"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
-  prerelease: 6
+  version: 2.0.0.rc3
 platform: java
 authors:
 - Theo Hultberg
@@ -10,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -40,6 +39,7 @@ files:
 - lib/march_hare/versioned_delivery_tag.rb
 homepage: http://rubymarchhare.info
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -49,18 +49,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
-  none: false
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 test_files: []
 has_rdoc: