chanko 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f38de7313d2d2ee7f638e03dc81c249a1bc3e6
-  data.tar.gz: 0fe314d508fdb5cf1df669f26eb02e2c61e6a7bc
+  metadata.gz: 30b75ddfc1e9fe43d6d3b754e7fbf52d335cc3fc
+  data.tar.gz: 95f8aff4181c18e35e9c9bab4764c8c965e10fec
 SHA512:
-  metadata.gz: 4294a26631dab10ffd21f2467c3ac7762dfa53009beebee2575f5b051862ee00da396c80af45a368a2489add336181a77d531bb3e5f28f3bba1c5df66752af46
-  data.tar.gz: 0801e6006c30e6e67fe5426487f6baa388d538b6028dfd20c987da74c87a76e9e4532ca0cbad64449cbcb21d0e9e679ebdf6ae1cf940ab739f4ce09d25a00072
+  metadata.gz: 475502c0c6e2795a09ec61ec99fb42ebdae1d34c63b35e49304a943c4f6b7806c6b688115662255ef155947e417b7ba62253c7ad17f741d11d122ba5e36b6433
+  data.tar.gz: 4984aabddb178deea973816105c6b3a590d2dc2b5901a1ec61c6a52e86f7b4797a5582a019437cc3b25069167094db4d9cf90cd8373b616708cf56d5ccfdda4e

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.6
+* Fix stack control of run_default.
+
 ## 2.0.5
 * Guarantee thread-safety of unit stack for Rails 4
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Ryo Nakamura
+Copyright (c) 2013 COOKPAD Inc.
 
 MIT License
 

data/chanko.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name          = "chanko"
   gem.version       = Chanko::VERSION
   gem.authors       = ["Ryo Nakamura"]
-  gem.email         = ["r7kamura@gmail.com"]
+  gem.email         = ["tech@cookpad.com"]
   gem.description   = "Chanko is a Rails extension tool"
   gem.summary       = "Rails extension tool"
   gem.homepage      = "https://github.com/cookpad/chanko"

data/lib/chanko/invoker.rb

@@ -40,6 +40,18 @@ module Chanko
       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
@@ -49,7 +61,7 @@ module Chanko
     end
 
     def __current_unit_locals
-      __unit_locals_stack.last || {}
+      __unit_locals_stack[-1 - __current_run_default_depth] || {}
     end
 
     def __unit_locals_stack
@@ -73,7 +85,7 @@ module Chanko
     end
 
     def __default_block
-      __defaults_stack.last
+      __defaults_stack[-1 - __current_run_default_depth]
     end
 
     def __has_default_block?
@@ -81,10 +93,16 @@ module Chanko
     end
 
     def __invoke_default_block
-      if view?
-        capture(&__default_block)
-      else
-        instance_exec(&__default_block)
+      current_default_block = __default_block
+      begin
+        __increment_run_default_depth
+        if view?
+          capture(&current_default_block)
+        else
+          instance_exec(&current_default_block)
+        end
+      ensure
+        __decrement_run_default_depth
       end
     end
 

data/lib/chanko/version.rb

@@ -1,3 +1,3 @@
 module Chanko
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/spec/chanko/invoker_spec.rb

@@ -115,6 +115,23 @@ module Chanko
         end
       end
 
+      context "when nested run_default is called in function" do
+        it "invokes given block as a fallback" do
+          Chanko::Loader.load("sensitive_unit")
+          expect(SensitiveUnit).to receive(:ping).once
+
+          controller.invoke(:sensitive_unit, :outer_default) do
+            "default"
+          end.should eq "default"
+        end
+
+        it 'use both locals' do
+          controller.invoke(:example_unit, :nesting_locals_outer, :locals => { :outer_one => "outer_one", :outer_two => "outer_two", :outer_three => "outer_three"}) do
+            "default"
+          end.should eq "outer_one.inner_one.outer_two.default.inner_two.outer_three"
+        end
+      end
+
       context "when run_default is called but no block given" do
         it "invokes given block as a fallback" do
           controller.invoke(:example_unit, :default).should == nil

data/spec/fixtures/units/example_unit/example_unit.rb

@@ -29,6 +29,19 @@ module ExampleUnit
     function(:render) do
       render_to_string :partial => "/test", :locals => { :local => "test" }
     end
+
+    function(:nesting_locals_outer) do
+      result = "#{outer_one}."
+      result += invoke(:example_unit, :nesting_locals_inner, :locals => { :inner_one => "inner_one", :inner_two => "inner_two" }) do
+        "#{outer_two}.#{run_default}"
+      end
+      result += ".#{outer_three}"
+      result
+    end
+
+    function(:nesting_locals_inner) do
+      "#{inner_one}.#{run_default}.#{inner_two}"
+    end
   end
 
   scope(:view) do

data/spec/fixtures/units/sensitive_unit/sensitive_unit.rb

@@ -1,4 +1,20 @@
 module SensitiveUnit
   include Chanko::Unit
   raise_error
+
+  def self.ping
+  end
+
+  scope(:controller) do
+    function(:outer_default) do
+      invoke(:sensitive_unit, :inner_default) do
+        SensitiveUnit.ping
+        run_default
+      end
+    end
+
+    function(:inner_default) do
+      run_default
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chanko
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,7 +180,7 @@ dependencies:
         version: '0'
 description: Chanko is a Rails extension tool
 email:
-- r7kamura@gmail.com
+- tech@cookpad.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Rails extension tool
@@ -369,4 +369,3 @@ test_files:
 - spec/fixtures/units/insensitive_unit/insensitive_unit.rb
 - spec/fixtures/units/sensitive_unit/sensitive_unit.rb
 - spec/spec_helper.rb
-has_rdoc: