statesman 7.2.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421da0e6d201060df4733a0e52e2742df2b1d527f241873dfd4b820c74cc587f
-  data.tar.gz: 20cd64e291373c21b83886cfdc12c7e68450759515557f3853bfc68bfff8ed38
+  metadata.gz: aa4a88371cc60e6698eb820b60096f681fbaedf8dbbbec5991d47db81daf695d
+  data.tar.gz: b67153a87f62722deb2053ddf661e79e7918fca5339f9a6829a086e30a2abf02
 SHA512:
-  metadata.gz: c48d5415915aee8e4f595b78b9018b9a048bfb3d8e3ff33a3efce0ba962540f71af1fe982a389d5b51104c8284fc485f4bfa62390a3c92f03fa7ce4592a2ffbf
-  data.tar.gz: cf11b1793461381b835efe9b2343b54c348a01de85fc0cbd63623a0c18cf21f9935f6cb4251d9117a7d73b52df7041458a943d160628073afc96eb5c16237d73
+  metadata.gz: ac43c11e5dc1791bac7a00ba8e84b459daad104be9c9b460626c7569e4b9bdf215f0d080b5151ff754ee109640e70d1ca6cec4b958acfeadd974aab6962f16fd
+  data.tar.gz: 965b0a4020631cb18c39ce6af8870f3e165c87058aaf25f40f217a71d51cf65345818f974569191156a5ed94021c63595cf049c45fa11b62e132b1631e6d3d46

data/.circleci/config.yml

@@ -86,11 +86,11 @@ jobs:
           - POSTGRES_DB=statesman_test
           - POSTGRES_PASSWORD=statesman
     steps: *steps
-  build-ruby265-rails-master-mysql:
+  build-ruby265-rails-main-mysql:
     docker:
       - image: circleci/ruby:2.6.5-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
@@ -100,11 +100,11 @@ jobs:
           - MYSQL_PASSWORD=
           - MYSQL_DATABASE=statesman_test
     steps: *steps
-  build-ruby265-rails-master-postgres:
+  build-ruby265-rails-main-postgres:
     docker:
       - image: circleci/ruby:2.6.5-node
         environment:
-          - RAILS_VERSION=master
+          - RAILS_VERSION=main
           - DATABASE_URL=postgres://postgres@localhost/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=5432
@@ -142,11 +142,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 +156,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 +179,9 @@ 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-ruby265-rails-main-mysql
+      - build-ruby265-rails-main-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,40 @@
+## 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

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

@@ -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

@@ -67,6 +67,10 @@ module Statesman
         end
       end
 
+      def reset
+        @last_transition = nil
+      end
+
       private
 
       # rubocop:disable Metrics/MethodLength
@@ -113,7 +117,7 @@ module Statesman
           to_state: to,
           sort_key: next_sort_key,
           metadata: metadata,
-          most_recent: not_most_recent_value,
+          most_recent: not_most_recent_value(db_cast: false),
         }
       end
 
@@ -301,19 +305,21 @@ 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
@@ -323,10 +329,12 @@ module Statesman
       # indexes. By doing the conditioning on the column, rather than Rails' opinion of
       # whether the database supports partial indexes, we're robust to DBs later adding
       # support for partial indexes.
-      def not_most_recent_value
-        return db_false if transition_class.columns_hash["most_recent"].null == false
+      def not_most_recent_value(db_cast: true)
+        if transition_class.columns_hash["most_recent"].null == false
+          return db_cast ? db_false : false
+        end
 
-        nil
+        db_cast ? db_null : nil
       end
     end
 

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.2.0"
+  VERSION = "8.0.1"
 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

@@ -355,6 +355,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.2.0
+  version: 8.0.1
 platform: ruby
 authors:
 - GoCardless
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -282,8 +282,13 @@ files:
 homepage: https://github.com/gocardless/statesman
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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:
 - lib
@@ -298,8 +303,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A statesman-like state machine library
 test_files: