coney_island 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ce6f8d79f2c7959d6f1d5650b494cae2a716ab2
-  data.tar.gz: 8affe8a1cfcc6e8705da3337b3f7ed416534bab2
+  metadata.gz: fdf7b8e2dfbaa750deb86831a4c1a98b42e620b0
+  data.tar.gz: 05701ccb0b9c4c3cdf4f1d293270bc55062c8c26
 SHA512:
-  metadata.gz: c8f1f23dfd854407b146fcf970eb05f3a14e2514f6146ac9273aeab36a441e7d8a7227c81ebdd780f4b0345908aa754075db33002b41abb80e1b96be7e6cb73c
-  data.tar.gz: 402697481acad3b9a357fa192597864287ba4883efa3ecdcb2735c15cb0b7e103971914c88773c0615e20455811530ca7684a1ae624ea25ddfbc18a93cf64d9a
+  metadata.gz: be8931b31581fa30a558947a0625b672733b3b8dba793ef7887fed06ae659aa9f538452d30ae20d2f8bc36b97330b1844851258ee8992a31a45f051adc350001
+  data.tar.gz: 367b56c8b52f12e96f2451d80860e256767f013c3d3c19430822695da2923a08ef64d283771d150605be8ee3bdfd100b9b9baff8853b33c75f937373abb85b51

data/bin/coney_island

@@ -7,4 +7,4 @@ require 'config/environment.rb'
 
 ConeyIsland.run_inline
 ConeyIsland.initialize_background
-ConeyIsland.start
+ConeyIsland.start_worker

data/lib/coney_island.rb

@@ -1,13 +1,8 @@
 module ConeyIsland
-  BG_TIMEOUT_SECONDS = 30
 
-  def self.run_inline
-    @run_inline = true
-  end
+  ### BEGIN configuration
 
-  def self.notification_service=(service_name)
-    @notifier = "ConeyIsland::Notifiers::#{service_name}Notifier".constantize
-  end
+  BG_TIMEOUT_SECONDS = 30
 
   def self.amqp_connection
     @connection
@@ -18,13 +13,17 @@ module ConeyIsland
   end
 
   def self.amqp_parameters
-    @amqp_parameters ||= (self.config.present? ? self.config['amqp_connection'] : nil)
+    @amqp_parameters ||= (self.config.present? ? self.config[:amqp_connection] : nil)
   end
 
   def self.handle_connection
     @connection ||= AMQP.connect(self.amqp_parameters)
     @channel  ||= AMQP::Channel.new(@connection)
-    @exchange ||= @channel.topic('coney_island')
+    self.exchange = @channel.topic('coney_island')
+  end
+
+  def self.exchange=(amqp_exchange)
+    @exchange ||= amqp_exchange
   end
 
   def self.exchange
@@ -35,266 +34,52 @@ module ConeyIsland
     @channel
   end
 
-  def self.config
-    if(File.exists?(File.join(Rails.root,"config","coney_island.yml")))
-      @config = Psych.load(File.read(File.join(Rails.root,"config","coney_island.yml")))
-      @config = @config[Rails.env]
-    end
+  def self.config=(config_hash)
+    ConeyIsland::Worker.config=(config_hash)
   end
 
-  #BEGIN web functionality
-
-  def self.submit(*args)
-    if RequestStore.store[:cache_jobs]
-      RequestStore.store[:jobs].push args
-    else
-      self.submit!(args)
-    end
-  end
-
-  def self.submit!(args)
-    if @run_inline
-      self.handle_publish(args)
-    else
-      EventMachine.next_tick do
-        self.handle_publish(args)
-      end
-    end
-  end
-
-  def self.handle_publish(args)
-    self.handle_connection unless @run_inline
-    jobs = (args.first.is_a? Array) ? args : [args]
-    jobs.each do |args|
-      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 unless @run_inline
-        method_name = args.shift
-        job_args = args.shift
-        job_args ||= {}
-        job_args['klass'] = klass
-        job_args['method_name'] = method_name
-        if @run_inline
-          job_args.stringify_keys!
-          method_args = job_args['args']
-          if job_args.has_key? 'instance_id'
-            instance_id = job_args.delete 'instance_id'
-            object = klass.find(instance_id)
-          else
-            object = klass
-          end
-          if method_args && (method_args.length > 0)
-            object.send method_name, *method_args
-          else
-            object.send method_name
-          end
-        else
-          work_queue = job_args.delete :work_queue
-          work_queue ||= 'default'
-          self.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
-        end
-      end
-      RequestStore.store[:completed_jobs] ||= 0
-      RequestStore.store[:completed_jobs] += 1
-    end
-  end
-
-  def self.cache_jobs
-    RequestStore.store[:cache_jobs] = true
-    RequestStore.store[:jobs] = []
+  def self.config
+    ConeyIsland::Worker.config
   end
 
-  def self.flush_jobs
-    jobs = RequestStore.store[:jobs].dup
-    self.submit!(jobs) if jobs.any?
-    RequestStore.store[:jobs] = []
+  def self.initialize_background
+    ConeyIsland::Worker.initialize_background
   end
 
-  def self.run_with_em(klass, method, *args)
-    EventMachine.run do
-      ConeyIsland.cache_jobs
-      ConeyIsland.submit(klass, method, *args)
-      ConeyIsland.flush_jobs
-      ConeyIsland.publisher_shutdown
-    end
+  def self.start_worker
+    ConeyIsland::Worker.start
   end
 
-  def self.publisher_shutdown
-    EventMachine.add_periodic_timer(1) do
-      if RequestStore.store[:jobs] && (RequestStore.store[:jobs].length > RequestStore.store[:completed_jobs])
-        Rails.logger.info("Waiting for #{RequestStore.store[:jobs].length - RequestStore.store[:completed_jobs]} publishes to finish")
-      else
-        Rails.logger.info("Shutting down coney island publisher")
-        EventMachine.stop
-      end
-    end
+  def self.run_inline
+    ConeyIsland::Submitter.run_inline
   end
 
-  # BEGIN background functionality
-
-  def self.initialize_background
-    ENV['NEW_RELIC_AGENT_ENABLED'] = 'false'
-    ENV['NEWRELIC_ENABLE'] = 'false'
-    @ticket = ARGV[0]
-
-    #TODO: set an env variable or constant that can be checked by pubnub to decide sync or not
-    @log_io = self.config['log'].constantize rescue nil
-    @log_io ||= self.config['log']
-    @log = Logger.new(@log_io)
-
-    @ticket ||= 'default'
-
-    @instance_config = self.config['carousels'][@ticket]
-
-    @prefetch_count = @instance_config['prefetch_count'] if @instance_config
-    @prefetch_count ||= 20
-
-    @worker_count = @instance_config['worker_count'] if @instance_config
-    @worker_count ||= 1
-    @child_count = @worker_count - 1
-    @child_pids = []
-
-    @full_instance_name = @ticket
-    @job_attempts = {}
-
-    @log.level = @config['log_level']
-    @log.info("config: #{self.config}")
-
+  def self.stop_running_inline
+    ConeyIsland::Submitter.stop_running_inline
   end
 
-  def self.shutdown(signal)
-    shutdown_time = Time.now
-    @child_pids.each do |child_pid|
-      Process.kill(signal, child_pid)
-    end
-    @queue.unsubscribe
-    EventMachine.add_periodic_timer(1) do
-      if @job_attempts.any?
-        @log.info("Waiting for #{@job_attempts.length} requests to finish")
-      else
-        @log.info("Shutting down coney island #{@ticket}")
-        EventMachine.stop
-      end
-    end
+  def self.cache_jobs
+    ConeyIsland::Submitter.cache_jobs
   end
 
-  def self.handle_job(metadata,args,job_id)
-    class_name = args['klass']
-    method_name = args['method_name']
-    klass = class_name.constantize
-    method_args = args['args']
-    timeout = args['timeout']
-    timeout ||= BG_TIMEOUT_SECONDS
-    begin
-      Timeout::timeout(timeout) do
-        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
-    rescue Timeout::Error => e
-      if @job_attempts.has_key? job_id
-        if @job_attempts[job_id] >= 3
-          @log.error("Request #{job_id} timed out after #{timeout} seconds, bailing out after 3 attempts")
-          self.finalize_job(metadata,job_id)
-          self.poke_the_badger(e, {work_queue: @ticket, job_payload: args, reason: 'Bailed out after 3 attempts'})
-        else
-          @log.error("Request #{job_id} timed out after #{timeout} seconds on attempt number #{@job_attempts[job_id]}, retrying...")
-          @job_attempts[job_id] += 1
-          self.handle_job(metadata,args,job_id)
-        end
-      end
-    rescue Exception => e
-      self.poke_the_badger(e, {work_queue: @ticket, job_payload: args})
-      @log.error("Error executing #{class_name}##{method_name} #{job_id} for id #{args['instance_id']} with args #{args}:")
-      @log.error(e.message)
-      @log.error(e.backtrace.join("\n"))
-      self.finalize_job(metadata,job_id)
-    else
-      self.finalize_job(metadata,job_id)
-    end
+  def self.stop_caching_jobs
+    ConeyIsland::Submitter.stop_caching_jobs
   end
 
-  def self.finalize_job(metadata,job_id)
-    metadata.ack
-    @log.info("finished job #{job_id}")
-    @job_attempts.delete job_id
+  def self.flush_jobs
+    ConeyIsland::Submitter.flush_jobs
   end
 
-  def self.start
-    @child_count.times do
-      child_pid = Process.fork
-      unless child_pid
-        @log.info("started child for ticket #{@ticket} with pid #{Process.pid}")
-        break
-      end
-      @child_pids.push child_pid
-    end
-    defined?(ActiveRecord::Base) and
-      ActiveRecord::Base.establish_connection
-    EventMachine.run do
-
-      Signal.trap('INT') do
-        self.shutdown('INT')
-      end
-      Signal.trap('TERM') do
-        self.shutdown('TERM')
-      end
-
-      self.handle_connection
-      @log.info("Connecting to AMQP broker. Running #{AMQP::VERSION}")
-
-      #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
-      heartbeat_exchange = self.channel.fanout('coney_island_heartbeat')
-      EventMachine.add_periodic_timer(15) do
-        heartbeat_exchange.publish({:instance_name => @ticket})
-      end
-
-      self.channel.prefetch @prefetch_count
-      @queue = self.channel.queue(@full_instance_name, auto_delete: false, durable: true)
-      @queue.bind(self.exchange, routing_key: 'carousels.' + @ticket)
-      @queue.subscribe(:ack => true) do |metadata,payload|
-        begin
-          job_id = SecureRandom.uuid
-          @job_attempts[job_id] = 1
-          args = JSON.parse(payload)
-          @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)
-            end
-          else
-            self.handle_job(metadata,args,job_id)
-          end
-        rescue Timeout::Error => e
-          self.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args, reason: 'timeout in subscribe code before calling job method'})
-        rescue Exception => e
-          self.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args})
-          @log.error("ConeyIsland code error, not application code:\n#{e.inspect}\nARGS: #{args}")
-        end
-      end
-    end
+  def self.run_with_em(klass, method, *args)
+    ConeyIsland::Submitter.run_with_em(klass, method, *args)
   end
 
-  def self.poke_the_badger(message, context, attempts = 1)
-    begin
-      Timeout::timeout(3) do
-        @notifier.notify(message, context)
-      end
-    rescue
-      if attempts <= 3
-        attempts += 1
-        self.poke_the_badger(message, context, attempts)
-      end
-    end
+  def self.submit(*args)
+    ConeyIsland::Submitter.submit(*args)
   end
 end
+
 require 'coney_island/notifiers/honeybadger_notifier'
+require 'coney_island/worker'
+require 'coney_island/submitter'
 

data/lib/coney_island/submitter.rb

@@ -0,0 +1,92 @@
+module ConeyIsland
+  class Submitter
+
+    def self.run_inline
+      @run_inline = true
+    end
+
+    def self.stop_running_inline
+      @run_inline = false
+    end
+
+    def self.submit(*args)
+      if RequestStore.store[:cache_jobs]
+        RequestStore.store[:jobs].push args
+      else
+        self.submit!(args)
+      end
+    end
+
+    def self.submit!(args)
+      if @run_inline
+        self.handle_publish(args)
+      else
+        EventMachine.next_tick do
+          self.handle_publish(args)
+        end
+      end
+    end
+
+    def self.handle_publish(args)
+      ConeyIsland.handle_connection unless @run_inline
+      jobs = (args.first.is_a? Array) ? args : [args]
+      jobs.each do |args|
+        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
+          method_name = args.shift
+          job_args = args.shift
+          job_args ||= {}
+          job_args['klass'] = klass
+          job_args['method_name'] = method_name
+          if @run_inline
+            job_args.stringify_keys!
+            ConeyIsland::Worker.execute_job_method(job_args)
+          else
+            work_queue = job_args.delete :work_queue
+            work_queue ||= 'default'
+            ConeyIsland.exchange.publish((job_args.to_json), routing_key: "carousels.#{work_queue}")
+          end
+        end
+        RequestStore.store[:completed_jobs] ||= 0
+        RequestStore.store[:completed_jobs] += 1
+      end
+    end
+
+    def self.cache_jobs
+      RequestStore.store[:cache_jobs] = true
+      RequestStore.store[:jobs] = []
+    end
+
+    def self.flush_jobs
+      jobs = RequestStore.store[:jobs].dup
+      self.submit!(jobs) if jobs.any?
+      RequestStore.store[:jobs] = []
+    end
+
+    def self.stop_caching_jobs
+      RequestStore.store[:cache_jobs] = false
+    end
+
+    def self.run_with_em(klass, method, *args)
+      EventMachine.run do
+        ConeyIsland.cache_jobs
+        klass.send(method, *args)
+        ConeyIsland.flush_jobs
+        ConeyIsland.publisher_shutdown
+      end
+    end
+
+    def self.publisher_shutdown
+      EventMachine.add_periodic_timer(1) do
+        if RequestStore.store[:jobs] && (RequestStore.store[:jobs].length > RequestStore.store[:completed_jobs])
+          Rails.logger.info("Waiting for #{RequestStore.store[:jobs].length - RequestStore.store[:completed_jobs]} publishes to finish")
+        else
+          Rails.logger.info("Shutting down coney island publisher")
+          EventMachine.stop
+        end
+      end
+    end
+  end
+end
+

data/lib/coney_island/version.rb

@@ -1,3 +1,3 @@
 module ConeyIsland
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/coney_island/worker.rb

