aasm 4.11.1 → 5.2.0

data/Rakefile

@@ -23,4 +23,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-task :default => :spec
+if ENV["APPRAISAL_INITIALIZED"] || ENV["TRAVIS"]
+  task :default => :spec
+else
+  require 'appraisal'
+  task :default => :appraisal
+end

data/TESTING.md

@@ -0,0 +1,25 @@
+## Install dependency matrix
+
+    appraisal install
+
+This will re-generate Gemfiles in `gemfile` folder
+
+Use rvm gemsets or similar to avoid global gem pollution
+
+## Run specs
+
+For all supported Rails/ORM combinations:
+
+    appraisal rspec
+
+Or for specific one:
+
+    appraisal rails_4.2 rspec
+
+Or for one particular test file
+
+    appraisal rails_4.2_mongoid_5 rspec spec/unit/persistence/mongoid_persistence_multiple_spec.rb
+
+Or down to one test case
+
+    appraisal rails_4.2_mongoid_5 rspec spec/unit/persistence/mongoid_persistence_multiple_spec.rb:92

data/aasm.gemspec

@@ -16,10 +16,15 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 1.9.3'
 
+  s.add_dependency 'concurrent-ruby', '~> 1.0'
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sdoc'
   s.add_development_dependency 'rspec', ">= 3"
   s.add_development_dependency 'generator_spec'
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "codecov", ">= 0.1.21"
 
   # debugging
   # s.add_development_dependency 'debugger'

data/docker-compose.yml

@@ -0,0 +1,40 @@
+version: "2"
+
+services:
+  aasm:
+    image: aasm/aasm
+    build: .
+    command: bash -c 'bundle exec appraisal install && bundle exec appraisal rspec'
+    environment:
+      - DYNAMODB_HOST=dynamodb
+      - DYNAMODB_PORT=8000
+      - MONGODB_HOST=mongo
+      - MONGODB_PORT=27017
+      - RAILS_ENV=development
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - RETHINKDB_DB=rethinkdb_test
+      - RETHINKDB_HOST=rethinkdb
+      - RETHINKDB_PORT=28015
+    depends_on:
+      - dynamodb
+      - mongo
+      - redis
+      - rethinkdb
+    volumes:
+      - .:/application
+    volumes_from:
+      - bundle
+  bundle:
+    image: aasm/aasm
+    command: echo Bundler data container
+    volumes:
+      - /bundle
+  dynamodb:
+    image: cnadiminti/dynamodb-local:2017-02-16
+  mongo:
+    image: mongo:3.6.1
+  redis:
+    image: redis:4.0.6-alpine
+  rethinkdb:
+    image: rethinkdb:2.3.6

data/gemfiles/norails.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3", ">= 1.3.5", platforms: :ruby
+gem "rails", install_if: false
+gem "sequel"
+gem "redis-objects"
+
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,15 +1,17 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "sqlite3",                          :platforms => :ruby
-gem 'rubysl',                           :platforms => :rbx
-gem 'rubinius-developer_tools',         :platforms => :rbx
-gem "jruby-openssl",                    :platforms => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3')
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "4.2.5"
-gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-gem 'sequel'
-gem 'dynamoid', '~> 1',                 :platforms => :ruby
-gem 'aws-sdk', '~>2',                   :platforms => :ruby
+gem "nokogiri", "1.6.8.1", platforms: [:ruby_19]
+gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
+gem "mongoid", "~> 4.0"
+gem "sequel"
+gem "dynamoid", "~> 1", platforms: :ruby
+gem "aws-sdk", "~> 2", platforms: :ruby
+gem "redis-objects"
+gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
+gem "after_commit_everywhere", "~> 1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2_mongoid_5.gemfile

@@ -1,15 +1,12 @@
+# This file was generated by Appraisal
+
 source "https://rubygems.org"
 
-gem "sqlite3",                          :platforms => :ruby
-gem 'rubysl',                           :platforms => :rbx
-gem 'rubinius-developer_tools',         :platforms => :rbx
-gem "jruby-openssl",                    :platforms => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "mime-types", "~> 2" if Gem::Version.create(RUBY_VERSION.dup) <= Gem::Version.create('1.9.3')
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "4.2.5"
-gem 'mongoid', '~>5.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-gem 'sequel'
-gem 'dynamoid', '~> 1',                 :platforms => :ruby
-gem 'aws-sdk', '~>2',                   :platforms => :ruby
+gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
+gem "mongoid", "~> 5.0"
+gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
+gem "after_commit_everywhere", "~> 1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2_nobrainer.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "4.2.5"
+gem "nobrainer", "~> 0.33.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -1,21 +1,14 @@
-source "https://rubygems.org"
-
-gem "sqlite3",                          :platforms => :ruby
-gem 'rubysl',                           :platforms => :rbx
-gem 'rubinius-developer_tools',         :platforms => :rbx
-gem "jruby-openssl",                    :platforms => :jruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-gem "rails", "5.0.0.beta4"
+# This file was generated by Appraisal
 
-# mongoid is not yet Rails 5 compatible
-# gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
-
-gem 'sequel'
-
-# dynamoid is not yet Rails 5 compatible
-# gem 'dynamoid', '~> 1',                 :platforms => :ruby
+source "https://rubygems.org"
 
-gem 'aws-sdk', '~>2',                   :platforms => :ruby
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "5.0.0"
+gem "mongoid", "~> 6.0"
+gem "sequel"
+gem "dynamoid", "~> 1.3", platforms: :ruby
+gem "aws-sdk", "~> 2", platforms: :ruby
+gem "redis-objects"
+gem "after_commit_everywhere", "~> 1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0_nobrainer.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "5.0.0"
+gem "nobrainer", "~> 0.33.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "5.1"
+gem "mongoid", "~>6.0"
+gem "sequel"
+gem "dynamoid", "~> 1.3", platforms: :ruby
+gem "aws-sdk", "~>2", platforms: :ruby
+gem "redis-objects"
+gem "after_commit_everywhere", "~> 1.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.5", platforms: :ruby
+gem "rails", "5.2"
+gem "mongoid", "~>6.0"
+gem "sequel"
+gem "dynamoid", "~>2.2", platforms: :ruby
+gem "aws-sdk", "~>2", platforms: :ruby
+gem "redis-objects"
+gem "after_commit_everywhere", "~> 1.0"
+
+gemspec path: "../"

data/lib/aasm/aasm.rb

@@ -1,4 +1,6 @@
 module AASM
+  # this is used internally as an argument default value to represent no value
+  NO_VALUE = :_aasm_no_value
 
   # provide a state machine for the including class
   # make sure to load class methods as well
@@ -42,7 +44,7 @@ module AASM
 
       raise ArgumentError, "The class #{aasm_klass} must inherit from AASM::Base!" unless aasm_klass.ancestors.include?(AASM::Base)
 
-      @aasm ||= {}
+      @aasm ||= Concurrent::Map.new
       if @aasm[state_machine_name]
         # make sure to use provided options
         options.each do |key, value|
@@ -67,12 +69,12 @@ module AASM
     unless AASM::StateMachineStore.fetch(self.class, true).machine(name)
       raise AASM::UnknownStateMachineError.new("There is no state machine with the name '#{name}' defined in #{self.class.name}!")
     end
-    @aasm ||= {}
+    @aasm ||= Concurrent::Map.new
     @aasm[name.to_sym] ||= AASM::InstanceBase.new(self, name.to_sym)
   end
 
   def initialize_dup(other)
-    @aasm = {}
+    @aasm = Concurrent::Map.new
     super
   end
 
@@ -97,25 +99,10 @@ private
     begin
       old_state = aasm(state_machine_name).state_object_for_name(aasm(state_machine_name).current_state)
 
-      event.fire_global_callbacks(
-        :before_all_events,
-        self,
-        *process_args(event, aasm(state_machine_name).current_state, *args)
-      )
-
-      # new event before callback
-      event.fire_callbacks(
-        :before,
-        self,
-        *process_args(event, aasm(state_machine_name).current_state, *args)
-      )
+      fire_default_callbacks(event, *process_args(event, aasm(state_machine_name).current_state, *args))
 
       if may_fire_to = event.may_fire?(self, *args)
-        old_state.fire_callbacks(:before_exit, self,
-          *process_args(event, aasm(state_machine_name).current_state, *args))
-        old_state.fire_callbacks(:exit, self,
-          *process_args(event, aasm(state_machine_name).current_state, *args))
-
+        fire_exit_callbacks(old_state, *process_args(event, aasm(state_machine_name).current_state, *args))
         if new_state_name = event.fire(self, {:may_fire => may_fire_to}, *args)
           aasm_fired(state_machine_name, event, old_state, new_state_name, options, *args, &block)
         else
@@ -128,41 +115,65 @@ private
       event.fire_callbacks(:error, self, e, *process_args(event, aasm(state_machine_name).current_state, *args)) ||
       event.fire_global_callbacks(:error_on_all_events, self, e, *process_args(event, aasm(state_machine_name).current_state, *args)) ||
       raise(e)
