stateful_enum 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1388d189d8fe2a3c7f30a3b765526823295ef8a
-  data.tar.gz: c672208f53cdd2b07ec8c7e3d03f9c284e915d62
+  metadata.gz: c1f17ddca9a9a86a18e5a6dcfcc448a0511e7f63
+  data.tar.gz: c3fda258904629bd7be634a2cb8986c4c97f4d86
 SHA512:
-  metadata.gz: 6110d07106f0590e8651bc0c1b91f5e7e72d1ba30063ddb67a2a151405cc2b3c9aaa08153516b8115fbc7e82e59a20a140cb3a112307295246a08aea43f1238f
-  data.tar.gz: af06537cecafe02ce03d1744f202ece3d3039be662f5d7a726277350d64e51ca41b5d907b13c01da43b3d52e2fc71eba91b02420b6eaf7d16544f1d00b08fdfe
+  metadata.gz: bf2a2a383dcbc193fb4c2ff91b09c85d21ba39c7e13c60abdf1e8ada96b2adb76d180dd125581315b50ece0459272a38e59df0ecad05c489c485e56acf511366
+  data.tar.gz: dc97471c1c8455531706b98e89c69e6158abe215ba631694ab2dfd4216f70697e593adbbe1316f486e3b126c2370da6d9f167825eb47d06910856d9052a5aabe

data/.travis.yml

@@ -1,21 +1,32 @@
 language: ruby
 
+sudo: false
+
 cache:
+  - apt
   - bundler
 
 rvm:
-  - 2.2.4
-  - 2.3.0
+  - 2.2.5
+  - 2.3.1
   - ruby-head
 
+matrix:
+  exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/Gemfile-rails.4.1.x
+    - rvm: ruby-head
+      gemfile: gemfiles/Gemfile-rails.4.2.x
+
 gemfile:
   - gemfiles/Gemfile-rails.4.1.x
   - gemfiles/Gemfile-rails.4.2.x
-  - gemfiles/Gemfile-rails.5.0.0.beta3
+  - gemfiles/Gemfile-rails.5.0.0
 
-before_install:
- - sudo apt-get install graphviz
- - gem install bundler -v 1.11.2
+addons:
+  apt:
+    packages:
+      - graphviz
 
 matrix:
   allow_failures:

data/README.md

@@ -131,11 +131,22 @@ Note that you need to bundle the ruby-graphviz gem (and its dependencies) for th
 % rails g stateful_enum:graph bug
 ```
 
+You can specify relative or absolute output path via environment variable `DEST_DIR`.
+
+```bash
+% DEST_DIR=doc rails g stateful_enum:graph bug
+```
+
 ## TODO
 
 * Better Error handling
 
 
+## Support Rails Versions
+
+* Rails 4.1.x, 4.2.x, 5.0, and 5.1 (edge)
+
+
 ## Contributing
 
 Pull requests are welcome on GitHub at https://github.com/amatsuda/stateful_enum.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require 'yaml'
@@ -6,6 +8,8 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
+  t.warning = true
+  t.verbose = true
 end
 
 task default: :test

data/gemfiles/Gemfile-rails.4.1.x

@@ -4,5 +4,5 @@ gem 'stateful_enum', path: '..'
 
 gem 'rails', '~> 4.1.0'
 gem 'sqlite3'
-gem 'minitest', '~> 5.0'
+gem 'test-unit-rails'
 gem 'ruby-graphviz'

data/gemfiles/Gemfile-rails.4.2.x

@@ -4,5 +4,5 @@ gem 'stateful_enum', path: '..'
 
 gem 'rails', '~> 4.2.0'
 gem 'sqlite3'
-gem 'minitest', '~> 5.0'
+gem 'test-unit-rails'
 gem 'ruby-graphviz'

data/gemfiles/{Gemfile-rails.5.0.0.beta3 → Gemfile-rails.5.0.0}

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'stateful_enum', path: '..'
 
-gem 'rails', '~> 5.0.0.beta3'
+gem 'rails', '~> 5.0.0'
 gem 'sqlite3'
-gem 'minitest', '~> 5.0'
+gem 'test-unit-rails'
 gem 'ruby-graphviz'

data/lib/generators/stateful_enum/graph_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators/named_base'
 
 module StatefulEnum
@@ -13,28 +15,31 @@ module StatefulEnum
   end
 
   module Graph
-    def initialize(model, _column, states, prefix, suffix, &block)
+    def initialize(model, column, states, prefix, suffix, &block)
       super
-      GraphDrawer.new model, states, @prefix, @suffix, &block if block
+      GraphDrawer.new model, column, states, @prefix, @suffix, &block
     end
 
     class GraphDrawer
-      def initialize(model, states, prefix, suffix, &block)
+      def initialize(model, column, states, prefix, suffix, &block)
         @states, @prefix, @suffix = states, prefix, suffix
         @g = ::GraphViz.new 'G', rankdir: 'TB'
 
         states.each do |state|
           @g.add_node state.to_s, label: state.to_s, width: '1', height: '1', shape: 'ellipse'
         end
-        @g.add_edge @g.add_node('start state', shape: 'point'), @g.get_node_at_index(0)
+        if (default_value = model.columns_hash[column.to_s].default)
+          default_label = model.defined_enums[column.to_s].key default_value.to_i  # SQLite returns the default value in String
+          @g.add_edge @g.add_node('start state', shape: 'point'), @g.get_node(default_label)
+        end
 
         instance_eval(&block)
 
-        (@g.each_edge.map {|e| e.node_two }.uniq - @g.each_edge.map {|e| e.node_one }.uniq).each do |final|
+        (@g.each_edge.map(&:node_two).uniq - @g.each_edge.map(&:node_one).uniq).each do |final|
           @g.get_node(final) {|n| n['shape'] = 'doublecircle' }
         end
 
-        @g.output png: "#{model.name}.png"
+        @g.output png: File.join((ENV['DEST_DIR'] || Dir.pwd), "#{model.name}.png")
       end
 
       def event(name, &block)

data/lib/stateful_enum.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'stateful_enum/version'
 require 'stateful_enum/railtie'

data/lib/stateful_enum/active_record_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stateful_enum/machine'
 
 module StatefulEnum

data/lib/stateful_enum/machine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StatefulEnum
   class Machine
     def initialize(model, column, states, prefix, suffix, &block)
@@ -41,7 +43,7 @@ module StatefulEnum
           # def assign()
           detect_enum_conflict! column, new_method_name
           define_method new_method_name do
-            to, condition = transitions[self.send(column).to_sym]
+            to, condition = transitions[send(column).to_sym]
             #TODO better error
             if to && (!condition || instance_exec(&condition))
               #TODO transaction?
@@ -64,13 +66,13 @@ module StatefulEnum
           # def can_assign?()
           detect_enum_conflict! column, "can_#{new_method_name}?"
           define_method "can_#{new_method_name}?" do
-            transitions.has_key? self.send(column).to_sym
+            transitions.key? send(column).to_sym
           end
 
           # def assign_transition()
           detect_enum_conflict! column, "#{new_method_name}_transition"
           define_method "#{new_method_name}_transition" do
-            transitions[self.send(column).to_sym].try! :first
+            transitions[send(column).to_sym].try! :first
           end
         end
       end

data/lib/stateful_enum/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stateful_enum/active_record_extension'
 
 module StatefulEnum

data/lib/stateful_enum/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module StatefulEnum
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/stateful_enum.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit-rails'
   spec.add_development_dependency 'rails'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'ruby-graphviz'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: stateful_enum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-graphviz
+  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'
 description: A state machine plugin on top of ActiveRecord::Enum
 email:
 - ronnie@dio.jp
@@ -97,7 +111,7 @@ files:
 - bin/setup
 - gemfiles/Gemfile-rails.4.1.x
 - gemfiles/Gemfile-rails.4.2.x
-- gemfiles/Gemfile-rails.5.0.0.beta3
+- gemfiles/Gemfile-rails.5.0.0
 - lib/generators/stateful_enum/graph_generator.rb
 - lib/stateful_enum.rb
 - lib/stateful_enum/active_record_extension.rb
@@ -125,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A state machine plugin on top of ActiveRecord::Enum