Queue update

Author: dizer

Gemfile

@@ -1,16 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-# gem 'activesupport', '>= 5.0.0'
-# gem 'sucker_punch', '~> 2.0'
-#
-# group :development, :test do
-#   gem 'rspec',       '~> 3.5.0'
-#   gem 'spring'
-#   gem 'factory_girl'
-# end
-#
-# group :test do
-#   gem 'webmock'
-#   gem 'vcr'
-# end

eureka-bot.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'activesupport', '>= 5.0.0'
-  spec.add_runtime_dependency 'sucker_punch', '~> 2.0'
+  spec.add_runtime_dependency 'activejob', '>= 5.0.0'
 
   spec.add_development_dependency 'rspec', '~> 3.5.0'
   spec.add_development_dependency 'webmock'

lib/eureka-bot.rb

@@ -25,7 +25,7 @@ module EurekaBot
 
   def self.logger=(logger)
     @@logger = logger
-    SuckerPunch.logger = logger
+    EurekaBot::Job.logger = logger
     logger
   end
 end

lib/eureka_bot/exceptions.rb

@@ -1,5 +1,3 @@
-require 'sucker_punch'
-
 module EurekaBot::Exceptions
   extend ActiveSupport::Concern
 
@@ -28,7 +26,3 @@ def self.exception_handler(e, klass, args)
     end
   end
 end
-
-SuckerPunch.exception_handler = -> (e, klass, args) {
-  EurekaBot.exception_handler(e, klass, args)
-}

lib/eureka_bot/instrumentation.rb

@@ -1,7 +1,7 @@
 module EurekaBot::Instrumentation
   extend ActiveSupport::Concern
 
-  def instrument(name, payload=nil, &block)
+  def instrument(name, payload={}, &block)
     self.class.instrument(name, payload, &block)
   end
 
@@ -10,8 +10,15 @@ def self.prefix
   end
 
   class_methods do
-    def instrument(name, payload=nil, &block)
-      ActiveSupport::Notifications.instrument [EurekaBot::Instrumentation.prefix, name].compact.join('.'), payload, &block
+    def instrument(name, payload={}, &block)
+      ActiveSupport::Notifications.instrument(
+          [
+              EurekaBot::Instrumentation.prefix,
+              name
+          ].compact.join('.'),
+          payload,
+          &block
+      )
     end
   end
 

lib/eureka_bot/job.rb

@@ -1,30 +1,14 @@
-require 'sucker_punch'
+require 'active_job'
 
-class EurekaBot::Job
-  include ::SuckerPunch::Job
+class EurekaBot::Job < ActiveJob::Base
+  extend ActiveSupport::Autoload
+  autoload :Input
+  autoload :Output
   include EurekaBot::Instrumentation
 
-  def perform(resolver_class, message)
-    instrument 'job.perform' do
-      klass = if resolver_class <= EurekaBot::Resolver
-                resolver_class
-              elsif resolver_class <= String
-                resolver_class.constantize
-              else
-                raise UnknownResolverClass.new(resolver_class)
-              end
-
-      resolver = klass.new(
-          message:  message,
-          logger:   logger
-      )
-      resolver.execute
-    end
-  end
-
-  def logger
-    EurekaBot.logger
+  queue_as do
+    self.class.name.underscore.gsub('/', '__')
   end
 
-  class UnknownResolverClass < StandardError; end
+  self.logger = EurekaBot.logger
 end

lib/eureka_bot/job/input.rb

@@ -0,0 +1,15 @@
+class EurekaBot::Job::Input < EurekaBot::Job
+  queue_as :input
+
+  def perform(resolver_class, message)
+    instrument 'job.input' do
+      resolver = resolver_class.constantize.new(
+          message:  message,
+          logger:   logger
+      )
+      resolver.execute
+    end
+  end
+
+  class UnknownResolverClass < StandardError; end
+end

lib/eureka_bot/job/output.rb

@@ -0,0 +1,10 @@
+class EurekaBot::Job::Output < EurekaBot::Job
+  queue_as :output
+
+  def perform(sender_class, message, *args)
+    instrument 'job.output' do
+      sender_class.constantize.new.deliver(message, *args)
+    end
+  end
+
+end

lib/eureka_bot/notifications.rb

@@ -15,9 +15,11 @@ def self.log_notification(severity=::Logger::DEBUG, name, started, finished, id,
 end
 
 ActiveSupport::Notifications.subscribe /eureka-bot\..*/ do |*args|
-  EurekaBot::Notification.log_notification(::Logger::DEBUG, *args)
+  severity = if args[0] == 'eureka-bot.job.perform'
+               ::Logger::INFO
+             else
+               ::Logger::DEBUG
+             end
+  EurekaBot::Notification.log_notification(severity, *args)
 end
 
-ActiveSupport::Notifications.subscribe 'eureka-bot.job.perform' do |*args|
-  EurekaBot::Notification.log_notification(::Logger::INFO, *args)
-end

lib/eureka_bot/resolver.rb

@@ -16,8 +16,15 @@ def resolve
     nil
   end
 
+  def resolved
+    @resolved ||= begin
+      resolved = resolve
+      logger.info [:resolved, resolved, message]
+      resolved
+    end
+  end
+
   def execute
-    resolved = resolve
     raise ControllerNotFound.new("Can't resolve #{message}") unless resolved
     @controller = resolve_controller(resolved[:controller]).new(
         params:   resolved[:params] || {},

lib/eureka_bot/version.rb

@@ -1,3 +1,3 @@
 module EurekaBot
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

spec/eureka-bot/job_spec.rb

@@ -2,37 +2,51 @@
 
 RSpec.describe EurekaBot::Job do
   context '#execute' do
+    let(:resolver_class) do
+      class TestResolver < EurekaBot::Resolver
+      end
+      TestResolver
+    end
+
     let(:controller_class) do
-      Class.new(EurekaBot::Controller) do
+      class TestController < EurekaBot::Controller
         def some_action
           answer(some_action: 'finished')
         end
       end
-    end
-
-    let(:resolver_class) do
-      Class.new(EurekaBot::Resolver)
+      TestController
     end
 
     let(:job_class) do
       $job_result = nil
-      Class.new(EurekaBot::Job) do
+      class TestJob < EurekaBot::Job::Input
         def perform(resolver_class, message)
           $job_result = super
         end
       end
+      TestJob
+    end
+
+    after do
+      Object.send(:remove_const, :TestController)
+      Object.send(:remove_const, :TestJob)
+      Object.send(:remove_const, :TestResolver)
     end
 
     before do
       allow_any_instance_of(resolver_class).to receive(:resolve).and_return(
           controller: controller_class,
           action:     :some_action
       )
-      job_class.perform_async(resolver_class, {})
+
+      job_class.perform_later(resolver_class.to_s, {})
     end
 
     it do
-      expect($job_result.controller.response.to_a).to include(include(some_action: 'finished'))
+      expect($job_result).to be
+      expect(
+          $job_result.controller.response.to_a
+      ).to include(include(some_action: 'finished'))
     end
   end
 end

spec/spec_helper.rb

@@ -6,7 +6,8 @@
 require 'webmock/rspec'
 # require 'vcr'
 # require 'factory_girl'
-require 'sucker_punch/testing/inline'
+# require 'sucker_punch/testing/inline'
+EurekaBot::Job.queue_adapter = :inline
 
 $:.unshift File.dirname(__FILE__) + '/..'
 Dir['spec/support/**/*.rb'].each { |f| require f }