+      false
     ensure
       event.fire_callbacks(:ensure, self, *process_args(event, aasm(state_machine_name).current_state, *args))
       event.fire_global_callbacks(:ensure_on_all_events, self, *process_args(event, aasm(state_machine_name).current_state, *args))
     end
   end
 
+  def fire_default_callbacks(event, *processed_args)
+    event.fire_global_callbacks(
+      :before_all_events,
+      self,
+      *processed_args
+    )
+
+    # new event before callback
+    event.fire_callbacks(
+      :before,
+      self,
+      *processed_args
+    )
+  end
+
+  def fire_exit_callbacks(old_state, *processed_args)
+    old_state.fire_callbacks(:before_exit, self, *processed_args)
+    old_state.fire_callbacks(:exit, self, *processed_args)
+  end
+
   def aasm_fired(state_machine_name, event, old_state, new_state_name, options, *args)
     persist = options[:persist]
 
     new_state = aasm(state_machine_name).state_object_for_name(new_state_name)
+    callback_args = process_args(event, aasm(state_machine_name).current_state, *args)
 
-    new_state.fire_callbacks(:before_enter, self,
-      *process_args(event, aasm(state_machine_name).current_state, *args))
+    new_state.fire_callbacks(:before_enter, self, *callback_args)
 
-    new_state.fire_callbacks(:enter, self,
-      *process_args(event, aasm(state_machine_name).current_state, *args)) # TODO: remove for AASM 4?
+    new_state.fire_callbacks(:enter, self, *callback_args) # TODO: remove for AASM 4?
 
     persist_successful = true
     if persist
       persist_successful = aasm(state_machine_name).set_current_state_with_persistence(new_state_name)
       if persist_successful
         yield if block_given?
+        event.fire_callbacks(:before_success, self, *callback_args)
         event.fire_transition_callbacks(self, *process_args(event, old_state.name, *args))
-        event.fire_callbacks(:success, self)
+        event.fire_callbacks(:success, self, *callback_args)
       end
     else
       aasm(state_machine_name).current_state = new_state_name
       yield if block_given?
     end
 
+    binding_event = event.options[:binding_event]
+    if binding_event
+      __send__("#{binding_event}#{'!' if persist}")
+    end
+
     if persist_successful
-      old_state.fire_callbacks(:after_exit, self,
-        *process_args(event, aasm(state_machine_name).current_state, *args))
-      new_state.fire_callbacks(:after_enter, self,
-        *process_args(event, aasm(state_machine_name).current_state, *args))
+      old_state.fire_callbacks(:after_exit, self, *callback_args)
+      new_state.fire_callbacks(:after_enter, self, *callback_args)
       event.fire_callbacks(
         :after,
         self,

data/lib/aasm/base.rb

@@ -26,6 +26,9 @@ module AASM
       # raise if the model is invalid (in ActiveRecord)
       configure :whiny_persistence, false
 
+      # Use transactions (in ActiveRecord)
+      configure :use_transactions, true
+
       # use requires_new for nested transactions (in ActiveRecord)
       configure :requires_new_transaction, true
 
@@ -34,6 +37,9 @@ module AASM
       # string for a specific lock type i.e. FOR UPDATE NOWAIT
       configure :requires_lock, false
 
+      # automatically set `"#{state_name}_at" = ::Time.now` on state changes
+      configure :timestamps, false
+
       # set to true to forbid direct assignment of aasm_state column (in ActiveRecord)
       configure :no_direct_assignment, false
 
@@ -48,18 +54,12 @@ module AASM
       # Configure a logger, with default being a Logger to STDERR
       configure :logger, Logger.new(STDERR)
 
+      # setup timestamp-setting callback if enabled
+      setup_timestamps(@name)
+
       # make sure to raise an error if no_direct_assignment is enabled
       # and attribute is directly assigned though
-      aasm_name = @name
-      klass.send :define_method, "#{@state_machine.config.column}=", ->(state_name) do
-        if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
-          raise AASM::NoDirectAssignmentError.new(
-            'direct assignment of AASM column has been disabled (see AASM configuration for this class)'
-          )
-        else
-          super(state_name)
-        end
-      end
+      setup_no_direct_assignment(@name)
     end
 
     # This method is both a getter and a setter
@@ -130,6 +130,16 @@ module AASM
         aasm(aasm_name).current_event = event
         aasm_fire_event(aasm_name, event, {:persist => false}, *args, &block)
       end
+
+      skip_instance_level_validation(event, name, aasm_name, klass)
+
+      # Create aliases for the event methods. Keep the old names to maintain backwards compatibility.
+      if namespace?
+        klass.send(:alias_method, "may_#{name}_#{namespace}?", "may_#{name}?")
+        klass.send(:alias_method, "#{name}_#{namespace}!", "#{name}!")
+        klass.send(:alias_method, "#{name}_#{namespace}", name)
+      end
+
     end
 
     def after_all_transitions(*callbacks, &block)
@@ -208,7 +218,9 @@ module AASM
              klass.defined_enums.values.any?{ |methods|
                  methods.keys{| enum | enum + '?' == method_name }
              })
