stateful_enum 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78d2de46a67e071c7ec7d4b0147d6a52768af7fef8ba81a7454c1f129dcd6b0d
-  data.tar.gz: 38ddee71fcc5406f6fa8ac93ae582230277173527a5ab32fc8e36a7f9aa15f10
+  metadata.gz: 862f0fff7013f98f6f39aa069098e104f7d48bcdefabbb30ca8accf6f817dd49
+  data.tar.gz: 645171697753e52e14c87a42df936df727d2b984bfc0dba7f05a18c874667694
 SHA512:
-  metadata.gz: f5a4a52fc2a136374e3337d789cf0572296aa79f3724540d166654cffbf9d5c3529dde5b5e4241c0716d0d8a7ba726381e064b1e0996f5c5548813d444c2d926
-  data.tar.gz: fcd0c04464d71a140c2d7571b6e9732556d4d23b5aa2d52727402220438abd7d1bb266b4f7cd11a8692d1c6a90970a60c89a5a0e23b9cb4fdd0dc85405f73c1d
+  metadata.gz: ade6a0c15d35d147bb60f17d7dca8e36c0aa43975d14ca88dc88cf402b3bebd6b4d443b050048a0fbe8d92a339ae2fd966c6aa6220623e385d9df1c401366d8f
+  data.tar.gz: b6fd92a9296efb47852956375d73b8c801b63bbf877e4a9612db5f3f74f96ee4930a6cefe12cd635ea667ff43f0875ffebce8307bada70d409ac78f8171095c7

data/.github/workflows/main.yml

@@ -6,71 +6,87 @@ jobs:
   build:
     strategy:
       matrix:
+        ruby_version: [ruby-head, '3.4', '3.3', '3.2', '3.1']
+        rails_version: [edge, '8.1', '8.0', '7.2', '7.1', '7.0', '6.1']
+
         include:
-          - ruby_version: ruby-head
-            gemfile: gemfiles/Gemfile-rails.edge
-            allow_failures: 'true'
           - ruby_version: '3.0'
-            gemfile: gemfiles/Gemfile-rails.edge
-            allow_failures: 'true'
-
-          - ruby_version: ruby-head
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-            allow_failures: 'true'
-
+            rails_version: '7.1'
           - ruby_version: '3.0'
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-          - ruby_version: '2.7'
-            gemfile: gemfiles/Gemfile-rails.7.0.x
-
+            rails_version: '7.0'
           - ruby_version: '3.0'
-            gemfile: gemfiles/Gemfile-rails.6.1.x
-          - ruby_version: '2.7'
-            gemfile: gemfiles/Gemfile-rails.6.1.x
-          - ruby_version: '2.6'
-            gemfile: gemfiles/Gemfile-rails.6.1.x
+            rails_version: '6.1'
+          - ruby_version: '3.0'
+            rails_version: '6.0'
 
           - ruby_version: '2.7'
-            gemfile: gemfiles/Gemfile-rails.6.0.x
+            rails_version: '7.1'
+          - ruby_version: '2.7'
+            rails_version: '7.0'
+          - ruby_version: '2.7'
+            rails_version: '6.1'
+          - ruby_version: '2.7'
+            rails_version: '6.0'
 
           - ruby_version: '2.6'
-            gemfile: gemfiles/Gemfile-rails.5.2.x
-          - ruby_version: '2.4'
-            gemfile: gemfiles/Gemfile-rails.5.2.x
-          - ruby_version: '2.2'
-            gemfile: gemfiles/Gemfile-rails.5.2.x
-
+            rails_version: '6.1'
           - ruby_version: '2.6'
-            gemfile: gemfiles/Gemfile-rails.5.1.x
-
+            rails_version: '6.0'
+          - ruby_version: '2.6'
+            rails_version: '5.2'
+          - ruby_version: '2.6'
+            rails_version: '5.1'
+          - ruby_version: '2.6'
+            rails_version: '5.0'
           - ruby_version: '2.6'
-            gemfile: gemfiles/Gemfile-rails.5.0.x
+            rails_version: '4.2'
+            bundler_version: '1'
 
           - ruby_version: '2.5'
