superbolt 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993a942222be7e90d9ceb4abf46ba30cfb3f7635
-  data.tar.gz: 076f2935f293964db9a7942f049f44ccf165f0db
+  metadata.gz: 234d0975ce1b95e327ebefdd7f023a3ae9e36864
+  data.tar.gz: 86187f0b44f54b22365dfab163d5384036e1a670
 SHA512:
-  metadata.gz: 32bca69f1e4c42a0327f0c72142180351d09cdcb00e1f2276850d454f7f038ef47fafe081c48f884a3469cf655421e0486f4c7ca913f5de92b318d09fc9990a3
-  data.tar.gz: 48217dbf508298a7a0f16a4e3ba094f916e13d013a601bebfbd11b2b25422d9a34c47c8ed8fcea4a64f29bea38a9f94ac21057d5949926a9dd9076dc4252dd7e
+  metadata.gz: f9d41cf6285e5b4853813eed6befe9c150cf83efbab3c882cd2c162a6edf7ab99ffa52611a75d38b898fc69ff76db3d27427bb6de8ff106ce9f09d45a2a053c3
+  data.tar.gz: 66f8359c9a4b88ab9997c2c1ea66d1281fd51f9a857777b102e63fc9f1b3d3a6e078e726441ffdb01bd628d8b21f873e58491c8064442e404b414cb8afd98b64

data/Rakefile

@@ -1,23 +1 @@
 require "bundler/gem_tasks"
-require "superbolt/tasks"
-
-
-# This one is for locally testing your crazy ideas
-task :environment do
-  class MySleeperCell < Superbolt::MessageHandler
-    def perform
-      sleep(rand(10))
-    end
-  end
-
-  Superbolt.config = {
-    connection_params: {
-      host: '127.0.0.1',
-      heartbeat: 1,
-    }
-  }
-  Superbolt.app_name = 'food'
-  Superbolt::Router.routes = {
-    'do-it' => 'MySleeperCell'
-  }
-end

data/lib/superbolt.rb

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

data/lib/superbolt/app.rb

@@ -1,12 +1,13 @@
 module Superbolt
   class App
-    attr_reader :config, :env
+    attr_reader :config, :env, :runner_type
     attr_accessor :logger
 
     def initialize(name, options={})
       @name = name
       @env =            options[:env] || Superbolt.env
       @logger =         options[:logger] || Logger.new($stdout)
+      @runner_type =    options[:runner] || :default
       @config =         options[:config] || Superbolt.config
     end
 
@@ -43,7 +44,7 @@ module Superbolt
       EventMachine.run do
         queue.channel.auto_recovery = true
 
-        # LShift came up with this solution, which helps reconnect when
+        # LShift came up with this solution, which helps reconnect when 
         # a process runs longer than the heartbeat (and therefore disconnects)
         queue.channel.connection.on_tcp_connection_loss do |conn, settings|
           puts 'Lost TCP connection, reconnecting'
@@ -59,7 +60,7 @@ module Superbolt
     end
 
     def runner_class
-      runner_map[config.runner_type] || default_runner
+      runner_map[runner_type] || default_runner
     end
 
     def runner_map
@@ -67,17 +68,8 @@ module Superbolt
         pop:      Runner::Pop,
         ack_one:  Runner::AckOne,
         ack:      Runner::Ack,
-        greedy:   Runner::Greedy,
-        ar_deferrable: Runner::ActiveRecordDeferrable
-      }.merge(self.class.additional_runners)
-    end
-
-    def self.additional_runners
-      @additional_runners ||= {}
-    end
-
-    def self.additional_runners=(ar)
-      @additional_runners = ar
+        greedy:   Runner::Greedy
+      }
     end
 
     def default_runner

data/lib/superbolt/config.rb

@@ -23,10 +23,6 @@ module Superbolt
       options[:connection_key] || 'RABBITMQ_URL'
     end
 
-    def runner_type
-      options[:runner_type_key] ? ENV[options[:runner_type_key]].to_sym : :default
-    end
-
     def env_params
       ENV[env_connection_key]
     end

data/lib/superbolt/router.rb

@@ -21,7 +21,7 @@ module Superbolt
 
     def perform
       if handler_class
-        handler_class.new(arguments, logger).perform
+        handler_class.new(arguments, logger).perform 
       else
         logger.warn "No Superbolt route for event: '#{event}'"
       end

data/lib/superbolt/runner/default.rb

@@ -12,25 +12,12 @@ module Superbolt
 
       def subscribe
         queue.subscribe(ack: ack) do |metadata, payload|
-          #Thanks again to LShift for this solution to long-running processes
-          #Defer keeps heartbeat running while the process finishes
-
-          before_fork
-          EM.defer do
-            after_fork
-
-            # this gets run on the thread pool
-            message = Superbolt::IncomingMessage.new(metadata, payload, channel)
-            processor = Superbolt::Processor.new(message, logger, &block)
-            unless processor.perform
-              on_error(message.parse, processor.exception)
-            end
-
-            EM.next_tick do
-              # this gets run back on the main loop
-              message.ack if ack
-            end
+          message =   IncomingMessage.new(metadata, payload, channel)
+          processor = Processor.new(message, logger, &block)
+          unless processor.perform
+            on_error(message.parse, processor.exception)
           end
+          message.ack if ack
         end
       end
 
@@ -39,14 +26,6 @@ module Superbolt
 
       def prefetch
       end
-
-      def before_fork
-        # Implement me in da subclass
-      end
-
-      def after_fork
-        # Implement me in da subclass
-      end
     end
   end
 end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/tasks/superbolt.rake

@@ -1,7 +1,7 @@
 # assumes an environment task that sets up your app environment
 desc "worker that reads the queue and sends messages through the router as configured"
 task :superbolt => :environment do
-  Superbolt::App.new(Superbolt.app_name, {}).run do |message, logger|
+  Superbolt::App.new(Superbolt.app_name).run do |message, logger|
     Superbolt::Router.new(message, logger).perform
   end
 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)
+      runner: runner_type
     })
   }
 
@@ -23,7 +23,6 @@ describe Superbolt::App do
     error_queue.clear
   end
 
-
   shared_examples 'app' do
     it "shuts down with any message to the quit queue" do
       queue.push({please: 'stop'})
@@ -64,6 +63,7 @@ describe Superbolt::App do
       queue.size.should == 0
     end
 
+
     it "passes a logger to the block" do
       mock_logger = double
       app.logger = mock_logger
@@ -104,21 +104,6 @@ describe Superbolt::App do
     it_should_behave_like "app"
   end
 
-  context 'when runner acknowledges one and uses activerecord deferrable' do
-    let(:runner_type) { :ar_deferrable }
-    module ActiveRecord
-      class Base
-      end
-    end
-
-    before do
-      ActiveRecord::Base.stub(:connection).and_return(double('connection', disconnect!: true))
-      ActiveRecord::Base.stub(:establish_connection)
-    end
-
-    it_should_behave_like "app"
-  end
-
   context 'when runner acknowledges without a prefetch limit' do
     let(:runner_type) { :ack }
 
@@ -136,16 +121,4 @@ describe Superbolt::App do
 
     it_should_behave_like "app"
   end
-
-  context 'when there are additional runners in the apps config' do
-    let(:runner_type) { :monster_farts }
-
-    before do
-      Superbolt::App.additional_runners = {monster_farts: 'stinky'}
-    end
-
-    it 'uses the injected runner' do
-      app.runner_class.should == 'stinky'
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - socialchorus
@@ -156,7 +156,6 @@ files:
 - lib/superbolt/router.rb
 - lib/superbolt/runner/ack.rb
 - lib/superbolt/runner/ack_one.rb
-- lib/superbolt/runner/active_record_deferrable.rb
 - lib/superbolt/runner/base.rb
 - lib/superbolt/runner/default.rb
 - lib/superbolt/runner/greedy.rb
@@ -177,7 +176,6 @@ files:
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
 - spec/support/commodore.jpg
-- spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb
 - superbolt.gemspec
 homepage: ''
@@ -217,5 +215,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
 - spec/support/commodore.jpg
-- spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb
+has_rdoc: 

data/lib/superbolt/runner/active_record_deferrable.rb

@@ -1,13 +0,0 @@
-module Superbolt
-  module Runner
-    class ActiveRecordDeferrable < AckOne
-      def before_fork
-        ActiveRecord::Base.connection.disconnect!
-      end
-
-      def after_fork
-        ActiveRecord::Base.establish_connection
-      end
-    end
-  end
-end

data/spec/support/em_mocking.rb

@@ -1,9 +0,0 @@
-module EM
-  def self.defer(&block)
-    block.call
-  end
-
-  def self.next_tick(&block)
-    block.call
-  end
-end