make graphviz/active_support optional in case you dont want nice graphs

README.markdown

@@ -63,10 +63,10 @@ Let's create an article instance and check in which state it is:
 You can also access the whole `current_state` object including the list
 of possible events and other meta information:
 
-    article.current_state 
+    article.current_state
     => #<Workflow::State:0x7f1e3d6731f0 @events={
-      :submit=>#<Workflow::Event:0x7f1e3d6730d8 @action=nil, 
-        @transitions_to=:awaiting_review, @name=:submit, @meta={}>}, 
+      :submit=>#<Workflow::Event:0x7f1e3d6730d8 @action=nil,
+        @transitions_to=:awaiting_review, @name=:submit, @meta={}>},
       name:new, meta{}
 
 On Ruby 1.9 and above, you can check whether a state comes before or
@@ -86,7 +86,7 @@ Now we can call the submit event, which transitions to the
 
     article.submit!
     article.awaiting_review? # => true
-  
+
 Events are actually instance methods on a workflow, and depending on the
 state you're in, you'll have a different set of events used to
 transition to other states.
@@ -101,18 +101,17 @@ Installation
 
     gem install workflow
 
-Alternatively you can just download the lib/workflow.rb and put it in
-the lib folder of your Rails or Ruby application.
-
+**Important**: If you're interested in graphing your workflow state machine, you will also need to
+install the `active_support` and `ruby-graphviz` gems.
 
 Ruby 1.9
 --------
 
 Workflow gem does not work with some (but very widespread) Ruby 1.9
-builds due to a known bug in Ruby 1.9. Either 
+builds due to a known bug in Ruby 1.9. Either
 
 * use newer ruby build, 1.9.2-p136 and -p180 tested to work
-* or compile your Ruby 1.9 from source 
+* or compile your Ruby 1.9 from source
 * or [comment out some lines in workflow](http://github.com/geekq/workflow/issues#issue/6)
 (reduces functionality).
 
@@ -175,7 +174,7 @@ invoked for particular transitions leads to a bumpy and poorly readable code
 due to a deep nesting. We tried (and dismissed) lambdas for this. Eventually
 we decided to invoke an optional user defined callback method with the same
 name as the event (convention over configuration) as explained before.
-      
+
 
 Integration with ActiveRecord
 -----------------------------
@@ -212,7 +211,7 @@ custom persistence column easily, e.g. for a legacy database schema:
 
     class LegacyOrder < ActiveRecord::Base
       include Workflow
-      
+
       workflow_column :foo_bar # use this legacy database column for
                                # persistence
     end
@@ -234,8 +233,8 @@ need to override `load_workflow_state` and
 `persist_workflow_state(new_value)` methods. Next section contains an example for
 using CouchDB, a document oriented database.
 
-[Tim Lossen](http://tim.lossen.de/) implemented support 
-for [remodel](http://github.com/tlossen/remodel) / [redis](http://github.com/antirez/redis) 
+[Tim Lossen](http://tim.lossen.de/) implemented support
+for [remodel](http://github.com/tlossen/remodel) / [redis](http://github.com/antirez/redis)
 key-value store.
 
 Integration with CouchDB
@@ -268,7 +267,7 @@ couchrest library.
       end
     end
 
-Please also have a look at 
+Please also have a look at
 [the full source code](http://github.com/geekq/workflow/blob/master/test/couchtiny_example.rb).
 
 Integration with Mongoid
@@ -310,7 +309,7 @@ state and every event:
 
 The workflow library itself uses this feature to tweak the graphical
 representation of the workflow. See below.
- 
+
 
 Advanced transition hooks
 -------------------------
@@ -346,7 +345,7 @@ example][advanced_hooks_and_validation_test].
 
 ### on_error
 
-If you want to do custom exception handling internal to workflow, you can define an `on_error` hook in your workflow.  
+If you want to do custom exception handling internal to workflow, you can define an `on_error` hook in your workflow.
 For example:
 
     workflow do
@@ -356,12 +355,12 @@ For example:
       state :second
 
       on_error do |error, from, to, event, *args|
-        Log.info "Exception(#error.class) on #{from} -> #{to}" 
+        Log.info "Exception(#error.class) on #{from} -> #{to}"
       end
     end
 
-If forward! results in an exception, `on_error` is invoked and the workflow stays in a 'first' state.  This capability 
-is particularly useful if your errors are transient and you want to queue up a job to retry in the future without 
+If forward! results in an exception, `on_error` is invoked and the workflow stays in a 'first' state.  This capability
+is particularly useful if your errors are transient and you want to queue up a job to retry in the future without
 affecting the existing workflow state.
 
 ### Guards
@@ -400,7 +399,7 @@ Multiple Workflows
 ------------------
 
 I am frequently asked if it's possible to represent multiple "workflows"
-in an ActiveRecord class. 
+in an ActiveRecord class.
 
 The solution depends on your business logic and how you want to
 structure your implementation.
@@ -472,7 +471,7 @@ Earlier versions
 The `workflow` library was originally written by Ryan Allen.
 
 The version 0.3 was almost completely (including ActiveRecord
-integration, API for accessing workflow specification, 
+integration, API for accessing workflow specification,
 method_missing free implementation) rewritten by Vladimir Dobriakov
 keeping the original workflow DSL spirit.
 
@@ -568,7 +567,7 @@ Intermixing of transition graph definition (states, transitions)
 on the one side and implementation of the actions on the other side
 for a bigger state machine can introduce clutter.
 
-To reduce this clutter it is now possible to use state entry- and 
+To reduce this clutter it is now possible to use state entry- and
 exit- hooks defined through a naming convention. For example, if there
 is a state :pending, then instead of using a
 block:
@@ -579,7 +578,7 @@ block:
       end
     end
 
-you can hook in by defining method 
+you can hook in by defining method
 
     def on_pending_exit(new_state, event, *args)
       # your implementation here
@@ -590,7 +589,7 @@ like `def on_pending_exit(*args)` if your are not interested in
 arguments.  Please note: `def on_pending_exit()` with an empty list
 would not work.
 
-If both a function with a name according to naming convention and the 
+If both a function with a name according to naming convention and the
 on_entry/on_exit block are given, then only on_entry/on_exit block is used.
 
 

Rakefile

@@ -1,17 +1,11 @@
 require 'rubygems'
-require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'rdoc/task'
 
-task :default => [:test]
+require 'bundler'
+Bundler.setup
 
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+task :default => [:test]
 
 require 'rake'
 Rake::TestTask.new do |t|

lib/workflow/draw.rb

@@ -1,4 +1,14 @@
-require 'active_support/inflector'
+begin
+  require 'rubygems'
+
+  gem 'ruby-graphviz', '>=1.0'
+  gem 'activesupport'
+
+  require 'graphviz'
+  require 'active_support/inflector'
+rescue LoadError => e
+  $stderr.puts "Could not load the ruby-graphiz or active_support gems for rendering: #{e.message}"
+end
 
 module Workflow
   module Draw
@@ -37,40 +47,32 @@ def self.workflow_diagram(klass, options={})
         :ratio => "fill",
         :format => 'png',
         :font => 'Helvetica'
-      }.merge options
-
-      begin
-        require 'rubygems'
-        require 'graphviz'
+        }.merge options
 
-        graph = GraphViz.new('G', :rankdir => options[:orientation] == 'landscape' ? 'LR' : 'TB', :ratio => options[:ratio])
+        graph = ::GraphViz.new('G', :rankdir => options[:orientation] == 'landscape' ? 'LR' : 'TB', :ratio => options[:ratio])
 
-        # Add nodes
-        klass.workflow_spec.states.each do |_, state|
-          node = state.draw(graph)
-          node.fontname = options[:font]
+      # Add nodes
+      klass.workflow_spec.states.each do |_, state|
+        node = state.draw(graph)
+        node.fontname = options[:font]
 
-          state.events.each do |_, event|
-            edge = event.draw(graph, state)
-            edge.fontname = options[:font]
-          end
+        state.events.each do |_, event|
+          edge = event.draw(graph, state)
+          edge.fontname = options[:font]
         end
+      end
 
-        # Generate the graph
-        filename = File.join(options[:path], "#{options[:name]}.#{options[:format]}")
+      # Generate the graph
+      filename = File.join(options[:path], "#{options[:name]}.#{options[:format]}")
 
-        graph.output options[:format] => "'#{filename}'"
+      graph.output options[:format] => "'#{filename}'"
 
-    puts "
-Please run the following to open the generated file:
+      puts "
+      Please run the following to open the generated file:
 
-open '#{filename}'
-"
-        graph
-      rescue LoadError => e
-        $stderr.puts "Could not load the ruby-graphiz gem for rendering: #{e.message}"
-        false
-      end
+      open '#{filename}'
+      "
+      graph
     end
   end
-end
+end

test/new_versions/compare_states_test.rb

@@ -24,7 +24,6 @@ class CompareStatesTest < Test::Unit::TestCase
     assert o.current_state == :accepted
     assert o.current_state < :shipped
     assert o.current_state > :submitted
-    assert o.current_state.between? :submitted, :shipped
     assert_raise ArgumentError do
       o.current_state > :unknown
     end

workflow.gemspec

@@ -21,14 +21,12 @@ Gem::Specification.new do |gem|
     "README.markdown"
   ]
 
-  gem.add_dependency 'activesupport', [">= 3.2"]
-  gem.add_dependency 'ruby-graphviz'
-
   gem.add_development_dependency 'rdoc',    [">= 3.12"]
   gem.add_development_dependency 'bundler', [">= 1.0.0"]
   gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'ruby-graphviz', ['>= 1.0']
 end