state_manager 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/state_manager/base.rb

@@ -40,6 +40,9 @@ module StateManager
         new_states = state.find_states(path)
       end
 
+      # The first time we enter a state, the state_manager gets entered as well
+      new_states.unshift(self) unless has_state?
+
       # Can only transition to leaf states
       # TODO: transition to the initial_state of the state?
       raise(InvalidTransition, path) unless new_states.last.leaf?
@@ -48,7 +51,9 @@ module StateManager
       exit_states = exit_states - new_states
 
       from_state = current_state
-      to_state = enter_states.last
+      # TODO: does it make more sense to throw an error instead of allowing
+      # a transition to the current state?
+      to_state = enter_states.last || from_state
 
       # Before Callbacks
       will_transition(from_state, to_state, current_event)
@@ -102,7 +107,8 @@ module StateManager
     end
 
     def to_s
-      "#{current_state.path}" if current_state
+      path = "#{current_state.path}" if current_state
+      "#<%s:0x%x:%s>" % [self.class, object_id, path]
     end
 
     # Returns true if the underlying object is in the state specified by the
@@ -118,6 +124,11 @@ module StateManager
       self.find_states(current_state.path).include? find_state(path) 
     end
 
+    # Will not have a state if the state is invalid or nil
+    def has_state?
+      !!current_state
+    end
+
     # These methods can be overriden by an adapter
     def write_state(value)
       resource.send "#{self.class._state_property.to_s}=", value.path

data/lib/state_manager/core.rb

@@ -3,5 +3,6 @@ require 'state_manager/base'
 require 'state_manager/helpers'
 require 'state_manager/dsl'
 require 'state_manager/resource'
+require 'state_manager/serialization'
 require 'state_manager/adapters'
 require 'state_manager/plugins'

data/lib/state_manager/serialization.rb

@@ -0,0 +1,13 @@
+module StateManager
+  class Base
+    yaml_as "tag:grouptalent.com,2012:StateManager"
+
+    def self.yaml_new(klass, tag, val)
+      klass.new(val['resource'], val['context'])
+    end
+
+    def to_yaml_properties
+      ['@resource', '@context']
+    end
+  end
+end

data/lib/state_manager/state.rb

@@ -98,7 +98,7 @@ module StateManager
     def find_states(path)
       state = self
       parts = path.split('.')
-      ret = [state]
+      ret = []
       parts.each do |name|
         state = state.states[name.to_sym]
         ret << state

data/state_manager.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "state_manager"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gordon Hempton"]
-  s.date = "2012-06-09"
+  s.date = "2012-06-12"
   s.description = "Finite state machine implementation that keeps logic separate from model classes and supports sub-states."
   s.email = "ghempton@gmail.com"
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/state_manager/plugins.rb",
     "lib/state_manager/plugins/delayed_job.rb",
     "lib/state_manager/resource.rb",
+    "lib/state_manager/serialization.rb",
     "lib/state_manager/state.rb",
     "state_manager.gemspec",
     "test/adapters/active_record_test.rb",

data/test/basic_test.rb

@@ -129,4 +129,11 @@ class BasicTest < Test::Unit::TestCase
     end
   end
 
+  def test_transition_to_current_state
+    @resource = PostWithInitialState.new
+    assert_state 'submitted.awaiting_review'
+    @resource.state_manager.transition_to('submitted.awaiting_review')
+    assert_state 'submitted.awaiting_review'
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: state_manager
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Gordon Hempton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-09 00:00:00 Z
+date: 2012-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -183,6 +183,7 @@ files:
 - lib/state_manager/plugins.rb
 - lib/state_manager/plugins/delayed_job.rb
 - lib/state_manager/resource.rb
+- lib/state_manager/serialization.rb
 - lib/state_manager/state.rb
 - state_manager.gemspec
 - test/adapters/active_record_test.rb
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 696568598486714476
+      hash: -3482260086007933081
       segments: 
       - 0
       version: "0"