Merge pull request #124 from dry-rb/prevent-needless-shared-partial-l…

…ookup

Prevent needless partial lookup in `<template name>/shared`

lib/dry/view/path.rb

@@ -9,14 +9,16 @@ class Path
 
       attr_reader :dir, :root
 
-      def initialize(dir, options = {})
+      def initialize(dir, root: dir)
         @dir = Pathname(dir)
-        @root = Pathname(options.fetch(:root, dir))
+        @root = root
       end
 
-      def lookup(name, format)
+      def lookup(name, format, include_shared: true)
         fetch_or_store(dir, root, name, format) do
-          template?(name, format) || template?("shared/#{name}", format) || !root? && chdir('..').lookup(name, format)
+          template?(name, format) ||
+            (include_shared && template?("shared/#{name}", format)) ||
+            !root? && chdir('..').lookup(name, format)
         end
       end
 

lib/dry/view/renderer.rb

@@ -50,7 +50,7 @@ def chdir(dirname)
 
       def lookup(name)
         paths.inject(false) { |_, path|
-          result = path.lookup(name, format)
+          result = path.lookup(name, format, include_shared: false)
           break result if result
         }
       end

spec/spec_helper.rb

@@ -30,6 +30,19 @@ def self.remove_constants
   config.after do
     Test.remove_constants
   end
+
+  config.after do
+    [
+      Dry::View,
+      Dry::View::PartBuilder,
+      Dry::View::Path,
+      Dry::View::Renderer,
+      Dry::View::ScopeBuilder,
+      Dry::View::Tilt,
+    ].each do |klass|
+      klass.cache.clear
+    end
+  end
 end
 
 RSpec::Matchers.define :part_including do |data|

spec/unit/renderer_spec.rb

@@ -17,11 +17,13 @@
       expect(renderer.template(:hello, scope)).to eql('<h1>Hello</h1>')
     end
 
-    it 'renders template in shared/ subdirectory' do
-      expect(renderer.template(:_shared_hello, scope)).to eql('<h1>Hello</h1>')
+    it 'does not include `shared/` subdirectory under root when looking up templates' do
+      expect {
+        renderer.template(:_shared_hello, scope)
+      }.to raise_error(Dry::View::Renderer::TemplateNotFoundError, /_shared_hello/)
     end
 
-    it 'renders template in upper directory' do
+    it 'renders template in shared/ when descending from an upper directory' do
       expect(renderer.chdir('nested').template(:_shared_hello, scope)).to eql('<h1>Hello</h1>')
     end
 
@@ -37,8 +39,14 @@
       expect(renderer.partial(:hello, scope)).to eql('<h1>Partial hello</h1>')
     end
 
-    it 'renders partial in shared/ subdirectory' do
-      expect(renderer.partial(:shared_hello, scope)).to eql('<h1>Hello</h1>')
+    it 'does not include `shared/` subdirectory under root when looking up partials' do
+      expect {
+        renderer.partial(:shared_hello, scope)
+      }.to raise_error(Dry::View::Renderer::TemplateNotFoundError, /_shared_hello/)
+    end
+
+    it 'renders partial in shared/ subdirectory when descending from an upper directory' do
+      expect(renderer.chdir('hello').partial(:shared_hello, scope)).to eql('<h1>Hello</h1>')
     end
 
     it 'renders partial in upper directory' do