workflow 1.0.0 → 1.1.0

data/test/main_test.rb

@@ -14,7 +14,7 @@ class Order < ActiveRecord::Base
   include Workflow
   workflow do
     state :submitted do
-      event :accept, :transitions_to => :accepted, :meta => {:doc_weight => 8} do |reviewer, args|
+      event :accept, :transitions_to => :accepted, :meta => {:weight => 8} do |reviewer, args|
       end
     end
     state :accepted do
@@ -31,7 +31,7 @@ class LegacyOrder < ActiveRecord::Base
 
   workflow do
     state :submitted do
-      event :accept, :transitions_to => :accepted, :meta => {:doc_weight => 8} do |reviewer, args|
+      event :accept, :transitions_to => :accepted, :meta => {:weight => 8} do |reviewer, args|
       end
     end
     state :accepted do
@@ -438,8 +438,9 @@ class MainTest < ActiveRecordTestCase
   test 'diagram generation' do
     begin
       $stdout = StringIO.new('', 'w')
-      Workflow::create_workflow_diagram(Order, '/tmp')
-      assert_match(/open.+\.pdf/, $stdout.string,
+      require 'workflow/draw'
+      Workflow::Draw::workflow_diagram(Order, :path => '/tmp')
+      assert_match(/run the following/, $stdout.string,
         'PDF should be generate and a hint be given to the user.')
     ensure
       $stdout = STDOUT
@@ -519,7 +520,7 @@ class MainTest < ActiveRecordTestCase
   test 'workflow graph generation' do
     Dir.chdir('/tmp') do
       capture_streams do
-        Workflow::create_workflow_diagram(Order, '/tmp')
+        Workflow::Draw::workflow_diagram(Order, :path => '/tmp')
       end
     end
   end
@@ -527,7 +528,7 @@ class MainTest < ActiveRecordTestCase
   test 'workflow graph generation in a path with spaces' do
     `mkdir -p '/tmp/Workflow test'`
     capture_streams do
-      Workflow::create_workflow_diagram(Order,  '/tmp/Workflow test')
+      Workflow::Draw::workflow_diagram(Order, :path => '/tmp/Workflow test')
     end
   end
 

data/test/new_versions/compare_states_test.rb

@@ -5,7 +5,7 @@ class ComparableStatesOrder
   include Workflow
   workflow do
     state :submitted do
-      event :accept, :transitions_to => :accepted, :meta => {:doc_weight => 8} do |reviewer, args|
+      event :accept, :transitions_to => :accepted, :meta => {:weight => 8} do |reviewer, args|
       end
     end
     state :accepted do
@@ -21,6 +21,7 @@ class CompareStatesTest < Test::Unit::TestCase
     o = ComparableStatesOrder.new
     o.accept!
     assert_equal :accepted, o.current_state.name
+    assert o.current_state == :accepted
     assert o.current_state < :shipped
     assert o.current_state > :submitted
     assert_raise ArgumentError do

data/workflow.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'ruby-graphviz', ['>= 1.0']
 end
 

metadata

@@ -1,88 +1,122 @@
 --- !ruby/object:Gem::Specification
 name: workflow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Vladimir Dobriakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7744380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *7744380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7771320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7771320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &7767500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7767500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &7789480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7789480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &7788080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7788080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7784180 !ruby/object:Gem::Requirement
-    none: false
+  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'
+- !ruby/object:Gem::Dependency
+  name: ruby-graphviz
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *7784180
-description: ! "    Workflow is a finite-state-machine-inspired API for modeling and
-  interacting\n    with what we tend to refer to as 'workflow'.\n\n    * nice DSL
-  to describe your states, events and transitions\n    * robust integration with ActiveRecord
-  and non relational data stores\n    * various hooks for single transitions, entering
-  state etc.\n    * convenient access to the workflow specification: list states,
-  possible events\n      for particular state\n"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: |2
+      Workflow is a finite-state-machine-inspired API for modeling and interacting
+      with what we tend to refer to as 'workflow'.
+
+      * nice DSL to describe your states, events and transitions
+      * robust integration with ActiveRecord and non relational data stores
+      * various hooks for single transitions, entering state etc.
+      * convenient access to the workflow specification: list states, possible events
+        for particular state
 email:
 - vladimir@geekq.net
 executables: []
@@ -97,13 +131,25 @@ files:
 - README.markdown
 - Rakefile
 - gemfiles/Gemfile.rails-2.3.x
+- gemfiles/Gemfile.rails-3.x
+- gemfiles/Gemfile.rails-edge
 - lib/workflow.rb
+- lib/workflow/adapters/active_record.rb
+- lib/workflow/adapters/remodel.rb
+- lib/workflow/draw.rb
+- lib/workflow/errors.rb
+- lib/workflow/event.rb
+- lib/workflow/specification.rb
+- lib/workflow/state.rb
 - lib/workflow/version.rb
+- orders_workflow.png
+- test/active_record_scopes_test.rb
 - test/advanced_examples_test.rb
 - test/advanced_hooks_and_validation_test.rb
 - test/attr_protected_test.rb
 - test/before_transition_test.rb
 - test/couchtiny_example.rb
+- test/inheritance_test.rb
 - test/main_test.rb
 - test/multiple_workflows_test.rb
 - test/new_versions/compare_states_test.rb
@@ -113,43 +159,37 @@ files:
 - test/test_helper.rb
 - test/without_active_record_test.rb
 - workflow.gemspec
-- workflow.rb
 homepage: http://www.geekq.net/workflow/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 666989584691565007
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 666989584691565007
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A replacement for acts_as_state_machine.
 test_files:
+- test/active_record_scopes_test.rb
 - test/advanced_examples_test.rb
 - test/advanced_hooks_and_validation_test.rb
 - test/attr_protected_test.rb
 - test/before_transition_test.rb
 - test/couchtiny_example.rb
+- test/inheritance_test.rb
 - test/main_test.rb
 - test/multiple_workflows_test.rb
 - test/new_versions/compare_states_test.rb

data/workflow.rb

@@ -1 +0,0 @@
-Dir["#{File.dirname(__FILE__)}/lib/*.rb"].each { |rb| require rb }