lib/eac_templates/modules/ancestor.rb in eac_templates-0.4.0 vs lib/eac_templates/modules/ancestor.rb in eac_templates-0.5.0

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/interface_methods'
+require 'eac_templates/abstract/not_found_error'
 
 module EacTemplates
   module Modules
     class Ancestor
       class << self
@@ -18,16 +19,18 @@
       delegate :subpath, :source_set, to: :base
       delegate(*::EacTemplates::InterfaceMethods::ALL, to: :source_object)
 
       # @return [EacTemplates::Modules::Directory]
       def directory
-        ::EacTemplates::Modules::Ancestor::Directory.new(self)
+        @directory ||= ::EacTemplates::Modules::Ancestor::Directory
+                         .new(self, nil, nil, source_set: source_set)
       end
 
       # @return [EacTemplates::Modules::File]
       def file
-        @file ||= ::EacTemplates::Modules::Ancestor::File.new(self)
+        @file ||= ::EacTemplates::Modules::Ancestor::File
+                    .new(self, nil, nil, source_set: source_set)
       end
 
       # @return [Pathname]
       def path_for_search
         r = self.class.path_for_search(ancestor)
@@ -37,10 +40,10 @@
       # @return [EacTemplates::Modules::Ancestor::FsObject]
       def source_object
         return file if file.found?
         return directory if directory.found?
 
-        raise "No template found: #{path_for_search}"
+        raise ::EacTemplates::Abstract::NotFoundError, "No template found: #{path_for_search}"
       end
 
       require_sub __FILE__
     end
   end