stateful_enum 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d0d82f2cf13496a059030aac0a34a998e47997bcbf6605637fa488c5363454d
-  data.tar.gz: 69fc206ccfc3d4290ad0961cac0d011e92ed1fa5421c0064bd881213d52082d5
+  metadata.gz: 78d2de46a67e071c7ec7d4b0147d6a52768af7fef8ba81a7454c1f129dcd6b0d
+  data.tar.gz: 38ddee71fcc5406f6fa8ac93ae582230277173527a5ab32fc8e36a7f9aa15f10
 SHA512:
-  metadata.gz: e3f5cec3415b7401c36acf28d5dda810d75818cc88b38a768e721757aaf508714ee0613b7926bb0b5e05832df83e6d7deadc3cc0b816eb3e7ab9a6286f6b1399
-  data.tar.gz: 6a8d8196552d59c696c42872ae3a9decb62ddef4e75b42566af8e45cd2d3887e3fe6688808ac230f3d35ba7501f4e06328a4fad93462d3e8aee4fca985da4720
+  metadata.gz: f5a4a52fc2a136374e3337d789cf0572296aa79f3724540d166654cffbf9d5c3529dde5b5e4241c0716d0d8a7ba726381e064b1e0996f5c5548813d444c2d926
+  data.tar.gz: fcd0c04464d71a140c2d7571b6e9732556d4d23b5aa2d52727402220438abd7d1bb266b4f7cd11a8692d1c6a90970a60c89a5a0e23b9cb4fdd0dc85405f73c1d

data/.github/workflows/main.yml

@@ -0,0 +1,76 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        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'
+
+          - ruby_version: '3.0'
+            gemfile: gemfiles/Gemfile-rails.7.0.x
+          - ruby_version: '2.7'
+            gemfile: gemfiles/Gemfile-rails.7.0.x
+
+          - 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
+
+          - ruby_version: '2.7'
+            gemfile: gemfiles/Gemfile-rails.6.0.x
+
+          - 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
+
+          - ruby_version: '2.6'
+            gemfile: gemfiles/Gemfile-rails.5.1.x
+
+          - ruby_version: '2.6'
+            gemfile: gemfiles/Gemfile-rails.5.0.x
+
+          - ruby_version: '2.5'
+            gemfile: gemfiles/Gemfile-rails.4.2.x
+            bundler_version: '1'
+
+          - ruby_version: '2.3'
+            gemfile: gemfiles/Gemfile-rails.4.1.x
+            bundler_version: '1'
+
+
+    runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "${{ matrix.ruby_version }}"
+          bundler: "${{ matrix.bundler_version }}"
+          bundler-cache: true
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - run: sudo apt-get install graphviz
+
+      - run: bundle exec rake
+        continue-on-error: ${{ matrix.allow_failures == 'true' }}

data/README.md

@@ -1,4 +1,4 @@
-# StatefulEnum [![Build Status](https://travis-ci.org/amatsuda/stateful_enum.svg?branch=master)](https://travis-ci.org/amatsuda/stateful_enum)
+# StatefulEnum [![Build Status](https://github.com/amatsuda/stateful_enum/actions/workflows/main.yml/badge.svg)](https://github.com/amatsuda/stateful_enum/actions)
 
 stateful_enum is a state machine gem built on top of ActiveRecord's built-in ActiveRecord::Enum.
 
@@ -177,7 +177,7 @@ You can specify relative or absolute output path via environment variable `DEST_
 
 ## Support Rails Versions
 
-* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, and 6.0 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, and 7.1 (edge)
 
 
 ## Contributing

data/Rakefile

@@ -13,11 +13,3 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
-
-namespace :test do
-  task :all do
-    YAML.load(File.read(File.expand_path('.travis.yml')))['gemfile'].each do |gemfile|
-      sh "BUNDLE_GEMFILE='#{gemfile}' bundle exec rake test"
-    end
-  end
-end

data/gemfiles/Gemfile-rails.5.2.x

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

data/gemfiles/Gemfile-rails.6.0.x

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0.0.rc1'
-gem 'selenium-webdriver'
+gem 'rails', '~> 6.0.0'
+gem 'sqlite3', '~> 1.4'

data/gemfiles/Gemfile-rails.6.1.x

@@ -0,0 +1,7 @@
+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

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

data/lib/stateful_enum/active_record_extension.rb

@@ -9,13 +9,31 @@ module StatefulEnum
     #       transition :unassigned => :assigned
     #     end
     #   end
-    def enum(definitions, &block)
-      prefix, suffix = definitions[:_prefix], definitions[:_suffix] if Rails::VERSION::MAJOR >= 5
-      enum = super definitions
+    if Rails::VERSION::MAJOR >= 7
+      def enum(name = nil, values = nil, **options, &block)
+        return super unless block
 
-      if block
-        definitions.each_key do |column|
-          states = enum[column]
+        definitions = super name, values, **options
+
+        if name
+          (@_defined_stateful_enums ||= []) << StatefulEnum::Machine.new(self, name, (definitions.is_a?(Hash) ? definitions.keys : definitions), options[:prefix], options[:suffix], &block)
+        else
+          definitions.each do |column, states|
+            (@_defined_stateful_enums ||= []) << StatefulEnum::Machine.new(self, column, (states.is_a?(Hash) ? states.keys : states), options[:_prefix], options[:_suffix], &block)
+          end
+        end
+
+        definitions
+      end
+    else
+      def enum(definitions, &block)
+        return super unless block
+
+        # Preserving prefix and suffix values before calling super because the super destroys the given Hash
+        prefix, suffix = definitions[:_prefix], definitions[:_suffix] if Rails::VERSION::MAJOR >= 5
+        enum_values = super definitions
+
+        enum_values.each_pair do |column, states|
           (@_defined_stateful_enums ||= []) << StatefulEnum::Machine.new(self, column, (states.is_a?(Hash) ? states.keys : states), prefix, suffix, &block)
         end
       end

data/lib/stateful_enum/machine.rb

@@ -5,7 +5,7 @@ module StatefulEnum
     attr_reader :events
 
     def initialize(model, column, states, prefix, suffix, &block)
-      @model, @column, @states, @events = model, column, states, []
+      @model, @column, @states, @events = model, column, states.map(&:to_sym), []
       @prefix = if prefix
         prefix == true ? "#{column}_" : "#{prefix}_"
       end
@@ -27,7 +27,7 @@ module StatefulEnum
     end
 
     class Event
-      attr_reader :name, :value_method_name
+      attr_reader :name, :value_method_name, :transitions
 
       def initialize(model, column, states, prefix, suffix, name, &block)
         @states, @name, @transitions, @before, @after = states, name, {}, [], []
@@ -54,7 +54,7 @@ module StatefulEnum
           define_method value_method_name do
             to, condition = transitions[send(column).to_sym]
             #TODO better error
-            if to && (!condition || instance_exec(&condition))
+            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}!"
@@ -77,7 +77,7 @@ module StatefulEnum
             state = send(column).to_sym
             return false unless transitions.key? state
             _to, condition = transitions[state]
-            !condition || instance_exec(&condition)
+            condition.nil? || instance_exec(&condition)
           end
 
           # def assign_transition()

data/lib/stateful_enum/state_inspection.rb

@@ -37,7 +37,7 @@ module StatefulEnum
       @defined_stateful_enums.flat_map do |stateful_enum|
         col = stateful_enum.instance_variable_get :@column
         pe = stateful_enum.events.select {|e| @model_instance.send("can_#{e.value_method_name}?") }
-        pe.flat_map {|e| e.instance_variable_get(:@transitions)[@model_instance.send(col).to_sym].first }
+        pe.flat_map {|e| e.transitions[@model_instance.send(col).to_sym].first }
       end
     end
   end

data/lib/stateful_enum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stateful_enum
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -115,6 +115,8 @@ files:
 - 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
@@ -129,7 +131,7 @@ homepage: https://github.com/amatsuda/stateful_enum
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A state machine plugin on top of ActiveRecord::Enum
 test_files: []

data/.travis.yml

@@ -1,47 +0,0 @@
-language: ruby
-
-sudo: false
-
-cache:
-  - apt
-  - bundler
-before_install:
-  - gem i bundler -v '<2'
-
-addons:
-  apt:
-    packages:
-      - graphviz
-
-matrix:
-  include:
-    - rvm: 2.6.0
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-
-    - rvm: 2.6.0
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.6.0
-      gemfile: gemfiles/Gemfile-rails.5.1.x
-    - rvm: 2.6.0
-      gemfile: gemfiles/Gemfile-rails.5.0.x
-
-    - rvm: 2.5.3
-      gemfile: gemfiles/Gemfile-rails.4.2.x
-
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-
-    - rvm: 2.4.5
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-
-    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile-rails.5.2.x
-
-    - rvm: 2.6.0
-      gemfile: gemfiles/Gemfile-rails.edge
-
-  allow_failures:
-    - rvm: ruby-head
-    - gemfile: gemfiles/Gemfile-rails.edge