aasm 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f758ead4b090ac11ffd00fd7b5a85b5a24dfa626
-  data.tar.gz: 7e2192786e067726f08fdae1f70341922edf63bb
+  metadata.gz: 4976d2633b75f1b3ee17661e698a4aa3c5ff96bb
+  data.tar.gz: 19598287ca29eb957579fef45c2054efa227b8f2
 SHA512:
-  metadata.gz: f3df7b62a3328455e73356824ceca28663ea789963518730e731078f8d419dbcda1fc20dafe7697563e5e8da5a97fe1409ddda0366b48258c14c14e671b4b855
-  data.tar.gz: 2a001ca4ce4e3b8452396546201e2506fc467eb5b12ad24dfbd21ed420f20112df5b854e45e2c02211a463f3476ec4e0ce9a587936c082c0200ed4e5bebf6127
+  metadata.gz: 71e5ccc6259fbb7400b7e2c4c14da15a1ad2275a59ca94d23469afc1e1c5212f3a8a38b68f7fc5ed99b466bcef3df350c331d9525b324274d85dc47ded71132b
+  data.tar.gz: a3688432d71fe26211b511d665b13b9a171a3e79196dc4eac3fb6fae5f63b60ae82f4e15d20a5e7b627b02dfdf1d47e8643b67bad9d45d6585848dfb8a501864

data/.travis.yml

@@ -11,8 +11,8 @@ rvm:
   - 2.2
   # - jruby-18mode # JRuby in 1.8 mode
   - jruby-1.7 # JRuby in 1.9 mode
-  - jruby-9.0.3.0
-  - rbx-2.2.1
+  - jruby-9.0.4.0
+  - rbx-2.5.8
 
 services: mongodb
 
@@ -26,6 +26,11 @@ gemfile:
   - gemfiles/rails_4.2_mongoid_5.gemfile
   - gemfiles/rails_4.2_mongo_mapper.gemfile
 
+before_script:
+  - mkdir /tmp/dynamodb
+  - wget -O - http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_latest | tar xz --directory /tmp/dynamodb
+  - java -Djava.library.path=/tmp/dynamodb/DynamoDBLocal_lib -jar /tmp/dynamodb/DynamoDBLocal.jar -inMemory -delayTransientStatuses -port 30180 &
+
 matrix:
   allow_failures:
     - rvm: rbx-2.2.1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 4.8.0
