pebbles-river 0.2.0 → 0.2.1

data/lib/pebbles/river/river.rb

@@ -108,18 +108,21 @@ module Pebbles
               retry
             end
           end
-        rescue Timeout::Error => timeout
-          last_exception ||= timeout
-          raise exception_klass.new(last_exception.message, last_exception)
+        rescue Timeout::Error => timeout_exception
+          if last_exception
+            raise exception_klass.new(last_exception.message, last_exception)
+          else
+            raise exception_klass.new("Timeout", timeout_exception)
+          end
         end
 
         def backoff(iteration)
           sleep([(1.0 / 2.0 * (2.0 ** [30, iteration].min - 1.0)).ceil, MAX_BACKOFF_SECONDS].min)
         end
 
-        MAX_RETRY_TIMEOUT = 10
+        MAX_RETRY_TIMEOUT = 30
 
-        MAX_BACKOFF_SECONDS = MAX_RETRY_TIMEOUT
+        MAX_BACKOFF_SECONDS = 10
 
         EXCHANGE_OPTIONS = {type: :topic, durable: :true}.freeze
 

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/lib/river_spec.rb

@@ -158,8 +158,8 @@ describe Pebbles::River::River do
           expect(subject).to receive(:disconnect).at_least(11).times
 
           expect(-> { subject.publish({event: 'explode', uid: 'thing:rspec$1'})}).to raise_error do |e|
-            e.should be Pebbles::River::SendFailure
-            e.exception.should be exception_class
+            expect(e).to be_instance_of Pebbles::River::SendFailure
+            expect(e.connection_exception.class).to eq exception_class
           end
 
           expect(sleeps[0, 9]).to eq [1, 2, 4, 8, 10, 10, 10, 10, 10]
@@ -167,6 +167,28 @@ describe Pebbles::River::River do
       end
     end
 
+    context 'on connection timeout' do
+      it "gives up with SendFailure" do
+        exchange = double('exchange')
+        exchange.stub(:publish) { }
+
+        subject.stub(:exchange) { exchange }
+
+        Timeout.stub(:timeout) { |&block|
+          raise Timeout::Error, "execution expired"
+        }
+        expect(Timeout).to receive(:timeout).exactly(1).times
+
+        expect(-> {
+          subject.publish({event: 'explode', uid: 'thing:rspec$1'})
+        }).to raise_error do |e|
+          expect(e).to be_instance_of Pebbles::River::SendFailure
+          expect(e.message).to eq 'Timeout'
+          expect(e.connection_exception.class).to eq Timeout::Error
+        end
+      end
+    end
+
   end
 
   it "subscribes" do

data/spec/lib/worker_spec.rb

@@ -229,7 +229,7 @@ describe Worker do
 
           let :handler do
             handler = double('handler')
-            handler.stub(:call).and_return {
+            allow(handler).to receive(:call) {
               raise exception
             }
             handler

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed