From 3a7fcc5c0f4b3d4f279607a934ec2399932e37d2 Mon Sep 17 00:00:00 2001
From: Tim Riley <tim@openmonkey.com>
Date: Tue, 29 Jan 2019 11:32:45 +1100
Subject: [PATCH 1/4] Prevent needless partial lookup in `<path>/<template
 name>/shared`

It's pointless putting partials in that directory (`<path>/<template name>` is already exclusive to the current template so the extra "shared" nesting makes no sense), so stop checking it and save ourselves the filesystem hit.
---
 lib/dry/view/path.rb     | 6 ++++--
 lib/dry/view/renderer.rb | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/dry/view/path.rb b/lib/dry/view/path.rb
index 968114c6..eaae9d0d 100644
--- a/lib/dry/view/path.rb
+++ b/lib/dry/view/path.rb
@@ -14,9 +14,11 @@ def initialize(dir, options = {})
         @root = Pathname(options.fetch(:root, dir))
       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
 
diff --git a/lib/dry/view/renderer.rb b/lib/dry/view/renderer.rb
index 12a7271f..80e04be3 100644
--- a/lib/dry/view/renderer.rb
+++ b/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

From 28b8687d0640ab1a6cf0acb74a83a1d93f5a819f Mon Sep 17 00:00:00 2001
From: Tim Riley <tim@openmonkey.com>
Date: Tue, 29 Jan 2019 11:33:05 +1100
Subject: [PATCH 2/4] Use real keyword arg for Path#initialize

---
 lib/dry/view/path.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dry/view/path.rb b/lib/dry/view/path.rb
index eaae9d0d..c8000f6a 100644
--- a/lib/dry/view/path.rb
+++ b/lib/dry/view/path.rb
@@ -9,9 +9,9 @@ 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, include_shared: true)

From f93b883f3879d88d864daca387744230dc33bf62 Mon Sep 17 00:00:00 2001
From: Tim Riley <tim@openmonkey.com>
Date: Tue, 29 Jan 2019 12:09:20 +1100
Subject: [PATCH 3/4] Clear all caches after each spec example

This should ensure our tests run faithfully regardless of order
---
 spec/spec_helper.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 831a475c..83f8d68f 100644
--- a/spec/spec_helper.rb
+++ b/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|

From f918caf979a0364c161a02b910e815dfb66ae37b Mon Sep 17 00:00:00 2001
From: Tim Riley <tim@openmonkey.com>
Date: Tue, 29 Jan 2019 12:10:07 +1100
Subject: [PATCH 4/4] Update spec to show `shared/` is not part of the initial
 template lookup

---
 spec/unit/renderer_spec.rb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/spec/unit/renderer_spec.rb b/spec/unit/renderer_spec.rb
index e22679e1..dcce1a23 100644
--- a/spec/unit/renderer_spec.rb
+++ b/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