statesman 7.3.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 444b828dd17ce5984d99e93e25ff774ccbc621a06d0afeb51dc6d8a4b7cd0bc5
-  data.tar.gz: 8e70e4e74a6edc795d66f203619974c1483d8b2a3b02a19e5264ba588e991a37
+  metadata.gz: 1b67b01e36452d54ed3a46731198cf31b62bc4b96c658f1555c1246a859a369a
+  data.tar.gz: d6bedd395500f7a079c8a7a3dda16c48f78b532dbd37bf9242644d1fb6f5186c
 SHA512:
-  metadata.gz: 9e354a540525c8ab3a2c2f0de4b7c6eb4ecc931f54e1d46dca64f03e910a3f95267f94fb61584444f53e37891ac5a8bd75a2054001eaff118a8a3c5eccad6be3
-  data.tar.gz: 1f2266d2181d451621ca355c9c5e8db982548f0028c65af723e3d9164deb43f1516e1550fd11678f99b5243e47302ee5fcd916cc2b0f9fb6f7dc9a4a8edb6218
+  metadata.gz: 573dd79df9f8bbf958cfca8bd2a2477b10904916d43917fb269b41f154bde0f40e8bda641f5984c56772d1aa918bbfd84f8a14be881917370167ee1f3c4d6324
+  data.tar.gz: 9440bfaa20b003060c9dfa152d93c7142cff6ffa6ffc56ae52e966c1f96fdd95bd47d9e411987802bc986c7b6557223ce8696ffe446468735b360ed80d130ca3

data/.circleci/config.yml

@@ -86,34 +86,6 @@ jobs:
           - POSTGRES_DB=statesman_test
           - POSTGRES_PASSWORD=statesman
     steps: *steps
-  build-ruby265-rails-master-mysql:
-    docker:
-      - image: circleci/ruby:2.6.5-node
-        environment:
-          - RAILS_VERSION=master
-          - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
-          - DATABASE_DEPENDENCY_PORT=3306
-      - image: circleci/mysql:5.7.18
-        environment:
-          - MYSQL_ALLOW_EMPTY_PASSWORD=true
-          - MYSQL_USER=root
-          - MYSQL_PASSWORD=
-          - MYSQL_DATABASE=statesman_test
-    steps: *steps
-  build-ruby265-rails-master-postgres:
-    docker:
-      - image: circleci/ruby:2.6.5-node
-        environment:
-          - RAILS_VERSION=master
-          - DATABASE_URL=postgres://postgres@localhost/statesman_test
-          - EXCLUDE_MONGOID=true
-          - DATABASE_DEPENDENCY_PORT=5432
-      - image: circleci/postgres:9.6
-        environment:
-          - POSTGRES_USER=postgres
-          - POSTGRES_DB=statesman_test
-          - POSTGRES_PASSWORD=statesman
-    steps: *steps
 
   build-ruby270-rails-602-mysql:
     docker:
@@ -142,11 +114,11 @@ jobs:
           - POSTGRES_DB=statesman_test
           - POSTGRES_PASSWORD=statesman
     steps: *steps
-  build-ruby270-rails-master-mysql:
+  build-ruby270-rails-main-mysql:
     docker:
       - image: circleci/ruby:2.7.0-node
         environment:
-          - RAILS_VERSION=master
+          - RAILS_VERSION=main
           - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
           - DATABASE_DEPENDENCY_PORT=3306
       - image: circleci/mysql:5.7.18
@@ -156,11 +128,11 @@ jobs:
           - MYSQL_PASSWORD=
           - MYSQL_DATABASE=statesman_test
     steps: *steps
-  build-ruby270-rails-master-postgres:
+  build-ruby270-rails-main-postgres:
     docker:
       - image: circleci/ruby:2.7.0-node
         environment:
-          - RAILS_VERSION=master
+          - RAILS_VERSION=main
           - DATABASE_URL=postgres://postgres@localhost/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=5432
@@ -179,9 +151,7 @@ workflows:
       - build-ruby249-rails-524-postgres
       - build-ruby265-rails-602-mysql
       - build-ruby265-rails-602-postgres
-      - build-ruby265-rails-master-mysql
-      - build-ruby265-rails-master-postgres
       - build-ruby270-rails-602-mysql
       - build-ruby270-rails-602-postgres
