rails_state_machine 1.1.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9600103349aae06d290487b42d571e2c3128068b
-  data.tar.gz: 6599f3c3ae8aa457876917b082a9394d17bd3af3
+SHA256:
+  metadata.gz: 12ccebe03922ae8add9f35e88e0b2d9759e8105b8278713242fc88df697a320a
+  data.tar.gz: 44c8d685840968e1e69ce0a225062a9ca84e2715fd515cc7cbada5923dff204a
 SHA512:
-  metadata.gz: f824cc7e14c0a452dcec86193967825d8d98a83fffa18e1330ac18532d31b46a2121b509391b37e7594c0b9c44dce39ec73fe72a290aaa2ce9bea98b9dd1b149
-  data.tar.gz: a39eef615eefffb383c1f9a0576de0f56022e49275a056ebef9f9b792305247968805f879fe7287c5a50ac51440c3a8bc479c1a9852734951d63962e73875ad4
+  metadata.gz: 6e1a075ea8c01a222e872672925ce96c884491f4deced754c21dc598f65dd5aecb9381f0097269c9efdd5da855a10a69e9a1da63b1decaf047990cc7e8e57487
+  data.tar.gz: 6337d7f34d934b8a62239dcef8ed45a88fe545311cbc0e0c7b0728a03f047362e237104802caf929ff3ea72e669ba445365dc8afa7e92737893904421f798ff4

data/.ruby-version

@@ -1 +1 @@
-2.4.4
+2.4.6

data/.travis.yml

@@ -7,19 +7,31 @@ before_script:
   - mysql -e 'create database IF NOT EXISTS rails_state_machine_test;'
 
 install:
+  - gem install bundler:2.0.2
   # Replace default Travis CI bundler script with a version that doesn't
   # explode when lockfile doesn't match recently bumped version
   - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
 
 script: bundle exec rake current_rspec
 
-rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-
-gemfile:
-  - Gemfile.5.1.pg
-  - Gemfile.5.2.pg
+matrix:
+  include:
+    - rvm: 2.3.8
+      gemfile: Gemfile.5.1.pg
+    - rvm: 2.4.6
+      gemfile: Gemfile.5.1.pg
+    - rvm: 2.3.8
+      gemfile: Gemfile.5.2.pg
+    - rvm: 2.4.6
+      gemfile: Gemfile.5.2.pg
+    - rvm: 2.5.6
+      gemfile: Gemfile.5.2.pg
+    - rvm: 2.5.6
+      gemfile: Gemfile.6.0.pg
+    - rvm: 2.6.4
+      gemfile: Gemfile.6.0.pg
 
 dist: trusty
+
+addons:
+  postgresql: 9.3

data/CHANGELOG.md

@@ -5,13 +5,23 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Unreleased
 
+### Compatible changes
+
 ### Breaking changes
 
--
+
+## 2.0.0 2019-09-30
 
 ### Compatible changes
 
--
+- Added: State machine can now use an attribute other than `state` to represent the machine's state.
+- Added: It is now possible to define multiple state machines on the same model. States and event names
+  have to differ, though.
+
+### Breaking changes
+
+- Removed: Dropped support for adding a state machine to a model without including `RailsStateMachine::Model`.
+
 
 ## 1.1.3 2019-08-12
 

data/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_state_machine (1.1.3)
+    rails_state_machine (2.0.0)
       activerecord
 
 GEM
@@ -53,7 +53,7 @@ GEM
     database_cleaner (1.6.2)
     diff-lcs (1.3)
     erubi (1.7.0)