+
+ * add support for [dynamoid](http://joshsymonds.com/Dynamoid/) (see [issue #300](https://github.com/aasm/aasm/pull/300) for details, thanks to [@LeeChSien](https://github.com/LeeChSien))
+ * make compatible with [RubyMotion](http://www.rubymotion.com) (see [issue #315](https://github.com/aasm/aasm/pull/315) for details, thanks to [@Infotaku](https://github.com/Infotaku))
+ * improve error handling in case of an exception during transitioning (see [issue #275](https://github.com/aasm/aasm/pull/275) for details, thanks to [@chriswoodrich](https://github.com/chriswoodrich))
+ * rspec matcher `on_event` now supports arguments (see [issue #309](https://github.com/aasm/aasm/pull/309) for details, thanks to [@zacviandier](https://github.com/zacviandier))
+ * fix: permitted states now respect guards (see [issue #308](https://github.com/aasm/aasm/pull/308) for details, thanks to [@eebs](https://github.com/eebs))
+ * fix: reloading the env now doesn't add callbacks twice anymore (see [issue #311](https://github.com/aasm/aasm/pull/311) for details, thanks to [@lingceng](https://github.com/lingceng))
+
 ## 4.7.0
 
  * fix: allow :send as event name (see [issue #257](https://github.com/aasm/aasm/issues/257) for details)

data/Gemfile

@@ -7,6 +7,11 @@ gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "~>4.2"
 gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
 gem 'sequel'
+
+# testing dynamoid
+# gem 'dynamoid', '~> 1'
+# gem 'aws-sdk', '~>2'
+
 # Since mongoid V4 requires incompatible bson V2, cannot have mongoid (V4 or greater)
 # and mongo_mapper ( or mongo ) in the same application
 # gem 'mongo_mapper', '~> 0.13'

data/README.md

@@ -429,11 +429,13 @@ job.run   # not saved
 job.run!  # saved
 ```
 
-Saving includes running all validations on the `Job` class. If you want make sure
-the state gets saved without running validations (and thereby maybe persisting an
-invalid object state), simply tell AASM to skip the validations. Be aware that
-when skipping validations, only the state column will be updated in the database
-(just like ActiveRecord `change_column` is working).
+Saving includes running all validations on the `Job` class, and returns `true` if
+successful or `false` if errors occur. Exceptions are not raised.
+
+If you want make sure the state gets saved without running validations (and
+thereby maybe persisting aninvalid object state), simply tell AASM to skip the
+validations. Be aware that when skipping validations, only the state column will
+be updated in the database (just like ActiveRecord `change_column` is working).
 
 ```ruby
 class Job < ActiveRecord::Base
@@ -534,6 +536,11 @@ end
 However it's not yet as feature complete as _ActiveRecord_. For example, there are
 scopes defined yet. See [Automatic Scopes](#automatic-scopes).
 
+### Dynamoid
+
+Since version `4.8.0` _AASM_ also supports [Dynamoid](http://joshsymonds.com/Dynamoid/) as
+persistence ORM.
+
 ### Mongoid
 
 AASM also supports persistence to Mongodb if you're using Mongoid. Make sure
@@ -750,6 +757,14 @@ Job.aasm.states_for_select
 ```
 
 
+### RubyMotion support
+
+To use AASM with a RubyMotion project, use it with the [motion-bundler](https://github.com/archan937/motion-bundler) gem.
+
+Warning: Due to the way key-value observation (KVO) works in iOS, 
+you currently CANNOT use AASM with an object you are observing. (Yes.. that's pretty sad).
+
+
 ### Testing
 
 AASM provides some matchers for [RSpec](http://rspec.info): `transition_from`, `have_state`, `allow_event` and `allow_transition_to`. Add `require 'aasm/rspec'` to your `spec_helper.rb` file and use them like this
@@ -765,6 +780,8 @@ expect(job).to allow_event :run
 expect(job).to_not allow_event :clean
 expect(job).to allow_transition_to(:running)
 expect(job).to_not allow_transition_to(:cleaning)
+# on_event also accept arguments
+expect(job).to transition_from(:sleeping).to(:running).on_event(:run, :defragmentation)
 
 # classes with multiple state machine
 multiple = SimpleMultipleExample.new
@@ -815,7 +832,7 @@ After installing Aasm you can run generator:
 ```sh
 % rails generate aasm NAME [COLUMN_NAME]
 ```
-Replace NAME with the Model name, COLUMN_NAME is optional(default is 'aasm_state'). 
+Replace NAME with the Model name, COLUMN_NAME is optional(default is 'aasm_state').
 This will create a model (if one does not exist) and configure it with aasm block.
 For Active record orm a migration file is added to add aasm state column to table.
 

data/gemfiles/rails_4.0.gemfile

@@ -8,5 +8,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rails", "4.0.13"
 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
 
 gemspec :path => "../"

data/gemfiles/rails_4.0_mongo_mapper.gemfile

@@ -10,5 +10,7 @@ gem "rails", "4.0.13"
 gem 'sequel'
 gem 'mongo_mapper', '~>0.13'
 gem 'bson_ext',                          :platforms => :ruby
+gem 'dynamoid', '~> 1',                  :platforms => :ruby
+gem 'aws-sdk', '~>2',                    :platforms => :ruby
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -5,8 +5,10 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.1.9"
+gem "rails", "4.1.14"
 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
 
 gemspec :path => "../"

data/gemfiles/rails_4.1_mongo_mapper.gemfile

@@ -6,9 +6,11 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.1.9"
+gem "rails", "4.1.14"
 gem 'sequel'
 gem 'mongo_mapper', '~> 0.13'
 gem 'bson_ext',                          :platforms => :ruby
+gem 'dynamoid', '~> 1',                  :platforms => :ruby
+gem 'aws-sdk', '~>2',                    :platforms => :ruby
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -5,8 +5,10 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.2.0"
+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
 
 gemspec :path => "../"

data/gemfiles/rails_4.2_mongo_mapper.gemfile

@@ -6,9 +6,11 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.2.0"
+gem "rails", "4.2.5"
 gem 'sequel'
 gem 'mongo_mapper'
 gem 'bson_ext',                          :platforms => :ruby
+gem 'dynamoid', '~> 1',                  :platforms => :ruby
+gem 'aws-sdk', '~>2',                    :platforms => :ruby
 
 gemspec :path => "../"

data/gemfiles/rails_4.2_mongoid_5.gemfile

@@ -5,8 +5,10 @@ gem 'rubysl',                           :platforms => :rbx
 gem 'rubinius-developer_tools',         :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-gem "rails", "4.2.0"
+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
 
 gemspec :path => "../"

data/lib/aasm.rb

@@ -12,4 +12,5 @@ require 'aasm/core/state'
 require 'aasm/localizer'
 require 'aasm/state_machine'
 require 'aasm/persistence'
+require 'aasm/persistence/plain_persistence' # RubyMotion support
 require 'aasm/aasm'

data/lib/aasm/aasm.rb

@@ -110,10 +110,10 @@ private
         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
-          aasm_failed(state_machine_name, event_name, old_state)
+          aasm_failed(state_machine_name, event_name, old_state, event.failed_callbacks)
         end
       else
-        aasm_failed(state_machine_name, event_name, old_state)
+        aasm_failed(state_machine_name, event_name, old_state, event.failed_callbacks)
       end
     rescue StandardError => e
       event.fire_callbacks(:error, self, e, *process_args(event, aasm(state_machine_name).current_state, *args)) ||
@@ -172,13 +172,13 @@ private
     persist_successful
   end
 
-  def aasm_failed(state_machine_name, event_name, old_state)
+  def aasm_failed(state_machine_name, event_name, old_state, failures = [])
     if self.respond_to?(:aasm_event_failed)
       self.aasm_event_failed(event_name, old_state.name)
     end
 
     if AASM::StateMachine[self.class][state_machine_name].config.whiny_transitions
-      raise AASM::InvalidTransition.new(self, event_name, state_machine_name)
+      raise AASM::InvalidTransition.new(self, event_name, state_machine_name, failures)
     else
       false
     end

data/lib/aasm/base.rb

@@ -31,17 +31,16 @@ module AASM
 
       # make sure to raise an error if no_direct_assignment is enabled
       # and attribute is directly assigned though
-      @klass.class_eval %Q(
-        def #{@state_machine.config.column}=(state_name)
-          if self.class.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
-          end
+      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
     end
 
     # This method is both a getter and a setter
@@ -70,11 +69,10 @@ module AASM
         warn "#{@klass.name}: The aasm state name #{name} is already used!"
       end
 
-      @klass.class_eval <<-EORUBY, __FILE__, __LINE__ + 1
-        def #{name}?
-          aasm(:#{@name}).current_state == :#{name}
-        end
-      EORUBY
+      aasm_name = @name
+      @klass.send :define_method, "#{name}?", ->() do
+        aasm(:"#{aasm_name}").current_state == :"#{name}"
+      end
 
       unless @klass.const_defined?("STATE_#{name.upcase}")
         @klass.const_set("STATE_#{name.upcase}", name)
@@ -92,21 +90,21 @@ module AASM
       # an addition over standard aasm so that, before firing an event, you can ask
       # may_event? and get back a boolean that tells you whether the guard method
       # on the transition will let this happen.
-      @klass.class_eval <<-EORUBY, __FILE__, __LINE__ + 1
-        def may_#{name}?(*args)
-          aasm(:#{@name}).may_fire_event?(:#{name}, *args)
-        end
+      aasm_name = @name
 
-        def #{name}!(*args, &block)
-          aasm(:#{@name}).current_event = :#{name}!
-          aasm_fire_event(:#{@name}, :#{name}, {:persist => true}, *args, &block)
-        end
+      @klass.send :define_method, "may_#{name}?", ->(*args) do
+        aasm(:"#{aasm_name}").may_fire_event?(:"#{name}", *args)
+      end
 
-        def #{name}(*args, &block)
-          aasm(:#{@name}).current_event = :#{name}
-          aasm_fire_event(:#{@name}, :#{name}, {:persist => false}, *args, &block)
-        end
-      EORUBY
+      @klass.send :define_method, "#{name}!", ->(*args, &block) do
+        aasm(:"#{aasm_name}").current_event = :"#{name}!"
+        aasm_fire_event(:"#{aasm_name}", :"#{name}", {:persist => true}, *args, &block)
+      end
+
+      @klass.send :define_method, "#{name}", ->(*args, &block) do
+        aasm(:"#{aasm_name}").current_event = :"#{name}"
+        aasm_fire_event(:"#{aasm_name}", :"#{name}", {:persist => false}, *args, &block)
+      end
     end
 
     def after_all_transitions(*callbacks, &block)

data/lib/aasm/core/event.rb

@@ -85,6 +85,10 @@ module AASM::Core
       @transitions
     end
 
+    def failed_callbacks
+      transitions.flat_map(&:failures)
+    end
+
   private
 
     def attach_event_guards(definitions)

data/lib/aasm/core/transition.rb

@@ -2,7 +2,7 @@ module AASM::Core
   class Transition
     include DslHelper
 
-    attr_reader :from, :to, :event, :opts
+    attr_reader :from, :to, :event, :opts, :failures
     alias_method :options, :opts
 
     def initialize(event, opts, &block)
@@ -13,6 +13,7 @@ module AASM::Core
       @to = opts[:to]
       @guards = Array(opts[:guards]) + Array(opts[:guard]) + Array(opts[:if])
       @unless = Array(opts[:unless]) #TODO: This could use a better name
+      @failures = []
 
       if opts[:on_transition]
         warn '[DEPRECATION] :on_transition is deprecated, use :after instead'
@@ -53,9 +54,13 @@ module AASM::Core
       case code
       when Symbol, String
         arity = record.__send__(:method, code.to_sym).arity
-        arity == 0 ? record.__send__(code) : record.__send__(code, *args)
+        result = (arity == 0 ? record.__send__(code) : result = record.__send__(code, *args))
+        failures << code unless result
+        result
       when Proc
-        code.parameters.size == 0 ? record.instance_exec(&code) : record.instance_exec(*args, &code)
+        result = (code.parameters.size == 0 ? record.instance_exec(&code) : record.instance_exec(*args, &code))
+        failures << code.source_location.join('#') unless result
+        result
       when Array
         if options[:guard]
           # invoke guard callbacks

data/lib/aasm/errors.rb

@@ -3,14 +3,18 @@ module AASM
   class UnknownStateMachineError < RuntimeError; end
 
   class InvalidTransition < RuntimeError
-    attr_reader :object, :event_name, :state_machine_name
+    attr_reader :object, :event_name, :state_machine_name, :failures
 
-    def initialize(object, event_name, state_machine_name)
-      @object, @event_name, @state_machine_name = object, event_name, state_machine_name
+    def initialize(object, event_name, state_machine_name, failures = [])
+      @object, @event_name, @state_machine_name, @failures = object, event_name, state_machine_name, failures
     end
 
     def message
-      "Event '#{event_name}' cannot transition from '#{object.aasm(state_machine_name).current_state}'"
+      "Event '#{event_name}' cannot transition from '#{object.aasm(state_machine_name).current_state}'. #{reasoning}"
+    end
+
+    def reasoning
+      "Failed callback(s): #{@failures}." unless failures.empty?
     end
   end
 

data/lib/aasm/instance_base.rb

@@ -35,11 +35,23 @@ module AASM
 
     def states(options={})
       if options[:permitted]
-        # ugliness level 1000
-        permitted_event_names = events(:permitted => true).map(&:name)
-        transitions = @instance.class.aasm(@name).state_machine.events.values_at(*permitted_event_names).compact.map {|e| e.transitions_from_state(current_state) }
-        tos = transitions.map {|t| t[0] ? t[0].to : nil}.flatten.compact.map(&:to_sym).uniq
-        @instance.class.aasm(@name).states.select {|s| tos.include?(s.name.to_sym)}
+        permitted_events = events(:permitted => true)
+
+        # An array of arrays. Each inner array represents the transitions that
+        # transition from the current state for an event
+        event_transitions = permitted_events.map {|e| e.transitions_from_state(current_state) }
+
+        # An array of symbols that are possible :to transition states
+        to_state_names = event_transitions.map do |transitions|
+          return nil if transitions.empty?
+
+          # Return the :to state of the first transition that is allowed or nil
+          transition = transitions.find { |t| t.allowed?(@instance) }
+          transition ? transition.to : nil
+        end.flatten.compact.uniq
+
+        # Select states that are in to_state_names
+        @instance.class.aasm(@name).states.select {|s| to_state_names.include?(s.name)}
       else
         @instance.class.aasm(@name).states
       end

data/lib/aasm/persistence.rb

@@ -14,6 +14,8 @@ module AASM
           include_persistence base, :mongo_mapper
         elsif hierarchy.include?("Sequel::Model")
           include_persistence base, :sequel
+        elsif hierarchy.include?("Dynamoid::Document")
+          include_persistence base, :dynamoid
         else
           include_persistence base, :plain
         end
@@ -23,7 +25,7 @@ module AASM
 
       def include_persistence(base, type)
         require File.join(File.dirname(__FILE__), 'persistence', "#{type}_persistence")
-        base.send(:include, constantize("AASM::Persistence::#{capitalize(type)}Persistence"))
+        base.send(:include, constantize("#{capitalize(type)}Persistence"))
       end
 
       def capitalize(string_or_symbol)
@@ -31,7 +33,7 @@ module AASM
       end
 
       def constantize(string)
-        instance_eval(string)
+        AASM::Persistence.const_get(string)
       end
 
     end # class << self

data/lib/aasm/persistence/dynamoid_persistence.rb

@@ -0,0 +1,94 @@
+require_relative 'base'
+
+module AASM
+  module Persistence
+    module DynamoidPersistence
+      def self.included(base)
+        base.send(:include, AASM::Persistence::Base)
+        base.send(:include, AASM::Persistence::DynamoidPersistence::InstanceMethods)
+
+        base.after_initialize :aasm_ensure_initial_state
+
+        # Because Dynamoid only use define_method to add attribute assignment method in Class.
+        #
+        # In AASM::Base.initialize, it redefines and calls super in this method without superclass method.
+        # We override method_missing to solve this problem.
+        #
+        base.class_eval %Q(
+          def method_missing(method_name, *arguments, &block)
+            if (AASM::StateMachine[self.class].keys.map { |state_machine_name| self.class.aasm(state_machine_name).attribute_name.to_s + "=" }).include? method_name.to_s
+              attribute_name = method_name.to_s.gsub("=", '')
+              write_attribute(attribute_name.to_sym, *arguments)
+            else
+              super
+            end
+          end
+        )
+      end
+
+      module InstanceMethods
+
+        # Writes <tt>state</tt> to the state column and persists it to the database
+        # using update_attribute (which bypasses validation)
+        #
+        #   foo = Foo.find(1)
+        #   foo.aasm.current_state # => :opened
+        #   foo.close!
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state(state, name=:default)
+          old_value = read_attribute(self.class.aasm(name).attribute_name)
+          write_attribute(self.class.aasm(name).attribute_name, state.to_s)
+
+          unless self.save(:validate => false)
+            write_attribute(self.class.aasm(name).attribute_name, old_value)
+            return false
+          end
+
+          true
+        end
+
+        # Writes <tt>state</tt> to the state column, but does not persist it to the database
+        #
+        #   foo = Foo.find(1)
+        #   foo.aasm.current_state # => :opened
+        #   foo.close
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :opened
+        #   foo.save
+        #   foo.aasm.current_state # => :closed
+        #   Foo.find(1).aasm.current_state # => :closed
+        #
+        # NOTE: intended to be called from an event
+        def aasm_write_state_without_persistence(state, name=:default)
+          write_attribute(self.class.aasm(name).attribute_name, state.to_s)
+        end
+
+      private
+
+        # Ensures that if the aasm_state column is nil and the record is new
+        # that the initial state gets populated before validation on create
+        #
+        #   foo = Foo.new
+        #   foo.aasm_state # => nil
+        #   foo.valid?
+        #   foo.aasm_state # => "open" (where :open is the initial state)
+        #
+        #
+        #   foo = Foo.find(:first)
+        #   foo.aasm_state # => 1
+        #   foo.aasm_state = nil
+        #   foo.valid?
+        #   foo.aasm_state # => nil
+        #
+        def aasm_ensure_initial_state
+          AASM::StateMachine[self.class].keys.each do |state_machine_name|
+            aasm(state_machine_name).enter_initial_state if send(self.class.aasm(state_machine_name).attribute_name).blank?
+          end
+        end
+      end # InstanceMethods
+    end
+  end # Persistence
+end # AASM

data/lib/aasm/rspec/transition_from.rb

@@ -2,8 +2,7 @@ RSpec::Matchers.define :transition_from do |from_state|
   match do |obj|
     @state_machine_name ||= :default
     obj.aasm(@state_machine_name).current_state = from_state.to_sym
-    # expect(obj).to receive(:broadcast_event).with(@event.to_s, obj, from_state, @to_state)
-    obj.send(@event) && obj.aasm(@state_machine_name).current_state == @to_state.to_sym
+    obj.send(@event, *@args) && obj.aasm(@state_machine_name).current_state == @to_state.to_sym
   end
 
   chain :on do |state_machine_name|
@@ -14,12 +13,13 @@ RSpec::Matchers.define :transition_from do |from_state|
     @to_state = state
   end
 
-  chain :on_event do |event|
+  chain :on_event do |event, *args|
     @event = event
+    @args = args
   end
 
   description do
-    "transition state to :#{@to_state} from :#{expected} on event :#{@event} (on :#{@state_machine_name})"
+    "transition state to :#{@to_state} from :#{expected} on event :#{@event}, with params: #{@args} (on :#{@state_machine_name})"
   end
 
   failure_message do |obj|

data/lib/aasm/state_machine.rb

@@ -44,7 +44,7 @@ module AASM
     def add_global_callbacks(name, *callbacks, &block)
       @global_callbacks[name] ||= []
       callbacks.each do |callback|
-        @global_callbacks[name] << callback
+        @global_callbacks[name] << callback unless @global_callbacks[name].include? callback
       end
       @global_callbacks[name] << block if block
     end

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "4.7.0"
+  VERSION = "4.8.0"
 end

data/spec/models/dynamoid/complex_dynamoid_example.rb

@@ -0,0 +1,37 @@
+class ComplexDynamoidExample
+  include Dynamoid::Document
+  include AASM
+
+  field :left
+  field :right
+
+  aasm :left, :column => 'left' do
+    state :one, :initial => true
+    state :two
+    state :three
+
+    event :increment do
+      transitions :from => :one, :to => :two
+      transitions :from => :two, :to => :three
+    end
+    event :reset do
+      transitions :from => :three, :to => :one
+    end
+  end
+
+  aasm :right, :column => 'right' do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+
+    event :level_up do
+      transitions :from => :alpha, :to => :beta
+      transitions :from => :beta, :to => :gamma
+    end
+    event :level_down do
+      transitions :from => :gamma, :to => :beta
+      transitions :from => :beta, :to => :alpha
+    end
+  end
+
+end

data/spec/models/dynamoid/dynamoid_multiple.rb

@@ -0,0 +1,18 @@
+class DynamoidMultiple
+  include Dynamoid::Document
+  include AASM
+
+  field :status
+
+  attr_accessor :default
+
+  aasm :left, :column => :status
+  aasm :left do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+    event :release do
+      transitions :from => [:alpha, :beta, :gamma], :to => :beta
+    end
+  end
+end

data/spec/models/dynamoid/dynamoid_simple.rb

@@ -0,0 +1,18 @@
+class DynamoidSimple
+  include Dynamoid::Document
+  include AASM
+
+  field :status
+
+  attr_accessor :default
+
+  aasm :column => :status
+  aasm do
+    state :alpha, :initial => true
+    state :beta
+    state :gamma
+    event :release do
+      transitions :from => [:alpha, :beta, :gamma], :to => :beta
+    end
+  end
+end

data/spec/models/multi_transitioner.rb

@@ -0,0 +1,24 @@
+class MultiTransitioner
+  include AASM
+
+  attr_accessor :can_run
+
+  def initialize
+    @can_run = false
+  end
+
+  aasm do
+    state :sleeping, :initial => true
+    state :running
+    state :dancing
+
+    event :start do
+      transitions :from => :sleeping, :to => :running, guard: :runnable?
+      transitions :from => :sleeping, :to => :dancing
+    end
+  end
+
+  def runnable?
+    @can_run
+  end
+end

data/spec/spec_helper.rb

@@ -18,6 +18,39 @@ def load_schema
   require File.dirname(__FILE__) + "/database.rb"
 end
 
+# Dynamoid initialization
+begin
+  require 'dynamoid'
+  require 'aws-sdk-resources'
+
+  ENV['ACCESS_KEY'] ||= 'abcd'
+  ENV['SECRET_KEY'] ||= '1234'
+
+  Aws.config.update({
+    region: 'us-west-2',
+    credentials: Aws::Credentials.new(ENV['ACCESS_KEY'], ENV['SECRET_KEY'])
+  })
+
+  Dynamoid.configure do |config|
+    config.namespace = "dynamoid_tests"
+    config.endpoint = 'http://127.0.0.1:30180'
+    config.warn_on_scan = false
+  end
+
+  Dynamoid.logger.level = Logger::FATAL
+
+  RSpec.configure do |c|
+    c.before(:each) do
+      Dynamoid.adapter.list_tables.each do |table|
+        Dynamoid.adapter.delete_table(table) if table =~ /^#{Dynamoid::Config.namespace}/
+      end
+      Dynamoid.adapter.tables.clear
+    end
+  end
+rescue LoadError
+  # Without Dynamoid settings
+end
+
 # custom spec helpers
 Dir[File.dirname(__FILE__) + "/spec_helpers/**/*.rb"].sort.each { |f| require File.expand_path(f) }
 

data/spec/unit/callback_multiple_spec.rb

@@ -49,7 +49,8 @@ describe 'callbacks for the new DSL' do
 
     expect {
       callback.left_close!
-    }.to raise_error(AASM::InvalidTransition)
+    }.to raise_error(AASM::InvalidTransition, "Event 'left_close' cannot transition from 'open'. Failed callback(s): [:after_transition, :event_guard].")
+
   end
 
   it "handles private callback methods as well" do
@@ -87,7 +88,7 @@ describe 'callbacks for the new DSL' do
 
       expect {
         callback.left_close!
-      }.to raise_error(AASM::InvalidTransition)
+      }.to raise_error(AASM::InvalidTransition, "Event 'left_close' cannot transition from 'open'. Failed callback(s): [:after_transition, :event_guard, :transition_guard].")
     end
 
     it "does not run transition_guard twice for multiple permitted transitions" do
@@ -132,10 +133,10 @@ describe 'callbacks for the new DSL' do
       expect(callback).to_not receive(:after_exit_open)
       expect(callback).to_not receive(:after_enter_closed)
       expect(callback).to_not receive(:after)
-
       expect {
         callback.close!
       }.to raise_error(AASM::InvalidTransition)
+
     end
   end
 
@@ -277,12 +278,16 @@ describe 'event callbacks' do
 
     it 'should call it when transition failed for bang fire' do
       expect(@foo).to receive(:aasm_event_failed).with(:null, :open)
-      expect {@foo.null!}.to raise_error(AASM::InvalidTransition)
+      expect{
+        @foo.null!
+      }.to raise_error(AASM::InvalidTransition, "Event 'null' cannot transition from 'open'. Failed callback(s): [:always_false].")
     end
 
     it 'should call it when transition failed for non-bang fire' do
       expect(@foo).to receive(:aasm_event_failed).with(:null, :open)
-      expect {@foo.null}.to raise_error(AASM::InvalidTransition)
+      expect{
+        @foo.null
+      }.to raise_error(AASM::InvalidTransition, "Event 'null' cannot transition from 'open'. Failed callback(s): [:always_false, :always_false].")
     end
 
     it 'should not call it if persist fails for bang fire' do

data/spec/unit/callbacks_spec.rb

@@ -94,6 +94,39 @@ describe 'callbacks for the new DSL' do
     callback.close!
   end
 
+
+  it "works fine after reload" do
+    show_debug_log = false
+
+    callback = Callbacks::Basic.new(:log => show_debug_log)
+    callback.aasm.current_state
+
+    # reload the class
+    Callbacks.send(:remove_const, :Basic)
+    load 'models/callbacks/basic.rb'
+
+    unless show_debug_log
+      expect(callback).to receive(:before_event).once.ordered
+      expect(callback).to receive(:event_guard).once.ordered.and_return(true)
+      expect(callback).to receive(:transition_guard).once.ordered.and_return(true)
+      expect(callback).to receive(:before_exit_open).once.ordered                   # these should be before the state changes
+      expect(callback).to receive(:exit_open).once.ordered
+      # expect(callback).to receive(:event_guard).once.ordered.and_return(true)
+      # expect(callback).to receive(:transition_guard).once.ordered.and_return(true)
+      expect(callback).to receive(:after_all_transitions).once.ordered
+      expect(callback).to receive(:after_transition).once.ordered
+      expect(callback).to receive(:before_enter_closed).once.ordered
+      expect(callback).to receive(:enter_closed).once.ordered
+      expect(callback).to receive(:aasm_write_state).once.ordered.and_return(true)  # this is when the state changes
+      expect(callback).to receive(:after_exit_open).once.ordered                    # these should be after the state changes
+      expect(callback).to receive(:after_enter_closed).once.ordered
+      expect(callback).to receive(:after_event).once.ordered
+    end
+
+    # puts "------- close!"
+    callback.close!
+  end
+
   it "does not run any state callback if the event guard fails" do
     callback = Callbacks::Basic.new(:log => false)
     callback.aasm.current_state

data/spec/unit/event_spec.rb

@@ -109,6 +109,35 @@ describe 'firing an event' do
     expect(event.fire(obj, {}, nil, 'arg1', 'arg2')).to eq(:closed)
   end
 
+  context 'when given a gaurd proc' do
+    it 'should have access to callback failures in the transitions' do
+      event = AASM::Core::Event.new(:graduate, state_machine) do
+        transitions :to => :alumni, :from => [:student, :applicant],
+          :guard => Proc.new { 1 + 1 == 3 }
+      end
+      line_number = __LINE__ - 2
+      obj = double('object', :aasm => double('aasm', :current_state => :student))
+
+      event.fire(obj, {}, nil)
+      expect(event.failed_callbacks).to eq ["#{__FILE__}##{line_number}"]
+    end
+  end
+
+  context 'when given a guard symbol' do
+    it 'should have access to callback failures in the transitions' do
+      event = AASM::Core::Event.new(:graduate, state_machine) do
+        transitions :to => :alumni, :from => [:student, :applicant],
+          guard: :paid_tuition?
+      end
+
+      obj = double('object', :aasm => double('aasm', :current_state => :student))
+      allow(obj).to receive(:paid_tuition?).and_return(false)
+
+      event.fire(obj, {}, nil)
+      expect(event.failed_callbacks).to eq [:paid_tuition?]
+    end
+  end
+
 end
 
 describe 'should fire callbacks' do

data/spec/unit/inspection_spec.rb

@@ -17,6 +17,7 @@ describe 'inspection for common cases' do
   context "instance level inspection" do
     let(:foo) { Foo.new }
     let(:two) { FooTwo.new }
+    let(:multi) { MultiTransitioner.new }
 
     it "delivers all states" do
       states = foo.aasm.states
@@ -37,11 +38,13 @@ describe 'inspection for common cases' do
       states = two.aasm.states
       expect(states).to include(:open)
       expect(states).to include(:closed)
+      expect(states).to include(:final)
       expect(states).to include(:foo)
 
       states = two.aasm.states(:permitted => true)
       expect(states).to include(:closed)
       expect(states).not_to include(:open)
+      expect(states).not_to include(:final)
 
       two.close
       expect(two.aasm.states(:permitted => true)).to be_empty
@@ -54,6 +57,18 @@ describe 'inspection for common cases' do
       foo.close
       expect(foo.aasm.events).to be_empty
     end
+
+    it "delivers permitted states when multiple transitions are defined" do
+      multi.can_run = false
+      states = multi.aasm.states(:permitted => true)
+      expect(states).to_not include(:running)
+      expect(states).to include(:dancing)
+
+      multi.can_run = true
+      states = multi.aasm.states(:permitted => true)
+      expect(states).to include(:running)
+      expect(states).to_not include(:dancing)
+    end
   end
 
   it 'should list states in the order they have been defined' do

data/spec/unit/persistence/dynamoid_persistence_multiple_spec.rb

@@ -0,0 +1,140 @@
+describe 'dynamoid' do
+  begin
+    require 'dynamoid'
+    require 'logger'
+    require 'spec_helper'
+
+    Dir[File.dirname(__FILE__) + "/../../models/dynamoid/*.rb"].sort.each do |f|
+      require File.expand_path(f)
+    end
+
+    before(:all) do
+      @model = DynamoidMultiple
+    end
+
+    describe "instance methods" do
+      let(:model) {@model.new}
+
+      it "should respond to aasm persistence methods" do
+        expect(model).to respond_to(:aasm_read_state)
+        expect(model).to respond_to(:aasm_write_state)
+        expect(model).to respond_to(:aasm_write_state_without_persistence)
+      end
+
+      it "should return the initial state when new and the aasm field is nil" do
+        expect(model.aasm(:left).current_state).to eq(:alpha)
+      end
+
+      it "should save the initial state" do
+        model.save
+        expect(model.status).to eq("alpha")
+      end
+
+      it "should return the aasm column when new and the aasm field is not nil" do
+        model.status = "beta"
+        expect(model.aasm(:left).current_state).to eq(:beta)
+      end
+
+      it "should return the aasm column when not new and the aasm_column is not nil" do
+        model.save
+        model.status = "gamma"
+        expect(model.aasm(:left).current_state).to eq(:gamma)
+      end
+
+      it "should allow a nil state" do
+        model.save
+        model.status = nil
+        expect(model.aasm(:left).current_state).to be_nil
+      end
+
+      it "should not change the state if state is not loaded" do
+        model.release
+        model.save
+        model.reload
+        expect(model.aasm(:left).current_state).to eq(:beta)
+      end
+    end
+
+    describe 'subclasses' do
+      it "should have the same states as its parent class" do
+        expect(Class.new(@model).aasm(:left).states).to eq(@model.aasm(:left).states)
+      end
+
+      it "should have the same events as its parent class" do
+        expect(Class.new(@model).aasm(:left).events).to eq(@model.aasm(:left).events)
+      end
+
+      it "should have the same column as its parent even for the new dsl" do
+        expect(@model.aasm(:left).attribute_name).to eq(:status)
+        expect(Class.new(@model).aasm(:left).attribute_name).to eq(:status)
+      end
+    end
+
+    describe 'initial states' do
+      it 'should support conditions' do
+        @model.aasm(:left) do
+          initial_state lambda{ |m| m.default }
+        end
+
+        expect(@model.new(:default => :beta).aasm(:left).current_state).to eq(:beta)
+        expect(@model.new(:default => :gamma).aasm(:left).current_state).to eq(:gamma)
+      end
+    end
+
+    describe "complex example" do
+      it "works" do
+        record = ComplexDynamoidExample.new
+        expect(record.aasm(:left).current_state).to eql :one
+        expect(record.aasm(:right).current_state).to eql :alpha
+
+        record.save
+        expect_aasm_states record, :one, :alpha
+        record.reload
+        expect_aasm_states record, :one, :alpha
+
+        record.increment!
+        expect_aasm_states record, :two, :alpha
+        record.reload
+        expect_aasm_states record, :two, :alpha
+
+        record.level_up!
+        expect_aasm_states record, :two, :beta
+        record.reload
+        expect_aasm_states record, :two, :beta
+
+        record.increment!
+        expect { record.increment! }.to raise_error(AASM::InvalidTransition)
+        expect_aasm_states record, :three, :beta
+        record.reload
+        expect_aasm_states record, :three, :beta
+
+        record.level_up!
+        expect_aasm_states record, :three, :gamma
+        record.reload
+        expect_aasm_states record, :three, :gamma
+
+        record.level_down # without saving
+        expect_aasm_states record, :three, :beta
+        record.reload
+        expect_aasm_states record, :three, :gamma
+
+        record.level_down # without saving
+        expect_aasm_states record, :three, :beta
+        record.reset!
+        expect_aasm_states record, :one, :beta
+      end
+
+      def expect_aasm_states(record, left_state, right_state)
+        expect(record.aasm(:left).current_state).to eql left_state.to_sym
+        expect(record.left).to eql left_state.to_s
+        expect(record.aasm(:right).current_state).to eql right_state.to_sym
+        expect(record.right).to eql right_state.to_s
+      end
+    end
+
+  rescue LoadError
+    puts "------------------------------------------------------------------------"
+    puts "Not running Dynamoid multiple-specs because dynamoid gem is not installed!!!"
+    puts "------------------------------------------------------------------------"
+  end
+end

data/spec/unit/persistence/dynamoid_persistence_spec.rb

@@ -0,0 +1,89 @@
+describe 'dynamoid' do
+  begin
+    require 'dynamoid'
+    require 'logger'
+    require 'spec_helper'
+
+    Dir[File.dirname(__FILE__) + "/../../models/dynamoid/*.rb"].sort.each do |f|
+      require File.expand_path(f)
+    end
+
+    before(:all) do
+      @model = DynamoidSimple
+    end
+
+    describe "instance methods" do
+      let(:model) {@model.new}
+
+      it "should respond to aasm persistence methods" do
+        expect(model).to respond_to(:aasm_read_state)
+        expect(model).to respond_to(:aasm_write_state)
+        expect(model).to respond_to(:aasm_write_state_without_persistence)
+      end
+
+      it "should return the initial state when new and the aasm field is nil" do
+        expect(model.aasm.current_state).to eq(:alpha)
+      end
+
+      it "should save the initial state" do
+        model.save
+        expect(model.status).to eq("alpha")
+      end
+
+      it "should return the aasm column when new and the aasm field is not nil" do
+        model.status = "beta"
+        expect(model.aasm.current_state).to eq(:beta)
+      end
+
+      it "should return the aasm column when not new and the aasm_column is not nil" do
+        model.save
+        model.status = "gamma"
+        expect(model.aasm.current_state).to eq(:gamma)
+      end
+
+      it "should allow a nil state" do
+        model.save
+        model.status = nil
+        expect(model.aasm.current_state).to be_nil
+      end
+
+      it "should not change the state if state is not loaded" do
+        model.release
+        model.save
+        model.reload
+        expect(model.aasm.current_state).to eq(:beta)
+      end
+    end
+
+    describe 'subclasses' do
+      it "should have the same states as its parent class" do
+        expect(Class.new(@model).aasm.states).to eq(@model.aasm.states)
+      end
+
+      it "should have the same events as its parent class" do
+        expect(Class.new(@model).aasm.events).to eq(@model.aasm.events)
+      end
+
+      it "should have the same column as its parent even for the new dsl" do
+        expect(@model.aasm.attribute_name).to eq(:status)
+        expect(Class.new(@model).aasm.attribute_name).to eq(:status)
+      end
+    end
+
+    describe 'initial states' do
+      it 'should support conditions' do
+        @model.aasm do
+          initial_state lambda{ |m| m.default }
+        end
+
+        expect(@model.new(:default => :beta).aasm.current_state).to eq(:beta)
+        expect(@model.new(:default => :gamma).aasm.current_state).to eq(:gamma)
+      end
+    end
+
+  rescue LoadError
+    puts "------------------------------------------------------------------------"
+    puts "Not running Dynamoid specs because dynamoid gem is not installed!!!"
+    puts "------------------------------------------------------------------------"
+  end
+end

data/spec/unit/transition_spec.rb

@@ -6,7 +6,7 @@ describe 'transitions' do
     process = ProcessWithNewDsl.new
     expect { process.stop! }.to raise_error do |err|
       expect(err.class).to eql(AASM::InvalidTransition)
-      expect(err.message).to eql("Event 'stop' cannot transition from 'sleeping'")
+      expect(err.message).to eql("Event 'stop' cannot transition from 'sleeping'. ")
       expect(err.object).to eql(process)
       expect(err.event_name).to eql(:stop)
     end
@@ -145,6 +145,17 @@ describe AASM::Core::Transition, '- when performing guard checks' do
     expect(st.allowed?(obj)).to be false
   end
 
+  it 'should add the name of the failed method calls to the failures instance var' do
+    opts = {:from => 'foo', :to => 'bar', :guard => :test}
+    st = AASM::Core::Transition.new(event, opts)
+
+    obj = double('object')
+    expect(obj).to receive(:test)
+
+    st.allowed?(obj)
+    expect(st.failures).to eq [:test]
+  end
+
   it 'should call the method on the object if unless is a symbol' do
     opts = {:from => 'foo', :to => 'bar', :unless => :test}
     st = AASM::Core::Transition.new(event, opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Scott Barron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,7 @@ files:
 - lib/aasm/persistence.rb
 - lib/aasm/persistence/active_record_persistence.rb
 - lib/aasm/persistence/base.rb
+- lib/aasm/persistence/dynamoid_persistence.rb
 - lib/aasm/persistence/mongo_mapper_persistence.rb
 - lib/aasm/persistence/mongoid_persistence.rb
 - lib/aasm/persistence/plain_persistence.rb
@@ -186,6 +187,9 @@ files:
 - spec/models/conversation.rb
 - spec/models/default_state.rb
 - spec/models/double_definer.rb
+- spec/models/dynamoid/complex_dynamoid_example.rb
+- spec/models/dynamoid/dynamoid_multiple.rb
+- spec/models/dynamoid/dynamoid_simple.rb
 - spec/models/foo.rb
 - spec/models/foo_callback_multiple.rb
 - spec/models/guardian.rb
@@ -200,6 +204,7 @@ files:
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
+- spec/models/multi_transitioner.rb
 - spec/models/no_initial_state.rb
 - spec/models/not_auto_loaded/process.rb
 - spec/models/parametrised_event.rb
@@ -244,6 +249,8 @@ files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_multiple_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/dynamoid_persistence_multiple_spec.rb
+- spec/unit/persistence/dynamoid_persistence_spec.rb
 - spec/unit/persistence/mongo_mapper_persistence_multiple_spec.rb
 - spec/unit/persistence/mongo_mapper_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistence_multiple_spec.rb
@@ -327,6 +334,9 @@ test_files:
 - spec/models/conversation.rb
 - spec/models/default_state.rb
 - spec/models/double_definer.rb
+- spec/models/dynamoid/complex_dynamoid_example.rb
+- spec/models/dynamoid/dynamoid_multiple.rb
+- spec/models/dynamoid/dynamoid_simple.rb
 - spec/models/foo.rb
 - spec/models/foo_callback_multiple.rb
 - spec/models/guardian.rb
@@ -341,6 +351,7 @@ test_files:
 - spec/models/mongoid/no_scope_mongoid.rb
 - spec/models/mongoid/simple_mongoid.rb
 - spec/models/mongoid/simple_new_dsl_mongoid.rb
+- spec/models/multi_transitioner.rb
 - spec/models/no_initial_state.rb
 - spec/models/not_auto_loaded/process.rb
 - spec/models/parametrised_event.rb
@@ -385,6 +396,8 @@ test_files:
 - spec/unit/new_dsl_spec.rb
 - spec/unit/persistence/active_record_persistence_multiple_spec.rb
 - spec/unit/persistence/active_record_persistence_spec.rb
+- spec/unit/persistence/dynamoid_persistence_multiple_spec.rb
+- spec/unit/persistence/dynamoid_persistence_spec.rb
 - spec/unit/persistence/mongo_mapper_persistence_multiple_spec.rb
 - spec/unit/persistence/mongo_mapper_persistence_spec.rb
 - spec/unit/persistence/mongoid_persistence_multiple_spec.rb