-         @state_machine.config.logger.warn "#{klass.name}: overriding method '#{method_name}'!"
+        unless AASM::Configuration.hide_warnings
+          @state_machine.config.logger.warn "#{klass.name}: overriding method '#{method_name}'!"
+        end
       end
 
       klass.send(:define_method, method_name, method_definition)
@@ -236,5 +248,43 @@ module AASM
       end
     end
 
+    def skip_instance_level_validation(event, name, aasm_name, klass)
+      # Overrides the skip_validation config for an instance (If skip validation is set to false in original config) and
+      # restores it back to the original value after the event is fired.
+      safely_define_method klass, "#{name}_without_validation!", ->(*args, &block) do
+        original_config = AASM::StateMachineStore.fetch(self.class, true).machine(aasm_name).config.skip_validation_on_save
+        begin
+          AASM::StateMachineStore.fetch(self.class, true).machine(aasm_name).config.skip_validation_on_save = true unless original_config
+          aasm(aasm_name).current_event = :"#{name}!"
+          aasm_fire_event(aasm_name, event, {:persist => true}, *args, &block)
+        ensure
+          AASM::StateMachineStore.fetch(self.class, true).machine(aasm_name).config.skip_validation_on_save = original_config
+        end
+      end
+    end
+
+    def setup_timestamps(aasm_name)
+      return unless @state_machine.config.timestamps
+
+      after_all_transitions do
+        if self.class.aasm(:"#{aasm_name}").state_machine.config.timestamps
+          ts_setter = "#{aasm(aasm_name).to_state}_at="
+          respond_to?(ts_setter) && send(ts_setter, ::Time.now)
+        end
+      end
+    end
+
+    def setup_no_direct_assignment(aasm_name)
+      return unless @state_machine.config.no_direct_assignment
+
+      @klass.send(:define_method, "#{@state_machine.config.column}=") do |state_name|
+        if self.class.aasm(:"#{aasm_name}").state_machine.config.no_direct_assignment
+          raise AASM::NoDirectAssignmentError.new('direct assignment of AASM column has been disabled (see AASM configuration for this class)')
+        else
+          super(state_name)
+        end
+      end
+    end
+
   end
 end

data/lib/aasm/configuration.rb

@@ -15,12 +15,18 @@ module AASM
     # for ActiveRecord: store the new state even if the model is invalid and return true
     attr_accessor :skip_validation_on_save
 
+    # for ActiveRecord: use transactions
+    attr_accessor :use_transactions
+
     # for ActiveRecord: use requires_new for nested transactions?
     attr_accessor :requires_new_transaction
 
     # for ActiveRecord: use pessimistic locking
     attr_accessor :requires_lock
 
+    # automatically set `"#{state_name}_at" = ::Time.now` on state changes
+    attr_accessor :timestamps
+
     # forbid direct assignment in aasm_state column (in ActiveRecord)
     attr_accessor :no_direct_assignment
 
@@ -34,5 +40,9 @@ module AASM
 
     # Configure a logger, with default being a Logger to STDERR
     attr_accessor :logger
+
+    class << self
+      attr_accessor :hide_warnings
+    end
   end
 end

data/lib/aasm/core/event.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module AASM::Core
   class Event
-    include DslHelper
+    include AASM::DslHelper
 
-    attr_reader :name, :state_machine, :options
+    attr_reader :name, :state_machine, :options, :default_display_name
 
     def initialize(name, state_machine, options = {}, &block)
       @name = name
@@ -11,6 +13,7 @@ module AASM::Core
       @valid_transitions = {}
       @guards = Array(options[:guard] || options[:guards] || options[:if])
       @unless = Array(options[:unless]) #TODO: This could use a better name
+      @default_display_name = name.to_s.gsub(/_/, ' ').capitalize
 
       # from aasm4
       @options = options # QUESTION: .dup ?
@@ -22,18 +25,29 @@ module AASM::Core
         :before_transaction,
         :ensure,
         :error,
+        :before_success,
         :success,
       ], &block) if block
     end
 
