dm-is-state_machine 0.9.8 → 0.9.9

data/History.txt

@@ -1,10 +1,17 @@
+=== 0.9.9 / 2009-01-04
+
+* 1 minor enhancement:
+
+  * Added transition! to allow before/after hooks to execute on state
+    transitions.
+
 === 0.9.8 / 2008-12-07
 
 * No changes this version
 
 === 0.9.7 / 2008-11-18
 
-4 minor enhancements:
+* 4 minor enhancements:
 
   * Added support to pass a symbol to a transition, which will call the
     corresponding method.  This means you don't have to put a whole

data/lib/dm-is-state_machine/is/dsl/event_dsl.rb

@@ -42,11 +42,8 @@ module DataMapper
           push_state_machine_context(:event)
 
           # ===== Define methods =====
-          column = machine.column
           define_method("#{name}!") do
-            machine.current_state_name = send(:"#{column}")
-            machine.fire_event(name, self)
-            send(:"#{column}=", machine.current_state_name)
+            transition!(name)
           end
 
           # Possible alternative to the above:

data/lib/dm-is-state_machine/is/state_machine.rb

@@ -103,6 +103,14 @@ module DataMapper
           end
         end
 
+        def transition!(event_name)
+          machine = self.class.instance_variable_get(:@is_state_machine)[:machine]
+          column = machine.column
+          machine.current_state_name = attribute_get(:"#{column}")
+          machine.fire_event(event_name, self)
+          attribute_set(:"#{column}", machine.current_state_name)
+        end
+
       end # InstanceMethods
 
     end # StateMachine

data/lib/dm-is-state_machine/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module StateMachine
-      VERSION = '0.9.8'
+      VERSION = '0.9.9'
     end
   end
 end

data/lib/dm-is-state_machine.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'pathname'
 
 # Add all external dependencies for the plugin here
-gem 'dm-core', '~>0.9.8'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
 # Require plugin-files

data/spec/examples/traffic_light.rb

@@ -22,7 +22,20 @@ class TrafficLight
     end
   end
 
+  before :transition!, :before_hook
+  after  :transition!, :after_hook
+
+  def before_hook
+    before_hook_log << attribute_get(:color)
+  end
+
+  def after_hook
+    after_hook_log << attribute_get(:color)
+  end
+
   def log; @log ||= [] end
+  def before_hook_log; @bh_log ||= [] end
+  def after_hook_log; @ah_log ||= [] end
 
   attr_reader :init
   def initialize(*args)

data/spec/integration/traffic_light_spec.rb

@@ -147,4 +147,40 @@ describe TrafficLight do
 
   end
 
+  describe "hooks" do
+
+    it "should log initial state before state is changed on a before hook" do
+      @t.forward!
+      @t.before_hook_log.should == %w(green)
+      @t.forward!
+      @t.before_hook_log.should == %w(green yellow)
+      @t.forward!
+      @t.before_hook_log.should == %w(green yellow red)
+    end
+
+    it "should log final state before state is changed on a before hook" do
+      @t.forward!
+      @t.after_hook_log.should == %w(yellow)
+      @t.forward!
+      @t.after_hook_log.should == %w(yellow red)
+      @t.forward!
+      @t.after_hook_log.should == %w(yellow red green)
+    end
+
+  end
+
+  describe "overwriting event methods" do
+
+    before(:all) do
+      TrafficLight.class_eval "def forward!(added_param); log << added_param; transition!(:forward); end"
+    end
+
+    it "should transition normally with added functionality" do
+      @t.color.should == "green"
+      @t.forward!("test")
+      @t.color.should == "yellow"
+      @t.log.should == %w(G test Y)
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 description: DataMapper plugin for creating state machines
 email: