aasm 5.0.3 → 5.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 90423050620c1cd3228e8f5f67b76be213c9c491
-  data.tar.gz: 8d583eb68700900b6e0a8c22d6e8b7b0e8714ce7
+SHA256:
+  metadata.gz: c02be243049ac08482ee6dd9de9b388d7f965019012f680507b75aee43e1819c
+  data.tar.gz: e41809b4fd44cd1d5358e4da499c6b2691caf6a2b6f0b1cf24816458af711522
 SHA512:
-  metadata.gz: fb3ca30cbb4d415e5fc9905ae1b9e9ace0b7145ff97f29ce8639a57a99df3df43f3b1626dd9029421e54326085a8e4f5853dfbd21e231c778b3dca058cc980b9
-  data.tar.gz: 72996c355abefda14839e009f50bdcf900b0acd6d43f3d9eabb4e587390dd67b16be0a9eb66119f7e9d394993d266a0af823dedd6b54ad3e20049d7794fe9bfa
+  metadata.gz: c5e49eeff60a68201dccfd988525030946a5f4e2ff080a8818ec729f7bb88291b6f333ccf8666a241dfb72b38a2f30333afbc4d284c3c6103eaab49446630b8e
+  data.tar.gz: d2d16d9368d1c8dfd8f50baaea1f07b525798a017fc612c27705161606ae27e1cdd1ea15b979d6d916cfd8abaa81479ff20c72577f8dbbd140dcb78572683845

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/.travis.yml

@@ -2,6 +2,9 @@ sudo: false
 language: ruby
 cache: bundler
 
+jdk:
+  - openjdk8
+
 before_install:
   - rvm list
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
@@ -11,23 +14,27 @@ before_install:
 rvm:
   - 2.3.0
   - 2.5.0
+  - 2.6.5
+  - 2.7.0
   - jruby-9.1.12.0
 
 services:
   - mongodb
   - redis-server
 
-addons:
-  rethinkdb: '2.3.6'
+#addons:
+#  rethinkdb: '2.3.4'
 
 gemfile:
+  - gemfiles/norails.gemfile
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_4.2_mongoid_5.gemfile
-  - gemfiles/rails_4.2_nobrainer.gemfile
+#  - gemfiles/rails_4.2_nobrainer.gemfile
   - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.0_nobrainer.gemfile
+#  - gemfiles/rails_5.0_nobrainer.gemfile
   - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 
 before_script:
   - mkdir /tmp/dynamodb
@@ -42,27 +49,51 @@ script:
 matrix:
   exclude:
     - rvm: 2.3.0
-      gemfile: gemfiles/rails_5.0.gemfile
+      gemfile: gemfiles/norails.gemfile
     - rvm: 2.3.0
-      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
+      gemfile: gemfiles/rails_5.0.gemfile
+#    - rvm: 2.3.0
+#      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
     - rvm: 2.3.0
       gemfile: gemfiles/rails_5.1.gemfile
+    - rvm: 2.3.0
+      gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_5.2.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_5.2.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_4.2.gemfile
     - rvm: 2.5.0
       gemfile: gemfiles/rails_4.2_mongoid_5.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_4.2_mongoid_5.gemfile
+    - rvm: 2.7.0
+      gemfile: gemfiles/rails_4.2_mongoid_5.gemfile
+#    - rvm: 2.5.0
+#      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
+    - rvm: jruby-9.1.12.0
+      gemfile: gemfiles/norails.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.0.gemfile
     - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_5.1.gemfile
     - rvm: jruby-9.1.12.0
-      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
-    - rvm: jruby-9.1.12.0
-      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
+      gemfile: gemfiles/rails_5.2.gemfile
+#    - rvm: jruby-9.1.12.0
+#      gemfile: gemfiles/rails_4.2_nobrainer.gemfile
+#    - rvm: jruby-9.1.12.0
+#      gemfile: gemfiles/rails_5.0_nobrainer.gemfile
 
 notifications:
   slack:

data/Appraisals

@@ -36,7 +36,7 @@ appraise 'rails_5.0' do
   gem 'rails', '5.0.0'
   gem 'mongoid', '~> 6.0'
   gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
