state_machine 1.1.2 → 1.2.0

data/gemfiles/sequel-3.14.0.gemfile

@@ -2,7 +2,8 @@
 
 source "http://www.rubygems.org"
 
-gem "sqlite3-ruby", "1.3.1"
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
 gem "sequel", "3.14.0"
 
 gemspec :path=>"../"

data/gemfiles/sequel-3.14.0.gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
   specs:
-    state_machine (1.1.2)
+    state_machine (1.2.0)
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
     sequel (3.14.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sqlite3-ruby (1.3.1)
 
 PLATFORMS
@@ -21,8 +25,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
   rake
-  rcov
   sequel (= 3.14.0)
+  simplecov
   sqlite3-ruby (= 1.3.1)
   state_machine!

data/gemfiles/sequel-3.23.0.gemfile

@@ -2,7 +2,8 @@
 
 source "http://www.rubygems.org"
 
-gem "sqlite3-ruby", "1.3.1"
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
 gem "sequel", "3.23.0"
 
 gemspec :path=>"../"

data/gemfiles/sequel-3.23.0.gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
   specs:
-    state_machine (1.1.2)
+    state_machine (1.2.0)
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
     sequel (3.23.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sqlite3-ruby (1.3.1)
 
 PLATFORMS
@@ -21,8 +25,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
   rake
-  rcov
   sequel (= 3.23.0)
+  simplecov
   sqlite3-ruby (= 1.3.1)
   state_machine!

data/gemfiles/sequel-3.24.0.gemfile

@@ -2,7 +2,8 @@
 
 source "http://www.rubygems.org"
 
-gem "sqlite3-ruby", "1.3.1"
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
 gem "sequel", "3.24.0"
 
 gemspec :path=>"../"

data/gemfiles/sequel-3.24.0.gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
   specs:
-    state_machine (1.1.2)
+    state_machine (1.2.0)
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
     sequel (3.24.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sqlite3-ruby (1.3.1)
 
 PLATFORMS
@@ -21,8 +25,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
   rake
-  rcov
   sequel (= 3.24.0)
+  simplecov
   sqlite3-ruby (= 1.3.1)
   state_machine!

data/gemfiles/sequel-3.29.0.gemfile

@@ -2,7 +2,8 @@
 
 source "http://www.rubygems.org"
 
-gem "sqlite3-ruby", "1.3.1"
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
 gem "sequel", "3.29.0"
 
 gemspec :path=>"../"

data/gemfiles/sequel-3.29.0.gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
   specs:
-    state_machine (1.1.2)
+    state_machine (1.2.0)
 
 GEM
   remote: http://www.rubygems.org/
   specs:
-    appraisal (0.4.0)
+    appraisal (0.4.1)
       bundler
       rake
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
     sequel (3.29.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sqlite3-ruby (1.3.1)
 
 PLATFORMS
@@ -21,8 +25,9 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
   rake
-  rcov
   sequel (= 3.29.0)
+  simplecov
   sqlite3-ruby (= 1.3.1)
   state_machine!

data/gemfiles/sequel-3.34.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
+gem "sequel", "3.34.0"
+
+gemspec :path=>"../"

data/gemfiles/sequel-3.34.0.gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+  specs:
+    state_machine (1.2.0)
+
+GEM
+  remote: http://www.rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    sequel (3.34.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
+  rake
+  sequel (= 3.34.0)
+  simplecov
+  sqlite3-ruby (= 1.3.1)
+  state_machine!

data/gemfiles/sequel-3.35.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
+gem "sequel", "3.35.0"
+
+gemspec :path=>"../"

data/gemfiles/sequel-3.35.0.gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+  specs:
+    state_machine (1.2.0)
+
+GEM
+  remote: http://www.rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    sequel (3.35.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
+  rake
+  sequel (= 3.35.0)
+  simplecov
+  sqlite3-ruby (= 1.3.1)
+  state_machine!

data/gemfiles/sequel-3.4.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
+gem "sequel", "3.4.0"
+
+gemspec :path=>"../"

data/gemfiles/sequel-3.4.0.gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+  specs:
+    state_machine (1.2.0)
+
+GEM
+  remote: http://www.rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    sequel (3.4.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
+  rake
+  sequel (= 3.4.0)
+  simplecov
+  sqlite3-ruby (= 1.3.1)
+  state_machine!

data/gemfiles/sequel-3.44.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://www.rubygems.org"
+
+gem "sqlite3-ruby", "1.3.1", :platform=>[:ruby, :mswin, :mingw]
+gem "jdbc-sqlite3", "3.7.2", :platform=>:jruby
+gem "sequel", "3.44.0"
+
+gemspec :path=>"../"

data/gemfiles/sequel-3.44.0.gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: /home/aaron/Projects/Personal/pluginaweek/state_machine
+  specs:
+    state_machine (1.2.0)
+
+GEM
+  remote: http://www.rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    jdbc-sqlite3 (3.7.2)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    sequel (3.44.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3-ruby (1.3.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  jdbc-sqlite3 (= 3.7.2)
+  rake
+  sequel (= 3.44.0)
+  simplecov
+  sqlite3-ruby (= 1.3.1)
+  state_machine!

data/lib/state_machine.rb

@@ -1,2 +1,8 @@
+# By default, requiring "state_machine" means that both the core implementation
+# *and* extensions to the Ruby core (Class in particular) will be pulled in.
+# 
+# If you want to skip the Ruby core extensions, simply require "state_machine/core"
+# and extend StateMachine::MacroMethods in your class.  See the README for more
+# information.
 require 'state_machine/core'
 require 'state_machine/core_ext'

data/lib/state_machine/branch.rb

@@ -140,10 +140,8 @@ module StateMachine
     # 
     # Each edge will be labeled with the name of the event that would cause the
     # transition.
-    # 
-    # The collection of edges generated on the graph will be returned.
     def draw(graph, event, valid_states)
-      state_requirements.inject([]) do |edges, state_requirement|
+      state_requirements.each do |state_requirement|
         # From states determined based on the known valid states
         from_states = state_requirement[:from].filter(valid_states)
         
@@ -160,11 +158,11 @@ module StateMachine
         # Generate an edge between each from and to state
         from_states.each do |from_state|
           from_state = from_state ? from_state.to_s : 'nil'
-          edges << graph.add_edge(from_state, loopback ? from_state : to_state, :label => event.to_s)
+          graph.add_edges(from_state, loopback ? from_state : to_state, :label => event.to_s)
         end
-        
-        edges
       end
+      
+      true
     end
     
     protected
@@ -175,9 +173,12 @@ module StateMachine
         assert_exclusive_keys(options, whitelist_option, blacklist_option)
         
         if options.include?(whitelist_option)
-          WhitelistMatcher.new(options[whitelist_option])
+          value = options[whitelist_option]
+          value.is_a?(Matcher) ? value : WhitelistMatcher.new(options[whitelist_option])
         elsif options.include?(blacklist_option)
-          BlacklistMatcher.new(options[blacklist_option])
+          value = options[blacklist_option]
+          raise ArgumentError, ":#{blacklist_option} option cannot use matchers; use :#{whitelist_option} instead" if value.is_a?(Matcher)
+          BlacklistMatcher.new(value)
         else
           AllMatcher.instance
         end

data/lib/state_machine/callback.rb

@@ -175,9 +175,9 @@ module StateMachine
       # method passes the terminator.
       def run_methods(object, context = {}, index = 0, *args, &block)
         if type == :around
-          if method = @methods[index]
+          if current_method = @methods[index]
             yielded = false
-            evaluate_method(object, method, *args) do
+            evaluate_method(object, current_method, *args) do
               yielded = true
               run_methods(object, context, index + 1, *args, &block)
             end

data/lib/state_machine/core.rb

@@ -1,2 +1,12 @@
+module StateMachine
+  # Graphing extensions aren't required, so they're loaded when referenced
+  autoload :Graph, 'state_machine/graph'
+end
+
+# Load all of the core implementation required to use state_machine.  This
+# includes:
+# * StateMachine::MacroMethods which adds the state_machine DSL to your class
+# * A set of initializers for setting state_machine defaults based on the current
+#   running environment (such as within Rails)
 require 'state_machine/macro_methods'
 require 'state_machine/initializers'