stateful_enum 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c76765e33135bb963a09c10f7b35c0f64c623a4
-  data.tar.gz: 13c55c02af388232d71cfa9341f4d226b66c39fe
+SHA256:
+  metadata.gz: fdcc7c193f8597cec775968ecf6cfae38dfe09299d024b877b5da5fae7e5e5ca
+  data.tar.gz: 20558b138fd9df10e915e40ce6ff197b436a3fe4ce4717f935207dae21d7254e
 SHA512:
-  metadata.gz: c20bf58167c940d157fb73821d81a0e08daf080642b78f69181e7237a49408e1d819035d6618cae86b15acfb380f3aa3b37de12f10dc5cfd53e831ad0f63ac5c
-  data.tar.gz: 86d6d5a1e299d3721319b4dcb51f43031feb1cc0b44f5ec95f91dcf1fe2461d011e54897f8fa90aebef0d090c168424d86c46ed3453df4ec5d5ae93ac99893fe
+  metadata.gz: 1f89d7a82fc8264fbd93b3bd85bb320607409fa662f7726f5b79f04b65da88ee3f080ff39a9ba8d5a2a14c128a1b52fdbf7c773ac6f9cbad8df61cff7052a9e8
+  data.tar.gz: b2bb43940cffd1be568fff1903920f569585fc3e56a257b9f9d824427ec42de5b2aeaf675faeab48404794ea8179d671dc2a661b98f379e5a7f3f679d6900121

data/.travis.yml

@@ -5,17 +5,8 @@ sudo: false
 cache:
   - apt
   - bundler
-
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - ruby-head
-
-gemfile:
-  - gemfiles/Gemfile-rails.4.1.x
-  - gemfiles/Gemfile-rails.4.2.x
-  - gemfiles/Gemfile-rails.5.0.0
+before_install:
+  - gem i bundler -v '<2'
 
 addons:
   apt:
@@ -23,14 +14,31 @@ addons:
       - graphviz
 
 matrix:
-  exclude:
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile-rails.4.1.x
-    - rvm: 2.4.0
+  include:
+    - 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: ruby-head
+
+    - 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.4.2.x
+      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

data/README.md

@@ -105,6 +105,7 @@ There are a few important details to note regarding this feature:
 * The "from" states and the "to" states should both be given in Symbols.
 * The "from" state can be multiple states, in which case the key can be given as an Array of states, as shown in the usage example.
 * The "from" state can be `all` that means all defined states.
+* The "from" state can be an exception of Array of states, in this case the key can be a subtraction of `all` with the state to be excluded, as shown in the usage example.
 
 ### :if and :unless Condition
 
@@ -144,7 +145,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, and 5.1 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, and 6.0 (edge)
 
 
 ## Contributing

data/gemfiles/Gemfile-rails.4.1.x

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'stateful_enum', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 4.1.0'
-gem 'sqlite3'
-gem 'test-unit-rails'
-gem 'ruby-graphviz'
+gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.4.2.x

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'stateful_enum', path: '..'
+gemspec path: '..'
 
 gem 'rails', '~> 4.2.0'
-gem 'sqlite3'
-gem 'test-unit-rails'
-gem 'ruby-graphviz'
+gem 'sqlite3', '~> 1.3.6'

data/gemfiles/Gemfile-rails.5.0.x

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

data/gemfiles/Gemfile-rails.5.1.x

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

data/gemfiles/Gemfile-rails.5.2.x

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

data/gemfiles/Gemfile-rails.edge

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

data/lib/generators/stateful_enum/graph_generator.rb

@@ -7,7 +7,7 @@ module StatefulEnum
     class GraphGenerator < ::Rails::Generators::NamedBase
       desc 'Draws a state machine diagram as a PNG file'
       def draw
-        require 'graphviz'
+        require 'ruby-graphviz'
         StatefulEnum::Machine.prepend StatefulEnum::Graph
         class_name.constantize
       end
@@ -50,6 +50,7 @@ module StatefulEnum
     class EventDrawer < ::StatefulEnum::Machine::Event
       def initialize(g, states, prefix, suffix, name, &block)
         @g, @states, @prefix, @suffix, @name = g, states, prefix, suffix, name
+        @before, @after = [], []
 
         instance_eval(&block) if block
       end

