bunny 2.11.0.pre1 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3f36588bd0953c3c43b8828d00aef4ccbf750aa
-  data.tar.gz: 219a436f9ef331a65dc64b7099636448f5742f92
+  metadata.gz: 30bc96b65edcb9a0d976408669ca1af4654e5a8a
+  data.tar.gz: 144a71c34e3f0cc04024dd7d80eb400fd1834a36
 SHA512:
-  metadata.gz: 49de63ff6da6733575a771e9a3c9eb1aa42770c9441cdcd5d4e86a11075c838dc6d4c5d096a24e28f660f82c278c23df7e31590799a1ed4619efe2555813106f
-  data.tar.gz: 359d102f28f9adab1f2f855872613ef8d9b0b8f486db0dd62db8d742520490c72cd151c341834f68aa86dee4e7c4efbb923683f67eaeb5ed94020ceebabb0260
+  metadata.gz: f85596d0dd8e731f6d6bf6719d3f1324690762c61f2829ad65125a4b55d833c000b574f90160e956fefbff930519e9d33fab30723cb9b0a00de85e3252a208ae
+  data.tar.gz: 60ee0016f188410417f8742c24850fa57260808759c2c95f71f4c9ea2ea2cf9e940ea170b4503f6bca800f7ccf0cae5eabe382ebf00dbd432ad6337e64febcad

data/examples/connection/automatic_recovery_with_basic_get.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(:heartbeat_timeout => 8)
 conn.start
 
 ch = conn.create_channel

data/examples/connection/automatic_recovery_with_client_named_queues.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(heartbeat_timeout: 8)
 conn.start
 
 ch = conn.create_channel

data/examples/connection/automatic_recovery_with_multiple_consumers.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(heartbeat_timeout: 8)
 conn.start
 
 ch1 = conn.create_channel

data/examples/connection/automatic_recovery_with_republishing.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'Bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(:heartbeat_timeout => 8)
 conn.start
 
 ch0 = conn.create_channel

data/examples/connection/automatic_recovery_with_server_named_queues.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(heartbeat_timeout: 8)
 conn.start
 
 ch = conn.create_channel

data/examples/connection/channel_level_exception.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(heartbeat_timeout: 8)
 conn.start
 
 begin

data/examples/connection/disabled_automatic_recovery.rb

@@ -8,7 +8,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 
 require 'bunny'
 
-conn = Bunny.new(:heartbeat_interval => 8, :automatically_recover => false)
+conn = Bunny.new(heartbeat_timeout: 8, automatically_recover: false)
 conn.start
 
 ch = conn.create_channel

data/examples/connection/heartbeat.rb

@@ -9,7 +9,7 @@ $:.unshift(File.expand_path("../../../lib", __FILE__))
 require 'bunny'
 
 
-conn = Bunny.new(:heartbeat_interval => 2)
+conn = Bunny.new(:heartbeat_timeout => 2)
 conn.start
 
 c = conn.create_channel

data/examples/consumers/high_and_low_priority.rb

@@ -11,7 +11,7 @@ require 'bunny'
 HIGH_PRIORITY_Q = "bunny.examples.priority.hilo.high"
 LOW_PRIORITY_Q  = "bunny.examples.priority.hilo.low"
 
-conn = Bunny.new(:heartbeat_interval => 8)
+conn = Bunny.new(heartbeat_timeout: 8)
 conn.start
 
 ch1  = conn.create_channel

data/lib/bunny/session.rb

@@ -101,7 +101,7 @@ module Bunny
     # @option connection_string_or_opts [String] :username ("guest") Username
     # @option connection_string_or_opts [String] :password ("guest") Password
     # @option connection_string_or_opts [String] :vhost ("/") Virtual host to use
-    # @option connection_string_or_opts [Integer, Symbol] :heartbeat (:server) Heartbeat interval. :server means use the default suggested by RabbitMQ. 0 means heartbeats and socket read timeouts will be disabled (not recommended).
+    # @option connection_string_or_opts [Integer, Symbol] :heartbeat (:server) Heartbeat timeout to offer to the server. :server means use the value suggested by RabbitMQ. 0 means heartbeats and socket read timeouts will be disabled (not recommended).
     # @option connection_string_or_opts [Integer] :network_recovery_interval (4) Recovery interval periodic network recovery will use. This includes initial pause after network failure.
     # @option connection_string_or_opts [Boolean] :tls (false) Should TLS/SSL be used?
     # @option connection_string_or_opts [String] :tls_cert (nil) Path to client TLS/SSL certificate file (.pem)
@@ -233,9 +233,13 @@ module Bunny
     # @return [String] Virtual host used
     def virtual_host; self.vhost; end
 
-    # @return [Integer] Heartbeat interval used
+    # @deprecated
+    # @return [Integer] Heartbeat timeout (not interval) used
     def heartbeat_interval; self.heartbeat; end
 
+    # @return [Integer] Heartbeat timeout used
+    def heartbeat_timeout; self.heartbeat; end
+
     # @return [Boolean] true if this connection uses TLS (SSL)
     def uses_tls?
       @transport.uses_tls?
@@ -944,7 +948,7 @@ module Bunny
 
     # @private
     def heartbeat_from(options)
-      options[:heartbeat] || options[:heartbeat_interval] || options[:requested_heartbeat] || DEFAULT_HEARTBEAT
+      options[:heartbeat] || options[:heartbeat_timeout] || options[:requested_heartbeat] || options[:heartbeat_interval] || DEFAULT_HEARTBEAT
     end
 
     # @private

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.11.0.pre1"
+  VERSION = "2.11.0"
 end

data/spec/higher_level_api/integration/connection_spec.rb

@@ -462,7 +462,7 @@ describe Bunny::Session do
     let(:interval) { 1 }
 
     subject do
-      described_class.new(hostname: host, username: username, password: password, vhost: vhost, heartbeat_interval: interval)
+      described_class.new(hostname: host, username: username, password: password, vhost: vhost, heartbeat_timeout: interval)
     end
 
     it "successfully connects" do

data/spec/higher_level_api/integration/heartbeat_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "Client-defined heartbeat interval" do
   context "with value > 0" do
     let(:connection) do
-      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: 4)
+      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_timeout: 4)
       c.start
       c
     end
@@ -19,7 +19,7 @@ describe "Client-defined heartbeat interval" do
   context "with value = 0" do
     let(:connection) do
       c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
-        heartbeat_interval: 0, automatically_recover: false)
+        heartbeat_timeout: 0, automatically_recover: false)
       c.start
       c
     end
@@ -35,7 +35,7 @@ end
 
 describe "Server-defined heartbeat interval" do
   let(:connection) do
-    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: :server)
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_timeout: :server)
     c.start
     c
   end

data/spec/stress/long_running_consumer_spec.rb

@@ -9,7 +9,7 @@ unless ENV["CI"]
     before :all do
       @connection = Bunny.new(username: "bunny_gem",
         password: "bunny_password", vhost: "bunny_testbed",
-        automatic_recovery: false, heartbeat_interval: 6)
+        automatic_recovery: false, heartbeat_timeout: 6)
       @connection.start
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.11.0.pre1
+  version: 2.11.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -227,9 +227,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11