Merge pull request #47 from eudoxa/use_stack_control_instead_of_counting

use stack control instead of counting

lib/chanko/invoker.rb

@@ -40,18 +40,6 @@ def method_missing(method_name, *args, &block)
       end
     end
 
-    def __current_run_default_depth
-      @__run_default_depth ||= 0
-    end
-
-    def __increment_run_default_depth
-      @__run_default_depth = __current_run_default_depth + 1
-    end
-
-    def __decrement_run_default_depth
-      @__run_default_depth = __current_run_default_depth - 1
-    end
-
     def __find_unit_local(method_name)
       __current_unit_locals.has_key?(method_name)
     end
@@ -61,7 +49,7 @@ def __fetch_unit_local(method_name)
     end
 
     def __current_unit_locals
-      __unit_locals_stack[-1 - __current_run_default_depth] || {}
+      __unit_locals_stack.last || {}
     end
 
     def __unit_locals_stack
@@ -85,7 +73,7 @@ def __defaults_stack
     end
 
     def __default_block
-      __defaults_stack[-1 - __current_run_default_depth]
+      __defaults_stack.last
     end
 
     def __has_default_block?
@@ -95,14 +83,15 @@ def __has_default_block?
     def __invoke_default_block
       current_default_block = __default_block
       begin
-        __increment_run_default_depth
-        if view?
-          capture(&current_default_block)
-        else
-          instance_exec(&current_default_block)
+        __without_default_stack do
+          __without_locals_stack do
+            if view?
+              capture(&current_default_block)
+            else
+              instance_exec(&current_default_block)
+            end
+          end
         end
-      ensure
-        __decrement_run_default_depth
       end
     end
 
@@ -119,5 +108,19 @@ def __with_unit_locals_stack(locals)
     ensure
       __unit_locals_stack.pop
     end
+
+    def __without_default_stack
+      default = __defaults_stack.pop
+      yield
+    ensure
+      __defaults_stack << default
+    end
+
+    def __without_locals_stack
+      locals = __unit_locals_stack.pop
+      yield
+    ensure
+      __unit_locals_stack << locals
+    end
   end
 end

spec/chanko/invoker_spec.rb

@@ -130,6 +130,15 @@ module Chanko
             "default"
           end.should eq "outer_one.inner_one.outer_two.default.inner_two.outer_three"
         end
+
+        context 'active_if is false' do
+          it "invokes given block as a fallback " do
+            Chanko::Loader.load("sensitive_inactive_unit")
+            controller.invoke(:sensitive_inactive_unit, :outer) do
+              invoke(:sensitive_inactive_unit, :inner)
+            end.should eq nil
+          end
+        end
       end
 
       context "when run_default is called but no block given" do

spec/fixtures/units/sensitive_inactive_unit/sensitive_inactive_unit.rb

@@ -0,0 +1,9 @@
+module SensitiveInactiveUnit
+  include Chanko::Unit
+  active_if { false }
+
+  scope(:controller) do
+    function(:outer) {}
+    function(:innner) {}
+  end
+end