dm-is-persistent_state_machine 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

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.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-02-04}
   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

@@ -57,22 +57,6 @@ class StateEvent
   property :type, Discriminator
 end
 
-class StateChange
-  include DataMapper::Resource
-  
-  property :id, Serial
-  
-  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
-
 module DataMapper
   module Is
     module PersistentStateMachine
@@ -83,7 +67,7 @@ module DataMapper
       # fired when plugin gets included into Resource
       #
       def self.included(base)
- 
+        
       end
  
       ##
@@ -102,18 +86,44 @@ module DataMapper
         # Add instance-methods
         include DataMapper::Is::PersistentStateMachine::InstanceMethods
         
+        target_model_name = self.name.snake_case
+        
         # target object must have a status associated
         property :state_id, Integer, :required => true, :min => 1
         belongs_to :state
         
+        has n, Extlib::Inflection.pluralize(target_model_name+"StateChange").to_sym
+        
         # generate a FooState class that is derived from State        
         state_model = Object.full_const_set(self.to_s+"State", Class.new(State))
         # generate a FooStateEvent class that is derived from StateEvent
         event_model = Object.full_const_set(self.to_s+"StateEvent", Class.new(StateEvent))
+
+        state_change_model = Class.new do
+          include DataMapper::Resource
+
+          property :id, ::DataMapper::Types::Serial
+
+          property :from_id, Integer,   :required => true, :min => 1
+          property :to_id, Integer,     :required => true, :min => 1
+          property :user_id, Integer
+          property Extlib::Inflection.foreign_key(target_model_name).to_sym, Integer, :required => true, :min => 1
+          property :created_at, DateTime
+
+          # associations
+          belongs_to :user
+          belongs_to :from, "State"
+          belongs_to :to,   "State"
+          belongs_to target_model_name.to_sym
+        end
+        
+        state_change_model = Object.full_const_set(self.to_s+"StateChange",state_change_model)
+        
+        self_cached = self
         
         after :save do
           if (@prev_state && @prev_state != state)
-            @state_change = StateChange.create(:from => @prev_state, :to => state, :created_at => DateTime.now, :user => @user)
+            @state_change = state_change_model.create(:from => @prev_state, :to => state, :created_at => DateTime.now, :user => @user, Extlib::Inflection.foreign_key(target_model_name).to_sym => self.id)
             @prev_state = nil # clean up cache
             @user = nil
           end

data/spec/dm-is-persistent_state_machine_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe DataMapper::Is::PersistentStateMachine do
-  
   before(:all) do
     DataMapper.auto_migrate!
     
@@ -25,7 +24,7 @@ describe DataMapper::Is::PersistentStateMachine do
   describe "at least" do
     before :each do
       Project.auto_migrate!
-      StateChange.auto_migrate!
+      ProjectStateChange.auto_migrate!
     end
     
     it "should log state changes" do
@@ -33,12 +32,13 @@ describe DataMapper::Is::PersistentStateMachine do
       @project.state.code.should == "open"
       @project.trigger_event!('review', User.first)
       Project.first(:name => "Operation X").state.code.should == "open" # not persistent yet
-      
-      StateChange.count.should == 0
+
+      ProjectStateChange.count.should == 0
       @project.state.code.should == "reviewed"
       @project.save
-      StateChange.count.should == 1
-      StateChange.first.user.name.should == "John Doe"
+      ProjectStateChange.count.should == 1
+      ProjectStateChange.first.user.name.should == "John Doe"
+      ProjectStateChange.first.project.should == @project
     end   
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
 require 'dm-is-persistent_state_machine'
 
+# DataMapper::Logger.new($stdout, :debug)
+
 DataMapper.setup(:default, 'sqlite3::memory:')
  
 # classes/vars for tests

metadata

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