jack_rabbit 0.3.0-java → 0.3.1-java

data/lib/jack_rabbit/connection.rb

@@ -8,10 +8,10 @@ module JackRabbit
     include Backoff
     include Logging
 
-    DEFAULT_OPTIONS = { connection_timeout: 5, heartbeat_interval: 5 }
+    DEFAULT_OPTIONS = { heartbeat_interval: 5 }
 
     def initialize(uri, options)
-      @uri, @options = uri, options.merge(connection_options(uri))
+      @uri, @options = uri, connection_options(uri).merge!(options)
       @channels = []
     end
 

data/lib/jack_rabbit/version.rb

@@ -1,3 +1,3 @@
 module JackRabbit
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -2,14 +2,14 @@
 name: jack_rabbit
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.0
+  version: 0.3.1
 platform: java
 authors:
 - Sebastian Ohm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hot_bunnies