chanko 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b75ddfc1e9fe43d6d3b754e7fbf52d335cc3fc
-  data.tar.gz: 95f8aff4181c18e35e9c9bab4764c8c965e10fec
+  metadata.gz: f325906ba94cd59313a68d2cba3be3bb6d3b05f9
+  data.tar.gz: 5a7e857db28ef637d4fed3c77bd3c6976885fcc7
 SHA512:
-  metadata.gz: 475502c0c6e2795a09ec61ec99fb42ebdae1d34c63b35e49304a943c4f6b7806c6b688115662255ef155947e417b7ba62253c7ad17f741d11d122ba5e36b6433
-  data.tar.gz: 4984aabddb178deea973816105c6b3a590d2dc2b5901a1ec61c6a52e86f7b4797a5582a019437cc3b25069167094db4d9cf90cd8373b616708cf56d5ccfdda4e
+  metadata.gz: f456c90d96c0ad8002028cf1c8d5402878133c330ec59917a75bdffb5ddece6937ce412337270cc8e455331e8160833b77a8ac467f21cb84d5194a0052b6edd6
+  data.tar.gz: 5180320d9015bdcca75c76ba35c99ed2177e5f54da759e25680da76745fe17f160faa9304225a3f9891f9b5ab7998cc512a9c174a2df3226926cb392819bbbde

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.7
+* Fix run_default again. 2.0.6 still has run_default bug. Use unstack block instad of depth counting.
+  
+
 ## 2.0.6
 * Fix stack control of run_default.
 

data/Gemfile

@@ -3,24 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test, :production do
-  gem "jquery-rails"
   gem "quiet_assets"
-  gem "rails", ">= 4.0.0"
-  gem "slim"
-  gem "sqlite3"
-end
-
-group :test do
-  gem "rspec-rails", "2.14.0"
 end
 
 group :development, :test do
   gem "pry-rails"
-  gem "thin"
-end
-
-group :assets do
-  gem "sass-rails"
-  gem "coffee-rails"
-  gem "uglifier"
 end

data/README.md

@@ -1,4 +1,4 @@
-# Chanko [![Build Status](https://travis-ci.org/cookpad/chanko.png)](https://travis-ci.org/cookpad/chanko) [![Code Climate](https://codeclimate.com/github/cookpad/chanko.png)](https://codeclimate.com/github/cookpad/chanko) [![Coverage Status](https://coveralls.io/repos/cookpad/chanko/badge.png?branch=master)](https://coveralls.io/r/cookpad/chanko)
+# Chanko [![Build Status](https://travis-ci.org/cookpad/chanko.svg?branch=master)](https://travis-ci.org/cookpad/chanko) [![Code Climate](https://codeclimate.com/github/cookpad/chanko/badges/gpa.svg)](https://codeclimate.com/github/cookpad/chanko) [![Coverage Status](https://coveralls.io/repos/cookpad/chanko/badge.svg?branch=master)](https://coveralls.io/r/cookpad/chanko?branch=master)
 
 http://cookpad.github.io/chanko/
 

data/chanko.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "coveralls"
   gem.add_development_dependency "jquery-rails"
   gem.add_development_dependency "pry"
-  gem.add_development_dependency "rspec-rails", "2.12.2"
+  gem.add_development_dependency "rspec-rails", ">= 3.0.0"
   gem.add_development_dependency "sass-rails", ">= 3.0.10"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "slim"

data/lib/chanko/invoker.rb

@@ -40,18 +40,6 @@ 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
@@ -61,7 +49,7 @@ module Chanko
     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 @@ module Chanko
     end
 
     def __default_block
-      __defaults_stack[-1 - __current_run_default_depth]
+      __defaults_stack.last
     end
 
     def __has_default_block?
@@ -95,14 +83,15 @@ module Chanko
     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 @@ module Chanko
     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

data/lib/chanko/version.rb

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

data/spec/chanko/controller_spec.rb

@@ -22,21 +22,21 @@ module Chanko
       end
 
       it "defines an action to invoke unit function" do
-        controller.test.should == "test"
+        expect(controller.test).to eq("test")
       end
 
       it "defines 2 actions at one line" do
-        controller.foo.should == "foo"
-        controller.bar.should == "bar"
+        expect(controller.foo).to eq("foo")
+        expect(controller.bar).to eq("bar")
       end
 
       it "is aliased with `ext_action`" do
-        controller.alias.should == "alias"
+        expect(controller.alias).to eq("alias")
       end
 
       context "when invoke is fallen back" do
         it "halts with 400 status code" do
-          controller.error.should == "Bad Request 400"
+          expect(controller.error).to eq("Bad Request 400")
         end
       end
     end

data/spec/chanko/deprecated_spec.rb

@@ -12,7 +12,7 @@ module Chanko
       context "with option arguments" do
         it "prints warning message on standard error output" do
           ActiveIf.new(foo: "bar")
-          $stderr.string.should =~ /\Aoptions in ActiveIf#new are deprecated and are never used at #{__FILE__}/
+          expect($stderr.string).to match(/\Aoptions in ActiveIf#new are deprecated and are never used at #{__FILE__}/)
         end
       end
     end
@@ -20,7 +20,7 @@ module Chanko
     describe "#options" do
       it "prints warning message on standard error output" do
         ActiveIf.new.options
-        $stderr.string.should =~ /\AActiveIf#options is deprecated and is never used at #{__FILE__}/
+        expect($stderr.string).to match(/\AActiveIf#options is deprecated and is never used at #{__FILE__}/)
       end
     end
   end

data/spec/chanko/exception_handler_spec.rb

@@ -20,7 +20,7 @@ module Chanko
       end
 
       it "raises up error without any logging" do
-        Logger.should_not_receive(:debug)
+        expect(Logger).not_to receive(:debug)
         expect { described_class.handle(error, insensitive_unit) }.to raise_error
       end
     end

data/spec/chanko/function_spec.rb

@@ -40,19 +40,19 @@ module Chanko
 
     describe ".invoke" do
       it "invokes block with given context and stacked unit" do
-        described_class.new(unit, :label) { current_unit }.invoke(context, options).should == unit
+        expect(described_class.new(unit, :label) { current_unit }.invoke(context, options)).to eq(unit)
       end
 
       context "when context is a view" do
         it "invokes with unit's view path" do
-          described_class.new(unit, :label) { path }.invoke(context, options).should == unit.view_path
+          expect(described_class.new(unit, :label) { path }.invoke(context, options)).to eq(unit.view_path)
         end
       end
 
       context "when context does not have view_paths" do
         it "invokes successfully" do
-          described_class.new(unit, :label) { "test" }.
-            invoke(context_without_view_paths, options).should == "test"
+          expect(described_class.new(unit, :label) { "test" }.
+            invoke(context_without_view_paths, options)).to eq("test")
         end
       end
     end

data/spec/chanko/helper_spec.rb

@@ -19,7 +19,7 @@ module Chanko
             "test"
           end
         end
-        view.__example_unit_test.should == "test"
+        expect(view.__example_unit_test).to eq("test")
       end
     end
   end

data/spec/chanko/invoker_spec.rb

@@ -20,25 +20,25 @@ module Chanko
 
     describe "#invoke" do
       it "invokes in the same context with receiver" do
-        view.invoke(:example_unit, :self, :type => :plain).should == view
+        expect(view.invoke(:example_unit, :self, :type => :plain)).to eq(view)
       end
 
       it "invokes with locals option" do
-        view.invoke(:example_unit, :locals, :locals => { :key => "value" }, :type => :plain).
-          should == "value"
+        expect(view.invoke(:example_unit, :locals, :locals => { :key => "value" }, :type => :plain)).
+          to eq("value")
       end
 
       it "invokes with falsy locals" do
-        view.invoke(:example_unit, :falsy, :locals => { :key => nil }, :type => :plain).
-          should == true
+        expect(view.invoke(:example_unit, :falsy, :locals => { :key => nil }, :type => :plain)).
+          to eq(true)
       end
 
       it "invokes with shared method" do
-        view.invoke(:example_unit, :shared, :type => :plain).should == "shared args"
+        expect(view.invoke(:example_unit, :shared, :type => :plain)).to eq("shared args")
       end
 
       it "invokes with helper method in view context" do
-        view.invoke(:example_unit, :helper, :type => :plain).should == "helper"
+        expect(view.invoke(:example_unit, :helper, :type => :plain)).to eq("helper")
       end
 
       context 'when unit is referred from unit function' do
@@ -49,27 +49,29 @@ module Chanko
 
       context "when invoked in view" do
         it "invokes with partial view" do
-          view.invoke(:example_unit, :render, :type => :plain).should == "test\n"
+          expect(view.invoke(:example_unit, :render, :type => :plain)).to eq("test\n")
         end
       end
 
       context "when invoked in controller" do
         it "invokes with unit views path" do
-          controller.invoke(:example_unit, :render, :type => :plain).should == "test\n"
+          expect(controller.invoke(:example_unit, :render, :type => :plain)).to eq("test\n")
         end
       end
 
       context "when short-hand style args is passed" do
         it "recognizes args as locals option" do
-          view.invoke(:example_unit, :locals, :key => "value").should ==
+          expect(view.invoke(:example_unit, :locals, :key => "value")).to eq(
             '<div class="unit unit__example_unit unit__example_unit__locals">value</div>'
+          )
         end
       end
 
       context "when type is not specified" do
         it "invokes and returns result surrounded by div" do
-          view.invoke(:example_unit, :test).should ==
+          expect(view.invoke(:example_unit, :test)).to eq(
             '<div class="unit unit__example_unit unit__example_unit__test">test</div>'
+          )
         end
       end
 
@@ -79,39 +81,41 @@ module Chanko
         end
 
         it "invokes and returns result surrounded by div" do
-          view.invoke(:example_unit, :test).should ==
+          expect(view.invoke(:example_unit, :test)).to eq(
             '<div class="extension ext_example_unit ext_example_unit-test">test</div>'
+          )
         end
       end
 
       context "when type is :plain" do
         it "does not surround result with html element" do
-          view.invoke(:example_unit, :test, :type => :plain).should == "test"
+          expect(view.invoke(:example_unit, :test, :type => :plain)).to eq("test")
         end
       end
 
       context "when the result is blank" do
         it "does not surround result with html element" do
-          view.invoke(:example_unit, :blank).should == " "
+          expect(view.invoke(:example_unit, :blank)).to eq(" ")
         end
       end
 
       context "when type is :inline" do
         it "invokes and returns result surrounded by span" do
-          view.invoke(:example_unit, :test, :type => :inline).should ==
+          expect(view.invoke(:example_unit, :test, :type => :inline)).to eq(
             '<span class="unit unit__example_unit unit__example_unit__test">test</span>'
+          )
         end
       end
 
       context "when context is not a view" do
         it "does not surround result with html tag" do
-          controller.invoke(:example_unit, :test).should == "test"
+          expect(controller.invoke(:example_unit, :test)).to eq("test")
         end
       end
 
       context "when run_default is called in function" do
         it "invokes given block as a fallback" do
-          controller.invoke(:example_unit, :default) { "default" }.should == "default"
+          expect(controller.invoke(:example_unit, :default) { "default" }).to eq("default")
         end
       end
 
@@ -120,34 +124,41 @@ module Chanko
           Chanko::Loader.load("sensitive_unit")
           expect(SensitiveUnit).to receive(:ping).once
 
-          controller.invoke(:sensitive_unit, :outer_default) do
+          expect(controller.invoke(:sensitive_unit, :outer_default) do
             "default"
-          end.should eq "default"
+          end).to 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
+          expect(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).to 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")
+            expect(controller.invoke(:sensitive_inactive_unit, :outer) { invoke(:sensitive_inactive_unit, :inner) }).to eq(nil)
+          end
         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
+          expect(controller.invoke(:example_unit, :default)).to eq(nil)
         end
       end
 
       context "when non-existent unit is specified" do
         it "does nothing" do
-          view.invoke(:non_existent_unit, :test, :type => :plain).should == nil
+          expect(view.invoke(:non_existent_unit, :test, :type => :plain)).to eq(nil)
         end
       end
 
       context "when function is not found" do
         it "runs default but not handled by ExceptionHandler" do
-          ExceptionHandler.should_not_receive(:handle)
-          view.invoke(:example_unit, :non_existent_function) { "default" }.should == "default"
+          expect(ExceptionHandler).not_to receive(:handle)
+          expect(view.invoke(:example_unit, :non_existent_function) { "default" }).to eq("default")
         end
       end
 
@@ -155,22 +166,22 @@ module Chanko
         context "when block is given" do
           context "when context is a view" do
             it "captures given block as a fallback" do
-              view.should_receive(:capture).and_call_original
-              view.invoke(:example_unit, :error) { "error" }.should == "error"
+              expect(view).to receive(:capture).and_call_original
+              expect(view.invoke(:example_unit, :error) { "error" }).to eq("error")
             end
           end
 
           context "when context is not a view" do
             it "calls given block as a fallback" do
-              controller.should_not_receive(:capture)
-              controller.invoke(:example_unit, :error) { "error" }.should == "error"
+              expect(controller).not_to receive(:capture)
+              expect(controller.invoke(:example_unit, :error) { "error" }).to eq("error")
             end
           end
         end
 
         context "when no block is given" do
           it "rescues the error and does nothing" do
-            view.invoke(:example_unit, :error).should == nil
+            expect(view.invoke(:example_unit, :error)).to eq(nil)
           end
         end
       end

data/spec/chanko/loader_spec.rb

@@ -9,19 +9,19 @@ module Chanko
 
       context "when existent unit name is passed" do
         it "loads unit in units directory and returns the Module" do
-          described_class.load(:example_unit).should == ExampleUnit
+          expect(described_class.load(:example_unit)).to eq(ExampleUnit)
         end
       end
 
       context "when non-existent unit name is passed" do
         it "returns nil" do
-          described_class.load(:non_existent_unit).should == nil
+          expect(described_class.load(:non_existent_unit)).to eq(nil)
         end
       end
 
       context "when loader has ever loaded specified unit" do
         it "load unit from cache" do
-          described_class.any_instance.should_receive(:load_from_file).and_call_original
+          expect_any_instance_of(described_class).to receive(:load_from_file).and_call_original
           described_class.load(:example_unit)
           described_class.load(:example_unit)
         end
@@ -33,7 +33,7 @@ module Chanko
         end
 
         it "load unit from cache" do
-          described_class.any_instance.should_receive(:load_from_file).and_call_original
+          expect_any_instance_of(described_class).to receive(:load_from_file).and_call_original
           described_class.load(:non_existent_unit)
           described_class.load(:non_existent_unit)
         end

data/spec/chanko/logger_spec.rb

@@ -53,7 +53,7 @@ module Chanko
       context "when given Exception" do
         it "parses and logs it" do
           described_class.debug(exception)
-          log.should == lines.join("\n")
+          expect(log).to eq(lines.join("\n"))
         end
 
         context "when Config.backtrace_limit is configured" do
@@ -63,7 +63,7 @@ module Chanko
 
           it "prints backtrace up to configured depth" do
             described_class.debug(exception)
-            log.should == lines[0..5].join("\n")
+            expect(log).to eq(lines[0..5].join("\n"))
           end
         end
       end
@@ -71,7 +71,7 @@ module Chanko
       context "when given String" do
         it "adds prefix" do
           described_class.debug("test")
-          log.should == "  [Chanko] test"
+          expect(log).to eq("  [Chanko] test")
         end
       end
     end
@@ -83,13 +83,13 @@ module Chanko
 
       it "logs nothing" do
         described_class.debug("test")
-        log.should == ""
+        expect(log).to eq("")
       end
     end
 
     context "when Rails.logger is nil" do
       before do
-        Rails.stub(:logger)
+        allow(Rails).to receive(:logger)
       end
 
       it "does notihng" do

data/spec/chanko/test_spec.rb

@@ -14,14 +14,14 @@ module Chanko
     describe "#enable_unit" do
       it "forces to enable specified unit" do
         enable_unit(:inactive_unit)
-        view.invoke(:inactive_unit, :inactive, :type => :plain).should == "inactive"
+        expect(view.invoke(:inactive_unit, :inactive, :type => :plain)).to eq("inactive")
       end
     end
 
     describe "#disable_unit" do
       it "forces to disable specified unit" do
         disable_unit(:example_unit)
-        view.invoke(:example_unit, :test).should == nil
+        expect(view.invoke(:example_unit, :test)).to eq(nil)
       end
     end
   end

data/spec/chanko/unit/extender_spec.rb

@@ -13,7 +13,7 @@ module Chanko
             "test"
           end
         end
-        ExampleClass.new.test.should == "test"
+        expect(ExampleClass.new.test).to eq("test")
       end
 
       it "extends class methods" do
@@ -24,7 +24,7 @@ module Chanko
             end
           end
         end
-        ExampleClass.test.should == "test"
+        expect(ExampleClass.test).to eq("test")
       end
 
       it "extends instance methods with prefix" do
@@ -33,7 +33,7 @@ module Chanko
             "test"
           end
         end
-        ExampleClass.new.__prefix_test.should == "test"
+        expect(ExampleClass.new.__prefix_test).to eq("test")
       end
     end
   end

data/spec/chanko/unit/scope_finder_spec.rb

@@ -7,28 +7,28 @@ module Chanko
         context "when identifier is a class" do
           it "returns identifier with no change" do
             identifier = ActionView::Base
-            described_class.find(identifier).should == ActionView::Base
+            expect(described_class.find(identifier)).to eq(ActionView::Base)
           end
         end
 
         context "when identifier is a reserved label" do
           it "returns reserved class for that" do
             identifier = :view
-            described_class.find(identifier).should == ActionView::Base
+            expect(described_class.find(identifier)).to eq(ActionView::Base)
           end
         end
 
         context "when identifier is a string that means a class" do
           it "returns class of that string" do
             identifier = "ActionView::Base"
-            described_class.find(identifier).should == ActionView::Base
+            expect(described_class.find(identifier)).to eq(ActionView::Base)
           end
         end
 
         context "when no class is found" do
           it "returns nil" do
             identifier = "Non::Existent::Class"
-            described_class.find(identifier).should == nil
+            expect(described_class.find(identifier)).to eq(nil)
           end
         end
       end

data/spec/chanko/unit_proxy_provider_spec.rb

@@ -10,8 +10,8 @@ module Chanko
       context "when given unit name" do
         it "returns proxy for specified unit" do
           proxy = view.unit(:example_unit)
-          proxy.should be_a UnitProxy
-          proxy.unit.should == ExampleUnit
+          expect(proxy).to be_a UnitProxy
+          expect(proxy.unit).to eq(ExampleUnit)
         end
       end
 
@@ -26,7 +26,7 @@ module Chanko
 
         it "returns proxy for the top unit of current unit stack" do
           proxy = view.unit
-          proxy.unit.should == ExampleUnit
+          expect(proxy.unit).to eq(ExampleUnit)
         end
       end
 
@@ -39,10 +39,10 @@ module Chanko
         end
 
         it "change this method name with it" do
-          view.should_not be_respond_to(:proxy)
+          expect(view).not_to be_respond_to(:proxy)
           proxy = view.proxy(:example_unit)
-          proxy.should be_a UnitProxy
-          view.should be_respond_to(:proxy)
+          expect(proxy).to be_a UnitProxy
+          expect(view).to be_respond_to(:proxy)
         end
       end
 
@@ -55,12 +55,12 @@ module Chanko
         end
 
         it "change this method name with it" do
-          view.should_not be_respond_to(:proxy1)
-          view.should_not be_respond_to(:proxy2)
-          view.proxy1(:example_unit).should be_a UnitProxy
-          view.proxy2(:example_unit).should be_a UnitProxy
-          view.should be_respond_to(:proxy1)
-          view.should be_respond_to(:proxy2)
+          expect(view).not_to be_respond_to(:proxy1)
+          expect(view).not_to be_respond_to(:proxy2)
+          expect(view.proxy1(:example_unit)).to be_a UnitProxy
+          expect(view.proxy2(:example_unit)).to be_a UnitProxy
+          expect(view).to be_respond_to(:proxy1)
+          expect(view).to be_respond_to(:proxy2)
         end
       end
     end

data/spec/chanko/unit_proxy_spec.rb

@@ -8,14 +8,14 @@ module Chanko
 
     describe "#active?" do
       it "returns activation status of unit" do
-        view.unit(:example_unit).should be_active
-        view.unit(:inactive_unit).should_not be_active
+        expect(view.unit(:example_unit)).to be_active
+        expect(view.unit(:inactive_unit)).not_to be_active
       end
     end
 
     describe "#method_missing" do
       it "calls prefixed method" do
-        view.should_receive(:__example_unit_test)
+        expect(view).to receive(:__example_unit_test)
         view.unit(:example_unit).test
       end
     end

data/spec/chanko/unit_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module Chanko
   describe Unit do
     before do
-      unit.stub(:name => "ExampleUnit")
+      allow(unit).to receive_messages(:name => "ExampleUnit")
     end
 
     let(:unit) do
@@ -29,7 +29,7 @@ module Chanko
       describe ".active_if" do
         context "in default configuration" do
           it "is configured to return always true" do
-            should be_true
+            is_expected.to eq(true)
           end
         end
 
@@ -38,7 +38,7 @@ module Chanko
             unit.active_if(:true, :false)
           end
           specify "all of defined conditions must pass" do
-            should be_false
+            is_expected.to eq(false)
           end
         end
 
@@ -47,7 +47,7 @@ module Chanko
             unit.active_if(:true) { false }
           end
           specify "all of defined conditions and block must pass" do
-            should be_false
+            is_expected.to eq(false)
           end
         end
 
@@ -69,7 +69,7 @@ module Chanko
               active_if any(:true, :false)
             end
           end
-          it { should be_true }
+          it { is_expected.to eq(true) }
         end
 
         context "when all conditions returned false" do
@@ -78,7 +78,7 @@ module Chanko
               active_if any(:false, :false)
             end
           end
-          it { should be_false }
+          it { is_expected.to eq(false) }
         end
       end
 
@@ -89,7 +89,7 @@ module Chanko
               active_if none(:false, :false)
             end
           end
-          it { should be_true }
+          it { is_expected.to eq(true) }
         end
 
         context "when conditions returned true and false" do
@@ -98,7 +98,7 @@ module Chanko
               active_if none(:true, :false)
             end
           end
-          it { should be_false }
+          it { is_expected.to eq(false) }
         end
       end
 
@@ -110,7 +110,7 @@ module Chanko
             end
           end
           it "returns negatived result of inner-expression" do
-            should be_false
+            is_expected.to eq(false)
           end
         end
 
@@ -121,7 +121,7 @@ module Chanko
             end
           end
           it "uses none(:true) as false" do
-            should be_false
+            is_expected.to eq(false)
           end
         end
 
@@ -131,7 +131,7 @@ module Chanko
               active_if any(any(none(:false), :false), :false)
             end
           end
-          it { should be_true }
+          it { is_expected.to eq(true) }
         end
       end
     end
@@ -139,13 +139,13 @@ module Chanko
     describe ".scope" do
       specify "given scope is recorded to used scope list" do
         unit.scope(:view) { }
-        unit.scopes.keys.should == [ActionView::Base]
+        expect(unit.scopes.keys).to eq([ActionView::Base])
       end
 
       context "in the scoped block" do
         specify "current_scope returns given scope" do
           unit.scope(:view) do
-            unit.current_scope.should == ActionView::Base
+            expect(unit.current_scope).to eq(ActionView::Base)
           end
         end
       end
@@ -153,7 +153,7 @@ module Chanko
       context "out of the scoped block" do
         specify "current_scope returns nil" do
           unit.scope(:view) { }
-          unit.current_scope.should == nil
+          expect(unit.current_scope).to eq(nil)
         end
       end
     end
@@ -165,7 +165,7 @@ module Chanko
             "test"
           end
         end
-        unit.scopes[ActionView::Base][:test].block.call.should == "test"
+        expect(unit.scopes[ActionView::Base][:test].block.call).to eq("test")
       end
     end
 
@@ -174,7 +174,7 @@ module Chanko
         unit.shared(:test) do
           "test"
         end
-        unit.shared_methods[:test].call.should == "test"
+        expect(unit.shared_methods[:test].call).to eq("test")
       end
     end
 
@@ -185,7 +185,7 @@ module Chanko
             "test"
           end
         end
-        view.__example_unit_test.should == "test"
+        expect(view.__example_unit_test).to eq("test")
       end
     end
 
@@ -230,25 +230,25 @@ module Chanko
       end
 
       it "defines instance methods with prefix" do
-        ExampleModel.new.__example_unit_test.should == "test"
+        expect(ExampleModel.new.__example_unit_test).to eq("test")
       end
 
       it "defines class methods with prefix" do
-        ExampleModel.__example_unit_test.should == "test"
+        expect(ExampleModel.__example_unit_test).to eq("test")
       end
 
       it "defines scope method with prefix" do
-        ExampleModel.__example_unit_active.should == "scoped"
+        expect(ExampleModel.__example_unit_active).to eq("scoped")
       end
 
       it "defines has_one association method with prefix" do
-        ExampleModel.__example_unit_user.should == [:class_name => "User"]
+        expect(ExampleModel.__example_unit_user).to eq([:class_name => "User"])
       end
     end
 
     describe ".view_path" do
       it "returns path for its view directory" do
-        unit.view_path.should == "#{Config.units_directory_path}/example_unit/views"
+        expect(unit.view_path).to eq("#{Config.units_directory_path}/example_unit/views")
       end
     end
   end

data/spec/controllers/application_controller_spec.rb

@@ -8,7 +8,7 @@ describe ApplicationController do
   end
 
   it "clears cache before each request" do
-    Chanko::Loader.cache.should_receive(:clear).exactly(2)
+    expect(Chanko::Loader.cache).to receive(:clear).exactly(2)
     get :index
     get :index
   end

data/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

data/spec/spec_helper.rb

@@ -12,19 +12,32 @@ require "chanko"
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
-require "rspec/autorun"
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+
   config.after do
     Chanko::Config.reset
     Chanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)
   end
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end
 
 Chanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chanko
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +279,7 @@ files:
 - spec/fixtures/units/example_unit/views/_test.html.erb
 - spec/fixtures/units/inactive_unit/inactive_unit.rb
 - spec/fixtures/units/insensitive_unit/insensitive_unit.rb
+- spec/fixtures/units/sensitive_inactive_unit/sensitive_inactive_unit.rb
 - spec/fixtures/units/sensitive_unit/sensitive_unit.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cookpad/chanko
@@ -367,5 +368,6 @@ test_files:
 - spec/fixtures/units/example_unit/views/_test.html.erb
 - spec/fixtures/units/inactive_unit/inactive_unit.rb
 - spec/fixtures/units/insensitive_unit/insensitive_unit.rb
+- spec/fixtures/units/sensitive_inactive_unit/sensitive_inactive_unit.rb
 - spec/fixtures/units/sensitive_unit/sensitive_unit.rb
 - spec/spec_helper.rb