state_manager 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0419accf4a65819e6bd75028b092a9888a36e691
-  data.tar.gz: a0565779df5cc5b9446a8ecca9774360050956ef
+  metadata.gz: 8b15ad84b96d1dad7c55974b0471fa4be5a09566
+  data.tar.gz: 92fe664907bc65765d071c5e81eebf866d3e08d3
 SHA512:
-  metadata.gz: 23dbd0c988675d0a84913c4882632ca8fc44c529a1694a43ad3ec91892e3b1495a2aeeb49538e9e7c8a162c788d65afa0a899664cab2f635ff1f76779fec10fc
-  data.tar.gz: a8576af247fd9ee9401198d64573d3e867b807251887d4893dca15d7916324a44e595b214a2505c183db7519dea5deb9d5244d41afd25462d60d1b4b67227700
+  metadata.gz: 1ef18c91dc474166265143cb2e72a20c35c02a1fa324b1b56556fe07a39065a8f36f3d14c47189fca6b2506c7e23b8b8a074d88261b48682f98003d82cd198db
+  data.tar.gz: b6db67cb4441b593453c8c323bfb6d9aa4bfa4e27f48e5e626f79d7179e327c24bac64d1ab3011f33f402b247892f1e3a0fbe77c6613beb76d0990d94fd53554

data/lib/state_manager/adapters/active_record.rb

@@ -19,11 +19,11 @@ module StateManager
         def _validate_states
           self.validate_states!
         end
-        
+
         module ClassMethods
           def state_manager_added(property, klass, options)
             class_eval do
-              klass.specification.states.keys.each do |state|
+              klass.specification.states.each do |state, specification_klass|
                 # The connection might not be ready when defining this code is
                 # reached so we wrap in a lamda.
                 scope state, lambda {
@@ -31,12 +31,12 @@ module StateManager
                   table = conn.quote_table_name table_name
                   column = conn.quote_column_name klass._state_property
                   namespaced_col = "#{table}.#{column}"
-                  query = "#{namespaced_col} = ? OR #{namespaced_col} LIKE ?"
-                  like_term = "#{state.to_s}.%"
-                  where(query, state, like_term)
+                  states = [state].concat specification_klass.specification.descendant_names.map{|s| "#{state}.#{s}"}
+                  query = "#{namespaced_col} in (?)"
+                  where(query, states)
                 }
               end
-              
+
               after_initialize do
                 self.state_managers ||= {}
               end
@@ -49,7 +49,7 @@ module StateManager
               after_commit(:on => :update) { state_managers.values.map(&:after_commit) }
               before_save { state_managers.values.map(&:before_save) }
               after_save { state_managers.values.map(&:after_save) }
-            end 
+            end
           end
         end
 
@@ -73,7 +73,7 @@ module StateManager
 
             def run_after_callbacks(*args)
             end
-            
+
           end
         end
 
@@ -101,10 +101,10 @@ module StateManager
 
           _run_after_callbacks(*transition)
         end
-        
+
         def after_commit
           transitions = self.uncommitted_transitions.dup
-          
+
           self.uncommitted_transitions.clear
 
           transitions.each{ |t| run_commit_callbacks(*t) }
@@ -122,7 +122,7 @@ module StateManager
         def persist_state
           resource.save!
         end
-        
+
         def perform_initial_transition?
           !current_state || resource.new_record?
         end

data/lib/state_manager/state.rb

@@ -18,6 +18,15 @@ module StateManager
         self.states = source.states.dup
         self.events = source.events.dup
       end
+
+      def descendant_names
+        res = []
+        states.each do |state, specification_klass|
+          res << state
+          res.concat specification_klass.specification.descendant_names.map{|s| "#{state}.#{s}"}
+        end
+        res
+      end
     end
 
     class_attribute :specification
@@ -140,7 +149,7 @@ module StateManager
     end
 
     protected
-    
+
     attr_writer :name, :states, :parent_state
 
     def method_missing(name, *args, &block)
@@ -149,4 +158,4 @@ module StateManager
 
 
   end
-end
+end

data/lib/state_manager/version.rb

@@ -1,3 +1,3 @@
 module StateManager
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/test/adapters/active_record_test.rb

@@ -25,7 +25,7 @@ class ActiveRecordTest < Minitest::Test
     state :active
     state :rejected
     state :mutated
-    
+
     attr_accessor :unsubmitted_entered_count
     attr_accessor :unsubmitted_enter_committed_count
     attr_accessor :unsubmitted_exit_committed_count
@@ -51,9 +51,9 @@ 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
@@ -65,11 +65,11 @@ class ActiveRecordTest < Minitest::Test
       def exit_committed
         state_manager.unsubmitted_exit_committed_count += 1
       end
-      
+
     end
-    
+
     class Active
-      
+
       def entered
         state_manager.active_entered_count += 1
       end
@@ -81,7 +81,7 @@ class ActiveRecordTest < Minitest::Test
       def exit_committed
         state_manager.active_exit_committed_count += 1
       end
-      
+
     end
 
     class Mutated
@@ -92,7 +92,7 @@ class ActiveRecordTest < Minitest::Test
       end
 
     end
-    
+
   end
 
   class Post < ActiveRecord::Base
@@ -195,8 +195,8 @@ class ActiveRecordTest < Minitest::Test
 
     # +1 from setup
     assert_equal 1, Post.unsubmitted.count
-    # +2 from setup
-    assert_equal 8, Post.submitted.count
+    # +1 from setup (one is in a bad state)
+    assert_equal 7, Post.submitted.count
     assert_equal 4, Post.active.count
     assert_equal 0, Post.rejected.count
   end
@@ -217,7 +217,7 @@ class ActiveRecordTest < Minitest::Test
       @resource.state_manager.send_event :review
     end
   end
-  
+
   def test_commit_callbacks
     @resource = Post.find(1)
     assert_state 'unsubmitted'
@@ -242,7 +242,7 @@ class ActiveRecordTest < Minitest::Test
     assert_equal 1, @resource.state_manager.unsubmitted_exit_committed_count
     assert_equal 1, @resource.state_manager.active_enter_committed_count
   end
-  
+
   def test_commit_callbacks_on_create
     Post.transaction do
       @resource = Post.new
@@ -254,7 +254,7 @@ class ActiveRecordTest < Minitest::Test
     end
     assert_equal 1, @resource.state_manager.unsubmitted_enter_committed_count
   end
-  
+
   def test_commit_callbacks_on_different_initial_state
     Post.transaction do
       @resource = Post.new(:state => 'active')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: state_manager
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Gordon L. Hempton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: "%Q{Finite state machine implementation.}"