+    # called internally by Ruby 1.9 after clone()
+    def initialize_copy(orig)
+      super
+      @transitions = @transitions.collect { |transition| transition.clone }
+      @guards      = @guards.dup
+      @unless      = @unless.dup
+      @options     = {}
+      orig.options.each_pair { |name, setting| @options[name] = setting.is_a?(Hash) || setting.is_a?(Array) ? setting.dup : setting }
+    end
+
     # a neutered version of fire - it doesn't actually fire the event, it just
     # executes the transition guards to determine if a transition is even
     # an option given current conditions.
-    def may_fire?(obj, to_state=nil, *args)
+    def may_fire?(obj, to_state=::AASM::NO_VALUE, *args)
       _fire(obj, {:test_only => true}, to_state, *args) # true indicates test firing
     end
 
-    def fire(obj, options={}, to_state=nil, *args)
+    def fire(obj, options={}, to_state=::AASM::NO_VALUE, *args)
       _fire(obj, options, to_state, *args) # false indicates this is not a test (fire!)
     end
 
@@ -85,7 +99,7 @@ module AASM::Core
           @transitions << AASM::Core::Transition.new(self, attach_event_guards(definitions.merge(:from => s.to_sym)), &block)
         end
         # Create a transition if :to is specified without :from (transitions from ANY state)
-        if @transitions.empty? && definitions[:to]
+        if !definitions[:from] && definitions[:to]
           @transitions << AASM::Core::Transition.new(self, attach_event_guards(definitions), &block)
         end
       end
@@ -96,6 +110,10 @@ module AASM::Core
       transitions.flat_map(&:failures)
     end
 
+    def to_s
+      name.to_s
+    end
+
   private
 
     def attach_event_guards(definitions)
@@ -110,28 +128,31 @@ module AASM::Core
       definitions
     end
 
-    def _fire(obj, options={}, to_state=nil, *args)
+    def _fire(obj, options={}, to_state=::AASM::NO_VALUE, *args)
       result = options[:test_only] ? false : nil
+      clear_failed_callbacks
       transitions = @transitions.select { |t| t.from == obj.aasm(state_machine.name).current_state || t.from == nil}
       return result if transitions.size == 0
 
-      # If to_state is not nil it either contains a potential
-      # to_state or an arg
-      unless to_state == nil
-        if !to_state.respond_to?(:to_sym) || !transitions.map(&:to).flatten.include?(to_state.to_sym)
-          args.unshift(to_state)
-          to_state = nil
-        end
+      if to_state == ::AASM::NO_VALUE
+        to_state = nil
+      elsif !(to_state.respond_to?(:to_sym) && transitions.map(&:to).flatten.include?(to_state.to_sym))
+        # to_state is an argument
+        args.unshift(to_state)
+        to_state = nil
       end
+      
+      # nop, to_state is a valid to-state
 
       transitions.each do |transition|
         next if to_state and !Array(transition.to).include?(to_state)
-        if (options.key?(:may_fire) && Array(transition.to).include?(options[:may_fire])) ||
+        if (options.key?(:may_fire) && transition.eql?(options[:may_fire])) ||
            (!options.key?(:may_fire) && transition.allowed?(obj, *args))
-          result = to_state || Array(transition.to).first
+
           if options[:test_only]
-            # result = true
+            result = transition
           else
+            result = to_state || Array(transition.to).first
             Array(transition.to).each {|to| @valid_transitions[to] = transition }
             transition.execute(obj, *args)
           end
@@ -142,28 +163,15 @@ module AASM::Core
       result
     end
 
-    def invoke_callbacks(code, record, args)
-      case code
-        when Symbol, String
-          unless record.respond_to?(code, true)
-            raise NoMethodError.new("NoMethodError: undefined method `#{code}' for #{record.inspect}:#{record.class}")
-          end
-          arity = record.__send__(:method, code.to_sym).arity
-          record.__send__(code, *(arity < 0 ? args : args[0...arity]))
-          true
-
-        when Proc
-          arity = code.arity
-          record.instance_exec(*(arity < 0 ? args : args[0...arity]), &code)
-          true
-
-        when Array
-          code.each {|a| invoke_callbacks(a, record, args)}
-          true
+    def clear_failed_callbacks
+      # https://github.com/aasm/aasm/issues/383, https://github.com/aasm/aasm/issues/599
+      transitions.each { |transition| transition.failures.clear }
+    end
 
-        else
-          false
-      end
+    def invoke_callbacks(code, record, args)
+      Invoker.new(code, record, args)
+             .with_default_return_value(false)
+             .invoke
     end
   end
 end # AASM