@@ -0,0 +1,195 @@
+module ConeyIsland
+  class Worker
+
+    def self.config=(config_hash)
+      @config = config_hash.symbolize_keys!
+    end
+
+    def self.config
+      @config
+    end
+
+    def self.log
+      @log ||= Logger.new(File.open(File::NULL, "w"))
+    end
+
+    def self.log=(log_thing)
+      @log = log_thing
+    end
+
+    def self.job_attempts
+      @job_attempts ||= {}
+    end
+
+    def self.initialize_background
+      ENV['NEW_RELIC_AGENT_ENABLED'] = 'false'
+      ENV['NEWRELIC_ENABLE'] = 'false'
+      @ticket = ARGV[0]
+      @ticket ||= 'default'
+
+      @log_io = self.config[:log]
+      self.log = Logger.new(@log_io)
+
+      @instance_config = self.config[:carousels][@ticket]
+
+      @prefetch_count = @instance_config[:prefetch_count] if @instance_config
+      @prefetch_count ||= 20
+
+      @worker_count = @instance_config[:worker_count] if @instance_config
+      @worker_count ||= 1
+      @child_count = @worker_count - 1
+      @child_pids = []
+
+      @full_instance_name = @ticket
+
+      self.log.level = self.config[:log_level]
+      self.log.info("config: #{self.config}")
+
+      @notifier = "ConeyIsland::Notifiers::#{self.config[:notifier_service]}Notifier".constantize
+    end
+
+    def self.start
+      @child_count.times do
+        child_pid = Process.fork
+        unless child_pid
+          self.log.info("started child for ticket #{@ticket} with pid #{Process.pid}")
+          break
+        end
+        @child_pids.push child_pid
+      end
+      defined?(ActiveRecord::Base) and
+        ActiveRecord::Base.establish_connection
+      EventMachine.run do
+
+        Signal.trap('INT') do
+          self.shutdown('INT')
+        end
+        Signal.trap('TERM') do
+          self.shutdown('TERM')
+        end
+
+        ConeyIsland.handle_connection
+        
+        self.log.info("Connecting to AMQP broker. Running #{AMQP::VERSION}")
+
+        #send a heartbeat every 15 seconds to avoid aggresive network configurations that close quiet connections
+        heartbeat_exchange = ConeyIsland.channel.fanout('coney_island_heartbeat')
+        EventMachine.add_periodic_timer(15) do
+          heartbeat_exchange.publish({:instance_name => @ticket})
+        end
+
+        ConeyIsland.channel.prefetch @prefetch_count
+        @queue = ConeyIsland.channel.queue(@full_instance_name, auto_delete: false, durable: true)
+        @queue.bind(ConeyIsland.exchange, routing_key: 'carousels.' + @ticket)
+        @queue.subscribe(:ack => true) do |metadata,payload|
+          self.handle_incoming_message(metadata,payload)
+        end
+      end
+    end
+
+    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)
+          end
+        else
+          self.handle_job(metadata,args,job_id)
+        end
+      rescue Timeout::Error => e
+        self.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args, reason: 'timeout in subscribe code before calling job method'})
+      rescue Exception => e
+        self.poke_the_badger(e, {code_source: 'ConeyIsland', job_payload: args})
+        self.log.error("ConeyIsland code error, not application code:\n#{e.inspect}\nARGS: #{args}")
+      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)
+            self.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
+        self.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.poke_the_badger(message, context, attempts = 1)
+      begin
+        Timeout::timeout(3) do
+          @notifier.notify(message, context)
+        end
+      rescue
+        if attempts <= 3
+          attempts += 1
+          self.poke_the_badger(message, context, attempts)
+        end
+      end
+    end
+
+    def self.shutdown(signal)
+      shutdown_time = Time.now
+      @child_pids.each do |child_pid|
+        Process.kill(signal, child_pid)
+      end
+      @queue.unsubscribe
+      EventMachine.add_periodic_timer(1) do
+        if self.job_attempts.any?
+          self.log.info("Waiting for #{self.job_attempts.length} requests to finish")
+        else
+          self.log.info("Shutting down coney island #{@ticket}")
+          EventMachine.stop
+        end
+      end
+    end
+
+  end
+end

data/test/coney_island_test.rb

@@ -1,7 +1,23 @@
 require 'test_helper'
 
-class ConeyIslandTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, ConeyIsland
+class ConeyIslandTest < MiniTest::Test
+  describe "running jobs" do
+    it "runs inline" do
+      ConeyIsland.run_inline
+      my_array = []
+      ConeyIsland.submit(TestModel, :add_to_list, args: [my_array])
+      my_array.first.must_equal 'Added one!'
+    end
+    it "caches jobs" do
+      ConeyIsland.run_inline
+      my_array = []
+      ConeyIsland.cache_jobs
+      ConeyIsland.submit(TestModel, :add_to_list, args: [my_array])
+      RequestStore.store[:jobs].length.must_equal 1
+      my_array.length.must_equal 0
+      ConeyIsland.flush_jobs
+      my_array.first.must_equal 'Added one!'
+      ConeyIsland.stop_caching_jobs
+    end
   end
 end

data/test/submitter_test.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class SubmitterTest < MiniTest::Test
+  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
+        ConeyIsland::Submitter.run_inline
+        ConeyIsland::Submitter.submit(TestModel, :add_to_list, args: [[]])
+      end
+      @execute_job_method.verify
+    end
+  end
+  describe "running jobs in the background" do
+    it "publishes the job to the message bus" do
+      @exchange = Minitest::Mock.new
+      @exchange.expect :publish, nil, [String,Hash]
+      @next_tick = Minitest::Mock.new
+      @next_tick.expect :call, nil, []
+      EventMachine.stub(:next_tick, @next_tick) do
+        ConeyIsland.stub(:handle_connection, nil) do
+          ConeyIsland.stub(:exchange, @exchange) do
+            ConeyIsland::Submitter.stop_running_inline
+            ConeyIsland::Submitter.submit(TestModel, :add_to_list, args: [[]])
+          end
+        end
+      end
+      @next_tick.verify
+      @exchange.verify
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,9 +3,13 @@ ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
+require 'minitest/unit'
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'request_store'
+require 'amqp'
 
 Rails.backtrace_cleaner.remove_silencers!
-
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -13,3 +17,38 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
+
+class TestModel
+
+  def self.add_to_list(array)
+    array.push "Added one!"
+  end
+
+  def self.take_too_long
+    sleep(10)
+  end
+
+  def self.throw_an_error
+    raise 'It broke!'
+  end
+
+  def self.instances
+    @instances ||= {}
+  end
+
+  def self.find(id)
+    self.instances[id]
+  end
+
+  def initialize(params)
+    TestModel.instances[params['id']] = self
+  end
+
+  def set_color(color)
+    @color = (color)
+  end
+
+  def color
+    @color
+  end
+end

data/test/worker_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+class WorkerTest < MiniTest::Test
+  describe "handling jobs" do
+    before do
+      @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.01
+          },'my_job_id')
+      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::Worker.stub(:poke_the_badger,@poke_the_badger) do
+        ConeyIsland::Worker.handle_job(@metadata,{
+          'klass' => 'TestModel',
+          'method_name' => :throw_an_error
+          },'my_job_id')
+      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' 
+    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
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coney_island
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Eric Draut
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An industrial-strength background worker system for rails using RabbitMQ.
 email:
 - edraut@gmail.com
@@ -96,7 +110,9 @@ files:
 - lib/coney_island.rb
 - lib/coney_island/notifiers/airbrake_notifier.rb
 - lib/coney_island/notifiers/honeybadger_notifier.rb
+- lib/coney_island/submitter.rb
 - lib/coney_island/version.rb
+- lib/coney_island/worker.rb
 - lib/tasks/coney_island_tasks.rake
 - test/coney_island_test.rb
 - test/dummy/README.rdoc
@@ -128,11 +144,15 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/submitter_test.rb
 - test/test_helper.rb
+- test/worker_test.rb
 homepage: https://github.com/edraut/coney_island
 licenses:
 - MIT
@@ -157,8 +177,9 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Want guaranteed delivery between your queue and your workers using ACKs?
-  How about load-balancing? Throw in all the features other background worker systems
-  offer and you must have a ticket to ride at Coney Island.
+  How about load-balancing? Would job-specific timeouts be nice? Throw in all the
+  features other background worker systems offer and you must have a ticket to ride
+  at Coney Island.
 test_files:
 - test/coney_island_test.rb
 - test/dummy/app/assets/javascripts/application.js
@@ -188,10 +209,14 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/submitter_test.rb
 - test/test_helper.rb
+- test/worker_test.rb