statesman 10.0.0 → 10.2.3

data/spec/support/active_record.rb

@@ -20,10 +20,22 @@ class MyStateMachine
   transition from: :failed,  to: :initial
 end
 
+class MyActiveRecordModelTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  belongs_to :my_active_record_model
+  serialize :metadata, JSON
+end
+
 class MyActiveRecordModel < ActiveRecord::Base
   has_many :my_active_record_model_transitions, autosave: false
   alias_method :transitions, :my_active_record_model_transitions
 
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: MyActiveRecordModelTransition,
+    initial_state: :initial
+  ]
+
   def state_machine
     @state_machine ||= MyStateMachine.new(
       self, transition_class: MyActiveRecordModelTransition
@@ -33,18 +45,6 @@ class MyActiveRecordModel < ActiveRecord::Base
   def metadata
     super || {}
   end
-
-  def reload(*)
-    state_machine.reset
-    super
-  end
-end
-
-class MyActiveRecordModelTransition < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordTransition
-
-  belongs_to :my_active_record_model
-  serialize :metadata, JSON
 end
 
 class MyActiveRecordModelTransitionWithoutInclude < ActiveRecord::Base
@@ -64,7 +64,6 @@ class CreateMyActiveRecordModelMigration < MIGRATION_CLASS
 end
 
 # TODO: make this a module we can extend from the app? Or a generator?
-# rubocop:disable Metrics/MethodLength
 class CreateMyActiveRecordModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :my_active_record_model_transitions do |t|
@@ -110,7 +109,6 @@ class CreateMyActiveRecordModelTransitionMigration < MIGRATION_CLASS
     end
   end
 end
-# rubocop:enable Metrics/MethodLength
 
 class OtherActiveRecordModel < ActiveRecord::Base
   has_many :other_active_record_model_transitions, autosave: false
@@ -144,7 +142,6 @@ class CreateOtherActiveRecordModelMigration < MIGRATION_CLASS
   end
 end
 
-# rubocop:disable Metrics/MethodLength
 class CreateOtherActiveRecordModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :other_active_record_model_transitions do |t|
@@ -177,18 +174,17 @@ class CreateOtherActiveRecordModelTransitionMigration < MIGRATION_CLASS
                 %i[other_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
-                name: "index_other_active_record_model_transitions_"\
+                name: "index_other_active_record_model_transitions_" \
                       "parent_latest"
     else
       add_index :other_active_record_model_transitions,
                 %i[other_active_record_model_id most_recent],
                 unique: true,
-                name: "index_other_active_record_model_transitions_"\
+                name: "index_other_active_record_model_transitions_" \
                       "parent_latest"
     end
   end
 end
-# rubocop:enable Metrics/MethodLength
 
 class DropMostRecentColumn < MIGRATION_CLASS
   def change
@@ -242,7 +238,6 @@ class CreateNamespacedARModelMigration < MIGRATION_CLASS
   end
 end
 
-# rubocop:disable Metrics/MethodLength
 class CreateNamespacedARModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :my_namespace_my_active_record_model_transitions do |t|
@@ -282,5 +277,95 @@ class CreateNamespacedARModelTransitionMigration < MIGRATION_CLASS
                 name: "index_namespace_model_transitions_parent_latest"
     end
   end
-  # rubocop:enable Metrics/MethodLength
+end
+
+class StiActiveRecordModel < ActiveRecord::Base
+  has_many :sti_a_active_record_model_transitions, autosave: false
+  has_many :sti_b_active_record_model_transitions, autosave: false
+
+  def state_machine_a
+    @state_machine_a ||= MyStateMachine.new(
+      self, transition_class: StiAActiveRecordModelTransition
+    )
+  end
+
+  def state_machine_b
+    @state_machine_b ||= MyStateMachine.new(
+      self, transition_class: StiBActiveRecordModelTransition
+    )
+  end
+
+  def metadata
+    super || {}
+  end
+
+  def reload(*)
+    state_machine_a.reset
+    state_machine_b.reset
+    super
+  end
+end
+
+class StiActiveRecordModelTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  belongs_to :sti_active_record_model
+  serialize :metadata, JSON
+end
+
+class StiAActiveRecordModelTransition < StiActiveRecordModelTransition
+end
+
+class StiBActiveRecordModelTransition < StiActiveRecordModelTransition
+end
+
+class CreateStiActiveRecordModelMigration < MIGRATION_CLASS
+  def change
+    create_table :sti_active_record_models do |t|
+      t.timestamps null: false
+    end
+  end
+end
+
+class CreateStiActiveRecordModelTransitionMigration < MIGRATION_CLASS
+  def change
+    create_table :sti_active_record_model_transitions do |t|
+      t.string  :to_state
+      t.integer :sti_active_record_model_id
+      t.integer :sort_key
+      t.string  :type
+
+      # MySQL doesn't allow default values on text fields
+      if ActiveRecord::Base.connection.adapter_name == "Mysql2"
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
+
+      if Statesman::Adapters::ActiveRecord.database_supports_partial_indexes?
+        t.boolean :most_recent, default: true, null: false
+      else
+        t.boolean :most_recent, default: true
+      end
+
+      t.timestamps null: false
+    end
+
+    add_index :sti_active_record_model_transitions,
+              %i[type sti_active_record_model_id sort_key],
+              unique: true, name: "sti_sort_key_index"
+
+    if Statesman::Adapters::ActiveRecord.database_supports_partial_indexes?
+      add_index :sti_active_record_model_transitions,
+                %i[type sti_active_record_model_id most_recent],
+                unique: true,
+                where: "most_recent",
+                name: "index_sti_active_record_model_transitions_parent_latest"
+    else
+      add_index :sti_active_record_model_transitions,
+                %i[type sti_active_record_model_id most_recent],
+                unique: true,
+                name: "index_sti_active_record_model_transitions_parent_latest"
+    end
+  end
 end

data/statesman.gemspec

@@ -18,24 +18,22 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.7"
 
   spec.add_development_dependency "ammeter", "~> 1.1"
   spec.add_development_dependency "bundler", "~> 2"
-  spec.add_development_dependency "gc_ruboconfig", "~> 2.26.0"
+  spec.add_development_dependency "gc_ruboconfig", "~> 3.6.0"
   spec.add_development_dependency "mysql2", ">= 0.4", "< 0.6"
-  spec.add_development_dependency "pg", ">= 0.18", "<= 1.3"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pg", ">= 0.18", "<= 1.5"
   spec.add_development_dependency "rails", ">= 5.2"
   spec.add_development_dependency "rake", "~> 13.0.0"
   spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec-github", "~> 2.4.0"
   spec.add_development_dependency "rspec-its", "~> 1.1"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.5.1"
-  spec.add_development_dependency "rspec-rails", "~> 3.1"
-  spec.add_development_dependency "sqlite3", "~> 1.4.2"
+  spec.add_development_dependency "rspec-rails", "~> 6.0"
+  spec.add_development_dependency "sqlite3", "~> 1.6.1"
   spec.add_development_dependency "timecop", "~> 0.9.1"
 
   spec.metadata = {
@@ -44,5 +42,6 @@ Gem::Specification.new do |spec|
     "documentation_uri" => "#{GITHUB_URL}/blob/master/README.md",
     "homepage_uri" => GITHUB_URL,
     "source_code_uri" => GITHUB_URL,
+    "rubygems_mfa_required" => "true",
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.2.3
 platform: ruby
 authors:
 - GoCardless
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.26.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
         version: '0.18'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,21 +91,7 @@ dependencies:
         version: '0.18'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -149,61 +135,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -225,8 +211,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/dependabot.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -251,6 +237,7 @@ files:
 - lib/statesman/adapters/active_record_transition.rb
 - lib/statesman/adapters/memory.rb
 - lib/statesman/adapters/memory_transition.rb
+- lib/statesman/adapters/type_safe_active_record_queries.rb
 - lib/statesman/callback.rb
 - lib/statesman/config.rb
 - lib/statesman/exceptions.rb
@@ -272,6 +259,7 @@ files:
 - spec/statesman/adapters/memory_spec.rb
 - spec/statesman/adapters/memory_transition_spec.rb
 - spec/statesman/adapters/shared_examples.rb
+- spec/statesman/adapters/type_safe_active_record_queries_spec.rb
 - spec/statesman/callback_spec.rb
 - spec/statesman/config_spec.rb
 - spec/statesman/exceptions_spec.rb
@@ -290,6 +278,7 @@ metadata:
   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
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -305,28 +294,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A statesman-like state machine library
-test_files:
-- spec/fixtures/add_constraints_to_most_recent_for_bacon_transitions_with_partial_index.rb
-- spec/fixtures/add_constraints_to_most_recent_for_bacon_transitions_without_partial_index.rb
-- spec/fixtures/add_most_recent_to_bacon_transitions.rb
-- spec/generators/statesman/active_record_transition_generator_spec.rb
-- spec/generators/statesman/migration_generator_spec.rb
-- spec/spec_helper.rb
-- spec/statesman/adapters/active_record_queries_spec.rb
-- spec/statesman/adapters/active_record_spec.rb
-- spec/statesman/adapters/active_record_transition_spec.rb
-- spec/statesman/adapters/memory_spec.rb
-- spec/statesman/adapters/memory_transition_spec.rb
-- spec/statesman/adapters/shared_examples.rb
-- spec/statesman/callback_spec.rb
-- spec/statesman/config_spec.rb
-- spec/statesman/exceptions_spec.rb
-- spec/statesman/guard_spec.rb
-- spec/statesman/machine_spec.rb
-- spec/statesman/utils_spec.rb
-- spec/support/active_record.rb
-- spec/support/generators_shared_examples.rb
+test_files: []

data/.circleci/config.yml

@@ -1,127 +0,0 @@
----
-version: 2.1
-
-references:
-  bundle_install: &bundle_install
-    run:
-      name: Bundle
-      command: |
-        gem install bundler --no-document && \
-        bundle config set no-cache 'true' && \
-        bundle config set jobs '4' && \
-        bundle config set retry '3' && \
-        bundle install
-
-  cache_bundle: &cache_bundle
-    save_cache:
-      key: bundle-<< parameters.ruby_version >>-<< parameters.rails_version >>-{{ checksum "statesman.gemspec" }}-{{ checksum "Gemfile" }}
-      paths:
-        - vendor/bundle
-
-  restore_bundle: &restore_bundle
-    restore_cache:
-      key: bundle-<< parameters.ruby_version >>-<< parameters.rails_version >>-{{ checksum "statesman.gemspec" }}-{{ checksum "Gemfile" }}
-
-  steps: &steps
-    - add_ssh_keys
-    - checkout
-    - run:
-        name: "Add dependencies"
-        command: |
-          sudo apt-get update && sudo apt-get install -y sqlite3 libsqlite3-dev
-    - *restore_bundle
-    - *bundle_install
-    - *cache_bundle
-    - run: dockerize -wait tcp://localhost:$DATABASE_DEPENDENCY_PORT -timeout 1m
-    - run:
-        name: Run specs
-        command: |
-          bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) --profile --format progress --format RspecJunitFormatter -o /tmp/circle_artifacts/rspec.xml
-    - run:
-        name: "Rubocop"
-        command: bundle exec rubocop --extra-details --display-style-guide --parallel --force-exclusion
-    - store_artifacts:
-        path: /tmp/circle_artifacts/
-    - store_test_results:
-        path: /tmp/circle_artifacts/
-
-  ruby_versions: &ruby_versions
-    - "2.7"
-    - "3.0"
-    - "3.1"
-
-  rails_versions: &rails_versions
-    - "5.2.7"
-    - "6.0.4"
-    - "6.1.5"
-    - "7.0.2"
-    - "main"
-
-  mysql_versions: &mysql_versions
-    - "5.7"
-
-  psql_versions: &psql_versions
-    - "9.6"
-
-jobs:
-  rspec_mysql:
-    working_directory: /mnt/ramdisk
-    parameters:
-      ruby_version:
-        type: string
-      rails_version:
-        type: string
-      mysql_version:
-        type: string
-    docker:
-      - image: cimg/ruby:<< parameters.ruby_version >>
-        environment:
-          CIRCLE_TEST_REPORTS: /tmp/circle_artifacts/
-          DATABASE_URL: mysql2://foobar:password@127.0.0.1/statesman_test
-          DATABASE_DEPENDENCY_PORT: "3306"
-      - image: cimg/mysql:<< parameters.mysql_version >>
-        environment:
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_USER: foobar
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: statesman_test
-    steps: *steps
-
-  rspec_postgres:
-    working_directory: /mnt/ramdisk
-    parameters:
-      ruby_version:
-        type: string
-      rails_version:
-        type: string
-      psql_version:
-        type: string
-    docker:
-      - image: cimg/ruby:<< parameters.ruby_version >>
-        environment:
-          CIRCLE_TEST_REPORTS: /tmp/circle_artifacts/
-          DATABASE_URL: postgres://postgres@localhost/statesman_test
-          DATABASE_DEPENDENCY_PORT: "5432"
-      - image: circleci/postgres:<< parameters.psql_version >>
-        environment:
-          POSTGRES_USER: postgres
-          POSTGRES_DB: statesman_test
-          POSTGRES_PASSWORD: statesman
-    steps: *steps
-
-workflows:
-  version: 2
-  tests:
-    jobs:
-      - rspec_mysql:
-          matrix:
-            parameters:
-              mysql_version: *mysql_versions
-              ruby_version: *ruby_versions
-              rails_version: *rails_versions
-      - rspec_postgres:
-          matrix:
-            parameters:
-              psql_version: *psql_versions
-              ruby_version: *ruby_versions
-              rails_version: *rails_versions