lib/rocket_job/plugins/state_machine.rb in rocketjob-3.4.3 vs lib/rocket_job/plugins/state_machine.rb in rocketjob-3.5.0

@@ -1,6 +1,5 @@
-require 'thread'
 require 'active_support/concern'
 require 'aasm'
 
 module RocketJob
   module Plugins
@@ -32,36 +31,35 @@
         include AASM
 
         # Adds a :before or :after callback to an event
         #  state_machine_add_event_callback(:start, :before, :my_method)
         def self.state_machine_add_event_callback(event_name, action, *methods, &block)
-          raise(ArgumentError, 'Cannot supply both a method name and a block') if (methods.size > 0) && block
-          raise(ArgumentError, 'Must supply either a method name or a block') unless (methods.size > 0) || block
+          raise(ArgumentError, 'Cannot supply both a method name and a block') if methods.size.positive? && block
+          raise(ArgumentError, 'Must supply either a method name or a block') unless methods.size.positive? || block
 
-          # TODO Somehow get AASM to support options such as :if and :unless to be consistent with other callbacks
+          # TODO: Somehow get AASM to support options such as :if and :unless to be consistent with other callbacks
           # For example:
           #    before_start :my_callback, unless: :encrypted?
           #    before_start :my_callback, if: :encrypted?
-          if event = aasm.state_machine.events[event_name]
-            values = Array(event.options[action])
-            code   =
-              if block
-                block
-              else
-                # Validate methods are any of Symbol String Proc
-                methods.each do |method|
-                  unless method.is_a?(Symbol) || method.is_a?(String)
-                    raise(ArgumentError, "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
-                  end
+          event = aasm.state_machine.events[event_name]
+          raise(ArgumentError, "Unknown event: #{event_name.inspect}") unless event
+
+          values = Array(event.options[action])
+          code   =
+            if block
+              block
+            else
+              # Validate methods are any of Symbol String Proc
+              methods.each do |method|
+                unless method.is_a?(Symbol) || method.is_a?(String)
+                  raise(ArgumentError, "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
                 end
-                methods
               end
-            action == :before ? values.push(code) : values.unshift(code)
-            event.options[action] = values.flatten.uniq
-          else
-            raise(ArgumentError, "Unknown event: #{event_name.inspect}")
-          end
+              methods
+            end
+          action == :before ? values.push(code) : values.unshift(code)
+          event.options[action] = values.flatten.uniq
         end
 
         def self.state_machine_define_event_callbacks(*event_names)
           event_names.each do |event_name|
             module_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -73,11 +71,9 @@
                state_machine_add_event_callback(:#{event_name}, :after, *methods, &block)
               end
             RUBY
           end
         end
-
       end
-
     end
   end
 end