-            gemfile: gemfiles/Gemfile-rails.4.2.x
+            rails_version: '5.2'
+          - ruby_version: '2.5'
+            rails_version: '4.2'
+            bundler_version: '1'
+
+          - ruby_version: '2.4'
+            rails_version: '5.2'
+          - ruby_version: '2.4'
+            rails_version: '4.2'
             bundler_version: '1'
 
           - ruby_version: '2.3'
-            gemfile: gemfiles/Gemfile-rails.4.1.x
+            rails_version: '4.1'
             bundler_version: '1'
 
+          - ruby_version: '2.2'
+            rails_version: '5.2'
+            bundler_version: '1'
 
-    runs-on: ubuntu-latest
+        exclude:
+          - ruby_version: '3.1'
+            rails_version: 'edge'
+          - ruby_version: '3.1'
+            rails_version: '8.1'
+          - ruby_version: '3.1'
+            rails_version: '8.0'
 
     env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RAILS_VERSION: ${{ matrix.rails_version }}
+
+    runs-on: ubuntu-24.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "${{ matrix.ruby_version }}"
+          rubygems: ${{ matrix.ruby_version < '2.7' && 'default' || 'latest' }}
           bundler: "${{ matrix.bundler_version }}"
           bundler-cache: true
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.rails_version == 'edge') || (matrix.allow_failures == 'true') }}
 
       - run: sudo apt-get install graphviz
 
       - run: bundle exec rake
-        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.rails_version == 'edge') || (matrix.allow_failures == 'true') }}

data/.gitignore

@@ -10,5 +10,7 @@ gemfiles/*.lock
 /tmp/
 /log/
 /test/dummy/log/
+/test/dummy/tmp/
+/test/dummy/**/*.png
 
 .byebug_history

data/Gemfile

@@ -1,6 +1,30 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stateful_enum.gemspec
 gemspec
 
-gem 'byebug'
+if ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails', git: 'https://github.com/rails/rails.git'
+elsif ENV['RAILS_VERSION']
+  gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
+  if ENV['RAILS_VERSION'] <= '5.0'
+    gem 'sqlite3', '< 1.4'
+  elsif ENV['RAILS_VERSION'] <= '7.1'
+    gem 'sqlite3', '~> 1.4'
+  end
+else
+  gem 'rails'
+end
+
+gem 'selenium-webdriver'
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+gem 'loofah', RUBY_VERSION < '2.5' ? '< 2.21.0' : '>= 0'
+
+if RUBY_VERSION >= '3.3'
+  gem 'bigdecimal'
+  gem 'mutex_m'
+end
+
+gem 'benchmark' if RUBY_VERSION >= '3.5'

data/README.md

@@ -41,7 +41,7 @@ The stateful_enum gem extends AR::Enum definition to take a block with a similar
 Example:
 ```ruby
 class Bug < ApplicationRecord
-  enum status: {unassigned: 0, assigned: 1, resolved: 2, closed: 3} do
+  enum :status, {unassigned: 0, assigned: 1, resolved: 2, closed: 3} do
     event :assign do
       transition :unassigned => :assigned
     end
@@ -122,6 +122,29 @@ end
 
 You can define `before` and `after` event hooks inside of an `event` block.
 
+Event methods accept arguments (both positional and keyword arguments) that are passed through to the callbacks:
+
+```ruby
+class Bug < ApplicationRecord
+  enum :status, {unassigned: 0, assigned: 1, resolved: 2, closed: 3} do
+    event :close do
+      before do |closed_by:, reason: nil|
+        self.closed_by = closed_by
+        self.close_reason = reason
+      end
+
+      after do |closed_by:, **|
+        Notifier.notify "Bug##{id} was closed by #{closed_by.name}"
+      end
+
+      transition all - [:closed] => :closed
+    end
+  end
+end
+
+@bug.close(closed_by: current_user, reason: 'Duplicate')
+```
+
 ### Inspecting All Defined Events And Current Possible Events
 
 You can get the list of defined events from the model class:
@@ -175,9 +198,9 @@ You can specify relative or absolute output path via environment variable `DEST_
 * Better Error handling
 
 
-## Support Rails Versions
+## Supported Rails Versions
 
-* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, and 7.1 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, 7.1, 7.2, 8.0, 8.1, and 8.2 (edge)
 
 
 ## Contributing

data/lib/generators/stateful_enum/graph_generator.rb

@@ -39,7 +39,7 @@ module StatefulEnum
           @g.get_node(final) {|n| n['shape'] = 'doublecircle' }
         end
 
-        @g.output png: File.join((ENV['DEST_DIR'] || Dir.pwd), "#{model.name}.png")
+        @g.output png: File.join((ENV['DEST_DIR'] || Dir.pwd), "#{model.name}_#{column}.png")
       end
 
       def event(name, &block)

data/lib/stateful_enum/machine.rb

@@ -42,24 +42,23 @@ module StatefulEnum
           # def assign()
           detect_enum_conflict! column, value_method_name
 
-          # defining callbacks
-          define_callbacks value_method_name
-          before.each do |before_callback|
-            model.set_callback value_method_name, :before, before_callback
-          end
-          after.each do |after_callback|
-            model.set_callback value_method_name, :after, after_callback
-          end
-
-          define_method value_method_name do
+          define_method value_method_name do |*args, **kwargs|
             to, condition = transitions[send(column).to_sym]
             #TODO better error
             if to && (condition.nil? || instance_exec(&condition))
               #TODO transaction?
-              run_callbacks value_method_name do
-                original_method = self.class.send(:_enum_methods_module).instance_method "#{prefix}#{to}#{suffix}!"
-                original_method.bind(self).call
+              before.each do |before_callback|
+                instance_exec(*args, **kwargs, &before_callback)
               end
+
+              original_method = self.class.send(:_enum_methods_module).instance_method "#{prefix}#{to}#{suffix}!"
+              ret = original_method.bind(self).call
+
+              after.each do |after_callback|
+                instance_exec(*args, **kwargs, &after_callback)
+              end
+
+              ret
             else
               false
             end
@@ -67,8 +66,8 @@ module StatefulEnum
 
           # def assign!()
           detect_enum_conflict! column, "#{value_method_name}!"
-          define_method "#{value_method_name}!" do
-            send(value_method_name) || raise('Invalid transition')
+          define_method "#{value_method_name}!" do |*args, **kwargs|
+            send(value_method_name, *args, **kwargs) || raise('Invalid transition')
           end
 
           # def can_assign?()

data/lib/stateful_enum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StatefulEnum
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: stateful_enum
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,15 +108,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/Gemfile-rails.4.1.x
-- gemfiles/Gemfile-rails.4.2.x
-- gemfiles/Gemfile-rails.5.0.x
-- gemfiles/Gemfile-rails.5.1.x
-- gemfiles/Gemfile-rails.5.2.x
-- gemfiles/Gemfile-rails.6.0.x
-- gemfiles/Gemfile-rails.6.1.x
-- gemfiles/Gemfile-rails.7.0.x
-- gemfiles/Gemfile-rails.edge
 - lib/generators/stateful_enum/graph_generator.rb
 - lib/generators/stateful_enum/plantuml_generator.rb
 - lib/stateful_enum.rb
@@ -131,7 +121,6 @@ homepage: https://github.com/amatsuda/stateful_enum
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A state machine plugin on top of ActiveRecord::Enum
 test_files: []

data/gemfiles/Gemfile-rails.4.1.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 4.1.0'
-gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.4.2.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 4.2.0'
-gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.5.0.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 5.0.0'
-gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.5.1.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 5.1.0'
-gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.5.2.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', git: 'https://github.com/rails/rails/', branch: '5-2-stable'
-gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.6.0.x

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 6.0.0'
-gem 'sqlite3', '~> 1.4'

data/gemfiles/Gemfile-rails.6.1.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 6.1.0'
-gem 'sqlite3', '~> 1.4'
-gem 'selenium-webdriver'

data/gemfiles/Gemfile-rails.7.0.x

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'rails', '~> 7.0.0'
-gem 'sqlite3', '~> 1.4'
-gem 'selenium-webdriver'

data/gemfiles/Gemfile-rails.edge

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end
-
-gemspec path: '..'
-
-github 'rails/rails' do
-  gem 'rails'
-end
-gem 'sqlite3'
-gem 'selenium-webdriver'