flojo 0.5.2 → 0.5.3

data/CHANGELOG

@@ -1,2 +1,3 @@
 0.5.1 Added workflow_states and transition parameter checks.
-0.5.1.1 Renamed valid_state method to valid_states?
+0.5.1.1 Renamed valid_state method to valid_states?
+0.5.3 Fixed state persistence. State is persisted even if you don't use the! versions of event methods. New Active record object now have the default state even before save. Updated the tests.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('flojo', '0.5.2') do |p|
+Echoe.new('flojo', '0.5.3') do |p|
   p.description    = "ActiveRecord aware workflow (state machine) module that will also work with any plain old ruby object." 
   p.summary    = "When used within an ActiveRecord subclass, flojo events can automatically save a record after a transition.     
 	

data/flojo.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{flojo}
-  s.version = "0.5.2"
+  s.name = "flojo"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joey Adarkwah"]
-  s.date = %q{2011-02-03}
-  s.description = %q{ActiveRecord aware workflow (state machine) module that will also work with any plain old ruby object.}
-  s.email = %q{alternegro @nospam@ me.com}
+  s.date = "2012-01-19"
+  s.description = "ActiveRecord aware workflow (state machine) module that will also work with any plain old ruby object."
+  s.email = "alternegro @nospam@ me.com"
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/flojo.rb"]
   s.files = ["CHANGELOG", "MIT_LICENSE", "README.rdoc", "Rakefile", "lib/flojo.rb", "test/test_active_record.rb", "test/test_db.sqlite3", "test/test_helper.rb", "test/test_poro.rb", "Manifest", "flojo.gemspec"]
-  s.homepage = %q{http://github.com/alternegro/flojo}
+  s.homepage = "http://github.com/alternegro/flojo"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Flojo", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{flojo}
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{When used within an ActiveRecord subclass, flojo events can automatically save a record after a transition.       After including the module in your class and configuring it with an event _event_, and a state _state_, you can interact with instances of that class using the dynamically generated methods of the following form:  +object.wf_event+  - Triggers event and invokes any applicable transitions +object.wf_event!+ - Behaves just like +object.wf_event+ but will also persist object. +object.wf_state?+ - Returns true if the current workflow state is _state_.    +object.wf_current_state+ - Returns the objects current state.}
+  s.rubyforge_project = "flojo"
+  s.rubygems_version = "1.8.15"
+  s.summary = "When used within an ActiveRecord subclass, flojo events can automatically save a record after a transition.       After including the module in your class and configuring it with an event _event_, and a state _state_, you can interact with instances of that class using the dynamically generated methods of the following form:  +object.wf_event+  - Triggers event and invokes any applicable transitions +object.wf_event!+ - Behaves just like +object.wf_event+ but will also persist object. +object.wf_state?+ - Returns true if the current workflow state is _state_.    +object.wf_current_state+ - Returns the objects current state."
   s.test_files = ["test/test_active_record.rb", "test/test_helper.rb", "test/test_poro.rb"]
 
   if s.respond_to? :specification_version then

data/lib/flojo.rb

@@ -5,11 +5,19 @@ module Flojo
   	  attr_writer :wf_current_state 
   	  attr_accessor :_wf_current_event_transition_map, :wf_previous_state
   	  protected :wf_current_state=, :_set_workflow_state 
-      
+       
       def wf_current_state
         wf_current_state = @wf_current_state.nil? ? wf_initial_state : @wf_current_state 
       end    
       
+      if respond_to?(:after_initialize)
+        after_initialize :flojo_active_record_init
+        
+        def flojo_active_record_init
+          self.wf_state = self.wf_current_state.to_s if self.respond_to?(:wf_state=)
+        end 
+      end
+      
       def wf_initial_state
         st = self.respond_to?(:wf_state) ? (wf_state || self.class.wf_states[0]) : self.class.wf_states[0] 
         st.to_sym
@@ -22,7 +30,7 @@ module Flojo
           raise "Invalid Parameter. State array elements should be symbols" unless Symbol === st
         end
         
-	      self.synthesize_state_query_methods
+	    self.synthesize_state_query_methods
       end
 	    
       def self.wf_states
@@ -30,14 +38,13 @@ module Flojo
       end                           
 
       def self.synthesize_state_query_methods
-	      @workflow_states.each {|st| define_method("wf_#{st}?") { st.eql?(wf_current_state)}}
-	    end  
+	    @workflow_states.each {|st| define_method("wf_#{st}?") { st.eql?(wf_current_state)}}
+	  end  
 	    
-	    def self.valid_states?(*states)
-	      states.each {|st| return false if (!@workflow_states.include?(st) && (st != :any)) || !(Symbol === st)}                                               
+	  def self.valid_states?(*states)
+	    states.each {|st| return false if (!@workflow_states.include?(st) && (st != :any)) || !(Symbol === st)}                                               
         return true
-      end 
-            
+      end             
   	end
       
     host.class_eval("def self.transition(start_state, end_state); raise 'Invalid Transition State' unless self.valid_states?(start_state, end_state); @wf_current_event_transition_map[start_state]=end_state; end")
@@ -76,6 +83,7 @@ module Flojo
     
     if (state != self.wf_current_state) && (!state.nil?)
       self.wf_current_state=state
+      self.wf_state = self.wf_current_state if self.respond_to?(:wf_state=)
        
       eval("wf_on_#{event}") if event && (self.class.method_defined? "wf_on_#{event}")             
       eval("wf_on_exit_#{wf_current_state}") if self.class.method_defined? "wf_on_exit_#{wf_current_state}" 
@@ -86,7 +94,6 @@ module Flojo
   end   
                                                                                    
   def _wf_after_transition_save! 
-    self.wf_state = self.wf_current_state if self.respond_to?(:wf_state=)
     save! if self.respond_to?(:save!)
   end  
   

data/test/test_active_record.rb

@@ -28,8 +28,8 @@ class Counter < ActiveRecord::Base
   
   event :down do
     transition :one, :three
-	  transition :two, :one
-	  transition :three, :two
+	transition :two, :one
+	transition :three, :two
   end
   
   def wf_on_enter_one
@@ -55,7 +55,6 @@ class Counter < ActiveRecord::Base
   def wf_after_save
     "wf_after_save"
   end
-
 end     
 
 
@@ -76,6 +75,7 @@ class TestWorkflow < Test::Unit::TestCase
   def test_stored_counter   
     stored_counter = Counter.first
     assert_equal(:one, stored_counter.wf_current_state, "Initial state must be :one")   
+    assert_equal("one", stored_counter.wf_state, "Stored state must be one")
     
     stored_counter.wf_up!
     assert_equal(:two, stored_counter.wf_current_state, "Current state must be :two")   
@@ -95,7 +95,7 @@ class TestWorkflow < Test::Unit::TestCase
   
   def test_new_counter 
     new_counter = Counter.new   
-    assert_equal(nil, new_counter.wf_state, "Stored state must be nil")
+    assert_equal("one", new_counter.wf_state, "Stored state must be nil")
     assert_equal(:one, new_counter.wf_current_state, "Initial state must be :one")  
     assert_equal(1, Counter.count)
     

metadata

@@ -1,35 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flojo
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.5.3
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
 platform: ruby
-authors: 
+authors:
 - Joey Adarkwah
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-03 00:00:00 -05:00
-default_executable: 
+date: 2012-01-19 00:00:00.000000000Z
 dependencies: []
-
-description: ActiveRecord aware workflow (state machine) module that will also work with any plain old ruby object.
+description: ActiveRecord aware workflow (state machine) module that will also work
+  with any plain old ruby object.
 email: alternegro @nospam@ me.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - README.rdoc
 - lib/flojo.rb
-files: 
+files:
 - CHANGELOG
 - MIT_LICENSE
 - README.rdoc
@@ -41,47 +32,44 @@ files:
 - test/test_poro.rb
 - Manifest
 - flojo.gemspec
-has_rdoc: true
 homepage: http://github.com/alternegro/flojo
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Flojo
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: flojo
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: "When used within an ActiveRecord subclass, flojo events can automatically save a record after a transition.       After including the module in your class and configuring it with an event _event_, and a state _state_, you can interact with instances of that class using the dynamically generated methods of the following form:  +object.wf_event+  - Triggers event and invokes any applicable transitions +object.wf_event!+ - Behaves just like +object.wf_event+ but will also persist object. +object.wf_state?+ - Returns true if the current workflow state is _state_.    +object.wf_current_state+ - Returns the objects current state."
-test_files: 
+summary: ! 'When used within an ActiveRecord subclass, flojo events can automatically
+  save a record after a transition.       After including the module in your class
+  and configuring it with an event _event_, and a state _state_, you can interact
+  with instances of that class using the dynamically generated methods of the following
+  form:  +object.wf_event+  - Triggers event and invokes any applicable transitions
+  +object.wf_event!+ - Behaves just like +object.wf_event+ but will also persist object.
+  +object.wf_state?+ - Returns true if the current workflow state is _state_.    +object.wf_current_state+
+  - Returns the objects current state.'
+test_files:
 - test/test_active_record.rb
 - test/test_helper.rb
 - test/test_poro.rb