big_machine 1.0.1 → 1.1.0

data/lib/big_machine/active_record.rb

@@ -28,9 +28,5 @@ module BigMachine
       send "#{state_attribute}=", new_state_class.name
     end
 
-    def transition_to(next_state_class)
-      super(next_state_class)
-      save!
-    end
   end
 end

data/lib/big_machine/state.rb

@@ -1,29 +1,30 @@
-module BigMachine
-  class State
-
-    attr_reader :stateful
-    
-    def initialize(stateful)
-      @stateful = stateful
-      enter
-    end
-
-    def self.transition_methods
-      public_instance_methods - State.public_instance_methods
-    end
-
-    def transition_to(state_class)
-      @stateful.transition_to(state_class)
-    end
-
-    def workflow_is(name)
-      @stateful.workflow == name
-    end
-
-    def enter
-    end
-
-    def exit
-    end
-  end
-end
+module BigMachine
+  class State
+
+    attr_reader :stateful
+
+    def initialize(stateful)
+      @stateful = stateful
+    end
+
+    def self.transition_methods
+      public_instance_methods - State.public_instance_methods
+    end
+
+    def transition_to(state_class, *args, &block)
+      @stateful.transition_to(state_class, *args, &block)
+    end
+
+    def workflow_is(name)
+      @stateful.workflow == name
+    end
+
+    def enter(*args, &block)
+      true
+    end
+
+    def exit(*args, &block)
+      true
+    end
+  end
+end

data/lib/big_machine/version.rb

@@ -1,3 +1,3 @@
 module BigMachine
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/big_machine.rb

@@ -18,7 +18,7 @@ module BigMachine
   end
 
   module ClassMethods
-    def active_record_model? 
+    def active_record_model?
       defined?(::ActiveRecord::Base) && self.ancestors.include?(::ActiveRecord::Base)
     end
 
@@ -55,9 +55,19 @@ module BigMachine
     def_delegators :current_state, *current_state.class.transition_methods
   end
 
-  def transition_to(next_state_class)
-    current_state.exit
+  def transition_to(next_state_class, *args, &block)
+    return unless current_state.exit *args
+
+    previous_state = current_state
     set_current_state next_state_class
+
+    rollback(previous_state) and return unless current_state.enter *args
+
+    block.call self if block_given?
+  end
+
+  def rollback(previous_state)
+    @current_state = @previous_state
   end
 
 end

data/test/big_machine_test.rb

@@ -7,11 +7,49 @@ class Draft < BigMachine::State
     transition_to Online
   end
 
+  def cannot_enter
+    transition_to CannotEnter
+  end
+
   def lock
     transition_to LockState
   end
 end
 
+class Args < BigMachine::State
+
+  def publish
+    transition_to Online, 'args'
+  end
+
+  def back_to_draft
+    transition_to Online do |obj|
+      obj.block = 'block'
+    end
+  end
+
+  def exit(*args)
+    @stateful.args = args.first
+    super
+  end
+end
+
+class CannotExit < BigMachine::State
+
+  def publish
+    transition_to Online
+  end
+
+  def exit
+    false
+  end
+end
+
+class CannotEnter < BigMachine::State
+  def enter
+  end
+end
+
 class LockState < BigMachine::State
   include BigMachine::Lock
 
@@ -41,7 +79,7 @@ end
 class DummyWithActiveRecord < ActiveRecord::Base
   include BigMachine
 
-  attr_accessor :state
+  attr_accessor :state, :args, :block
 
   big_machine initial_state: :draft
 
@@ -128,4 +166,28 @@ class BigMachineTest < ActiveSupport::TestCase
     @dummyWS = DummyWithActiveRecord.new(nil)
     assert_equal 'Draft', @dummyWS.current_state.class.name
   end
+
+  test "big machine does not transtion if it's not possible to exit" do
+    @dummyCE = DummyWithActiveRecord.new('CannotExit')
+    @dummyCE.publish
+    assert_equal 'CannotExit', @dummyCE.current_state.class.name
+  end
+
+  test "big machine does not transtion if it's not possible to enter" do
+    @dummyCE = DummyWithActiveRecord.new('Draft')
+    @dummyCE.cannot_enter
+    assert_equal 'Draft', @dummyCE.current_state.class.name
+  end
+
+  test "big machine can take args into transition" do
+    @dummyArgs = DummyWithActiveRecord.new('Args')
+    @dummyArgs.publish
+    assert_equal 'args', @dummyArgs.args
+  end
+
+  test "big machine can take block into transition" do
+    @dummyArgs = DummyWithActiveRecord.new('Args')
+    @dummyArgs.back_to_draft
+    assert_equal 'block', @dummyArgs.block
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_machine
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: