state_manager 0.3.0 → 0.3.1

data/lib/state_manager/adapters/active_record.rb

@@ -28,8 +28,10 @@ module StateManager
                 # reached so we wrap in a lamda.
                 scope state, lambda {
                   conn = ::ActiveRecord::Base.connection
+                  table = conn.quote_table_name table_name
                   column = conn.quote_column_name klass._state_property
-                  query = "#{column} = ? OR #{column} LIKE ?"
+                  namespaced_col = "#{table}.#{column}"
+                  query = "#{namespaced_col} = ? OR #{namespaced_col} LIKE ?"
                   like_term = "#{state.to_s}.%"
                   where(query, state, like_term)
                 }
@@ -86,15 +88,21 @@ module StateManager
 
         def after_save
           return unless pending_transition
-          _run_after_callbacks(*pending_transition)
+          transition = pending_transition
+
           self.uncommitted_transitions ||= []
           self.uncommitted_transitions << self.pending_transition
           self.pending_transition = nil
+
+          _run_after_callbacks(*transition)
         end
         
         def after_commit
-          self.uncommitted_transitions.each{ |t| run_commit_callbacks(*t) }
+          transitions = self.uncommitted_transitions.dup
+          
           self.uncommitted_transitions.clear
+
+          transitions.each{ |t| run_commit_callbacks(*t) }
         end
 
         def run_commit_callbacks(from_state, to_state, current_event, enter_states, exit_states)

data/lib/state_manager/version.rb

@@ -1,3 +1,3 @@
 module StateManager
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/adapters/active_record_test.rb

@@ -24,6 +24,7 @@ class ActiveRecordTest < Minitest::Test
     end
     state :active
     state :rejected
+    state :mutated
     
     attr_accessor :unsubmitted_entered_count
     attr_accessor :unsubmitted_enter_committed_count
@@ -82,6 +83,15 @@ class ActiveRecordTest < Minitest::Test
       end
       
     end
+
+    class Mutated
+
+      def entered
+        self.title = 'mutant'
+        save
+      end
+
+    end
     
   end
 
@@ -256,4 +266,10 @@ class ActiveRecordTest < Minitest::Test
     assert_equal @resource.state_manager.active_entered_count, 1
     assert_equal @resource.state_manager.active_enter_committed_count, 1
   end
+
+  def test_save_in_entered_callback
+    @resource = Post.new(:state => 'mutated')
+    @resource.save
+    assert_equal 'mutant', @resource.title
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport