can_has_state 0.3.0 → 0.3.1

data/lib/can_has_state/definition.rb

@@ -3,7 +3,8 @@ module CanHasState
 
     attr_reader :column, :states, :initial_state, :triggers
 
-    def initialize(column_name, &block)
+    def initialize(column_name, parent_context, &block)
+      @parent_context = parent_context
       @column = column_name.to_sym
       @states = {}
       @triggers = []
@@ -49,12 +50,12 @@ module CanHasState
         when :on_enter
           @triggers << {:from=>["*"], :to=>[state_name], :trigger=>Array(val), :type=>:on_enter}
         when :on_enter_deferred
-          raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") unless respond_to?(:after_save)
+          raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") unless @parent_context.respond_to?(:after_save)
           @triggers << {:from=>["*"], :to=>[state_name], :trigger=>Array(val), :type=>:on_enter, :deferred=>true}
         when :on_exit
           @triggers << {:from=>[state_name], :to=>["*"], :trigger=>Array(val), :type=>:on_exit}
         when :on_exit_deferred
-          raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") unless respond_to?(:after_save)
+          raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") unless @parent_context.respond_to?(:after_save)
           @triggers << {:from=>[state_name], :to=>["*"], :trigger=>Array(val), :type=>:on_exit, :deferred=>true}
         end
       end
@@ -66,7 +67,7 @@ module CanHasState
     def on(pairs)
       trigger  = pairs.delete :trigger
       deferred = pairs.delete :deferred
-      raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") if deferred && !respond_to?(:after_save)
+      raise(ArgumentError, "use of deferred triggers requires support for #after_save callbacks") if deferred && !@parent_context.respond_to?(:after_save)
       pairs.each do |from, to|
         @triggers << {:from=>Array(from).map(&:to_s), :to=>Array(to).map(&:to_s), 
                       :trigger=>Array(trigger), :type=>:trigger, :deferred=>!!deferred}

data/lib/can_has_state/machine.rb

@@ -5,7 +5,7 @@ module CanHasState
     module ClassMethods
 
       def state_machine(column, &block)
-        d = Definition.new(column, &block)
+        d = Definition.new(column, self, &block)
 
         define_method "allow_#{column}?" do |to|
           state_machine_allow?(column.to_sym, to.to_s)

data/lib/can_has_state/version.rb

@@ -1,3 +1,3 @@
 module CanHasState
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/can_has_state_test.rb

@@ -61,6 +61,14 @@ class UserPreState
   include ActiveModel::Validations::Callbacks
   include CanHasState::Machine
 end
+class UserPreState2
+  include ActiveModel::Validations
+  include ActiveModel::Validations::Callbacks
+  include CanHasState::Machine
+  def self.after_save(*_)
+    # dummy to allow deferred triggers
+  end
+end
 
 class CanHasStateTest < MiniTest::Unit::TestCase #Minitest::Test
 
@@ -123,6 +131,27 @@ class CanHasStateTest < MiniTest::Unit::TestCase #Minitest::Test
     end
   end
 
+  def test_deferred_available
+    UserPreState2.class_eval do
+      state_machine :state_one do
+        state :one, on_enter_deferred: ->{ puts 'Hello' }
+      end
+    end
+
+    UserPreState2.class_eval do
+      state_machine :state_two do
+        state :two, on_exit_deferred: ->{ puts 'Hello' }
+      end
+    end
+
+    UserPreState2.class_eval do
+      state_machine :state_three do
+        state :three
+        on :* => :*, trigger: ->{ puts 'Hello' }, deferred: true
+      end
+    end
+  end
+
   def test_builder_complex
     assert_equal 1, Account.state_machines.size
     sm = Account.state_machines[0][1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: can_has_state
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: