simple_state_machine 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/simple_state_machine/active_record.rb

@@ -8,12 +8,12 @@ module SimpleStateMachine::ActiveRecord
 
   class Decorator < SimpleStateMachine::Decorator
 
-    def decorate event_name, from, to
-      super event_name, from, to
-      unless @subject.method_defined?("#{event_name}_and_save")
-        @subject.send(:define_method, "#{event_name}_and_save") do |*args|
+    def decorate transition
+      super transition
+      unless @subject.method_defined?("#{transition.event_name}_and_save")
+        @subject.send(:define_method, "#{transition.event_name}_and_save") do |*args|
           old_state = state
-          send "#{event_name}", *args
+          send "#{transition.event_name}", *args
           if !self.errors.entries.empty?
             self.state = old_state
             return false
@@ -27,10 +27,10 @@ module SimpleStateMachine::ActiveRecord
           end
         end
       end
-      unless @subject.method_defined?("#{event_name}_and_save!")
-        @subject.send(:define_method, "#{event_name}_and_save!") do |*args|
+      unless @subject.method_defined?("#{transition.event_name}_and_save!")
+        @subject.send(:define_method, "#{transition.event_name}_and_save!") do |*args|
           old_state = state
-          send "#{event_name}", *args
+          send "#{transition.event_name}", *args
           if !self.errors.entries.empty?
             self.state = old_state
             raise ActiveRecord::RecordInvalid.new(self)

data/lib/simple_state_machine/simple_state_machine.rb

@@ -4,19 +4,30 @@ module SimpleStateMachine
 
     def event event_name, state_transitions
       state_transitions.each do |from, to|
-        state_machine_definition.add_transition(event_name, from, to)
-        state_machine_decorator(self).decorate( event_name, from, to)
+        transition = state_machine_definition.add_transition(event_name, from, to)
+        state_machine_decorator(self).decorate(transition)
       end
     end
 
     def state_machine_definition
       @state_machine_definition ||= StateMachineDefinition.new
     end
+
+    def state_machine_definition= state_machine_definition
+      @state_machine_definition = state_machine_definition
+      state_machine_definition.transitions.each do |transition|
+        state_machine_decorator(self).decorate(transition)
+      end
+    end
     
     def state_machine_decorator subject
       Decorator.new subject
     end
 
+    def inherited(subclass)
+      subclass.state_machine_definition = state_machine_definition.clone
+      super
+    end
   end
 
   include EventMixin
@@ -24,12 +35,13 @@ module SimpleStateMachine
   class StateMachineDefinition
 
     def transitions
-      @transitions ||= {}
+      @transitions ||= []
     end
     
     def add_transition event_name, from, to
-      transitions[event_name.to_s] ||= {}
-      transitions[event_name.to_s][from.to_s] = to.to_s
+      transition = Transition.new(event_name.to_s, from.to_s, to.to_s)
+      transitions << transition
+      transition
     end
 
   end
@@ -41,7 +53,8 @@ module SimpleStateMachine
     end
   
     def next_state(event_name)
-      transitions[event_name.to_s][@subject.state.to_s]
+      transition = transitions.select{|t| t.event_name.to_s == event_name.to_s && @subject.state.to_s == t.from.to_s}.first
+      transition ? transition.to : nil
     end
   
     def transition(event_name)
@@ -77,6 +90,9 @@ module SimpleStateMachine
   
   end
 
+  class Transition < Struct.new(:event_name, :from, :to)
+  end
+
   class Decorator
 
     def initialize(subject)
@@ -86,11 +102,11 @@ module SimpleStateMachine
       define_state_setter_method
     end
 
-    def decorate event_name, from, to
-      define_state_helper_method(from)
-      define_state_helper_method(to)
-      define_event_method(event_name)
-      decorate_event_method(event_name)
+    def decorate transition
+      define_state_helper_method(transition.from)
+      define_state_helper_method(transition.to)
+      define_event_method(transition.event_name)
+      decorate_event_method(transition.event_name)
     end
 
     private

data/simple_state_machine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_state_machine}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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

@@ -58,6 +58,17 @@ describe SimpleStateMachine do
 
   end
 
+  describe "state_machine_definition" do
+    it "is inherited by subclasses" do
+      example = Class.new(SimpleExample).new
+      example.should be_state1
+      example.event1
+      example.should be_state2
+      example.event1
+      example.should be_state3
+    end
+  end
+
   describe "state_machine" do
     it "has a next_state method" do
       example = SimpleExample.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_state_machine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marek de Heus