simple_state_machine 0.4.2 → 0.4.3

data/README.rdoc

@@ -83,12 +83,14 @@ To add a state machine with ActiveRecord persistence:
     class User < ActiveRecord::Base
        
       extend SimpleStateMachine::ActiveRecord
-      
+      # define a custum state_method (state is default)
+      state_machine_definition.state_method = :ssm_state
+
       def after_initialize
-        self.state ||= 'new'
+        self.ssm_state ||= 'new'
         # if you get an ActiveRecord::MissingAttributeError
         # you'll probably need to do (http://bit.ly/35q23b):
-        #   write_attribute(:state, "new") unless read_attribute(:state)
+        #   write_attribute(:ssm_state, "new") unless read_attribute(:ssm_state)
       end
       
       def invite
@@ -104,6 +106,8 @@ To add a state machine with ActiveRecord persistence:
       end
       event :confirm_invitation, :invited => :active
       
+      # :all can be used to catch all from states
+      event :suspend, :all => :suspended
     end
 
 This generates the following methods

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/examples/conversation.rb

@@ -28,7 +28,6 @@ class Conversation
   end
 
   event :view,  :unread => :read
-  event :close, :unread => :closed,
-                :read   => :closed
+  event :close, :all    => :closed
 
-end
+end

data/lib/simple_state_machine/simple_state_machine.rb

@@ -71,7 +71,7 @@ module SimpleStateMachine
 
     # Returns the next state for the subject for event_name
     def next_state(event_name)
-      transition = transitions.select{|t| t.is_transition_for?(event_name) && @subject.send(state_method).to_s == t.from.to_s}.first
+      transition = transitions.select{|t| t.is_transition_for?(event_name, @subject.send(state_method))}.first
       transition ? transition.to : nil
     end
 
@@ -144,14 +144,24 @@ module SimpleStateMachine
     end
 
     # returns true if it's a transition for event_name
-    def is_transition_for?(event_name)
-      self.event_name == event_name.to_s
+    def is_transition_for?(event_name, subject_state)
+      is_same_event?(event_name) && is_same_from?(subject_state)
     end
 
     # returns true if it's a error transition for event_name and error
     def is_error_transition_for?(event_name, error)
-      is_transition_for?(event_name) && error.class == from
+      is_same_event?(event_name) && error.class == from
     end
+
+    private
+
+      def is_same_event?(event_name)
+        self.event_name == event_name.to_s
+      end
+
+      def is_same_from?(subject_from)
+        from.to_s == 'all' || subject_from.to_s == from.to_s
+      end
   end
 
   ##

data/simple_state_machine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_state_machine}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek de Heus", "Petrik de Heus"]

data/spec/simple_state_machine_spec.rb

@@ -13,6 +13,7 @@ class SimpleExample
   end
   event :event2, :state2 => :state3
   event :event_with_multiple_from, [:state1, :state2] => :state3
+  event :event_from_all, :all => :state3
 end
 
 class SimpleExampleWithCustomStateMethod
@@ -57,6 +58,16 @@ describe SimpleStateMachine do
       example.should be_state3
     end
 
+    it "changes state if event has all as from" do
+      example = SimpleExample.new
+      example.event_from_all
+      example.should be_state3
+      example = SimpleExample.new 'state2'
+      example.should be_state2
+      example.event_from_all
+      example.should be_state3
+    end
+
     it "changes state when state is a symbol instead of a string" do
       example = SimpleExample.new :state1
       example.state.should == :state1
@@ -100,6 +111,15 @@ describe SimpleStateMachine do
 
   describe 'custom state method' do
     
+    it "changes state when calling events" do
+      example = SimpleExampleWithCustomStateMethod.new
+      example.should be_state1
+      example.event1
+      example.should be_state2
+      example.event2
+      example.should be_state3
+    end    
+    
     it "raise an error if an invalid state_transition is called" do
       example = SimpleExampleWithCustomStateMethod.new
       lambda { example.event2 }.should raise_error(SimpleStateMachine::Error, "You cannot 'event2' when state is 'state1'")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_state_machine
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Marek de Heus