-    gemika (0.3.2)
+    gemika (0.4.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (0.9.1)
@@ -146,4 +146,4 @@ DEPENDENCIES
   rspec (~> 3.5)
 
 BUNDLED WITH
-   1.17.1
+   2.0.2

data/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_state_machine (1.1.3)
+    rails_state_machine (2.0.0)
       activerecord
 
 GEM
@@ -57,7 +57,7 @@ GEM
     database_cleaner (1.7.0)
     diff-lcs (1.3)
     erubi (1.7.1)
-    gemika (0.3.4)
+    gemika (0.4.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (1.1.0)
@@ -154,4 +154,4 @@ DEPENDENCIES
   rspec (~> 3.5)
 
 BUNDLED WITH
-   1.17.1
+   2.0.2

data/Gemfile.6.0.pg

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'rails', '~>6.0.0'
+gem 'pg'
+
+# Development dependencies
+gem 'rspec', '~>3.5'
+gem 'rake'
+gem 'pry-byebug'
+gem 'gemika'
+gem 'database_cleaner'
+
+# Gem under test
+gem 'rails_state_machine', :path => '.'

data/Gemfile.6.0.pg.lock

@@ -0,0 +1,173 @@
+PATH
+  remote: .
+  specs:
+    rails_state_machine (2.0.0)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    builder (3.2.3)
+    byebug (10.0.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    database_cleaner (1.7.0)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    gemika (0.4.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.3.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    pg (1.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
+      pry (~> 0.10)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  database_cleaner
+  gemika
+  pg
+  pry-byebug
+  rails (~> 6.0.0)
+  rails_state_machine!
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   2.0.2

data/README.md

@@ -71,39 +71,6 @@ event :request_feedback do
 end
 ```
 
-As an alternative to using `RailsStateMachine::Model` and `state_machine do`, configure the state machine manually. This only adds the `state_machine` to your model, but no `states` or `state_events`.
-
-```ruby
-class YourModel < ApplicationRecord
-  RailsStateMachine::StateMachine.new(self).configure do
-    state :draft, initial: true
-    state :review_pending
-    state :approved
-    state :rejected
-
-    event :request_review do
-      transitions from: [:draft, :rejected], to: :review_pending
-    end
-
-    event :approve do
-      transitions from: :review_pending, to: :approved
-    end
-
-    event :reject do
-      transitions from: :review_pending, to: :rejected
-    end
-  end
-
-  def self.states
-    state_machine.state_names
-  end
-
-  def self.state_events
-    state_machine.event_names
-  end
-end
-```
-
 ## Event callbacks
 
 Here is a list with all the available callbacks, listed in the same order in which they will get called during the respective operations. The callbacks are chained with the existing active record callbacks on the model.
@@ -137,6 +104,47 @@ event :request_review do
 end
 ```
 
+## Other state attributes and multiple state machines on the same model
+
+To use a state attribute other than the default `state`, pass it to the `.state_machine` method:
+
+```
+state_machine :review_state do
+  # ...
+end
+```
+
+This also allows you to define multiple state machines on the same model. Note that event
+and state names still have to be unique for the whole model.
+
+
+## Taking multiple transitions
+
+You can safely take a second transition inside an after_save callback. All relevant
+callbacks will be run.
+
+```
+state_machine do
+  state :draft, initial: true
+  state :review_pending
+  state :approved
+
+  event :request_review do
+    transitions from: [:draft, :rejected], to: :review_pending
+
+    after_save do
+      if auto_approve?
+        approve
+      end
+    end
+  end
+
+  event :approve do
+    transitions from: :review_pending, to: :approved
+  end
+end
+```
+
 ## Development
 
 There are tests in `spec`. We only accept PRs with tests. To run tests:
@@ -175,4 +183,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Credits
 
-Arne Hartherz and Emanuel Denzel from [makandra](https://makandra.de/).
+Arne Hartherz, Emanuel Denzel, Tobias Kraze from [makandra](https://makandra.de/).

data/lib/rails_state_machine.rb

@@ -1,5 +1,7 @@
 require 'rails_state_machine/version'
 require 'rails_state_machine/state'
 require 'rails_state_machine/event'
+require 'rails_state_machine/callbacks'
 require 'rails_state_machine/state_machine'
+require 'rails_state_machine/state_manager'
 require 'rails_state_machine/model'

data/lib/rails_state_machine/callbacks.rb

@@ -0,0 +1,68 @@
+module RailsStateMachine
+  module Callbacks
+    class << self
+      def included(model)
+        register_callbacks(model)
+        register_validations(model)
+      end
+
+      private
+
+      def register_callbacks(model)
+        model.class_eval do
+          before_validation :run_state_events_before_validation
+          before_save :register_state_events_for_callbacks
+          before_save { flush_state_event_callbacks(:before_save) }
+          after_save { flush_state_event_callbacks(:after_save) }
+          after_commit { flush_state_event_callbacks(:after_commit) }
+        end
+      end
+
+      def register_validations(model)
+        model.class_eval do
+          after_validation :revert_states, if: -> { errors.any? }
+        end
+      end
+    end
+
+    def run_state_events_before_validation
+      # Since validations may be skipped, we will not register validation callbacks in @state_event_callbacks,
+      # but call them explicitly when before_validation callbacks are triggered.
+      state_machine_state_managers.each do |state_manager|
+        state_manager.next_event&.run_before_validation(self)
+      end
+    end
+
+    def register_state_events_for_callbacks
+      @state_event_callbacks ||= {
+        before_save: [],
+        after_save: [],
+        after_commit: []
+      }
+      state_machine_state_managers.each do |state_manager|
+        if (next_event = state_manager.next_event)
+          @state_event_callbacks[:before_save] << next_event
+          @state_event_callbacks[:after_save] << next_event
+          @state_event_callbacks[:after_commit] << next_event
+          state_manager.next_event = nil
+        end
+      end
+
+      true
+    end
+
+    def flush_state_event_callbacks(name)
+      if @state_event_callbacks
+        while (event = @state_event_callbacks[name].shift)
+          event.public_send("run_#{name}", self)
+        end
+      end
+    end
+
+    def revert_states
+      state_machine_state_managers.each do |state_manager|
+        state_manager.revert
+      end
+    end
+  end
+end

data/lib/rails_state_machine/model.rb

@@ -1,21 +1,71 @@
 module RailsStateMachine
+  DEFAULT_STATE_ATTRIBUTE = :state
+
   module Model
     def self.included(base)
-      base.extend ClassMethods
+      base.class_eval do
+        extend ClassMethods
+
+        cattr_accessor :state_machines
+        self.state_machines = {}
+
+        delegate :state_machine, to: :class
+      end
     end
 
     module ClassMethods
-      def state_machine(&block)
-        StateMachine.new(self).configure(&block)
+      def state_machine(state_attribute = DEFAULT_STATE_ATTRIBUTE, &block)
+        state_machine = state_machines[state_attribute] ||= StateMachine.new(self, state_attribute)
+        if block
+          include(Callbacks) unless self < Callbacks
+          state_machine.configure(&block)
+        end
+        state_machine
+      end
+
+      def states(state_attribute = DEFAULT_STATE_ATTRIBUTE)
+        state_machine(state_attribute).state_names
+      end
+
+      def state_events(state_attribute = DEFAULT_STATE_ATTRIBUTE)
+        state_machine(state_attribute).event_names
       end
+    end
+
+
+    private
 
-      def states
-        state_machine.state_names
+    def state_machine_state_manager(state_attribute)
+      @state_machine_state_managers ||= {}
+      @state_machine_state_managers[state_attribute] ||= StateManager.new(self, state_machine(state_attribute), state_attribute)
+    end
+
+    def state_machine_state_managers
+      self.state_machines.keys.collect do |state_attribute|
+        state_machine_state_manager(state_attribute)
       end
+    end
 
-      def state_events
-        state_machine.event_names
+    def prepare_state_event_change(attributes)
+      if ActiveRecord::VERSION::STRING < '5.2' && saved_changes?
+        # After calling `save`, ActiveRecord 5.1 will flag the changes that it just stored as saved.
+        # https://github.com/rails/rails/blob/v5.1.4/activerecord/lib/active_record/attribute_methods/dirty.rb#L33-L46
+        #
+        # When taking multiple state events (e.g. a second event called inside an `after_save` callback) and thus
+        # saving after other changes were just saved, we need to mimic that behavior. Otherwise, ActiveRecord will
+        # print deprecation warnings like these:
+        #
+        #     DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the
+        #     next version of Rails. The new return value will reflect the behavior of calling the method after
+        #     `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use
+        #     `attribute_before_last_save` instead.
+        #
+        # These actually originate from ActiveRecord internals which try to determine the changes that should be
+        # stored for the second save. It is probably a shortcoming of ActiveRecord 5.1.x that will be fixed, but
+        # since the current/previous save was already successful, the right action is to just call `changes_applied`.
+        changes_applied
       end
+      self.attributes = attributes
     end
   end
 end

data/lib/rails_state_machine/state_machine.rb

@@ -1,13 +1,13 @@
 module RailsStateMachine
   class StateMachine
-    def initialize(model)
-      @model = model
-
-      model_constant('StateMachineMethods', Module.new)
-      @model.include(@model::StateMachineMethods)
+    attr_reader :model
 
+    def initialize(model, state_attribute)
+      @model = model
+      @state_attribute = state_attribute
       @states_by_name = {}
       @events_by_name = {}
+      build_model_module
     end
 
     def configure(&block)
@@ -18,11 +18,6 @@ module RailsStateMachine
       register_initial_state
 
       define_event_methods
-
-      register_callbacks
-      register_validations
-      register_state_machine
-
       define_model_methods
     end
 
@@ -60,18 +55,6 @@ module RailsStateMachine
       event = Event.new(name, self)
       event.configure(&block)
 
-      model_methods do
-        define_method "#{event.name}" do |**attributes|
-          prepare_state_event_change(attributes.merge(state_event: event.name))
-          save
-        end
-
-        define_method "#{event.name}!" do |**attributes|
-          prepare_state_event_change(attributes.merge(state_event: event.name))
-          save!
-        end
-      end
-
       @events_by_name[name] = event
     end
 
@@ -79,18 +62,24 @@ module RailsStateMachine
       @model.const_set(name, value)
     end
 
-    def model_methods(&block)
+    def build_model_module
       # Using a state machine defines several methods on the model.
       # The model should be able to re-define them and `super` into the original method, if necessary.
       # For that, we use a module to store all methods. The module is loaded into the model class.
-      @model::StateMachineMethods.module_eval(&block)
+      @model_module = Module.new
+      @model.include(@model_module)
+    end
+
+    def model_module_eval(&block)
+      @model_module.module_eval(&block)
     end
 
     def define_state_methods
+      state_attribute = @state_attribute
       state_names.each do |state_name|
-        model_methods do
+        model_module_eval do
           define_method "#{state_name}?" do
-            self.state.to_s == state_name.to_s
+            state_machine_state_manager(state_attribute).state == state_name.to_s
           end
         end
       end
@@ -103,131 +92,49 @@ module RailsStateMachine
     end
 
     def register_initial_state
-      initial_state = states.detect(&:initial?)
-      return unless initial_state
+      state_attribute = @state_attribute
+      initial_state_name = states.detect(&:initial?)&.name
+      return unless initial_state_name
 
       @model.after_initialize do
-        self.state ||= initial_state.name if new_record?
+        manager = state_machine_state_manager(state_attribute)
+        if new_record? && !manager.state
+          manager.state = initial_state_name
+        end
       end
     end
 
     def define_event_methods
+      state_attribute = @state_attribute
       event_names.each do |event_name, event|
-        model_methods do
-          define_method "may_#{event_name}?" do
-            state_machine.find_event(event_name).allowed_from?(source_state)
+        model_module_eval do
+          define_method "#{event_name}" do |**attributes|
+            prepare_state_event_change(attributes.merge("#{state_attribute}_event": event_name))
+            save
           end
-        end
-      end
-    end
-
-    def register_callbacks
-      @model.class_eval do
-        before_validation :run_state_event_before_validation
-        before_save :register_state_events_for_callbacks
-        before_save { flush_state_event_callbacks(:before_save) }
-        after_save { flush_state_event_callbacks(:after_save) }
-        after_save :unset_next_state_machine_event
-        after_commit { flush_state_event_callbacks(:after_commit) }
-      end
-    end
-
-    def register_validations
-      @model.class_eval do
-        after_validation :revert_state, if: -> { errors.any? }
-      end
-    end
 
-    def register_state_machine
-      @model.class_eval do
-        cattr_accessor :state_machine
-        delegate :state_machine, to: :class
-      end
-
-      @model.state_machine = self
-    end
-
-    def define_model_methods
-      model_methods do
-        def state_event=(event_name)
-          @next_state_machine_event = state_machine.find_event(event_name)
-          @state_before_state_event = source_state
-
-          # If the event can not transition from source_state, a TransitionNotFoundError will be raised
-          self.state = @next_state_machine_event.future_state_name(source_state).to_s
-        end
-
-        def state_event
-          @next_state_machine_event&.name
-        end
-
-        def source_state
-          if new_record?
-            state
-          else
-            state_in_database
+          define_method "#{event_name}!" do |**attributes|
+            prepare_state_event_change(attributes.merge("#{state_attribute}_event": event_name))
+            save!
           end
-        end
-
-        private
 
-        def run_state_event_before_validation
-          # Since validations may be skipped, we will not register validation callbacks in @state_event_callbacks,
-          # but call them explicitly when before_validation callbacks are triggered.
-          @next_state_machine_event&.run_before_validation(self)
-        end
-
-        def register_state_events_for_callbacks
-          @state_event_callbacks ||= {
-            before_save: [],
-            after_save: [],
-            after_commit: []
-          }
-          if @next_state_machine_event
-            @state_event_callbacks[:before_save] << @next_state_machine_event
-            @state_event_callbacks[:after_save] << @next_state_machine_event
-            @state_event_callbacks[:after_commit] << @next_state_machine_event
-          end
-
-          true
-        end
-
-        def flush_state_event_callbacks(name)
-          if @state_event_callbacks
-            while (event = @state_event_callbacks[name].shift)
-              event.public_send("run_#{name}", self)
-            end
+          define_method "may_#{event_name}?" do
+            state_machine_state_manager(state_attribute).transition_allowed_for?(event_name)
           end
         end
+      end
+    end
 
-        def unset_next_state_machine_event
-          @next_state_machine_event = nil
-        end
+    def define_model_methods
+      state_attribute = @state_attribute
 
-        def revert_state
-          self.state = @state_before_state_event if @next_state_machine_event
+      model_module_eval do
+        define_method :"#{state_attribute}_event=" do |event_name|
+          state_machine_state_manager(state_attribute).transition_to(event_name)
         end
 
-        def prepare_state_event_change(attributes)
-          if ActiveRecord::VERSION::STRING <= '5.2' && saved_changes?
-            # After calling `save`, ActiveRecord 5.1 will flag the changes that it just stored as saved.
-            # https://github.com/rails/rails/blob/v5.1.4/activerecord/lib/active_record/attribute_methods/dirty.rb#L33-L46
-            #
-            # When taking multiple state events (e.g. a second event called inside an `after_save` callback) and thus
-            # saving after other changes were just saved, we need to mimic that behavior. Otherwise, ActiveRecord will
-            # print deprecation warnings like these:
-            #
-            #     DEPRECATION WARNING: The behavior of `attribute_was` inside of after callbacks will be changing in the
-            #     next version of Rails. The new return value will reflect the behavior of calling the method after
-            #     `save` returned (e.g. the opposite of what it returns now). To maintain the current behavior, use
-            #     `attribute_before_last_save` instead.
-            #
-            # These actually originate from ActiveRecord internals which try to determine the changes that should be
-            # stored for the second save. It is probably a shortcoming of ActiveRecord 5.1.x that will be fixed, but
-            # since the current/previous save was already successful, the right action is to just call `changes_applied`.
-            changes_applied
-          end
-          self.attributes = attributes
+        define_method :"#{state_attribute}_event" do
+          state_machine_state_manager(state_attribute).next_event&.name
         end
       end
     end

data/lib/rails_state_machine/state_manager.rb

@@ -0,0 +1,47 @@
+module RailsStateMachine
+  class StateManager
+    attr_accessor :next_event, :state_before_state_event
+
+    def initialize(record, state_machine, state_attribute)
+      @record = record
+      @state_machine = state_machine
+      @state_attribute = state_attribute
+    end
+
+    def state
+      @record.public_send(@state_attribute)
+    end
+
+    def state_in_database
+      @record.public_send(:"#{@state_attribute}_in_database").to_s
+    end
+
+    def state=(value)
+      @record.public_send(:"#{@state_attribute}=", value)
+    end
+
+    def revert
+      self.state = @state_before_state_event if @next_event
+    end
+
+    def source_state
+      if @record.new_record?
+        state
+      else
+        state_in_database
+      end
+    end
+
+    def transition_to(event_name)
+      @next_event = @state_machine.find_event(event_name)
+      @state_before_state_event = source_state
+
+      # If the event can not transition from source_state, a TransitionNotFoundError will be raised
+      self.state = @next_event.future_state_name(source_state).to_s
+    end
+
+    def transition_allowed_for?(event_name)
+      @state_machine.find_event(event_name).allowed_from?(source_state)
+    end
+  end
+end

data/lib/rails_state_machine/version.rb

@@ -1,3 +1,3 @@
 module RailsStateMachine
-  VERSION = '1.1.3'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_state_machine
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Arne Hartherz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,6 +84,8 @@ files:
 - Gemfile.5.1.pg.lock
 - Gemfile.5.2.pg
 - Gemfile.5.2.pg.lock
+- Gemfile.6.0.pg
+- Gemfile.6.0.pg.lock
 - Gemfile.lock
 - LICENSE
 - LICENSE.txt
@@ -92,10 +94,12 @@ files:
 - bin/console
 - bin/setup
 - lib/rails_state_machine.rb
+- lib/rails_state_machine/callbacks.rb
 - lib/rails_state_machine/event.rb
 - lib/rails_state_machine/model.rb
 - lib/rails_state_machine/state.rb
 - lib/rails_state_machine/state_machine.rb
+- lib/rails_state_machine/state_manager.rb
 - lib/rails_state_machine/version.rb
 - rails_state_machine.gemspec
 homepage: https://github.com/makandra/rails_state_machine
@@ -117,8 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord-bound state machine