superbolt 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 617269c18e96ede571c922d7382caed2b4c4a490
-  data.tar.gz: 179415f08117fe92b14d85d183505b7afdb50bdf
+  metadata.gz: ee5f785becf5300b3f3aa76a6309e345b33e6f89
+  data.tar.gz: f91c93f3f9814d5a8e969ade48f06a76506276b8
 SHA512:
-  metadata.gz: 5b57fb7e2441d5980c0f35a3e6a550a7afce8ec714767cb159b3e0b22231f1bc066a81537fe2f533d28601304a942e08c343bbf7f755858769289924a5ea42f0
-  data.tar.gz: 5916fc473822704e98b3925bc7eff8f247239fd615da6f92882f737c400d1ebd20855a0dfb5be4d97685df3e013e2a88984bef88e65c2e2c86ae71d7fd7f38c6
+  metadata.gz: 26a593552635172c7e548c781b84846c63210536e57c2444e7b369e9518383bbd3b21856a644f1af8ff23395363dc725b4fa55cc4bf379605aa230c04a93899e
+  data.tar.gz: 6a96bb6ed931e49acf07a8e0dfe3415565c63dfcf97f4bfcb4a456e8ad6ed13616e608f664f6fc6f5f6d6b57b61e40cbf529d6c5b4a41639982056d8cb37d5da

data/lib/superbolt.rb

@@ -25,6 +25,7 @@ require "superbolt/runner/ack_one"
 require "superbolt/runner/ack"
 require "superbolt/runner/pop"
 require "superbolt/runner/greedy"
+require "superbolt/runner/pg"
 
 require "superbolt/queue"
 require "superbolt/incoming_message"

data/lib/superbolt/app.rb

@@ -8,7 +8,7 @@ module Superbolt
       @env =            options[:env] || Superbolt.env
       @logger =         options[:logger] || Logger.new($stdout)
       @config =         options[:config] || Superbolt.config
-      @runner_type =    options[:runner] || :default
+      @runner_type =    options[:runner] || config.runner || :default
     end
 
     def name
@@ -59,7 +59,8 @@ module Superbolt
         pop:      Runner::Pop,
         ack_one:  Runner::AckOne,
         ack:      Runner::Ack,
-        greedy:   Runner::Greedy
+        greedy:   Runner::Greedy,
+        pg:       Runner::Pg
       }
     end
 

data/lib/superbolt/config.rb

@@ -23,6 +23,10 @@ module Superbolt
       options[:connection_key] || 'RABBITMQ_URL'
     end
 
+    def runner
+      options[:runner]
+    end
+
     def env_params
       ENV[env_connection_key]
     end

data/lib/superbolt/runner/base.rb

@@ -25,4 +25,4 @@ module Superbolt
       end
     end
   end
-end
+end

data/lib/superbolt/runner/pg.rb

@@ -0,0 +1,13 @@
+module Superbolt
+  module Runner
+    class Pg < Default
+      def on_error(message, error)
+        if error == PG::UnableToSend || error == PG::ConnectionBad
+          ActiveRecord::Base.connection.reset!
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.5.8" #possibly broken for file transfer :(
+  VERSION = "0.5.9" #possibly broken for file transfer :(
 end

data/spec/app_spec.rb

@@ -5,7 +5,7 @@ describe Superbolt::App do
     Superbolt::App.new(name, {
       env: env,
       logger: logger,
-      config: double('config', runner_type: runner_type, connection_params: true)
+      config: double('config', runner: runner, connection_params: true)
     })
   }
 
@@ -99,25 +99,25 @@ describe Superbolt::App do
   end
 
   context 'when runner acknowledges one' do
-    let(:runner_type) { :ack_one }
+    let(:runner) { :ack_one }
 
     it_should_behave_like "app"
   end
 
   context 'when runner acknowledges without a prefetch limit' do
-    let(:runner_type) { :ack }
+    let(:runner) { :ack }
 
     it_should_behave_like 'app'
   end
 
   context 'when runner does not acknowledge and has no limits' do
-    let(:runner_type) { :greedy }
+    let(:runner) { :greedy }
 
     it_should_behave_like 'app'
   end
 
   context 'when the runner pops without acknowledgment' do
-    let(:runner_type) { :pop }
+    let(:runner) { :pop }
 
     it_should_behave_like "app"
   end

data/spec/lib/superbolt/runner/pg_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+module ActiveRecord
+  class Base
+  end
+end
+
+module PG
+  class UnableToSend
+    def self.message
+      'oh noes'
+    end
+
+    def self.backtrace
+      'trace me'
+    end
+  end
+
+  class ConnectionBad
+    def self.message
+      'oh noes'
+    end
+
+    def self.backtrace
+      'trace me'
+    end
+  end
+end
+
+describe "Superbolt::Runner::Pg" do
+  let(:runner) { Superbolt::Runner::Pg.new('berkin', double('error', push: true), 'whatever', 'some block') }
+  let(:connection) { double('connection', reset!: true) }
+
+  before do
+    ActiveRecord::Base.stub(:connection).and_return(connection)
+  end
+
+  describe "on_error" do
+    context "PG::UnableToSend" do
+      it "should handle it" do
+        connection.should_receive(:reset!).and_return(true)
+        runner.on_error({message: 'somethig has gone very wrong'}, PG::UnableToSend)
+      end
+    end
+
+    context "PG::ConnectionBad " do
+      it "should handle it" do
+        connection.should_receive(:reset!).and_return(true)
+        runner.on_error({message: 'somethig has gone very wrong'}, PG::ConnectionBad)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -159,6 +159,7 @@ files:
 - lib/superbolt/runner/base.rb
 - lib/superbolt/runner/default.rb
 - lib/superbolt/runner/greedy.rb
+- lib/superbolt/runner/pg.rb
 - lib/superbolt/runner/pop.rb
 - lib/superbolt/spec_helpers.rb
 - lib/superbolt/tasks.rb
@@ -170,6 +171,7 @@ files:
 - spec/file_packer_spec.rb
 - spec/file_unpacker_spec.rb
 - spec/incoming_message_spec.rb
+- spec/lib/superbolt/runner/pg_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/router_spec.rb
@@ -210,6 +212,7 @@ test_files:
 - spec/file_packer_spec.rb
 - spec/file_unpacker_spec.rb
 - spec/incoming_message_spec.rb
+- spec/lib/superbolt/runner/pg_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/router_spec.rb