-      - build-ruby270-rails-master-mysql
-      - build-ruby270-rails-master-postgres
+      - build-ruby270-rails-main-mysql
+      - build-ruby270-rails-main-postgres

data/CHANGELOG.md

@@ -1,3 +1,54 @@
+## v8.0.2 30th March 2021
+
+### Changed
+
+- Fixed a bug where the `history` of a model was left in an incorrect state after a transition
+  conflict [#433](https://github.com/gocardless/statesman/pull/433)
+
+## v8.0.1 20th January 2021
+
+### Changed
+
+- Fixed `no implicit conversion of nil into String` error when quoting null values
+  [#427](https://github.com/gocardless/statesman/pull/427)
+
+## v8.0.0 6th January 2021
+
+### Added
+
+- Use AR Arel table to type cast booleans in order to avoid deprecation warning [#421](https://github.com/gocardless/statesman/pull/421)
+- Support relationships that doesn't use `id` as a Primary Key
+  [#422](https://github.com/gocardless/statesman/pull/422)
+
+## v7.4.1 11th November 2020
+
+### Added
+
+- Add #reset method to state machine and adapter interfaces
+  [#417](https://github.com/gocardless/statesman/pull/417)
+
+## v7.4.0 26th August 2020
+
+### Added
+
+- [Gem Metadata](https://guides.rubygems.org/specification-reference/#metadata)
+  to make finding changes between releases even easier.
+
+## v7.3.0, 24th August 2020
+
+### Changed
+
+- Use correct Arel for null [#409](https://github.com/gocardless/statesman/pull/409)
+
+## v7.2.0, 19th May 2020
+
+### Changed
+
+- Set non-empty password for postgres tests [#398](https://github.com/gocardless/statesman/pull/398)
+- Handle transitions differently for MySQL [#399](https://github.com/gocardless/statesman/pull/399)
+- pg requirement from >= 0.18, <= 1.1 to >= 0.18, <= 1.3 [#400](https://github.com/gocardless/statesman/pull/400)
+- Lazily enable mysql gaplock protection [#402](https://github.com/gocardless/statesman/pull/402)
+
 ## v7.1.0, 10th Feb 2020
 
 - Fix `to_s` on `TransitionFailedError` & `GuardFailedError`. `.message` and
@@ -49,7 +100,7 @@
   to
   ```ruby
     include Statesman::Adapters::ActiveRecordQueries[
-      initial_state: :inital,
+      initial_state: :initial,
       transition_class: MyTransition
     ]
   ```

data/Gemfile

@@ -5,8 +5,8 @@ source 'https://rubygems.org'
 gemspec
 
 # rubocop:disable Bundler/DuplicatedGem
-if ENV['RAILS_VERSION'] == 'master'
-  gem "rails", git: "https://github.com/rails/rails"
+if ENV['RAILS_VERSION'] == 'main'
+  gem "rails", git: "https://github.com/rails/rails", branch: "main"
 elsif ENV['RAILS_VERSION']
   gem "rails", "~> #{ENV['RAILS_VERSION']}"
 end

data/README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="http://f.cl.ly/items/410n2A0S3l1W0i3i0o2K/statesman.png" alt="Statesman"></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/110275/106792848-96e4ee80-664e-11eb-8fd1-16ff24b41eb2.png" alt="Statesman" width="512"></p>
 
 A statesmanlike state machine library.
 
@@ -322,6 +322,10 @@ Machine.successors
 #### `Machine#current_state`
 Returns the current state based on existing transition objects.
 
+Takes an optional keyword argument to force a reload of data from the
+database.
+e.g `current_state(force_reload: true)`
+
 #### `Machine#in_state?(:state_1, :state_2, ...)`
 Returns true if the machine is in any of the given states.
 
@@ -404,10 +408,12 @@ Model.in_state(:state_1).or(
 #### Storing the state on the model object
 
 If you wish to store the model state on the model directly, you can keep it up
-to date using an `after_transition` hook:
+to date using an `after_transition` hook.
+Combine it with the `after_commit` option to ensure the model state will only be
+saved once the transition has made it irreversibly to the database:
 
 ```ruby
-after_transition do |model, transition|
+after_transition(after_commit: true) do |model, transition|
   model.state = transition.to_state
   model.save!
 end

data/lib/generators/statesman/generator_helpers.rb

@@ -39,8 +39,16 @@ module Statesman
     end
 
     def mysql?
-      ActiveRecord::Base.configurations[Rails.env].
-        try(:[], "adapter").try(:match, /mysql/)
+      configuration.try(:[], "adapter").try(:match, /mysql/)
+    end
+
+    # [] is deprecated and will be removed in 6.2
+    def configuration
+      if ActiveRecord::Base.configurations.respond_to?(:configs_for)
+        ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
+      else
+        ActiveRecord::Base.configurations[Rails.env]
+      end
     end
 
     def database_supports_partial_indexes?

data/lib/statesman/adapters/active_record.rb

@@ -42,7 +42,13 @@ module Statesman
       def create(from, to, metadata = {})
         create_transition(from.to_s, to.to_s, metadata)
       rescue ::ActiveRecord::RecordNotUnique => e
-        raise TransitionConflictError, e.message if transition_conflict_error? e
+        if transition_conflict_error? e
+          # The history has the invalid transition on the end of it, which means
+          # `current_state` would then be incorrect. We force a reload of the history to
+          # avoid this.
+          transitions_for_parent.reload
+          raise TransitionConflictError, e.message
+        end
 
         raise
       ensure
@@ -67,6 +73,10 @@ module Statesman
         end
       end
 
+      def reset
+        @last_transition = nil
+      end
+
       private
 
       # rubocop:disable Metrics/MethodLength
@@ -301,25 +311,23 @@ module Statesman
       end
 
       def db_true
-        value = ::ActiveRecord::Base.connection.type_cast(
-          true,
-          transition_class.columns_hash["most_recent"],
-        )
-        ::ActiveRecord::Base.connection.quote(value)
+        ::ActiveRecord::Base.connection.quote(type_cast(true))
       end
 
       def db_false
-        value = ::ActiveRecord::Base.connection.type_cast(
-          false,
-          transition_class.columns_hash["most_recent"],
-        )
-        ::ActiveRecord::Base.connection.quote(value)
+        ::ActiveRecord::Base.connection.quote(type_cast(false))
       end
 
       def db_null
         Arel::Nodes::SqlLiteral.new("NULL")
       end
 
+      # Type casting against a column is deprecated and will be removed in Rails 6.2.
+      # See https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
+      def type_cast(value)
+        ::ActiveRecord::Base.connection.type_cast(value)
+      end
+
       # Check whether the `most_recent` column allows null values. If it doesn't, set old
       # records to `false`, otherwise, set them to `NULL`.
       #

data/lib/statesman/adapters/active_record_queries.rb

@@ -104,7 +104,7 @@ module Statesman
 
         def most_recent_transition_join
           "LEFT OUTER JOIN #{model_table} AS #{most_recent_transition_alias} " \
-             "ON #{model.table_name}.id = " \
+             "ON #{model.table_name}.#{model_primary_key} = " \
                   "#{most_recent_transition_alias}.#{model_foreign_key} " \
              "AND #{most_recent_transition_alias}.most_recent = #{db_true}"
         end
@@ -127,6 +127,10 @@ module Statesman
                 "and #{transition_class}."
         end
 
+        def model_primary_key
+          transition_reflection.active_record_primary_key
+        end
+
         def model_foreign_key
           transition_reflection.foreign_key
         end

data/lib/statesman/adapters/memory.rb

@@ -37,6 +37,10 @@ module Statesman
         @history
       end
 
+      def reset
+        @history = []
+      end
+
       private
 
       def next_sort_key

data/lib/statesman/machine.rb

@@ -257,6 +257,10 @@ module Statesman
       false
     end
 
+    def reset
+      @storage_adapter.reset
+    end
+
     private
 
     def adapter_class(transition_class)

data/lib/statesman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Statesman
-  VERSION = "7.3.0"
+  VERSION = "8.0.2"
 end

data/spec/statesman/adapters/active_record_queries_spec.rb

@@ -154,6 +154,31 @@ describe Statesman::Adapters::ActiveRecordQueries, active_record: true do
       end
     end
 
+    context "with a custom primary key for the model" do
+      before do
+        # Switch to using OtherActiveRecordModelTransition, so the existing
+        # relation with MyActiveRecordModelTransition doesn't interfere with
+        # this spec.
+        # Configure the relationship to use a different primary key,
+        MyActiveRecordModel.send(:has_many,
+                                 :custom_name,
+                                 class_name: "OtherActiveRecordModelTransition",
+                                 primary_key: :external_id)
+
+        MyActiveRecordModel.class_eval do
+          def self.transition_class
+            OtherActiveRecordModelTransition
+          end
+        end
+      end
+
+      describe ".in_state" do
+        subject(:query) { MyActiveRecordModel.in_state(:succeeded) }
+
+        specify { expect { query }.to_not raise_error }
+      end
+    end
+
     context "after_commit transactional integrity" do
       before do
         MyStateMachine.class_eval do

data/spec/statesman/adapters/active_record_spec.rb

@@ -130,6 +130,31 @@ describe Statesman::Adapters::ActiveRecord, active_record: true do
         expect { adapter.create(:y, :z) }.
           to raise_exception(Statesman::TransitionConflictError)
       end
+
+      it "does not pollute the state when the transition fails" do
+        # this increments the sort_key in the database
+        adapter.create(:x, :y)
+
+        # we then pre-load the transitions for efficiency
+        preloaded_model = MyActiveRecordModel.
+          includes(:my_active_record_model_transitions).
+          find(model.id)
+
+        adapter2 = described_class.
+          new(MyActiveRecordModelTransition, preloaded_model, observer)
+
+        # Now we generate a race
+        adapter.create(:y, :z)
+        expect { adapter2.create(:y, :a) }.
+          to raise_error(Statesman::TransitionConflictError)
+
+        # The preloaded adapter should discard the preloaded info
+        expect(adapter2.last).to have_attributes(to_state: "z")
+        expect(adapter2.history).to contain_exactly(
+          have_attributes(to_state: "y"),
+          have_attributes(to_state: "z"),
+        )
+      end
     end
 
     context "when other exceptions occur" do
@@ -355,6 +380,19 @@ describe Statesman::Adapters::ActiveRecord, active_record: true do
     end
   end
 
+  it "resets last with #reload" do
+    model.save!
+    ActiveRecord::Base.transaction do
+      model.state_machine.transition_to!(:succeeded)
+      # force to cache value in last_transition instance variable
+      expect(model.state_machine.current_state).to eq("succeeded")
+      raise ActiveRecord::Rollback
+    end
+    expect(model.state_machine.current_state).to eq("succeeded")
+    model.reload
+    expect(model.state_machine.current_state).to eq("initial")
+  end
+
   context "with a namespaced model" do
     before do
       CreateNamespacedARModelMigration.migrate(:up)

data/spec/support/active_record.rb

@@ -33,6 +33,11 @@ class MyActiveRecordModel < ActiveRecord::Base
   def metadata
     super || {}
   end
+
+  def reload(*)
+    state_machine.reset
+    super
+  end
 end
 
 class MyActiveRecordModelTransition < ActiveRecord::Base

data/statesman.gemspec

@@ -4,6 +4,8 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "statesman/version"
 
+GITHUB_URL = "https://github.com/gocardless/statesman"
+
 Gem::Specification.new do |spec|
   spec.name          = "statesman"
   spec.version       = Statesman::VERSION
@@ -11,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["developers@gocardless.com"]
   spec.description   = "A statesman-like state machine library"
   spec.summary       = spec.description
-  spec.homepage      = "https://github.com/gocardless/statesman"
+  spec.homepage      = GITHUB_URL
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
@@ -35,4 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.0"
   spec.add_development_dependency "sqlite3", "~> 1.4.2"
   spec.add_development_dependency "timecop", "~> 0.9.1"
+
+  spec.metadata = {
+    "bug_tracker_uri" => "#{GITHUB_URL}/issues",
+    "changelog_uri" => "#{GITHUB_URL}/blob/master/CHANGELOG.md",
+    "documentation_uri" => "#{GITHUB_URL}/blob/master/README.md",
+    "homepage_uri" => GITHUB_URL,
+    "source_code_uri" => GITHUB_URL,
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 8.0.2
 platform: ruby
 authors:
 - GoCardless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -282,7 +282,12 @@ files:
 homepage: https://github.com/gocardless/statesman
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/gocardless/statesman/issues
+  changelog_uri: https://github.com/gocardless/statesman/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/gocardless/statesman/blob/master/README.md
+  homepage_uri: https://github.com/gocardless/statesman
+  source_code_uri: https://github.com/gocardless/statesman
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -298,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A statesman-like state machine library