tastebook-acts_as_state_machine 3.0.2 → 3.0.3

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => [:clean_db, :test]

data/acts_as_state_machine.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'tastebook-acts_as_state_machine'
-  s.version = '3.0.2'
-  s.date = '2013-03-26'
+  s.version = '3.0.3'
+  s.date = '2013-07-30'
 
   s.summary = "Allows ActiveRecord models to define states and transition actions between them"
   s.description = "This act gives an Active Record model the ability to act as a finite state machine (FSM)."
 
-  s.authors = ['RailsJedi', 'Scott Barron']
+  s.authors = ['RailsJedi', 'Scott Barron', 'Surendra Singhi']
   s.email = 'ssinghi@kreeti.com'
   s.homepage = 'http://github.com/tastebook/acts_as_state_machine'
 

data/lib/acts_as_state_machine.rb

@@ -62,6 +62,8 @@ module ScottBarron                   #:nodoc:
 
             record.update_attribute(record.class.state_column, next_state.value)
 
+            record.send(:run_state_change_action, record.class.state_change_success_hook, next_state, event)
+
             next_state.entered(record, event, *args) unless loopback
             old_state.exited(record, event, *args) unless loopback
             true
@@ -92,9 +94,11 @@ module ScottBarron                   #:nodoc:
           end
 
           def fire(record, *args)
-            next_states(record).each do |transition|
-              break true if transition.perform(record, *args)
+            transitioned = next_states(record).any? {|transition| transition.perform(record, *args) }
+            unless transitioned
+              record.send(:run_state_change_action, record.class.state_change_failure_hook, record.class._states[record.current_state.to_s], self)
             end
+            transitioned
           end
 
           def transitions(trans_opts)
@@ -132,6 +136,12 @@ module ScottBarron                   #:nodoc:
             class_attribute :state_column
             self.state_column = options[:column] || 'state'
 
+            class_attribute :state_change_success_hook
+            self.state_change_success_hook = options[:success]
+
+            class_attribute :state_change_failure_hook
+            self.state_change_failure_hook = options[:failure]
+
             before_create :set_initial_state
             after_create  :run_initial_state_actions
           end
@@ -146,6 +156,7 @@ module ScottBarron                   #:nodoc:
         def run_initial_state_actions
           initial = self.class._states[self.class.initial_state.to_s]
           initial.entering(self, nil)
+          run_state_change_action(self.class.state_change_success_hook, initial, nil)
           initial.entered(self, nil)
         end
 
@@ -174,6 +185,10 @@ module ScottBarron                   #:nodoc:
         def run_transition_action(action, event, *args)
           Symbol === action ? self.method(action).call(event, *args) : action.call(self, event, *args) if action
         end
+
+        def run_state_change_action(action, state, event, *args)
+          Symbol === action ? self.method(action).call(state, event, *args) : action.call(self, state, event, *args) if action
+        end
       end
 
       module ClassMethods

data/test/test_acts_as_state_machine.rb

@@ -1,12 +1,13 @@
-RAILS_ROOT = File.dirname(__FILE__)
+require "test/unit"
 
 require "rubygems"
-require "test/unit"
 require "active_record"
 require "active_record/fixtures"
+require "sqlite3"
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
-require File.dirname(__FILE__) + "/../init"
+$:.unshift File.dirname(__FILE__) + "/../"
+require "#{File.dirname(__FILE__)}/../init"
 
 # Log everything to a global StringIO object instead of a file.
 require "stringio"
@@ -15,13 +16,9 @@ $LOGGER = Logger.new($LOG)
 ActiveRecord::Base.logger = $LOGGER
 
 ActiveRecord::Base.configurations = {
-  "sqlite" => {
-    :adapter => "sqlite",
-    :dbfile  => "state_machine.sqlite.db"
-  },
-
   "sqlite3" => {
     :adapter => "sqlite3",
+    :database => "state_machine_test",
     :dbfile  => "state_machine.sqlite3.db"
   },
 
@@ -43,7 +40,7 @@ ActiveRecord::Base.configurations = {
 }
 
 # Connect to the database.
-ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite")
+ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite3")
 
 # Create table for conversations.
 ActiveRecord::Migration.verbose = false
@@ -55,14 +52,18 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 
-class Test::Unit::TestCase
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
+#class ActiveSupport::TestCase
+ # self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+#  self.use_transactional_fixtures = true
+#  self.use_instantiated_fixtures  = false
 
-  def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names, &block)
-  end
+ # def create_fixtures(*table_names, &block)
+ #   ActiveRecord::TestFixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names, &block)
+ # end
+#end
+
+ActiveRecord::Base.class_eval do
+  include ScottBarron::Acts::StateMachine
 end
 
 class Conversation < ActiveRecord::Base
@@ -81,34 +82,38 @@ class Conversation < ActiveRecord::Base
     !!@can_close
   end
 
-  def read_enter_action
+  def read_enter_action(event)
     self.read_enter = true
   end
 
-  def read_after_first_action
+  def read_after_first_action(event)
     self.read_after_first = true
   end
 
-  def read_after_second_action
+  def read_after_second_action(event)
     self.read_after_second = true
   end
 
-  def closed_after_action
+  def closed_after_action(event)
     self.closed_after = true
   end
 end
 
 class ActsAsStateMachineTest < Test::Unit::TestCase
   include ScottBarron::Acts::StateMachine
-  fixtures :conversations
 
-  def teardown
+  #include ActiveRecord::TestFixtures
+  #fixtures :conversations
+
+  def teardown1 #throws error
     Conversation.class_eval do
       self._states          = {}
-      self.finitial_state   = nil
+      self.initial_state   = nil
       self.transition_table = {}
       self.event_table      = {}
       self.state_column     = "state"
+      self.state_change_success_hook = nil
+      self.state_change_failure_hook = nil
 
       # Clear out any callbacks that were set by acts_as_state_machine.
       reset_callbacks :before_create
@@ -369,7 +374,7 @@ class ActsAsStateMachineTest < Test::Unit::TestCase
       state :needs_attention
       state :closed, :after => :closed_after_action
       state :read, :enter => :read_enter_action,
-      :exit  => Proc.new { |o| o.read_exit = true },
+      :exit  => Proc.new { |o, args| o.read_exit = true },
       :after => [:read_after_first_action, :read_after_second_action]
 
       event :view do
@@ -438,7 +443,7 @@ class ActsAsStateMachineTest < Test::Unit::TestCase
       acts_as_state_machine :initial => :needs_attention
       state :junk
       state :needs_attention
-      state :read, :exit => lambda { |o| o.read_exit = true }
+      state :read, :exit => lambda { |o, args| o.read_exit = true }
 
       event :view do
         transitions :to => :read, :from => :needs_attention
@@ -460,7 +465,7 @@ class ActsAsStateMachineTest < Test::Unit::TestCase
     Conversation.class_eval do
       acts_as_state_machine :initial => :needs_attention
       state :needs_attention
-      state :read, :exit => lambda { |o| o.read_exit = true }
+      state :read, :exit => lambda { |o, args| o.read_exit = true }
 
       event :view do
         transitions :to => :read, :from => [:needs_attention, :read]
@@ -479,8 +484,8 @@ class ActsAsStateMachineTest < Test::Unit::TestCase
   def test_entry_and_after_actions_called_for_initial_state
     Conversation.class_eval do
       acts_as_state_machine :initial => :needs_attention
-      state :needs_attention, :enter => lambda { |o| o.needs_attention_enter = true },
-      :after => lambda { |o| o.needs_attention_after = true }
+      state :needs_attention, :enter => lambda { |o, args| o.needs_attention_enter = true },
+      :after => lambda { |o, args| o.needs_attention_after = true }
     end
 
     c = Conversation.create!

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: tastebook-acts_as_state_machine
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
 - RailsJedi
 - Scott Barron
+- Surendra Singhi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151819800 !ruby/object:Gem::Requirement
+  requirement: &2153031500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +23,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2151819800
+  version_requirements: *2153031500
 description: This act gives an Active Record model the ability to act as a finite
   state machine (FSM).
 email: ssinghi@kreeti.com