hot_bunnies 2.0.0.pre4-java → 2.0.0.pre6-java

data/lib/hot_bunnies.rb

@@ -14,6 +14,7 @@ module HotBunnies
     Session.connect(*args)
   end
 end
+Hotbunnies = HotBunnies
 
 require 'hot_bunnies/channel'
 require 'hot_bunnies/queue'

data/lib/hot_bunnies/consumers.rb

@@ -71,6 +71,8 @@ module HotBunnies
 
   class CallbackConsumer < BaseConsumer
     def initialize(channel, callback)
+      raise ArgumentError, "callback must not be nil!" if callback.nil?
+
       super(channel)
       @callback = callback
       @callback_arity = @callback.arity

data/lib/hot_bunnies/exceptions.rb

@@ -2,6 +2,12 @@ module HotBunnies
   class Exception < StandardError
   end
 
+  class NetworkException < Exception
+  end
+
+  class ConnectionRefused < NetworkException
+  end
+
   class ChannelLevelException < Exception
     attr_reader :channel_close
 
@@ -60,6 +66,9 @@ module HotBunnies
   class UnexpectedFrame < ConnectionLevelException
   end
 
+  class ChannelAlreadyClosed < Exception
+  end
+
 
 
   # Converts RabbitMQ Java client exceptions
@@ -77,9 +86,7 @@ module HotBunnies
           c
         end
       when com.rabbitmq.client.AlreadyClosedException then
-        cmd = e.reason
-
-        puts cmd.method.class.inspect
+        ChannelAlreadyClosed.new(e.reason)
       when com.rabbitmq.client.ShutdownSignalException then
         cmd = e.reason
 

data/lib/hot_bunnies/session.rb

@@ -38,13 +38,16 @@ module HotBunnies
         end
       end
 
+
       new(cf)
     end
 
 
     def initialize(connection_factory)
       @cf         = connection_factory
-      @connection = self.new_connection
+      @connection = converting_rjc_exceptions_to_ruby do
+        self.new_connection
+      end
       @channels   = ConcurrentHashMap.new
     end
 
@@ -159,6 +162,8 @@ module HotBunnies
     def converting_rjc_exceptions_to_ruby(&block)
       begin
         block.call
+      rescue java.net.ConnectException => e
+        raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused")
       rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
         raise PossibleAuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       end

data/lib/hot_bunnies/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module HotBunnies
-  VERSION = "2.0.0.pre4"
+  VERSION = "2.0.0.pre6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hot_bunnies
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre6
   prerelease: 6
 platform: java
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: