coney_island 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35298c5543296c4c41a42bd756f6ef193a29186
-  data.tar.gz: ef14d5797940fd78f324126b7d86e42c7130ef04
+  metadata.gz: 7dba043d7a55d3830d4a1d26147fa56148433713
+  data.tar.gz: be41a962dd7a4507839f4f7285e823c2a4ba0508
 SHA512:
-  metadata.gz: 790d75b9af3c13a51f0493350956c8026d87976efb5f45b2cee87c7c06891a19ac574264ab9aa8e638b162c56f93e693fbd5141e70bb01f7d69b9a5bacd9c3a7
-  data.tar.gz: 7b45b0327ea9fe7f01bf76a509921f80dc3e8b355ad35a49206d8d0df68c08fc8289b7581cefbc766b42e7be364d82654288e5ef6eb551802deaf17a0bcb2fbd
+  metadata.gz: 9e816ff7f5e2620a672c6fb8be05755b5b270c77be586595befcea3258b8624d3a65011461781d9c62b8972acf608ef06ae6799336dc13bb27b472e44aeb1512
+  data.tar.gz: 3d8e612aad3bd9e432e15f3328cbdad05de6497a46ae62e4a6ba517fab9b89e211e0f6415e354cca7d28e6db341d2ce592abfcfba80b361d3990c5e2c69a3cc2

data/Rakefile

@@ -25,7 +25,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.verbose = true
 end
 
 

data/lib/coney_island.rb

@@ -57,6 +57,14 @@ module ConeyIsland
     ConeyIsland::Worker.config
   end
 
+  def self.delay_seed
+    @delay_seed ||= 2
+  end
+
+  def self.delay_seed=(seed)
+    @delay_seed = seed
+  end
+
   def self.single_amqp_connection?
     !!self.amqp_parameters
   end
@@ -73,6 +81,10 @@ module ConeyIsland
     ConeyIsland::Submitter.run_inline
   end
 
+  def self.running_inline?
+    ConeyIsland::Submitter.running_inline?
+  end
+
   def self.stop_running_inline
     ConeyIsland::Submitter.stop_running_inline
   end
@@ -112,6 +124,8 @@ end
 
 require 'coney_island/notifiers/honeybadger_notifier'
 require 'coney_island/worker'
+require 'coney_island/job'
 require 'coney_island/submitter'
 require 'coney_island/job_argument_error'
 require 'coney_island/railtie' if defined?(Rails)
+require 'coney_island/performer'

data/lib/coney_island/job.rb

@@ -0,0 +1,91 @@
+module ConeyIsland
+  class Job
+    attr_accessor :delay, :timeout, :method_name, :class_name, :klass, :method_args, :id, :args,
+                  :instance_id, :object, :metadata, :attempts, :retry_limit, :retry_on_exception
+
+    def initialize(metadata, args)
+      @args = args
+      @id = SecureRandom.uuid
+      self.log.info ("Starting job #{@id}: #{@args}")
+      @delay = args['delay'].to_i if args['delay']
+      @timeout = args['timeout']
+      @method_name = args['method_name']
+      @instance_id = args['instance_id']
+      @class_name = args['klass']
+      @klass = @class_name.constantize
+      @method_args = args['args']
+      @attempts = args['attempt_count'] || 1
+      @retry_limit = args['retry_limit'] || 3
+      @retry_on_exception = args['retry_on_exception']
+      @metadata = metadata
+      if @klass.respond_to? :coney_island_settings
+        @delay ||= @klass.coney_island_settings[:delay]
+        @timeout ||= @klass.coney_island_settings[:timeout]
+      end
+      @timeout ||= BG_TIMEOUT_SECONDS
+      if @instance_id.present?
+        @object = @klass.find(@instance_id)
+      else
+        @object = @klass
+      end
+    end
+
+    def ticket
+      ConeyIsland::Worker.ticket
+    end
+
+    def log
+      ConeyIsland::Worker.log
+    end
+
+    def execute_job_method
+      if method_args.present? and method_args.length > 0
+        object.send method_name, *method_args
+      else
+        object.send method_name
+      end
+    end
+
+    def handle_job
+      Timeout::timeout(timeout) do
+        execute_job_method
+      end
+    rescue Timeout::Error => e
+      if self.attempts >= self.retry_limit
+        log.error("Request #{self.id} timed out after #{self.timeout} seconds, bailing out after 3 attempts")
+        ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args, reason: 'Bailed out after 3 attempts'})
+      else
+        log.error("Request #{self.id} timed out after #{self.timeout} seconds on attempt number #{self.attempts}, retrying...")
+        self.attempts += 1
+        ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
+      end
+    rescue Exception => e
+      if retry_on_exception && (self.attempts < self.retry_limit)
+        self.attempts += 1
+        ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args, attempt_count: self.attempts})
+        ConeyIsland.submit(self.klass, self.method_name, self.resubmit_args)
+        log.error("Resubmitting after error on attempt ##{self.attempts}:")
+      else
+        ConeyIsland.poke_the_badger(e, {work_queue: self.ticket, job_payload: self.args})
+        log.error("Bailing out after error on final attempt ##{self.attempts}:")
+      end
+      log.error("Error executing #{self.class_name}##{self.method_name} #{self.id} for id #{self.instance_id} with args #{self.args}:")
+      log.error(e.message)
+      log.error(e.backtrace.join("\n"))
+    ensure
+      finalize_job
+    end
+
+    def resubmit_args
+      args.select{|key,val| ['timeout','retry_on_exception','retry_limit','args','instance_id'].include? key}.merge(
+        'attempt_count' => self.attempts, 'work_queue' => self.ticket, 'delay' => ConeyIsland.delay_seed**(self.attempts - 1))
+    end
+
+    def finalize_job
+      metadata.ack unless ConeyIsland.running_inline?
+      log.info("finished job #{id}")
+      ConeyIsland::Worker.running_jobs.delete self
+    end
+
+  end
+end

data/lib/coney_island/performer.rb

@@ -0,0 +1,41 @@
+module ConeyIsland
+  module Performer
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def set_background_defaults(work_queue: nil, delay: nil, timeout: nil)
+        self.coney_island_settings[:work_queue] = work_queue
+        self.coney_island_settings[:delay] = delay
+        self.coney_island_settings[:timeout] = timeout
+      end
+
+      def coney_island_settings
+        @coney_island_settings ||= {}
+      end
+
+      def create_instance_async_methods(*synchronous_methods)
+        synchronous_methods.each do |synchronous_method|
+          define_method("#{synchronous_method}_async") do |*args|
+            unless self.respond_to? :id
+              raise StandardError.new(
+                "#{synchronous_method} is not an instance method, ConeyIsland can't async it via :create_instance_async_methods")
+            end
+            ConeyIsland.submit(self.class, synchronous_method, instance_id: self.id, args: args)
+          end
+        end
+      end
+
+      def create_class_async_methods(*synchronous_methods)
+        synchronous_methods.each do |synchronous_method|
+          define_singleton_method("#{synchronous_method}_async") do |*args|
+            ConeyIsland.submit(self, synchronous_method, args: args)
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/coney_island/submitter.rb

@@ -9,6 +9,10 @@ module ConeyIsland
       @run_inline = false
     end
 
+    def self.running_inline?
+      @run_inline
+    end
+
     def self.submit(*args)
       if RequestStore.store[:cache_jobs]
         job_id = SecureRandom.uuid
@@ -93,19 +97,24 @@ module ConeyIsland
     def self.publish_job(args, job_id = nil)
       if (args.first.is_a? Class or args.first.is_a? Module) and (args[1].is_a? String or args[1].is_a? Symbol) and args.last.is_a? Hash and 3 == args.length
         klass = args.shift
-        klass = klass.name
+        klass_name = klass.name
+
         method_name = args.shift
         job_args = args.shift
         job_args ||= {}
-        job_args['klass'] = klass
+        job_args['klass'] = klass_name
         job_args['method_name'] = method_name
         if @run_inline
           job_args.stringify_keys!
-          ConeyIsland::Worker.execute_job_method(job_args)
+          job = ConeyIsland::Job.new(nil, job_args)
+          job.handle_job
         else
           work_queue = job_args.delete :work_queue
+          if klass.respond_to? :coney_island_settings
+            work_queue ||= klass.coney_island_settings[:work_queue]
+          end
           work_queue ||= 'default'
-          self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}") do
+          self.exchange.publish(job_args.to_json, {routing_key: "carousels.#{work_queue}"}) do
             RequestStore.store[:jobs].delete job_id if RequestStore.store[:jobs] && job_id.present?
           end
         end

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/lib/coney_island/worker.rb

@@ -17,12 +17,24 @@ module ConeyIsland
       @log = log_thing
     end
 
-    def self.job_attempts
-      @job_attempts ||= {}
+    def self.running_jobs
+      @running_jobs ||= []
     end
 
-    def self.clear_job_attempts
-      @job_attempts = {}
+    def self.clear_running_jobs
+      @running_jobs = []
+    end
+
+    def self.ticket
+      @ticket
+    end
+
+    def self.ticket=(some_ticket)
+      @ticket = some_ticket
+    end
+
+    def self.reset_child_pids
+      @child_pids = []
     end
 
     def self.initialize_background
@@ -42,7 +54,7 @@ module ConeyIsland
       @worker_count = @instance_config[:worker_count] if @instance_config
       @worker_count ||= 1
       @child_count = @worker_count - 1
-      @child_pids = []
+      reset_child_pids
 
       @full_instance_name = @ticket
 
@@ -146,16 +158,15 @@ module ConeyIsland
 
     def self.handle_incoming_message(metadata,payload)
       begin
-        job_id = SecureRandom.uuid
-        self.job_attempts[job_id] = 1
         args = JSON.parse(payload)
-        self.log.info ("Starting job #{job_id}: #{args}")
-        if args.has_key? 'delay'
-          EventMachine.add_timer(args['delay'].to_i) do
-            self.handle_job(metadata,args,job_id)
+        job = Job.new(metadata, args)
+        self.running_jobs << job
+        if job.delay.present?
+          EventMachine.add_timer(job.delay) do
+            job.handle_job
           end
         else
-          self.handle_job(metadata,args,job_id)
+          job.handle_job
         end
       rescue Timeout::Error => e
         ConeyIsland.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args, reason: 'timeout in subscribe code before calling job method'})
@@ -165,60 +176,6 @@ module ConeyIsland
       end
     end
 
-    def self.handle_job(metadata,args,job_id)
-      timeout = args['timeout']
-      timeout ||= BG_TIMEOUT_SECONDS
-      begin
-        Timeout::timeout(timeout) do
-          self.execute_job_method(args)
-        end
-      rescue Timeout::Error => e
-        if self.job_attempts.has_key? job_id
-          if self.job_attempts[job_id] >= 3
-            self.log.error("Request #{job_id} timed out after #{timeout} seconds, bailing out after 3 attempts")
-            self.finalize_job(metadata,job_id)
-            ConeyIsland.poke_the_badger(e, {work_queue: @ticket, job_payload: args, reason: 'Bailed out after 3 attempts'})
-          else
-            self.log.error("Request #{job_id} timed out after #{timeout} seconds on attempt number #{self.job_attempts[job_id]}, retrying...")
-            self.job_attempts[job_id] += 1
-            self.handle_job(metadata,args,job_id)
-          end
-        end
-      rescue Exception => e
-        ConeyIsland.poke_the_badger(e, {work_queue: @ticket, job_payload: args})
-        self.log.error("Error executing #{args['klass']}##{args['method_name']} #{job_id} for id #{args['instance_id']} with args #{args}:")
-        self.log.error(e.message)
-        self.log.error(e.backtrace.join("\n"))
-        self.finalize_job(metadata,job_id)
-      else
-        self.finalize_job(metadata,job_id)
-      end
-    end
-
-    def self.execute_job_method(args)
-      class_name = args['klass']
-      method_name = args['method_name']
-      klass = class_name.constantize
-      method_args = args['args']
-      if args.has_key? 'instance_id'
-        instance_id = args['instance_id']
-        object = klass.find(instance_id)
-      else
-        object = klass
-      end
-      if method_args and method_args.length > 0
-        object.send method_name, *method_args
-      else
-        object.send method_name
-      end
-    end
-
-    def self.finalize_job(metadata,job_id)
-      metadata.ack
-      self.log.info("finished job #{job_id}")
-      self.job_attempts.delete job_id
-    end
-
     def self.handle_missing_children
       @child_pids.each do |child_pid|
         begin
@@ -231,7 +188,7 @@ module ConeyIsland
 
     def self.abandon_and_shutdown
       self.log.info("Lost RabbitMQ connection, abandoning current jobs and shutting down")
-      self.clear_job_attempts
+      self.clear_running_jobs
       self.shutdown('TERM')
     end
 
@@ -242,8 +199,8 @@ module ConeyIsland
       end
       @queue.unsubscribe rescue nil
       EventMachine.add_periodic_timer(1) do
-        if self.job_attempts.any?
-          self.log.info("Waiting for #{self.job_attempts.length} requests to finish")
+        if self.running_jobs.any?
+          self.log.info("Waiting for #{self.running_jobs.length} requests to finish")
         else
           self.log.info("Shutting down coney island #{@ticket}")
           EventMachine.stop
@@ -252,4 +209,4 @@ module ConeyIsland
     end
 
   end
-end
+end

data/test/dummy/log/test.log

@@ -2,19 +2,52 @@ ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+mocked method :publish expects 0 arguments, got 2
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+undefined method `publish' for nil:NilClass
+mocked method :publish expects 0 arguments, got 2
+mocked method :publish expects 0 arguments, got 2
+mocked method :publish expects 0 arguments, got 2
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
+Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
 ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1
 Failed to connecto to RabbitMQ Attempt #1 time(s), trying again in 0 seconds...
+ConeyIsland::Submitter.submit! about to iterate over this many jobs: 1

data/test/job_test.rb

@@ -0,0 +1,151 @@
+require 'test_helper'
+
+class JobTest < MiniTest::Test
+  describe "ConeyIsland::Job" do
+    describe "handling a job" do
+      before do
+        @metadata = MiniTest::Mock.new
+        @metadata.expect :ack, nil
+      end
+
+      it "retries on timeout with correct initial attempt_count and delay" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :take_too_long,
+            'timeout' => 0.0001 }
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          ::JobTest.messages[:job_options] ||= []
+          ::JobTest.messages[:job_options] << options
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        ::JobTest.messages[:job_options].last['attempt_count'].must_equal 2
+        ::JobTest.messages[:job_options].last['delay'].must_equal 2
+      end
+
+      it "retries on timeout with correct subsequent attempt_count and delay" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :take_too_long,
+            'timeout' => 0.0001,
+            'attempt_count' => 2,
+            'delay' => 2 }
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          ::JobTest.messages[:job_options] ||= []
+          ::JobTest.messages[:job_options] << options
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        ::JobTest.messages[:job_options].last['attempt_count'].must_equal 3
+        ::JobTest.messages[:job_options].last['delay'].must_equal 4
+      end
+
+      it "bails out on timeout if retry limit reached" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :take_too_long,
+            'timeout' => 0.0001,
+            'attempt_count' => 3,
+            'delay' => 2 }
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          fail "Should not have called ConeyIsland.submit, should have bailed out instead"
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        @metadata.verify #we ack the message bus when we bail out
+      end
+
+      it "retries on exception with correct initial attempt_count and delay if retry_on_exception set" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :throw_an_error,
+            'retry_on_exception' => true }
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          ::JobTest.messages[:job_options] ||= []
+          ::JobTest.messages[:job_options] << options
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        ::JobTest.messages[:job_options].last['attempt_count'].must_equal 2
+        ::JobTest.messages[:job_options].last['delay'].must_equal 2
+      end
+
+      it "bails out on exception if retry_on_exception set and retry_limit reached" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :throw_an_error,
+            'retry_on_exception' => true,
+            'retry_limit' => 2,
+            'attempt_count' => 2}
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          fail "Should not have called ConeyIsland.submit, should have bailed out instead"
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        @metadata.verify #we ack the message bus when we bail out
+      end
+
+      it "bails out on exception if retry_on_exception not set" do
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :throw_an_error }
+        )
+        capture_submissions = lambda { |klass,method_name,options|
+          fail "Should not have called ConeyIsland.submit, should have bailed out instead"
+        }
+        ConeyIsland.stub(:submit, capture_submissions) do
+          job.handle_job
+        end
+        @metadata.verify #we ack the message bus when we bail out
+      end
+
+      it "sends exeptions to a notification service when bailing out" do
+        @poke_the_badger = MiniTest::Mock.new
+        @poke_the_badger.expect :call, nil, [Exception,Hash]
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :throw_an_error }
+        )
+        ConeyIsland.stub(:poke_the_badger,@poke_the_badger) do
+          job.handle_job
+        end
+        @poke_the_badger.verify
+      end
+
+      it "calls find on the submitted class if an instance_id is present" do
+        TestModel.new('id' => 'my_id')
+        job = ConeyIsland::Job.new(@metadata,{
+          'klass' => 'TestModel',
+          'method_name' => :set_color,
+          'instance_id' => 'my_id',
+          'args' => ['green']
+          })
+        job.handle_job
+        my_thing = TestModel.find('my_id')
+        my_thing.color.must_equal 'green'
+      end
+
+      it "acknowledges job completion to the message bus" do
+        ConeyIsland.stop_running_inline
+        job = ConeyIsland::Job.new(@metadata,
+          { 'klass' => 'TestModel',
+            'method_name' => :add_to_list,
+            'args' => [[]]})
+        job.handle_job
+        @metadata.verify
+        ConeyIsland::Worker.running_jobs.must_be :empty?
+      end
+
+    end
+  end
+end

data/test/performer_test.rb

@@ -0,0 +1,113 @@
+require 'test_helper'
+
+class PerformerTest < MiniTest::Test
+  describe "settings" do
+    it 'sets default class-level settings' do
+      job = ConeyIsland::Job.new(nil,
+        { 'klass' => 'MyPerformer',
+          'method_name' => 'set_color',
+          'args' => ['carmine'] }
+      )
+      job.delay.must_equal 1
+      job.timeout.must_equal 5
+    end
+    it 'overrides class-level settings with job-level settings' do
+      job = ConeyIsland::Job.new(nil,
+        { 'klass' => 'MyPerformer',
+          'method_name' => 'set_color',
+          'args' => ['carmine'],
+          'delay' => 3,
+          'timeout' => 10 }
+      )
+      job.delay.must_equal 3
+      job.timeout.must_equal 10
+    end
+    it 'sets work queue for the class' do
+      capture_publish = proc do |payload,options|
+      end
+      @exchange = Minitest::Mock.new
+      def @exchange.publish(payload,options,&blk)
+        ::PerformerTest.messages[:publish_hash] = options
+      end
+      ConeyIsland::Submitter.stub(:handle_connection, nil) do
+        ConeyIsland::Submitter.stub(:exchange, @exchange) do
+          ConeyIsland::Submitter.stop_running_inline
+          ConeyIsland::Submitter.submit(MyPerformer, :add_to_list, args: [[]])
+        end
+      end
+      @exchange.verify
+      ::PerformerTest.messages[:publish_hash][:routing_key].must_equal "carousels.cyclone"
+    end
+    it 'overrides the class work queue with the job-level work queue' do
+      capture_publish = proc do |payload,options|
+      end
+      @exchange = Minitest::Mock.new
+      def @exchange.publish(payload,options,&blk)
+        ::PerformerTest.messages[:publish_hash] = options
+      end
+      ConeyIsland::Submitter.stub(:handle_connection, nil) do
+        ConeyIsland::Submitter.stub(:exchange, @exchange) do
+          ConeyIsland::Submitter.stop_running_inline
+          ConeyIsland::Submitter.submit(MyPerformer, :add_to_list, work_queue: 'boardwalk', args: [[]])
+        end
+      end
+      @exchange.verify
+      ::PerformerTest.messages[:publish_hash][:routing_key].must_equal "carousels.boardwalk"
+    end
+  end
+
+  describe 'async methods' do
+    it 'creates async instance methods' do
+      my_performer = MyPerformer.new(7)
+      ConeyIsland.run_inline
+      my_performer.set_color_async 'sage'
+      my_performer.color.must_equal 'sage'
+    end
+    it 'creates async class methods' do
+      ConeyIsland.run_inline
+      MyPerformer.set_tone_async 'contemplative'
+      MyPerformer.tone.must_equal 'contemplative'
+    end
+  end
+end
+
+class MyPerformer
+  include ConeyIsland::Performer
+  set_background_defaults work_queue: 'cyclone', delay: 1, timeout: 5
+  create_class_async_methods :set_tone
+  create_instance_async_methods :set_color
+
+  def self.instances
+    @instances ||= {}
+  end
+
+  def self.find(id)
+    instances[id]
+  end
+
+  def self.set_tone(tone)
+    @tone = tone
+  end
+
+  def self.tone
+    @tone
+  end
+
+  def id
+    @id
+  end
+
+  def initialize(id)
+    @id = id
+    self.class.instances[id] = self
+  end
+
+  def set_color(color)
+    @color = color
+  end
+
+  def color
+    @color
+  end
+end
+

data/test/submitter_test.rb

@@ -4,13 +4,13 @@ class SubmitterTest < MiniTest::Test
   describe "ConeyIsland::Submitter" do
     describe "running jobs inline" do
       it "calls the worker directly" do
-        @execute_job_method = Minitest::Mock.new
-        @execute_job_method.expect :call, nil, [Hash]
-        ConeyIsland::Worker.stub(:execute_job_method,@execute_job_method) do
+        @job = Minitest::Mock.new
+        @job.expect :handle_job, nil
+        ConeyIsland::Job.stub(:new,@job) do
           ConeyIsland::Submitter.run_inline
           ConeyIsland::Submitter.submit(TestModel, :add_to_list, args: [[]])
         end
-        @execute_job_method.verify
+        @job.verify
       end
     end
     describe "running jobs in the background" do

data/test/test_helper.rb

@@ -18,6 +18,21 @@ if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
+class MiniTest::Test
+  def self.messages
+    @@messages[Thread.current.object_id] ||= {}
+  end
+
+  def self.clear_messages
+    @@messages ||= {}
+    @@messages[Thread.current.object_id] = {}
+  end
+
+  def setup
+    self.class.clear_messages
+  end
+end
+
 class TestModel
 
   def self.add_to_list(array)

data/test/worker_test.rb

@@ -7,46 +7,26 @@ class WorkerTest < MiniTest::Test
         @metadata = MiniTest::Mock.new
         @metadata.expect :ack, nil
       end
-      it "handles timeouts with 3 retries before bailing out" do
-        ConeyIsland::Worker.job_attempts['my_job_id'] = 1
-        ConeyIsland::Worker.job_attempts.stub(:delete,nil) do
-          ConeyIsland::Worker.handle_job(@metadata,{
-            'klass' => 'TestModel',
-            'method_name' => :take_too_long,
-            'timeout' => 0.0001
-            },'my_job_id')
+      it 'handles incoming messages' do
+        @capture_running_jobs = []
+        def @capture_running_jobs.delete(item)
         end
-        ConeyIsland::Worker.job_attempts['my_job_id'].must_equal 3
-      end
-      it "sends other exeptions to a notification service" do
-        @poke_the_badger = MiniTest::Mock.new
-        @poke_the_badger.expect :call, nil, [Exception,Hash]
-        ConeyIsland.stub(:poke_the_badger,@poke_the_badger) do
-          ConeyIsland::Worker.handle_job(@metadata,{
-            'klass' => 'TestModel',
-            'method_name' => :throw_an_error
-            },'my_job_id')
+        ConeyIsland::Worker.stub :running_jobs, @capture_running_jobs do
+          ConeyIsland::Worker.handle_incoming_message(@metadata,
+            "{\"klass\":\"TestModel\",\"method_name\":\"add_to_list\",\"args\":[[]]}")
         end
-        @poke_the_badger.verify
-      end
-      it "calls find on the submitted class if an instance_id is present" do
-        TestModel.new('id' => 'my_id')
-        ConeyIsland::Worker.handle_job(@metadata,{
-          'klass' => 'TestModel',
-          'method_name' => :set_color,
-          'instance_id' => 'my_id',
-          'args' => ['green']
-          },'my_job_id')
-        my_thing = TestModel.find('my_id')
-        my_thing.color.must_equal 'green' 
+        @capture_running_jobs.first.args['method_name'].must_equal 'add_to_list'
       end
-      it "acknowledges job completion to the message bus" do
-        ConeyIsland::Worker.handle_job(@metadata,
-          { 'klass' => 'TestModel',
-            'method_name' => :add_to_list,
-            'args' => [[]]},
-          'my_job_id')
-        @metadata.verify
+      it 'passes work_queue to the job' do
+        ConeyIsland::Worker.ticket = 'test_queue'
+        @capture_running_jobs = []
+        def @capture_running_jobs.delete(item)
+        end
+        ConeyIsland::Worker.stub :running_jobs, @capture_running_jobs do
+          ConeyIsland::Worker.handle_incoming_message(@metadata,
+            "{\"klass\":\"TestModel\",\"method_name\":\"add_to_list\",\"args\":[[]]}")
+        end
+        @capture_running_jobs.first.ticket.must_equal 'test_queue'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,14 +104,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
 - bin/coney_island
 - lib/coney_island.rb
 - lib/coney_island/coney_island_adapter.rb
+- lib/coney_island/job.rb
 - lib/coney_island/job_argument_error.rb
 - lib/coney_island/notifiers/airbrake_notifier.rb
 - lib/coney_island/notifiers/honeybadger_notifier.rb
+- lib/coney_island/performer.rb
 - lib/coney_island/railtie.rb
 - lib/coney_island/submitter.rb
 - lib/coney_island/version.rb
@@ -153,6 +154,8 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/job_test.rb
+- test/performer_test.rb
 - test/submitter_test.rb
 - test/test_helper.rb
 - test/worker_test.rb
@@ -220,6 +223,8 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/job_test.rb
+- test/performer_test.rb
 - test/submitter_test.rb
 - test/test_helper.rb
 - test/worker_test.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= ConeyIsland
-
-This project rocks and uses MIT-LICENSE.