data/lib/generators/stateful_enum/plantuml_generator.rb

@@ -46,7 +46,7 @@ module StatefulEnum
 
     class EventStore < ::StatefulEnum::Machine::Event
       def initialize(items, states, prefix, suffix, name, &block)
-        @items, @states, @prefix, @suffix, @name = items, states, prefix, suffix, name
+        @items, @states, @prefix, @suffix, @name, @before, @after = items, states, prefix, suffix, name, [], []
 
         instance_eval(&block) if block
       end

data/lib/stateful_enum/machine.rb

@@ -4,16 +4,12 @@ module StatefulEnum
   class Machine
     def initialize(model, column, states, prefix, suffix, &block)
       @model, @column, @states, @event_names = model, column, states, []
-      @prefix = if prefix == true
-                  "#{column}_"
-                elsif prefix
-                  "#{prefix}_"
-                end
-      @suffix = if suffix == true
-                  "_#{column}"
-                elsif suffix
-                  "_#{suffix}"
-                end
+      @prefix = if prefix
+        prefix == true ? "#{column}_" : "#{prefix}_"
+      end
+      @suffix = if suffix
+        suffix == true ? "_#{column}" : "_#{suffix}"
+      end
 
       # undef non-verb methods e.g. Model#active!
       states.each do |state|
@@ -31,7 +27,7 @@ module StatefulEnum
 
     class Event
       def initialize(model, column, states, prefix, suffix, name, &block)
-        @states, @name, @transitions, @before, @after = states, name, {}, nil, nil
+        @states, @name, @transitions, @before, @after = states, name, {}, [], []
 
         instance_eval(&block) if block
 
@@ -42,16 +38,25 @@ module StatefulEnum
         model.class_eval do
           # def assign()
           detect_enum_conflict! column, new_method_name
+
+          # defining callbacks
+          define_callbacks new_method_name
+          before.each do |before_callback|
+            model.set_callback new_method_name, :before, before_callback
+          end
+          after.each do |after_callback|
+            model.set_callback new_method_name, :after, after_callback
+          end
+
           define_method new_method_name do
             to, condition = transitions[send(column).to_sym]
             #TODO better error
             if to && (!condition || instance_exec(&condition))
               #TODO transaction?
-              instance_eval(&before) if before
-              original_method = self.class.send(:_enum_methods_module).instance_method "#{prefix}#{to}#{suffix}!"
-              ret = original_method.bind(self).call
-              instance_eval(&after) if after
-              ret
+              run_callbacks new_method_name do
+                original_method = self.class.send(:_enum_methods_module).instance_method "#{prefix}#{to}#{suffix}!"
+                original_method.bind(self).call
+              end
             else
               false
             end
@@ -66,7 +71,10 @@ module StatefulEnum
           # def can_assign?()
           detect_enum_conflict! column, "can_#{new_method_name}?"
           define_method "can_#{new_method_name}?" do
-            transitions.key? send(column).to_sym
+            state = send(column).to_sym
+            return false unless transitions.key? state
+            _to, condition = transitions[state]
+            !condition || instance_exec(&condition)
           end
 
           # def assign_transition()
@@ -100,11 +108,11 @@ module StatefulEnum
       end
 
       def before(&block)
-        @before = block
+        @before << block
       end
 
       def after(&block)
-        @after = block
+        @after << block
       end
     end
   end

data/lib/stateful_enum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stateful_enum
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2019-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,7 +111,10 @@ files:
 - bin/setup
 - gemfiles/Gemfile-rails.4.1.x
 - gemfiles/Gemfile-rails.4.2.x
-- gemfiles/Gemfile-rails.5.0.0
+- gemfiles/Gemfile-rails.5.0.x
+- gemfiles/Gemfile-rails.5.1.x
+- gemfiles/Gemfile-rails.5.2.x
+- gemfiles/Gemfile-rails.edge
 - lib/generators/stateful_enum/graph_generator.rb
 - lib/generators/stateful_enum/plantuml_generator.rb
 - lib/stateful_enum.rb
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A state machine plugin on top of ActiveRecord::Enum

data/gemfiles/Gemfile-rails.5.0.0

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'stateful_enum', path: '..'
-
-gem 'rails', '~> 5.0.0'
-gem 'sqlite3'
-gem 'test-unit-rails'
-gem 'ruby-graphviz'