aasm 4.12.3 → 5.0.1

data/gemfiles/rails_4.2.gemfile

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => :ruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "sqlite3", platforms: :ruby
 gem "rails", "4.2.5"
-gem "nokogiri", "1.6.8.1", :platforms => [:ruby_19]
-gem "mime-types", "~> 2", :platforms => [:ruby_19, :jruby]
-gem "mongoid", "~>4.0"
+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 "dynamoid", "~> 1", platforms: :ruby
+gem "aws-sdk", "~> 2", platforms: :ruby
 gem "redis-objects"
+gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2_mongoid_5.gemfile

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => :ruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "sqlite3", platforms: :ruby
 gem "rails", "4.2.5"
-gem "mime-types", "~> 2", :platforms => [:ruby_19, :jruby]
-gem "mongoid", "~>5.0"
+gem "mime-types", "~> 2", platforms: [:ruby_19, :jruby]
+gem "mongoid", "~> 5.0"
+gem "activerecord-jdbcsqlite3-adapter", "1.3.24", platforms: :jruby
 
-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", platforms: :ruby
+gem "rails", "4.2.5"
+gem "nobrainer", "~> 0.33.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,13 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platforms => :ruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "sqlite3", platforms: :ruby
 gem "rails", "5.0.0"
-gem "mongoid", "~>6.0"
+gem "mongoid", "~> 6.0"
 gem "sequel"
-gem "dynamoid", "~> 1", :platforms => :ruby
-gem "aws-sdk", "~>2", :platforms => :ruby
+gem "dynamoid", "~> 1", platforms: :ruby
+gem "aws-sdk", "~> 2", platforms: :ruby
 gem "redis-objects"
 
-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", platforms: :ruby
+gem "rails", "5.0.0"
+gem "nobrainer", "~> 0.33.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

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

data/lib/aasm.rb

@@ -9,6 +9,11 @@ require 'aasm/instance_base'
 require 'aasm/core/transition'
 require 'aasm/core/event'
 require 'aasm/core/state'
+require 'aasm/core/invoker'
+require 'aasm/core/invokers/base_invoker'
+require 'aasm/core/invokers/class_invoker'
+require 'aasm/core/invokers/literal_invoker'
+require 'aasm/core/invokers/proc_invoker'
 require 'aasm/localizer'
 require 'aasm/state_machine_store'
 require 'aasm/state_machine'

data/lib/aasm/aasm.rb

@@ -130,6 +130,7 @@ 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))

data/lib/aasm/core/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AASM::Core
   class Event
     include DslHelper
@@ -137,6 +139,7 @@ module AASM::Core
       end
 
       transitions.each do |transition|
+        transition.failures.clear #https://github.com/aasm/aasm/issues/383
         next if to_state and !Array(transition.to).include?(to_state)
         if (options.key?(:may_fire) && transition.eql?(options[:may_fire])) ||
            (!options.key?(:may_fire) && transition.allowed?(obj, *args))
@@ -156,27 +159,9 @@ module AASM::Core
     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
-
-        else
-          false
-      end
+      Invoker.new(code, record, args)
+             .with_default_return_value(false)
+             .invoke
     end
   end
 end # AASM

data/lib/aasm/core/invoker.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module AASM
+  module Core
+    ##
+    # main invoker class which encapsulates the logic
+    # for invoking literal-based, proc-based, class-based
+    # and array-based callbacks for different entities.
+    class Invoker
+      DEFAULT_RETURN_VALUE = true
+
+      ##
+      # Initialize a new invoker instance.
+      # NOTE that invoker must be used per-subject/record
+      #      (one instance per subject/record)
+      #
+      # ==Options:
+      #
+      # +subject+ - invoking subject, may be Proc,
+      #             Class, String, Symbol or Array
+      # +record+  - invoking record
+      # +args+    - arguments which will be passed to the callback
+
+      def initialize(subject, record, args)
+        @subject = subject
+        @record = record
+        @args = args
+        @options = {}
+        @failures = []
+        @default_return_value = DEFAULT_RETURN_VALUE
+      end
+
+      ##
+      # Pass additional options to concrete invoker
+      #
+      # ==Options:
+      #
+      # +options+ - hash of options which will be passed to
+      #             concrete invokers
+      #
+      # ==Example:
+      #
+      # with_options(guard: proc {...})
+
+      def with_options(options)
+        @options = options
+        self
+      end
+
+      ##
+      # Collect failures to a specified buffer
+      #
+      # ==Options:
+      #
+      # +failures+ - failures buffer to collect failures
+
+      def with_failures(failures)
+        @failures = failures
+        self
+      end
+
+      ##
+      # Change default return value of #invoke method
+      # if none of invokers processed the request.
+      #
+      # The default return value is #DEFAULT_RETURN_VALUE
+      #
+      # ==Options:
+      #
+      # +value+ - default return value for #invoke method
+
+      def with_default_return_value(value)
+        @default_return_value = value
+        self
+      end
+
+      ##
+      # Find concrete invoker for specified subject and invoker it,
+      # or return default value set by #DEFAULT_RETURN_VALUE or
+      # overridden by #with_default_return_value
+
+      # rubocop:disable Metrics/AbcSize
+      def invoke
+        return invoke_array if subject.is_a?(Array)
+        return literal_invoker.invoke if literal_invoker.may_invoke?
+        return proc_invoker.invoke if proc_invoker.may_invoke?
+        return class_invoker.invoke if class_invoker.may_invoke?
+        default_return_value
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      private
+
+      attr_reader :subject, :record, :args, :options, :failures,
+                  :default_return_value
+
+      def invoke_array
+        return subject.all? { |item| sub_invoke(item) } if options[:guard]
+        return subject.all? { |item| !sub_invoke(item) } if options[:unless]
+        subject.map { |item| sub_invoke(item) }
+      end
+
+      def sub_invoke(new_subject)
+        self.class.new(new_subject, record, args)
+            .with_failures(failures)
+            .with_options(options)
+            .invoke
+      end
+
+      def proc_invoker
+        @proc_invoker ||= Invokers::ProcInvoker
+                          .new(subject, record, args)
+                          .with_failures(failures)
+      end
+
+      def class_invoker
+        @class_invoker ||= Invokers::ClassInvoker
+                           .new(subject, record, args)
+                           .with_failures(failures)
+      end
+
+      def literal_invoker
+        @literal_invoker ||= Invokers::LiteralInvoker
+                             .new(subject, record, args)
+                             .with_failures(failures)
+      end
+    end
+  end
+end

data/lib/aasm/core/invokers/base_invoker.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module AASM
+  module Core
+    module Invokers
+      ##
+      # Base concrete invoker class which contain basic
+      # invoking and logging definitions
+      class BaseInvoker
+        attr_reader :failures, :subject, :record, :args, :result
+
+        ##
+        # Initialize a new concrete invoker instance.
+        # NOTE that concrete invoker must be used per-subject/record
+        #      (one instance per subject/record)
+        #
+        # ==Options:
+        #
+        # +subject+ - invoking subject comparable with this invoker
+        # +record+  - invoking record
+        # +args+    - arguments which will be passed to the callback
+
+        def initialize(subject, record, args)
+          @subject = subject
+          @record = record
+          @args = args
+          @result = false
+          @failures = []
+        end
+
+        ##
+        # Collect failures to a specified buffer
+        #
+        # ==Options:
+        #
+        # +failures+ - failures buffer to collect failures
+
+        def with_failures(failures_buffer)
+          @failures = failures_buffer
+          self
+        end
+
+        ##
+        # Execute concrete invoker, log the error and return result
+
+        def invoke
+          return unless may_invoke?
+          log_failure unless invoke_subject
+          result
+        end
+
+        ##
+        # Check if concrete invoker may be invoked for a specified subject
+
+        def may_invoke?
+          raise NoMethodError, '"#may_invoke?" is not implemented'
+        end
+
+        ##
+        # Log failed invoking
+
+        def log_failure
+          raise NoMethodError, '"#log_failure" is not implemented'
+        end
+
+        ##
+        # Execute concrete invoker
+
+        def invoke_subject
+          raise NoMethodError, '"#invoke_subject" is not implemented'
+        end
+      end
+    end
+  end
+end

data/lib/aasm/core/invokers/class_invoker.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module AASM
+  module Core
+    module Invokers
+      ##
+      # Class invoker which allows to use classes which respond to #call
+      # to be used as state/event/transition callbacks.
+      class ClassInvoker < BaseInvoker
+        def may_invoke?
+          subject.is_a?(Class) && subject.instance_methods.include?(:call)
+        end
+
+        def log_failure
+          return log_source_location if Method.method_defined?(:source_location)
+          log_method_info
+        end
+
+        def invoke_subject
+          @result = retrieve_instance.call
+        end
+
+        private
+
+        def log_source_location
+          failures << instance.method(:call).source_location.join('#')
+        end
+
+        def log_method_info
+          failures << instance.method(:call)
+        end
+
+        def instance
+          @instance ||= retrieve_instance
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def retrieve_instance
+          return subject.new if subject_arity.zero?
+          return subject.new(record) if subject_arity == 1
+          return subject.new(record, *args) if subject_arity < 0
+          subject.new(record, *args[0..(subject_arity - 2)])
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def subject_arity
+          @arity ||= subject.instance_method(:initialize).arity
+        end
+      end
+    end
+  end
+end

data/lib/aasm/core/invokers/literal_invoker.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module AASM
+  module Core
+    module Invokers
+      ##
+      # Literal invoker which allows to use strings or symbols to call
+      # record methods as state/event/transition callbacks.
+      class LiteralInvoker < BaseInvoker
+        def may_invoke?
+          subject.is_a?(String) || subject.is_a?(Symbol)
+        end
+
+        def log_failure
+          failures << subject
+        end
+
+        def invoke_subject
+          @result = exec_subject
+        end
+
+        private
+
+        def subject_arity
+          @arity ||= record.__send__(:method, subject.to_sym).arity
+        end
+
+        # rubocop:disable Metrics/AbcSize
+        def exec_subject
+          raise(*record_error) unless record.respond_to?(subject, true)
+          return record.__send__(subject) if subject_arity.zero?
+          return record.__send__(subject, *args) if subject_arity < 0
+          record.__send__(subject, *args[0..(subject_arity - 1)])
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def record_error
+          [
+            NoMethodError,
+            'NoMethodError: undefined method ' \
+            "`#{subject}' for #{record.inspect}:#{record.class}"
+          ]
+        end
+      end
+    end
+  end
+end