simple_machine 1.0.1 → 1.0.2

data/lib/simple_machine.rb

@@ -102,7 +102,7 @@ module SimpleMachine
         end
       end
       
-      SimpleMachine::ClassMethods.get_state_machine_class_for(self, state_field_name).instance_eval &block
+      SimpleMachine::ClassMethods.get_state_machine_class_for(self, state_field_name, true).instance_eval &block
       
       raise "Initial state not defined." unless send default_state_field_name
     end
@@ -111,10 +111,13 @@ module SimpleMachine
     
     @state_machine_classes = {}
     
-    def self.get_state_machine_class_for(cls, state_field_name)
+    def self.get_state_machine_class_for(cls, state_field_name, delete_if_exists=false)
       key = [cls.to_s.to_sym, state_field_name]
+      if @state_machine_classes.has_key? key and delete_if_exists
+        @state_machine_classes.delete key
+      end
       unless @state_machine_classes.has_key? key
-        @state_machine_classes[key] ||= SimpleMachine::SimpleMachinePrototype.clone
+        @state_machine_classes[key] = SimpleMachine::SimpleMachinePrototype.clone
         @state_machine_classes[key].owner_class = cls
         @state_machine_classes[key].parents_state_field_name = state_field_name
       end

data/spec/spec_simple_machine.rb

@@ -34,7 +34,7 @@ describe SimpleMachine, "for :dispatch_state field on Job, when state machine is
   end
 
   context "with only initial state :waiting" do
-    before :each do
+    before :all do
       Job.implement_state_machine_for :dispatch_state do
         initial_state :waiting
       end
@@ -200,12 +200,11 @@ describe SimpleMachine, "for :dispatch_state field on Job, when state machine is
   end
   context "when there are more job instances" do
     before :all do
-      Job.new.dispatch_state_machine.class.expects(:defined_transition?).with(:assign, :waiting).returns false
-      Job.new.dispatch_state_machine.class.expects(:defined_transition?).with(:accept, :assigned)
-      Job.implement_state_machine_for :dispatch_state do
-        allow_transition :assign, :from => :waiting, :to => :assigned
-        allow_transition :accept, :from => :assigned, :to => :accepted
-      end
+      @inner_state_machine_class = Job.new.dispatch_state_machine.class
+      @inner_state_machine_class.expects(:defined_transition?).with(:assign, :waiting).returns false
+      @inner_state_machine_class.expects(:defined_transition?).with(:accept, :assigned)
+      @inner_state_machine_class.allow_transition :assign, :from => :waiting, :to => :assigned
+      @inner_state_machine_class.allow_transition :accept, :from => :assigned, :to => :accepted
     end
     
     it "each instance tracks it's own flow" do
@@ -222,4 +221,9 @@ describe SimpleMachine, "for :dispatch_state field on Job, when state machine is
       job3.dispatch_state.should be(:waiting)
     end
   end
+  context "when invoking implement_state_machine_for :dispatch_state on Job again" do
+    xit "undos meta works from previous invocation" do
+      
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_machine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Milan Burmaja
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +01:00
+date: 2010-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: []