dm-is-persistent_state_machine 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dm-is-persistent_state_machine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-persistent_state_machine}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-02-03}
   s.description = %q{A persistent State Machine for DataMapper}
   s.email = %q{ma@zive.at}
   s.extra_rdoc_files = [

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

@@ -64,10 +64,11 @@ class StateChange
   
   property :from_id, Integer,   :required => true, :min => 1
   property :to_id, Integer,     :required => true, :min => 1
-  
+  property :user_id, Integer
   property :created_at, DateTime
   
   # associations
+  belongs_to :user
   belongs_to :from, "State"
   belongs_to :to,   "State"
 end
@@ -112,8 +113,9 @@ module DataMapper
         
         after :save do
           if (@prev_state && @prev_state != state)
-            StateChange.create(:from => @prev_state, :to => state, :created_at => DateTime.now)
+            @state_change = StateChange.create(:from => @prev_state, :to => state, :created_at => DateTime.now, :user => @user)
             @prev_state = nil # clean up cache
+            @user = nil
           end
         end
 
@@ -129,9 +131,10 @@ module DataMapper
       end # ClassMethods
  
       module InstanceMethods
-        def trigger_event!(event_code)          
-          # cache the old value
+        def trigger_event!(event_code, user)
+          # cache prev_state and the user that is triggering the event
           @prev_state = self.state
+          @user = user
 
           # delegate to State#trigger!
           self.state.trigger_event!(self, event_code)

data/spec/dm-is-persistent_state_machine_spec.rb

@@ -5,6 +5,9 @@ describe DataMapper::Is::PersistentStateMachine do
   before(:all) do
     DataMapper.auto_migrate!
     
+    # create a user
+    john_doe = User.create(:name => "John Doe")
+    
     # add some states
     open = ProjectState.create(:name => "Open", :code => "open")
     reviewed = ProjectState.create(:name => "Reviewed", :code => "reviewed")
@@ -19,8 +22,7 @@ describe DataMapper::Is::PersistentStateMachine do
     reviewed_confirmed = StateTransition.create(:state => reviewed, :target => confirmed, :state_event => confirm_evt)
   end
   
-  describe "with active DM Identity Map" do
-    
+  describe "at least" do
     before :each do
       Project.auto_migrate!
       StateChange.auto_migrate!
@@ -29,13 +31,14 @@ describe DataMapper::Is::PersistentStateMachine do
     it "should log state changes" do
       @project = Project.create(:name => "Operation X", :state => ProjectState.first(:code => "open"))
       @project.state.code.should == "open"
-      @project.trigger_event!('review')
+      @project.trigger_event!('review', User.first)
       Project.first(:name => "Operation X").state.code.should == "open" # not persistent yet
       
       StateChange.count.should == 0
       @project.state.code.should == "reviewed"
       @project.save
       StateChange.count.should == 1
+      StateChange.first.user.name.should == "John Doe"
     end   
   end
 end

data/spec/spec_helper.rb

@@ -14,6 +14,13 @@ DataMapper.setup(:default, 'sqlite3::memory:')
  
 # classes/vars for tests
 
+class User
+  include DataMapper::Resource
+  
+  property :id,       Serial
+  property :name,     String
+end
+
 class Project
   include DataMapper::Resource
  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-persistent_state_machine
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - michael
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +01:00
+date: 2010-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency