eac_tools 0.60.3 → 0.61.1

data/sub/eac_templates/lib/eac_templates/interface_methods.rb

@@ -2,10 +2,10 @@
 
 module EacTemplates
   module InterfaceMethods
-    COMMON = %w[apply path].freeze
-    ONLY_DIRECTORY = %w[child children].freeze
+    COMMON = %i[apply path].freeze
+    ONLY_DIRECTORY = %i[child children].freeze
     DIRECTORY = COMMON + ONLY_DIRECTORY
-    ONLY_FILE = %w[apply_to_file content variables].freeze
+    ONLY_FILE = %i[apply_to_file content variables].freeze
     FILE = COMMON + ONLY_FILE
     ALL = COMMON + ONLY_DIRECTORY + ONLY_FILE
   end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/directory.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/directory'
 require 'eac_templates/interface_methods'
 require 'eac_templates/modules/ancestor/fs_object'
 
 module EacTemplates
   module Modules
     class Ancestor
-      class Directory < ::EacTemplates::Modules::Ancestor::FsObject
-        delegate(*::EacTemplates::InterfaceMethods::ONLY_DIRECTORY, to: :source_object)
+      class Directory < ::EacTemplates::Abstract::Directory
+        include ::EacTemplates::Modules::Ancestor::FsObject
+        delegate :children_basenames, to: :source_object
       end
     end
   end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/file.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/file'
 require 'eac_templates/interface_methods'
 require 'eac_templates/modules/ancestor/fs_object'
 
 module EacTemplates
   module Modules
     class Ancestor
-      class File < ::EacTemplates::Modules::Ancestor::FsObject
-        delegate(*::EacTemplates::InterfaceMethods::ONLY_FILE, to: :source_object)
+      class File < ::EacTemplates::Abstract::File
+        include ::EacTemplates::Modules::Ancestor::FsObject
       end
     end
   end

data/sub/eac_templates/lib/eac_templates/modules/ancestor/fs_object.rb

@@ -6,25 +6,18 @@ require 'eac_templates/interface_methods'
 module EacTemplates
   module Modules
     class Ancestor
-      class FsObject
-        enable_simple_cache
-        common_constructor :base
-        delegate(*::EacTemplates::InterfaceMethods::COMMON, :found?, to: :source_object)
+      module FsObject
+        delegate :found?, :path, to: :source_object
 
-        # @return [Symbol]
-        def object_type
-          self.class.name.demodulize.underscore.to_sym
-        end
-
-        # @return [Pathname, nil]
-        def path
-          source_object.found? ? source_object.send(:real_paths).first : nil
+        # @return [Pathname]
+        def path_for_search_prefix
+          owner.path_for_search
         end
 
         private
 
         def source_object_uncached
-          base.source_set.send(object_type, base.path_for_search)
+          owner.source_set.send(type, path_for_search)
         end
       end
     end

data/sub/eac_templates/lib/eac_templates/modules/ancestor.rb

@@ -2,6 +2,7 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/interface_methods'
+require 'eac_templates/abstract/not_found_error'
 
 module EacTemplates
   module Modules
@@ -20,12 +21,14 @@ module EacTemplates
 
       # @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]
@@ -39,7 +42,7 @@ module EacTemplates
         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__

data/sub/eac_templates/lib/eac_templates/sources/directory.rb

@@ -1,23 +1,36 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/directory'
 require 'eac_templates/sources/fs_object'
-require 'eac_templates/variables/directory'
 
 module EacTemplates
   module Sources
-    class Directory < ::EacTemplates::Sources::FsObject
-      delegate :apply, :child, :children, :path, to: :applier
+    class Directory < ::EacTemplates::Abstract::Directory
+      include ::EacTemplates::Sources::FsObject
 
-      # @return [Class]
-      def applier_class
-        ::EacTemplates::Variables::Directory
+      # @return [Hash<Pathname, Symbol>]
+      def children_basenames
+        r = {}
+        real_paths.each do |real_path|
+          real_path.children.each do |child|
+            next if r.key?(child.basename)
+
+            r[child.basename] = real_path_type(child)
+          end
+        end
+        r
       end
 
-      # @param path [Pathname]
-      # @return [Boolean]
-      def select_path?(path)
-        super && path.directory?
+      # @return [Pathname]
+      def real_path_type(path)
+        if path.file?
+          :file
+        elsif path.directory?
+          :directory
+        else
+          raise "Path \"#{path}\" is not a file nor a directory"
+        end
       end
     end
   end

data/sub/eac_templates/lib/eac_templates/sources/file.rb

@@ -1,24 +1,13 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/file'
 require 'eac_templates/sources/fs_object'
-require 'eac_templates/variables/file'
 
 module EacTemplates
   module Sources
-    class File < ::EacTemplates::Sources::FsObject
-      delegate :apply, :apply_to_file, :content, :path, :variables, to: :applier
-
-      # @return [Class]
-      def applier_class
-        ::EacTemplates::Variables::File
-      end
-
-      # @param path [Pathname]
-      # @return [Boolean]
-      def select_path?(path)
-        super && path.file?
-      end
+    class File < ::EacTemplates::Abstract::File
+      include ::EacTemplates::Sources::FsObject
     end
   end
 end

data/sub/eac_templates/lib/eac_templates/sources/fs_object.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/not_found_error'
 
 module EacTemplates
   module Sources
-    class FsObject
-      enable_abstract_methods
-      enable_simple_cache
-      common_constructor :source_set, :subpath do
-        self.subpath = subpath.to_pathname
+    module FsObject
+      PATH_FOR_SEARCH_PREFIX = ::Pathname.new('')
+
+      common_concern do
+        enable_abstract_methods
+        enable_simple_cache
       end
 
       # @return [Boolean]
@@ -16,20 +18,18 @@ module EacTemplates
         real_paths.any?
       end
 
-      protected
-
-      # @return [Class]
-      def applier_class
-        raise_abstract_method __method__
+      # @return [Pathname]
+      def path
+        real_paths.first
       end
 
-      # @return [EacTemplates::Variables::SourceFile]
-      def applier_uncached
-        raise "No #{self.class.name.downcase} found for \"#{subpath}\"" unless found?
-
-        applier_class.new(real_paths.first)
+      # @return [Pathname]
+      def path_for_search_prefix
+        PATH_FOR_SEARCH_PREFIX
       end
 
+      protected
+
       # @return [Array<Pathname>]
       def real_paths_uncached
         source_set.included_paths.lazy.map { |source_single| source_single_search(source_single) }
@@ -39,13 +39,13 @@ module EacTemplates
       # @param path [Pathname]
       # @return [Boolean]
       def select_path?(path)
-        path.present?
+        path.present? && path.send("#{type}?")
       end
 
       # @param source_single [EacTemplates::Sources::Single]
       # @return [Pathname, nil]
       def source_single_search(source_single)
-        r = source_single.search(subpath)
+        r = source_single.search(path_for_search)
         select_path?(r) ? r : nil
       end
     end

data/sub/eac_templates/lib/eac_templates/sources/set.rb

@@ -4,6 +4,7 @@ require 'active_support/core_ext/object/blank'
 require 'eac_templates/sources/directory'
 require 'eac_templates/sources/file'
 require 'eac_templates/sources/internal_set'
+require 'eac_templates/abstract/not_found_error'
 
 module EacTemplates
   module Sources
@@ -17,13 +18,13 @@ module EacTemplates
       # @param subpath [Pathname]
       # @return [EacTemplates::Sources::Directory]
       def directory(subpath)
-        ::EacTemplates::Sources::Directory.new(self, subpath)
+        ::EacTemplates::Sources::Directory.by_subpath(self, nil, subpath, source_set: self)
       end
 
       # @param subpath [Pathname]
       # @return [EacTemplates::Sources::Directory]
       def file(subpath)
-        ::EacTemplates::Sources::File.new(self, subpath)
+        ::EacTemplates::Sources::File.by_subpath(self, nil, subpath, source_set: self)
       end
 
       def template(subpath, required = true)
@@ -46,8 +47,8 @@ module EacTemplates
       private
 
       def raise_template_not_found(subpath)
-        raise "Template not found for subpath \"#{subpath}\"" \
-          " (Included paths: #{included_paths.to_a.join(::File::PATH_SEPARATOR)})"
+        raise ::EacTemplates::Abstract::NotFoundError, 'Template not found for subpath ' \
+          "\"#{subpath}\" (Included paths: #{included_paths.to_a.join(::File::PATH_SEPARATOR)})"
       end
     end
   end

data/sub/eac_templates/lib/eac_templates/variables/content.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/variables/providers'
+
+module EacTemplates
+  module Variables
+    class Content
+      VARIABLE_DELIMITER = ::Regexp.quote('%%')
+      VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z0-9\._]*)#{VARIABLE_DELIMITER}/i.freeze
+
+      class << self
+        # @param path [Pathname]
+        # @return [EacTemplates::Variables::Content]
+        def from_file(path)
+          new(path.to_pathname.read)
+        end
+      end
+
+      enable_simple_cache
+      common_constructor :content
+
+      # +variables_provider+ A [Hash] or object which responds to +read_entry(entry_name)+.
+      def apply(variables_source)
+        variables_provider = ::EacTemplates::Variables::Providers.build(variables_source)
+        variables.inject(content) do |a, e|
+          a.gsub(variable_pattern(e), variables_provider.variable_value(e).to_s)
+        end
+      end
+
+      def apply_to_file(variables_source, output_file_path)
+        output_file_path.to_pathname.write(apply(variables_source))
+      end
+
+      private
+
+      def variables_uncached
+        content.scan(VARIABLE_PATTERN).map(&:first).map do |name|
+          sanitize_variable_name(name)
+        end.to_set
+      end
+
+      def sanitize_variable_name(variable_name)
+        variable_name.to_s.downcase
+      end
+
+      def variable_pattern(name)
+        /#{VARIABLE_DELIMITER}#{::Regexp.quote(name)}#{VARIABLE_DELIMITER}/i
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/variables/directory.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
+require 'eac_templates/abstract/not_found_error'
+require 'eac_templates/abstract/directory'
 require 'eac_templates/variables/file'
 require 'eac_templates/variables/fs_object'
 
 module EacTemplates
   module Variables
     class Directory
-      attr_reader :path
-
-      def initialize(path)
-        @path = path.is_a?(::Pathname) ? path : ::Pathname.new(path.to_s)
+      common_constructor :abstract_directory do
+        self.abstract_directory = ::EacTemplates::Abstract::Directory.assert(abstract_directory)
       end
+      delegate :path, to: :abstract_directory
 
       def apply(variables_source, directory)
         ::EacTemplates::Variables::FsObject.new(self, '.', directory, variables_source).apply
@@ -21,7 +22,8 @@ module EacTemplates
         return ::EacTemplates::Variables::File.new(child_path) if ::File.file?(child_path)
         return ::EacTemplates::Variables::Directory.new(child_path) if ::File.directory?(child_path)
 
-        raise "Child \"#{subpath}\" from \"#{path}\" not found"
+        raise ::EacTemplates::Abstract::NotFoundError,
+              "Child \"#{subpath}\" from \"#{path}\" not found"
       end
 
       def children

data/sub/eac_templates/lib/eac_templates/variables/file.rb

@@ -1,49 +1,25 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/file'
+require 'eac_templates/variables/content'
 require 'eac_templates/variables/providers'
 
 module EacTemplates
   module Variables
     class File
-      VARIABLE_DELIMITER = ::Regexp.quote('%%')
-      VARIABLE_PATTERN = /#{VARIABLE_DELIMITER}([a-z0-9\._]*)#{VARIABLE_DELIMITER}/i.freeze
-
       enable_simple_cache
-      common_constructor :path do
-        self.path = path.to_pathname
-      end
-
-      # +variables_provider+ A [Hash] or object which responds to +read_entry(entry_name)+.
-      def apply(variables_source)
-        variables_provider = ::EacTemplates::Variables::Providers.build(variables_source)
-        variables.inject(content) do |a, e|
-          a.gsub(variable_pattern(e), variables_provider.variable_value(e).to_s)
-        end
-      end
-
-      def apply_to_file(variables_source, output_file_path)
-        output_file_path.to_pathname.write(apply(variables_source))
+      common_constructor :abstract_file do
+        self.abstract_file = ::EacTemplates::Abstract::File.assert(abstract_file)
       end
+      delegate :path, to: :abstract_file
+      delegate :apply, :apply_to_file, :content, :variables, to: :content_applier
 
       private
 
-      def variables_uncached
-        content.scan(VARIABLE_PATTERN).map(&:first).map do |name|
-          sanitize_variable_name(name)
-        end.to_set
-      end
-
-      def content_uncached
-        path.read
-      end
-
-      def sanitize_variable_name(variable_name)
-        variable_name.to_s.downcase
-      end
-
-      def variable_pattern(name)
-        /#{VARIABLE_DELIMITER}#{::Regexp.quote(name)}#{VARIABLE_DELIMITER}/i
+      # @return [EacTemplates::Variables::Content]
+      def content_applier_uncached
+        ::EacTemplates::Variables::Content.from_file(path)
       end
     end
   end

data/sub/eac_templates/lib/eac_templates/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTemplates
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/sub/eac_templates/spec/lib/eac_templates/{patches/module/template_spec.rb → modules/base_spec.rb}

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'eac_templates/patches/module/template'
+require 'eac_templates/modules/base'
+require 'eac_templates/abstract/not_found_error'
 require 'eac_templates/sources/set'
 
-RSpec.describe ::Module do
+RSpec.describe ::EacTemplates::Modules::Base do
   def self.on_node_specs(node_name, &block)
     context "when object is \"#{node_name}\"" do # rubocop:disable RSpec/EmptyExampleGroup
       let(:node) { send(node_name) }
@@ -40,13 +41,13 @@ RSpec.describe ::Module do
   def self.file_specs_error(node_name)
     on_node_specs(node_name) do
       it do
-        expect { node }.to raise_error(::RuntimeError)
+        expect { node }.to raise_error(::EacTemplates::Abstract::NotFoundError)
       end
     end
   end
 
   let(:a_module) do
-    described_class.new do
+    ::Module.new do
       def self.name
         'AModule'
       end
@@ -61,43 +62,52 @@ RSpec.describe ::Module do
     r.include a_module
     r
   end
+  let(:prepended_module) do
+    ::Module.new do
+      def self.name
+        'PrependedModule'
+      end
+    end
+  end
   let(:sub_class) do
     r = ::Class.new(super_class) do
       def self.name
         'SuperClass'
       end
     end
+    r.prepend(prepended_module)
     r
   end
-  let(:files_dir) { __dir__.to_pathname.join('template_spec_files') }
+  let(:files_dir) { __dir__.to_pathname.join('base_spec_files') }
   let(:variables_source) { { vx: '_X_', vy: '_Y_' } }
+  let(:source_set) do
+    r = ::EacTemplates::Sources::Set.new
+    %w[path1 path2].each do |sub|
+      r.included_paths << files_dir.join(sub)
+    end
+    r
+  end
 
-  let(:a) { instance.template.child('a') }
+  let(:a) { instance.child('a') }
   let(:a_a) { a.child('a_a') }
   let(:a_b) { a.child('a_b') }
   let(:a_c) { a.child('a_c') }
-  let(:b) { instance.template.child('b') }
-  let(:c) { instance.template.child('c') }
-
-  before do
-    %w[path1 path2].each do |sub|
-      ::EacTemplates::Sources::Set.default.included_paths << files_dir.join(sub)
-    end
-  end
+  let(:b) { instance.child('b') }
+  let(:c) { instance.child('c') }
 
   context 'when module is AModule' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { a_module }
+    let(:instance) { described_class.new(a_module, source_set: source_set) }
 
-    dir_specs(:a, %w[a_a])
+    dir_specs(:a, %w[a_a a_b])
     file_specs_ok(:a_a, "A_MODULE_A_A\n", "A_MODULE_A_A\n", [])
-    file_specs_error(:a_b)
+    file_specs_ok(:a_b, "A_MODULE_A_B\n", "A_MODULE_A_B\n", [])
     file_specs_error(:a_c)
     file_specs_ok(:b, "A_MODULE_B%%vy%%\n", "A_MODULE_B_Y_\n", %w[vy])
-    file_specs_error(:c)
+    file_specs_ok(:c, "A_MODULE_C%%vx%%\n", "A_MODULE_C_X_\n", %w[vx])
   end
 
   context 'when module is SuperClass' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { super_class }
+    let(:instance) { described_class.new(super_class, source_set: source_set) }
 
     dir_specs(:a, %w[a_b])
     file_specs_error(:a_a)
@@ -108,7 +118,7 @@ RSpec.describe ::Module do
   end
 
   context 'when module is SubClass' do # rubocop:disable RSpec/EmptyExampleGroup
-    let(:instance) { sub_class }
+    let(:instance) { described_class.new(sub_class, source_set: source_set) }
 
     dir_specs(:a, %w[a_b])
     file_specs_error(:a_a)
@@ -117,4 +127,15 @@ RSpec.describe ::Module do
     file_specs_ok(:b, "SUPER_CLASS_B\n", "SUPER_CLASS_B\n", [])
     file_specs_error(:c)
   end
+
+  context 'when module is PrependedModule' do # rubocop:disable RSpec/EmptyExampleGroup
+    let(:instance) { described_class.new(prepended_module, source_set: source_set) }
+
+    file_specs_error(:a)
+    file_specs_error(:a_a)
+    file_specs_error(:a_b)
+    file_specs_error(:a_c)
+    file_specs_error(:b)
+    file_specs_ok(:c, "PREPENDED_MODULE_C%%vy%%%%vx%%\n", "PREPENDED_MODULE_C_Y__X_\n", %w[vy vx])
+  end
 end

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/a/a_b

@@ -0,0 +1 @@
+A_MODULE_A_B

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/a_module/c

@@ -0,0 +1 @@
+A_MODULE_C%%vx%%

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/prepended_module/c

@@ -0,0 +1 @@
+PREPENDED_MODULE_C%%vy%%%%vx%%

data/sub/eac_templates/spec/lib/eac_templates/modules/base_spec_files/path2/super_class/a/a_b

@@ -0,0 +1 @@
+SUPER_CLASS_A_B_PATH_2

data/sub/eac_templates/spec/lib/eac_templates/variables/{file_spec.rb → content_spec.rb}

@@ -3,10 +3,10 @@
 require 'eac_config/old_configs'
 require 'eac_templates/variables/file'
 
-RSpec.describe ::EacTemplates::Variables::File do
-  let(:files_dir) { ::File.join(__dir__, 'file_spec_files') }
-  let(:source_path) { ::File.join(files_dir, 'source.template') }
-  let(:instance) { described_class.new(source_path) }
+RSpec.describe ::EacTemplates::Variables::Content do
+  let(:files_dir) { ::File.join(__dir__, 'content_spec_files').to_pathname }
+  let(:source_path) { files_dir.join('source.template') }
+  let(:instance) { described_class.from_file(source_path) }
   let(:expected_content) { ::File.read(::File.join(files_dir, 'expected_content')) }
 
   describe '#apply' do