+  gem 'dynamoid', '~> 1.3', platforms: :ruby
   gem 'aws-sdk', '~> 2', platforms: :ruby
   gem 'redis-objects'
 end
@@ -50,7 +50,22 @@ appraise 'rails_5.1' do
   gem 'rails', '5.1'
   gem 'mongoid', '~>6.0'
   gem 'sequel'
-  gem 'dynamoid', '~> 1', platforms: :ruby
+  gem 'dynamoid', '~> 1.3', platforms: :ruby
+  gem 'aws-sdk', '~>2', platforms: :ruby
+  gem 'redis-objects'
+end
+
+appraise 'rails_5.2' do
+  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'
 end
+
+appraise 'norails' do
+  gem 'rails', install_if: false
+  gem 'sequel'
+  gem 'redis-objects'
+end

data/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 ## unreleased
 
+## 5.0.8
+
+* Revert Fix for :after_commit within nested transaction because it adds after_commit_action dependency which is dependent on many gems.
+
+## 5.0.7
+
+* Fix :after_commit within nested transaction [#666](https://github.com/aasm/aasm/pull/666), thanks to [stokarenko](https://github.com/stokarenko)
+* Add permitted_transitions to group permitted event with state [#664](https://github.com/aasm/aasm/pull/664), thanks to [dnamsons](https://github.com/dnamsons)
+* Add Ruby 2.7.0 & 2.6.5 to Travis CI Test Matrix [#661](https://github.com/aasm/aasm/pull/661), thanks to [the-spectator](https://github.com/the-spectator)
+* Handle InvalidTransition in transition_from matcher [#653](https://github.com/aasm/aasm/pull/653), thanks to [ryanwood](https://github.com/ryanwood)
+
+## 5.0.6
+
+* Fix no_direct_assignment, couldn't be turned off pragmatically [#636](https://github.com/aasm/aasm/issues/636)
+* Add instance level validation skip option [#644](https://github.com/aasm/aasm/pull/644), thanks to [Nitin-Salunke](https://github.com/Nitin-Salunke)
+* Fixed aasm.current_event incorrectly yields nil when calling aasm.fire!(:event) [#551](https://github.com/aasm/aasm/issues/551) in [#638](https://github.com/aasm/aasm/pull/638), thanks to [DoubleJarvis](https://github.com/DoubleJarvis)
+* Code Refactor [#634](https://github.com/aasm/aasm/pull/634) , thanks to [rahulknojha](https://github.com/rahulknojha)
+* Fixed callback argument for :before_success & :success callback, [#630](https://github.com/aasm/aasm/pull/630)
+
+## 5.0.5
+
+* Independent of ActiveSupport methods, [#627](https://github.com/aasm/aasm/pull/627),
+thanks to [tristandruyen](https://github.com/tristandruyen). Fixes [#508](https://github.com/aasm/aasm/issues/508)
+
+## 5.0.4
+
+* Specify dynamoid version for Rails > 5, [#625](https://github.com/aasm/aasm/pull/625),
+thanks to [waghanza](https://github.com/waghanza)
+* Add travis runner for Rails 5.2, [#624](https://github.com/aasm/aasm/pull/624), thanks
+to [waghanza](https://github.com/waghanza)
+* Cleanup Abstract class issue, [#620](https://github.com/aasm/aasm/pull/620), thanks to
+[dennym](https://github.com/dennym)
+
 ## 5.0.3
 
 * Fix Abstract class issue, [#619](https://github.com/aasm/aasm/pull/619)

data/Dockerfile

@@ -1,9 +1,4 @@
-ARG RVM_RUBY_VERSIONS="2.4.0 2.5.0"
-ARG RVM_RUBY_DEFAULT="2.4.0"
-FROM msati/docker-rvm
-
-# After Ruby versions are installed we continue as non-root rvm user
-USER ${RVM_USER}
+FROM ruby:2.3.4-slim
 
 LABEL maintainer="AASM"
 

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/aasm.svg)](http://badge.fury.io/rb/aasm)
 [![Build Status](https://travis-ci.org/aasm/aasm.svg?branch=master)](https://travis-ci.org/aasm/aasm)
 [![Code Climate](https://codeclimate.com/github/aasm/aasm/badges/gpa.svg)](https://codeclimate.com/github/aasm/aasm)
+[![codecov](https://codecov.io/gh/aasm/aasm/branch/master/graph/badge.svg)](https://codecov.io/gh/aasm/aasm)
 
 ## Index
 - [Upgrade from version 3 to 4](#upgrade-from-version-3-to-4)
@@ -29,6 +30,7 @@
   - [Transaction support](#transaction-support)
   - [Pessimistic Locking](#pessimistic-locking)
   - [Column name & migration](#column-name--migration)
+  - [Log State Changes](#log-state-changes)
   - [Inspection](#inspection)
   - [Warning output](#warning-output)
   - [RubyMotion support](#rubymotion-support)
@@ -214,13 +216,11 @@ Also, you can pass parameters to events:
 
 ```ruby
   job = Job.new
-  job.run(:running, :defragmentation)
+  job.run(:defragmentation)
 ```
 
 In this case the `set_process` would be called with `:defragmentation` argument.
 
-Note that when passing arguments to a state transition, the first argument must be the desired end state. In the above example, we wish to transition to `:running` state and run the callback with `:defragmentation` argument. You can also pass in `nil` as the desired end state, and AASM will try to transition to the first end state defined for that event.
-
 In case of an error during the event processing the error is rescued and passed to `:error`
 callback, which can handle it or re-raise it for further propagation.
 
@@ -436,12 +436,12 @@ job.aasm.current_state # stage3
 ### Multiple state machines per class
 
 Multiple state machines per class are supported. Be aware though that _AASM_ has been
-built with one state machine per class in mind. Nonetheless, here's how to do it:
+built with one state machine per class in mind. Nonetheless, here's how to do it (see below). Please note that you will need to specify database columns for where your pertinent states will be stored - we have specified two columns `move_state` and `work_state` in the example below. See the [Column name & migration](https://github.com/aasm/aasm#column-name--migration) section for further info. 
 
 ```ruby
 class SimpleMultipleExample
   include AASM
-  aasm(:move) do
+  aasm(:move, column: 'move_state') do
     state :standing, initial: true
     state :walking
     state :running
@@ -457,7 +457,7 @@ class SimpleMultipleExample
     end
   end
 
-  aasm(:work) do
+  aasm(:work, column: 'work_state') do
     state :sleeping, initial: true
     state :processing
 
@@ -741,6 +741,14 @@ class Job < ActiveRecord::Base
 end
 ```
 
+Also You can skip the validation at instance level with `some_event_name_without_validation!` method.
+With this you have the flexibility of having validation for all your transitions by default and then skip it wherever required.
+Please note that only state column will be updated as mentioned in the above example.
+
+```ruby
+job.run_without_validation!
+```
+
 If you want to make sure that the _AASM_ column for storing the state is not directly assigned,
 configure _AASM_ to not allow direct assignment, like this:
 
@@ -1057,11 +1065,11 @@ this by defining your favorite column name, using `:column` like this:
 class Job < ActiveRecord::Base
   include AASM
 
-  aasm column: 'my_state' do
+  aasm column: :my_state do
     ...
   end
 
-  aasm :another_state_machine, column: 'second_state' do
+  aasm :another_state_machine, column: :second_state do
     ...
   end
 end
@@ -1082,6 +1090,13 @@ class AddJobState < ActiveRecord::Migration
 end
 ```
 
+### Log State Changes
+
+Logging state change can be done using [paper_trail](https://github.com/paper-trail-gem/paper_trail) gem 
+
+Example of implementation can be found here [https://github.com/nitsujri/aasm-papertrail-example](https://github.com/nitsujri/aasm-papertrail-example)
+
+
 ### Inspection
 
 AASM supports query methods for states and events
@@ -1126,6 +1141,10 @@ job = Job.new
 job.aasm.states(permitted: true).map(&:name)
 #=> [:running]
 
+# List all the permitted transitions(event and state pairs) from initial state
+job.aasm.permitted_transitions
+#=> [{ :event => :run, :state => :running }]
+
 job.run
 job.aasm.states(permitted: true).map(&:name)
 #=> [:sleeping]
@@ -1193,7 +1212,7 @@ the 'instance method symbol / string' way whenever possible when defining guardi
 #### RSpec
 
 AASM provides some matchers for [RSpec](http://rspec.info):
-*`transition_from`,
+* `transition_from`,
 * `have_state`, `allow_event`
 * and `allow_transition_to`.
 

data/aasm.gemspec

@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
   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.10"
 
   # debugging
   # s.add_development_dependency 'debugger'

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_5.0.gemfile

@@ -6,7 +6,7 @@ gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.0.0"
 gem "mongoid", "~> 6.0"
 gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
+gem "dynamoid", "~> 1.3", platforms: :ruby
 gem "aws-sdk", "~> 2", platforms: :ruby
 gem "redis-objects"
 

data/gemfiles/rails_5.1.gemfile

@@ -6,7 +6,7 @@ gem "sqlite3", "~> 1.3.5", platforms: :ruby
 gem "rails", "5.1"
 gem "mongoid", "~>6.0"
 gem "sequel"
-gem "dynamoid", "~> 1", platforms: :ruby
+gem "dynamoid", "~> 1.3", platforms: :ruby
 gem "aws-sdk", "~>2", platforms: :ruby
 gem "redis-objects"
 

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,13 @@
+# 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"
+
+gemspec path: "../"

data/lib/aasm/aasm.rb

@@ -99,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
@@ -137,25 +122,44 @@ private
     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)
+        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
@@ -168,10 +172,8 @@ private
     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

@@ -54,25 +54,18 @@ module AASM
       # make sure to raise an error if no_direct_assignment is enabled
       # and attribute is directly assigned though
       aasm_name = @name
-      return true if should_not_define_method(klass) && !@state_machine.config.no_direct_assignment
-      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)
+
+      if @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
 
-    def should_not_define_method(klass)
-      (klass.methods.include?(:abstract_class) &&
-        klass.abstract_class) ||
-      (klass.superclass.methods.include?(:abstract_class) &&
-        klass.superclass.abstract_class)
-    end
-
     # This method is both a getter and a setter
     def attribute_name(column_name=nil)
       if column_name
@@ -142,6 +135,8 @@ module AASM
         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}?")
@@ -257,5 +252,20 @@ 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
+
   end
 end

data/lib/aasm/core/event.rb

@@ -131,13 +131,13 @@ module AASM::Core
 
       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)
-        # nop, to_state is a valid to-state
-      else
+      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)

data/lib/aasm/instance_base.rb

@@ -78,6 +78,17 @@ module AASM
       events
     end
 
+    def permitted_transitions
+      events(permitted: true).flat_map do |event|
+        available_transitions = event.transitions_from_state(current_state)
+        allowed_transitions = available_transitions.select { |t| t.allowed?(@instance) }
+
+        allowed_transitions.map do |transition|
+          { event: event.name, state: transition.to }
+        end
+      end
+    end
+
     def state_object_for_name(name)
       obj = @instance.class.aasm(@name).states.find {|s| s.name == name}
       raise AASM::UndefinedState, "State :#{name} doesn't exist" if obj.nil?
@@ -91,7 +102,7 @@ module AASM
         when Proc
           state.call(@instance)
         else
-          raise NotImplementedError, "Unrecognized state-type given.  Expected Symbol, String, or Proc."
+          raise NotImplementedError, "Unrecognized state-type given. Expected Symbol, String, or Proc."
       end
     end
 
@@ -104,11 +115,12 @@ module AASM
     end
 
     def fire(event_name, *args, &block)
-      @instance.send(:aasm_fire_event, @name, event_name, {persist: false}, *args, &block)
+      @instance.send(event_name, *args, &block)
     end
 
     def fire!(event_name, *args, &block)
-      @instance.send(:aasm_fire_event, @name, event_name, {persist: true}, *args, &block)
+      event_name = event_name.to_s.+("!").to_sym
+      @instance.send(event_name, *args, &block)
     end
 
     def set_current_state_with_persistence(state)

data/lib/aasm/persistence/active_record_persistence.rb

@@ -141,7 +141,8 @@ module AASM
 
         def aasm_column_is_blank?(state_machine_name)
           attribute_name = self.class.aasm(state_machine_name).attribute_name
-          attribute_names.include?(attribute_name.to_s) && send(attribute_name).blank?
+          attribute_names.include?(attribute_name.to_s) &&
+            (send(attribute_name).respond_to?(:empty?) ? !!send(attribute_name).empty? : !send(attribute_name))
         end
 
         def aasm_validate_states

data/lib/aasm/persistence/base.rb

@@ -34,7 +34,7 @@ module AASM
       # This allows for nil aasm states - be sure to add validation to your model
       def aasm_read_state(name=:default)
         state = send(self.class.aasm(name).attribute_name)
-        if state.blank?
+        if !state || state.empty?
           aasm_new_record? ? aasm(name).determine_state_name(self.class.aasm(name).initial_state) : nil
         else
           state.to_sym

data/lib/aasm/persistence/core_data_query_persistence.rb

@@ -77,7 +77,8 @@ module AASM
         #
         def aasm_ensure_initial_state
           AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |state_machine_name|
-            send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s) if send(self.class.aasm(state_machine_name).attribute_name).blank?
+            next if !send(self.class.aasm(state_machine_name).attribute_name) || send(self.class.aasm(state_machine_name).attribute_name).empty?
+            send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s)
           end
         end
       end # InstanceMethods

data/lib/aasm/persistence/dynamoid_persistence.rb

@@ -83,7 +83,7 @@ module AASM
         #
         def aasm_ensure_initial_state
           AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |state_machine_name|
-            aasm(state_machine_name).enter_initial_state if send(self.class.aasm(state_machine_name).attribute_name).blank?
+            aasm(state_machine_name).enter_initial_state if !send(self.class.aasm(state_machine_name).attribute_name) || send(self.class.aasm(state_machine_name).attribute_name).empty?
           end
         end
       end # InstanceMethods

data/lib/aasm/persistence/mongoid_persistence.rb

@@ -106,7 +106,7 @@ module AASM
             # mongoid has_many relationship does not load child object attributes when
             # only ids are loaded, for example parent.child_ids will not load child object attributes.
             # This feature is introduced in mongoid > 4.
-            if attribute_names.include?(attribute_name) && attributes[attribute_name].blank?
+            if attribute_names.include?(attribute_name) && !attributes[attribute_name] || attributes[attribute_name].empty?
               # attribute_missing? is defined in mongoid > 4
               return if Mongoid::VERSION.to_f >= 4 && attribute_missing?(attribute_name)
               send("#{self.class.aasm(state_machine_name).attribute_name}=", aasm(state_machine_name).enter_initial_state.to_s)

data/lib/aasm/persistence/no_brainer_persistence.rb

@@ -96,7 +96,7 @@ module AASM
         def aasm_ensure_initial_state
           AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |name|
             aasm_column = self.class.aasm(name).attribute_name
-            aasm(name).enter_initial_state if read_attribute(aasm_column).blank?
+            aasm(name).enter_initial_state if !read_attribute(aasm_column) || read_attribute(aasm_column).empty?
           end
         end
       end # InstanceMethods

data/lib/aasm/persistence/redis_persistence.rb

@@ -69,7 +69,7 @@ module AASM
         def aasm_ensure_initial_state
           AASM::StateMachineStore.fetch(self.class, true).machine_names.each do |name|
             aasm_column = self.class.aasm(name).attribute_name
-            aasm(name).enter_initial_state if send(aasm_column).value.blank?
+            aasm(name).enter_initial_state if !send(aasm_column).value || send(aasm_column).value.empty?
           end
         end
 

data/lib/aasm/rspec/transition_from.rb

@@ -2,7 +2,11 @@ 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
-    obj.send(@event, *@args) && obj.aasm(@state_machine_name).current_state == @to_state.to_sym
+    begin
+      obj.send(@event, *@args) && obj.aasm(@state_machine_name).current_state == @to_state.to_sym
+    rescue AASM::InvalidTransition
+      false
+    end
   end
 
   chain :on do |state_machine_name|

data/lib/aasm/version.rb

@@ -1,3 +1,3 @@
 module AASM
-  VERSION = "5.0.3"
+  VERSION = "5.0.8"
 end

data/spec/database.rb

@@ -51,4 +51,9 @@ ActiveRecord::Migration.suppress_messages do
     t.string "search"
     t.string "sync"
   end
+
+  ActiveRecord::Migration.create_table "instance_level_skip_validation_examples", :force => true do |t|
+    t.string "state"
+    t.string "some_string"
+  end
 end

data/spec/models/active_record/instance_level_skip_validation_example.rb

@@ -0,0 +1,19 @@
+class InstanceLevelSkipValidationExample < ActiveRecord::Base
+  include AASM
+
+  aasm :state do
+    state :new, :initial => true
+    state :draft
+    state :complete
+
+    event :set_draft do
+      transitions from: :new, to: :draft
+    end
+
+    event :complete do
+      transitions from: %i[draft new], to: :complete
+    end
+  end
+
+  validates :some_string, presence: true
+end

data/spec/models/active_record/person.rb

@@ -1,7 +1,4 @@
 class Base < ActiveRecord::Base
-  self.abstract_class = true
-  self.table_name = 'users'
-
   include AASM
 
   aasm column: 'status' do
@@ -16,6 +13,9 @@ class Base < ActiveRecord::Base
       transitions from: :active, to: :inactive
     end
   end
+
+  self.abstract_class = true
+  self.table_name = 'users'
 end
 
 

data/spec/models/callbacks/with_state_arg.rb

@@ -8,7 +8,7 @@ module Callbacks
       state :closed
       state :out_to_lunch
 
-      event :close, :before => :before_method, :after => :after_method do
+      event :close, :before => :before_method, :after => :after_method, :before_success => :before_success_method, :success => :success_method3 do
         transitions :to => :closed, :from => [:open], :after => :transition_method, :success => :success_method
         transitions :to => :out_to_lunch, :from => [:open], :after => :transition_method2, :success => :success_method2
       end
@@ -16,6 +16,8 @@ module Callbacks
 
     def before_method(arg); end
 
+    def before_success_method(arg); end
+
     def after_method(arg); end
 
     def transition_method(arg); end
@@ -26,5 +28,7 @@ module Callbacks
 
     def success_method2(arg); end
 
+    def success_method3(arg); end
+
   end
 end

data/spec/models/callbacks/with_state_arg_multiple.rb

@@ -8,7 +8,7 @@ module Callbacks
       state :closed
       state :out_to_lunch
 
-      event :close, :before => :before_method, :after => :after_method do
+      event :close, :before => :before_method, :after => :after_method, :before_success => :before_success_method, :success => :success_method do
         transitions :to => :closed, :from => [:open], :after => :transition_method
         transitions :to => :out_to_lunch, :from => [:open], :after => :transition_method2
       end
@@ -16,11 +16,14 @@ module Callbacks
 
     def before_method(arg); end
 
+    def before_success_method(arg); end
+
     def after_method(arg); end
 
     def transition_method(arg); end
 
     def transition_method2(arg); end
 
+    def success_method(arg); end
   end
 end

data/spec/models/simple_example.rb

@@ -3,11 +3,17 @@ class SimpleExample
   aasm do
     state :initialised, :initial => true
     state :filled_out
+    state :denied
     state :authorised
 
     event :fill_out do
       transitions :from => :initialised, :to => :filled_out
     end
+
+    event :deny do
+      transitions from: :initialised, to: :denied
+    end
+
     event :authorise do
       transitions :from => :filled_out, :to => :authorised
     end

data/spec/spec_helper.rb

@@ -1,3 +1,13 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')))
 require 'aasm'

data/spec/unit/callback_multiple_spec.rb

@@ -154,6 +154,8 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).never
     expect(cb).to receive(:transition_method2).with(:arg1).once.ordered
+    expect(cb).to receive(:before_success_method).with(:arg1).once.ordered
+    expect(cb).to receive(:success_method).with(:arg1).once.ordered
     expect(cb).to receive(:after_method).with(:arg1).once.ordered
     cb.close!(:out_to_lunch, :arg1)
 
@@ -161,6 +163,8 @@ describe 'callbacks for the new DSL' do
     some_object = double('some object')
     expect(cb).to receive(:before_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method2).with(some_object).once.ordered
+    expect(cb).to receive(:before_success_method).with(some_object).once.ordered
+    expect(cb).to receive(:success_method).with(some_object).once.ordered
     expect(cb).to receive(:after_method).with(some_object).once.ordered
     cb.close!(:out_to_lunch, some_object)
   end

data/spec/unit/callbacks_spec.rb

@@ -315,7 +315,9 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).with(:arg1).once.ordered
     expect(cb).to receive(:transition_method).never
+    expect(cb).to receive(:before_success_method).with(:arg1).once.ordered
     expect(cb).to receive(:success_method).with(:arg1).once.ordered
+    expect(cb).to receive(:success_method3).with(:arg1).once.ordered
     expect(cb).to receive(:success_method).never
     expect(cb).to receive(:after_method).with(:arg1).once.ordered
     cb.close!(:arg1)
@@ -325,7 +327,9 @@ describe 'callbacks for the new DSL' do
     expect(cb).to receive(:before_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method).with(some_object).once.ordered
     expect(cb).to receive(:transition_method).never
+    expect(cb).to receive(:before_success_method).with(some_object).once.ordered
     expect(cb).to receive(:success_method).with(some_object).once.ordered
+    expect(cb).to receive(:success_method3).with(some_object).once.ordered
     expect(cb).to receive(:success_method).never
     expect(cb).to receive(:after_method).with(some_object).once.ordered
     cb.close!(some_object)

data/spec/unit/complex_example_spec.rb

@@ -90,5 +90,4 @@ describe 'when being unsuspended' do
   it "should not be able to fire unknown events" do
     expect(auth.aasm.may_fire_event?(:unknown)).to be false
   end
-
 end

data/spec/unit/event_spec.rb

@@ -294,6 +294,19 @@ describe 'current event' do
     pe.wakeup!
     expect(pe.aasm.current_event).to eql :wakeup!
   end
+
+  describe "when calling events with fire/fire!" do
+    it "fire should populate aasm.current_event and transition (sleeping to showering)" do
+      pe.aasm.fire(:wakeup)
+      expect(pe.aasm.current_event).to eq :wakeup
+      expect(pe.aasm.current_state).to eq :showering
+    end
+    it "fire! should populate aasm.current_event and transition (sleeping to showering)" do
+      pe.aasm.fire!(:wakeup)
+      expect(pe.aasm.current_event).to eq :wakeup!
+      expect(pe.aasm.current_state).to eq :showering
+    end
+  end
 end
 
 describe 'parametrised events' do

data/spec/unit/persistence/active_record_persistence_multiple_spec.rb

@@ -359,13 +359,13 @@ if defined?(ActiveRecord)
 
       # allow it temporarily
       MultipleNoDirectAssignment.aasm(:left).state_machine.config.no_direct_assignment = false
-      obj.aasm_state = :pending
-      expect(obj.aasm_state.to_sym).to eql :pending
+      obj.aasm_state = :running
+      expect(obj.aasm_state.to_sym).to eql :running
 
       # and forbid it again
       MultipleNoDirectAssignment.aasm(:left).state_machine.config.no_direct_assignment = true
-      expect {obj.aasm_state = :running}.to raise_error(AASM::NoDirectAssignmentError)
-      expect(obj.aasm_state.to_sym).to eql :pending
+      expect {obj.aasm_state = :pending}.to raise_error(AASM::NoDirectAssignmentError)
+      expect(obj.aasm_state.to_sym).to eql :running
     end
   end # direct assignment
 

data/spec/unit/persistence/active_record_persistence_spec.rb

@@ -393,13 +393,13 @@ if defined?(ActiveRecord)
 
       # allow it temporarily
       NoDirectAssignment.aasm.state_machine.config.no_direct_assignment = false
-      obj.aasm_state = :pending
-      expect(obj.aasm_state.to_sym).to eql :pending
+      obj.aasm_state = :running
+      expect(obj.aasm_state.to_sym).to eql :running
 
       # and forbid it again
       NoDirectAssignment.aasm.state_machine.config.no_direct_assignment = true
-      expect {obj.aasm_state = :running}.to raise_error(AASM::NoDirectAssignmentError)
-      expect(obj.aasm_state.to_sym).to eql :pending
+      expect {obj.aasm_state = :pending}.to raise_error(AASM::NoDirectAssignmentError)
+      expect(obj.aasm_state.to_sym).to eql :running
     end
   end # direct assignment
 
@@ -748,4 +748,26 @@ if defined?(ActiveRecord)
       expect { job.run }.to raise_error(AASM::InvalidTransition)
     end
   end
+
+  describe 'testing the instance_level skip validation with _without_validation method' do
+    let(:example) do
+      obj = InstanceLevelSkipValidationExample.new(state: 'new')
+      obj.save(validate: false)
+      obj
+    end
+
+    it 'should be able to change the state with invalid record' do
+      expect(example.valid?).to be_falsey
+      expect(example.complete!).to be_falsey
+      expect(example.complete_without_validation!).to be_truthy
+      expect(example.state).to eq('complete')
+    end
+
+    it 'shouldn\'t affect the behaviour of existing method after calling _without_validation! method' do
+      expect(example.set_draft!).to be_falsey
+      expect(example.set_draft_without_validation!).to be_truthy
+      expect(example.state).to eq('draft')
+      expect(example.complete!).to be_falsey
+    end
+  end
 end

data/spec/unit/rspec_matcher_spec.rb

@@ -8,14 +8,17 @@ describe 'state machine' do
     it "works for simple state machines" do
       expect(simple).to transition_from(:initialised).to(:filled_out).on_event(:fill_out)
       expect(simple).to_not transition_from(:initialised).to(:authorised).on_event(:fill_out)
+      expect(simple).to_not transition_from(:authorised).to(:filled_out).on_event(:fill_out)
     end
 
     it "works for multiple state machines" do
       expect(multiple).to transition_from(:standing).to(:walking).on_event(:walk).on(:move)
       expect(multiple).to_not transition_from(:standing).to(:running).on_event(:walk).on(:move)
+      expect(multiple).to_not transition_from(:running).to(:walking).on_event(:walk).on(:move)
 
       expect(multiple).to transition_from(:sleeping).to(:processing).on_event(:start).on(:work)
       expect(multiple).to_not transition_from(:sleeping).to(:sleeping).on_event(:start).on(:work)
+      expect(multiple).to_not transition_from(:processing).to(:sleeping).on_event(:start).on(:work)
     end
   end
 

data/spec/unit/simple_example_spec.rb

@@ -23,6 +23,21 @@ describe 'state machine' do
     expect(simple).to be_authorised
   end
 
+  it 'shows the permitted transitions' do
+    expect(simple.aasm.permitted_transitions).to eq(
+      [
+        { event: :fill_out, state: :filled_out },
+        { event: :deny, state: :denied }
+      ]
+    )
+
+    simple.fill_out!
+    expect(simple.aasm.permitted_transitions).to eq([{ event: :authorise, state: :authorised }])
+
+    simple.authorise
+    expect(simple.aasm.permitted_transitions).to eq([])
+  end
+
   it 'denies transitions to other states' do
     expect {simple.authorise}.to raise_error(AASM::InvalidTransition)
     expect {simple.authorise!}.to raise_error(AASM::InvalidTransition)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aasm
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.8
 platform: ruby
 authors:
 - Thorsten Boettger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -95,6 +95,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +145,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".gitignore"
 - ".travis.yml"
 - API
@@ -137,6 +167,7 @@ files:
 - aasm.gemspec
 - callbacks.txt
 - docker-compose.yml
+- gemfiles/norails.gemfile
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_4.2_mongoid_5.gemfile
@@ -144,6 +175,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.0_nobrainer.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/aasm.rb
 - lib/aasm/aasm.rb
 - lib/aasm/base.rb
@@ -205,6 +237,7 @@ files:
 - spec/models/active_record/derivate_new_dsl.rb
 - spec/models/active_record/false_state.rb
 - spec/models/active_record/gate.rb
+- spec/models/active_record/instance_level_skip_validation_example.rb
 - spec/models/active_record/invalid_persistor.rb
 - spec/models/active_record/localizer_test_model.rb
 - spec/models/active_record/no_direct_assignment.rb
@@ -390,8 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: State machine mixin for Ruby objects
@@ -408,6 +440,7 @@ test_files:
 - spec/models/active_record/derivate_new_dsl.rb
 - spec/models/active_record/false_state.rb
 - spec/models/active_record/gate.rb
+- spec/models/active_record/instance_level_skip_validation_example.rb
 - spec/models/active_record/invalid_persistor.rb
 - spec/models/active_record/localizer_test_model.rb
 - spec/models/active_record/no_direct_assignment.rb