superbolt 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a855cc5c7f275eaded2255e896d67e2a765b7f06
-  data.tar.gz: 12e8c87da121d2b1d3e67261ec95950e8dcd6b69
+  metadata.gz: dfc8976e1d00e4f51ff26d28b413bd750ae3f317
+  data.tar.gz: 13cf9ddcbd97306aa7ea95862531a3d4d256e473
 SHA512:
-  metadata.gz: 2cdb3838b54af6621c62b9275b5729657068642257055109da51f639fbec89a50fe538fa414cbbd12402e2ff3a63d24aa2a9481bdd6bc249a4da79cea7860403
-  data.tar.gz: e3ef96919cc0c703107be66b2b1d8fac27a65730fe1ab060aeb1cb84b0350a338ef746e3a1a489586ddc9d0eaa991217f817865502167b8a1226c8e2b6cfc35d
+  metadata.gz: 122d5b6a367f4aa7bc6fd7641de8113d2fb70042066d362b8c385dc8641eb75e205965bd44077700417078fd730eb1c581d127cb98bf09a5926935d8cdb639ce
+  data.tar.gz: 085ecc038bba6700579e840a3192b38ba9929e622b1fb59861150a051f86f3fc48a43e151ef7608027867daa06c0519aa59953adfeb7cc9d53c9dd3134d88fdb

data/lib/superbolt/app.rb

@@ -1,19 +1,29 @@
 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)
-      @config = options[:config] || Superbolt.config
+      @env =            options[:env] || Superbolt.env
+      @logger =         options[:logger] || Logger.new($stdout)
+      @runner_type =    options[:runner] || :default
+      @config =         options[:config] || Superbolt.config
     end
 
     def name
       env ? "#{@name}_#{env}" : @name
     end
 
+    # just in case you have a handle to the app and want to quit it
+    def quit_queue
+      Queue.new("#{connection.name}.quit", connection.config)
+    end
+
+    def error_queue
+      Queue.new("#{connection.name}.error", connection.config)
+    end
+
     def connection
       @connection ||= Connection::App.new(name, config)
     end
@@ -30,29 +40,11 @@ module Superbolt
       connection.qq
     end
 
-    def quit_queue
-      Queue.new("#{connection.name}.quit", connection.config)
-    end
-
-    def error_queue
-      Queue.new("#{connection.name}.error", connection.config)
-    end
-
     def run(&block)
       EventMachine.run do
-        # only get one message at a time for performance
-        # and tell it to auto reconnect, duh!
-        queue.channel.prefetch(1)
         queue.channel.auto_recovery = true
 
-        queue.subscribe(ack: true) do |metadata, payload|
-          message = IncomingMessage.new(metadata, payload, channel)
-          processor = Processor.new(message, logger, &block)
-          unless processor.perform
-            on_error(message.parse, processor.exception)
-          end
-          message.ack
-        end
+        runner_class.new(queue, error_queue, logger, block).run
 
         quit_subscriber_queue.subscribe do |message|
           quit(message)
@@ -60,14 +52,21 @@ module Superbolt
       end
     end
 
-    def on_error(message, error)
-      error_message = message.merge({error: {
-        class: error.class,
-        message: error.message,
-        backtrace: error.backtrace,
-        errored_at: Time.now
-      }})
-      error_queue.push(error_message)
+    def runner_class
+      runner_map[runner_type] || default_runner
+    end
+
+    def runner_map
+      {
+        pop:      Runner::Pop,
+        ack_one:  Runner::AckOne,
+        ack:      Runner::Ack,
+        greedy:   Runner::Greedy
+      }
+    end
+
+    def default_runner
+      runner_map[:ack_one]
     end
 
     def quit(message='no message given')

data/lib/superbolt/runner/ack.rb

@@ -0,0 +1,9 @@
+module Superbolt
+  module Runner
+    class Ack < Default
+      def ack
+        true
+      end
+    end
+  end
+end

data/lib/superbolt/runner/ack_one.rb

@@ -0,0 +1,13 @@
+module Superbolt
+  module Runner
+    class AckOne < Default
+      def ack
+        true
+      end
+
+      def prefetch
+        1
+      end
+    end
+  end
+end

data/lib/superbolt/runner/base.rb

@@ -0,0 +1,28 @@
+module Superbolt
+  module Runner
+    class Base
+      attr_reader :queue, :error_queue, :logger, :block
+
+      def initialize(queue, error_queue, logger, block)
+        @queue = queue
+        @error_queue = error_queue
+        @logger = logger
+        @block = block
+      end
+
+      def channel
+        queue.channel
+      end
+
+      def on_error(message, error)
+        error_message = message.merge({error: {
+          class: error.class,
+          message: error.message,
+          backtrace: error.backtrace,
+          errored_at: Time.now
+        }})
+        error_queue.push(error_message)
+      end
+    end
+  end
+end

data/lib/superbolt/runner/default.rb

@@ -0,0 +1,31 @@
+module Superbolt
+  module Runner
+    class Default < Base
+      def run
+        set_prefetch
+        subscribe
+      end
+
+      def set_prefetch
+        channel.prefetch(prefetch) if prefetch
+      end
+
+      def subscribe
+        queue.subscribe(ack: ack) do |metadata, payload|
+          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
+
+      def ack
+      end
+
+      def prefetch
+      end
+    end
+  end
+end

data/lib/superbolt/runner/greedy.rb

@@ -0,0 +1,6 @@
+module Superbolt
+  module Runner
+    class Greedy < Default
+    end
+  end
+end

data/lib/superbolt/runner/pop.rb

@@ -0,0 +1,23 @@
+module Superbolt
+  module Runner
+    class Pop < Base
+      attr_reader :message
+    
+      def run
+        EventMachine.add_periodic_timer(0.01) do
+          next if message
+
+          queue.pop do |metadata, payload|
+            @message = IncomingMessage.new(metadata, payload, channel)
+            processor = Processor.new(message, logger, &block)
+
+            unless processor.perform
+              on_error(message.parse, processor.exception)
+            end
+            @message = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/superbolt.rb

@@ -7,12 +7,22 @@ require 'active_support/core_ext/module/delegation'
 
 require "superbolt/version"
 require "superbolt/config"
+
 require "superbolt/adapter/base"
 require "superbolt/adapter/bunny"
 require "superbolt/adapter/amqp"
+
 require "superbolt/connection/base"
 require "superbolt/connection/queue"
 require "superbolt/connection/app"
+
+require "superbolt/runner/base"
+require "superbolt/runner/default"
+require "superbolt/runner/ack_one"
+require "superbolt/runner/ack"
+require "superbolt/runner/pop"
+require "superbolt/runner/greedy"
+
 require "superbolt/queue"
 require "superbolt/incoming_message"
 require "superbolt/app"

data/spec/app_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
 describe Superbolt::App do
+  let(:app) {
+    Superbolt::App.new(name, {
+      env: env,
+      logger: logger,
+      runner: runner_type
+    })
+  }
+
   let(:env)         { 'test' }
   let(:name)        { 'superbolt' }
   let(:logger)      { Logger.new('/dev/null') }
-  let(:app)         {
-                       Superbolt::App.new(name, {
-                         env: env,
-                         logger: logger
-                       })
-                    }
   let(:queue)       { Superbolt::Queue.new("#{name}_#{env}") }
   let(:quit_queue)  { Superbolt::Queue.new("#{name}_#{env}.quit") }
   let(:error_queue) { Superbolt::Queue.new("#{name}_#{env}.error") }
@@ -21,7 +23,7 @@ describe Superbolt::App do
     error_queue.clear
   end
 
-  describe '#run' do
+  shared_examples 'app' do
     it "shuts down with any message to the quit queue" do
       queue.push({please: 'stop'})
 
@@ -95,4 +97,28 @@ describe Superbolt::App do
       error_queue.size.should == 1
     end
   end
+
+  context 'when runner acknowledges one' do
+    let(:runner_type) { :ack_one }
+
+    it_should_behave_like "app"
+  end
+
+  context 'when runner acknowledges without a prefetch limit' do
+    let(:runner_type) { :ack }
+
+    it_should_behave_like 'app'
+  end
+
+  context 'when runner does not acknowledge and has no limits' do
+    let(:runner_type) { :greedy }
+
+    it_should_behave_like 'app'
+  end
+
+  context 'when the runner pops without acknowledgment' do
+    let(:runner_type) { :pop }
+
+    it_should_behave_like "app"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -135,6 +135,12 @@ files:
 - lib/superbolt/messenger.rb
 - lib/superbolt/processor.rb
 - lib/superbolt/queue.rb
+- lib/superbolt/runner/ack.rb
+- lib/superbolt/runner/ack_one.rb
+- lib/superbolt/runner/base.rb
+- lib/superbolt/runner/default.rb
+- lib/superbolt/runner/greedy.rb
+- lib/superbolt/runner/pop.rb
 - lib/superbolt/spec_helpers.rb
 - lib/superbolt/version.rb
 - spec/app_spec.rb