state_manager 0.2.11 → 0.2.12

data/.gitignore

@@ -12,7 +12,7 @@ doc
 # bundler
 .bundle
 
-# jeweler generated
-pkg
+*.gem
+Gemfile.lock
 
 .DS_Store

data/lib/state_manager/adapters/active_record.rb

@@ -78,9 +78,9 @@ module StateManager
           end
         end  
 
-        def transition_to(path)
+        def transition_to(*args)
           raise(DirtyTransition, "Only one state transition may be performed before saving a record. This error could be caused by the record being initialized to a default state.") if pending_transition
-          super(path)
+          super
         end
 
         def before_save
@@ -101,6 +101,10 @@ module StateManager
         def persist_state
           resource.save
         end
+        
+        def perform_initial_transition?
+          !current_state || resource.new_record?
+        end
 
       end
     end

data/lib/state_manager/base.rb

@@ -20,12 +20,22 @@ module StateManager
       self.resource = resource
       self.context = context
 
-      transition_to(initial_state.path) unless current_state
+      if perform_initial_transition?
+        initial_path = current_state && current_state.path || initial_state.path
+        transition_to initial_path, nil
+      end
+    end
+    
+    # In the case of a new model, we wan't to transition into the initial state
+    # and fire the appropriate callbacks. The default behavior is to just check
+    # if the state field is nil.
+    def perform_initial_transition?
+      !current_state
     end
 
     # Transitions to the state at the specified path. The path can be relative
     # to any state along the current state's path.
-    def transition_to(path)
+    def transition_to(path, current_state=self.current_state)
       path = path.to_s
       state = current_state || self
       exit_states = []
@@ -189,4 +199,4 @@ module StateManager
 
   end
 
-end
+end

data/lib/state_manager/version.rb

@@ -0,0 +1,3 @@
+module StateManager
+  VERSION = "0.2.12"
+end

data/test/adapters/active_record_test.rb

@@ -23,6 +23,14 @@ class ActiveRecordTest < Minitest::Test
     end
     state :active
     state :rejected
+    
+    attr_accessor :unsubmitted_entered_count
+    attr_accessor :active_entered_count
+    def initialize(*args)
+      super
+      @unsubmitted_entered_count = 0
+      @active_entered_count = 0
+    end
 
     def will_transition(*args)
       self.before_callbacks_called = true
@@ -31,6 +39,23 @@ class ActiveRecordTest < Minitest::Test
     def did_transition(*args)
       self.after_callbacks_called = true
     end
+    
+    class Unsubmitted
+      
+      def entered
+        state_manager.unsubmitted_entered_count += 1
+      end
+      
+    end
+    
+    class Active
+      
+      def entered
+        state_manager.active_entered_count += 1
+      end
+      
+    end
+    
   end
 
   class Post < ActiveRecord::Base
@@ -183,6 +208,19 @@ class ActiveRecordTest < Minitest::Test
       @resource.save
       assert !@resource.state_manager.after_callbacks_called
     end
+    assert_equal @resource.state_manager.unsubmitted_entered_count, 1
+    assert @resource.state_manager.after_callbacks_called
+  end
+  
+  def test_after_commit_callback_on_different_initial_state
+    Post2.transaction do
+      @resource = Post2.new(:state => 'active')
+      assert !@resource.state_manager.after_callbacks_called
+      @resource.save
+      assert !@resource.state_manager.after_callbacks_called
+    end
+    assert_equal @resource.state_manager.unsubmitted_entered_count, 0
+    assert_equal @resource.state_manager.active_entered_count, 1
     assert @resource.state_manager.after_callbacks_called
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_manager
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -71,11 +71,9 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - lib/state_manager.rb
 - lib/state_manager/adapters.rb
 - lib/state_manager/adapters/active_record.rb
@@ -89,6 +87,7 @@ files:
 - lib/state_manager/resource.rb
 - lib/state_manager/serialization.rb
 - lib/state_manager/state.rb
+- lib/state_manager/version.rb
 - state_manager.gemspec
 - test/adapters/active_record_test.rb
 - test/basic_test.rb

data/Gemfile.lock

@@ -1,58 +0,0 @@
-PATH
-  remote: .
-  specs:
-    state_manager (0.2.11)
-      activesupport
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    byebug (3.1.2)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-    columnize (0.8.9)
-    database_cleaner (1.3.0)
-    debugger-linecache (1.2.0)
-    delayed_job (4.0.1)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
-      activerecord (>= 3.0, < 4.2)
-      delayed_job (>= 3.0, < 4.1)
-    i18n (0.6.9)
-    json (1.8.1)
-    minitest (5.3.4)
-    rake (10.3.2)
-    sqlite3 (1.3.9)
-    thread_safe (0.3.4)
-    timecop (0.7.1)
-    tzinfo (1.2.1)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  bundler
-  byebug
-  database_cleaner
-  delayed_job_active_record
-  rake
-  sqlite3
-  state_manager!
-  timecop

data/VERSION

@@ -1 +0,0 @@
-0.2.11