eac_templates 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c1db1cefd43c90ea04e40096c2bbe73a932827259cc1e249cd830dde64e949
-  data.tar.gz: 3339fb93550f9bdb819b5c7278d5905fd9da0481096115cccaa8eca74f1a704c
+  metadata.gz: bc9aafcd773770ed687e7ba11baa553e5968e18c9f124f71a446430d387e18a5
+  data.tar.gz: '096625ceb82074fbf40278cb545602726e33848488b734fd4ff86ab199bc5637'
 SHA512:
-  metadata.gz: eaadc382fd654d49eb8b5c8f9ce40a71f19f01a9181ddbac397cd378baa839706f46578e8428724e2a7b31471159476b8c2b9209cd7a07db81ad3304fd6d35b8
-  data.tar.gz: 4f876c41e037302bcbc4759c442d3466cc9ba30a188a219a7414256bdddb22c7e2777f5b7cc4c005b5f8de2b7f3eefffe7b9b61d79f3a1d0b1b9b65e1b2890aa
+  metadata.gz: c42ec59495782f16ecba7f27a05a89fd096900baeb30745806bdb5262b8d5057d2100339cdf3f11ea7bd503a42567fef0bf489ba0a4e7dd25648b6da8d616512
+  data.tar.gz: 106e1e173c5adc5e448514009616f6760ae7053cc05e2c2aa44c35b3963dc14e28b1edbd3d2bf8cc124753337ab91808787b175fc89116fa852df967ee68e10e

data/lib/eac_templates/abstract/fs_object.rb

@@ -23,12 +23,12 @@ module EacTemplates
         # @param subpath [Pathname]
         # @return [EacTemplates::Abstract::FsObject]
         def by_subpath(owner, parent_object, subpath, options = {})
-          r = nil
-          subpath.to_pathname.each_filename do |basename|
-            r = new(owner, parent_object, basename, options)
+          r = new(owner, parent_object, nil, options)
+          subpath.if_present(::Pathname.new(''), &:to_pathname).each_filename do |basename|
             parent_object = r
+            r = new(owner, parent_object, basename, options)
           end
-          r || raise("Subpath is empty: #{subpath}")
+          r
         end
       end
 

data/lib/eac_templates/abstract/with_directory_file_methods.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'eac_templates/abstract/not_found_error'
+
+module EacTemplates
+  module Abstract
+    module WithDirectoryFileMethods
+      def build_fs_object(type)
+        fs_object_class(type).by_subpath(self, nil, subpath, source_set: source_set)
+      end
+
+      # @param child_basename [Pathname
+      # @return [Pathname]
+      def child_subpath(child_basename)
+        subpath.if_present(child_basename) { |v| v.join(child_basename) }.to_pathname
+      end
+
+      # @return [EacTemplates::Abstract::Directory]
+      def directory
+        build_fs_object(:directory)
+      end
+
+      # @return [EacTemplates::Abstract::File]
+      def file
+        build_fs_object(:file)
+      end
+
+      # @param type [Symbol]
+      # @return [Class]
+      def fs_object_class(type)
+        self.class.const_get(type.to_s.camelize)
+      end
+
+      # @return [EacTemplates::Abstract::Directory, EacTemplates::Abstract::File]
+      def sub_fs_object
+        file_search = file
+        return file_search if file_search.found?
+
+        directory_search = directory
+        return directory_search if directory_search.found?
+
+        raise ::EacTemplates::Abstract::NotFoundError, "No template found: #{self}"
+      end
+    end
+  end
+end

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

@@ -10,9 +10,7 @@ module EacTemplates
         delegate :found?, :path, to: :source_object
 
         # @return [Pathname]
-        def path_for_search_prefix
-          owner.path_for_search
-        end
+        delegate :path_for_search, to: :owner
 
         private
 

data/lib/eac_templates/modules/ancestor.rb

@@ -2,11 +2,13 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/interface_methods'
-require 'eac_templates/abstract/not_found_error'
+require 'eac_templates/abstract/with_directory_file_methods'
 
 module EacTemplates
   module Modules
     class Ancestor
+      include ::EacTemplates::Abstract::WithDirectoryFileMethods
+
       class << self
         # @param a_module [Module]
         # @return [Pathname]
@@ -17,34 +19,18 @@ module EacTemplates
 
       common_constructor :base, :ancestor
       delegate :subpath, :source_set, to: :base
-      delegate(*::EacTemplates::InterfaceMethods::ALL, to: :source_object)
-
-      # @return [EacTemplates::Modules::Directory]
-      def directory
-        @directory ||= ::EacTemplates::Modules::Ancestor::Directory
-                         .new(self, nil, nil, source_set: source_set)
-      end
+      delegate(*::EacTemplates::InterfaceMethods::ALL, to: :sub_fs_object)
 
-      # @return [EacTemplates::Modules::File]
-      def file
-        @file ||= ::EacTemplates::Modules::Ancestor::File
-                    .new(self, nil, nil, source_set: source_set)
+      def ancestor_path_for_search
+        self.class.path_for_search(ancestor)
       end
 
       # @return [Pathname]
       def path_for_search
-        r = self.class.path_for_search(ancestor)
+        r = ancestor_path_for_search
         subpath.if_present(r) { |v| r.join(v) }
       end
 
-      # @return [EacTemplates::Modules::Ancestor::FsObject]
-      def source_object
-        return file if file.found?
-        return directory if directory.found?
-
-        raise ::EacTemplates::Abstract::NotFoundError, "No template found: #{path_for_search}"
-      end
-
       require_sub __FILE__
     end
   end

data/lib/eac_templates/modules/base/directory.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/directory'
+require 'eac_templates/interface_methods'
+require 'eac_templates/modules/base/fs_object'
+
+module EacTemplates
+  module Modules
+    class Base
+      class Directory < ::EacTemplates::Abstract::Directory
+        include ::EacTemplates::Modules::Base::FsObject
+        delegate(*(EacTemplates::InterfaceMethods::DIRECTORY - %i[children]), to: :self_ancestor)
+
+        # @param basename [Pathname]
+        # @return [EacTemplates::Abstract::FsObject]
+        delegate :child, to: :owner
+
+        # @return [Hash<Pathname, Symbol>]
+        def children_basenames
+          owner.ancestors.each_with_object({}) do |e, a|
+            ancestor_children_names(e, a)
+          end
+        end
+
+        # @return [Boolean]
+        def found?
+          children.any?
+        end
+
+        protected
+
+        # @param ancestor []
+        # @param result [Hash<Pathname, Symbol>]
+        # @return [void]
+        def ancestor_children_names(ancestor, result)
+          ancestor.directory.source_object.children_basenames.each do |path, type|
+            result[path] = type
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_templates/modules/base/file.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/file'
+require 'eac_templates/interface_methods'
+require 'eac_templates/modules/base/fs_object'
+
+module EacTemplates
+  module Modules
+    class Base
+      class File < ::EacTemplates::Abstract::File
+        include ::EacTemplates::Modules::Base::FsObject
+        delegate(*EacTemplates::InterfaceMethods::FILE, to: :ancestor_found)
+
+        def found?
+          ancestor_found.present?
+        end
+
+        private
+
+        def ancestor_found_uncached
+          owner.ancestors.lazy.map(&:file).select(&:found?).first
+        end
+      end
+    end
+  end
+end

data/lib/eac_templates/modules/base/fs_object.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+
+module EacTemplates
+  module Modules
+    class Base
+      module FsObject
+        def self_ancestor
+          owner.self_ancestor.send(type)
+        end
+
+        delegate :found?, to: :self_ancestor
+      end
+    end
+  end
+end

data/lib/eac_templates/modules/base.rb

@@ -2,23 +2,40 @@
 
 require 'eac_ruby_utils/core_ext'
 require 'eac_templates/interface_methods'
+require 'eac_templates/abstract/with_directory_file_methods'
 require 'eac_templates/modules/ancestor'
 require 'eac_templates/sources/set'
 
 module EacTemplates
   module Modules
     class Base
+      include ::EacTemplates::Abstract::WithDirectoryFileMethods
       enable_listable
+      enable_simple_cache
       lists.add_symbol :option, :source_set, :subpath
       common_constructor :the_module, :options, default: [{}] do
         self.options = self.class.lists.option.hash_keys_validate!(options)
       end
-      delegate(*::EacTemplates::InterfaceMethods::ALL, :path_for_search, :source_object,
-               to: :self_ancestor)
+      delegate(*::EacTemplates::InterfaceMethods::ONLY_DIRECTORY, to: :directory)
+      delegate(*::EacTemplates::InterfaceMethods::ONLY_FILE, to: :file)
+      delegate(*::EacTemplates::InterfaceMethods::COMMON, :path_for_search, :source_object,
+               to: :sub_fs_object)
 
-      # @return [EacTemplates::Modules::Ancestor]
-      def self_ancestor
-        @self_ancestor ||= ::EacTemplates::Modules::Ancestor.new(self, the_module)
+      # @param basename [Pathname]
+      # @return [EacTemplates::Abstract::FsObject]
+      def child(basename)
+        r = ::EacTemplates::Modules::Base.new(
+          the_module, subpath: child_subpath(basename), source_set: source_set
+        )
+        return r if r.found?
+
+        raise ::EacTemplates::Abstract::NotFoundError,
+              "No child for #{self} found with basename \"#{basename}\""
+      end
+
+      # @return [Boolean]
+      def found?
+        file.found? || directory.found?
       end
 
       # @return [EacTemplates::SourceSet]
@@ -30,6 +47,20 @@ module EacTemplates
       def subpath
         options[OPTION_SUBPATH].if_present(&:to_pathname)
       end
+
+      private
+
+      # @return [Enumerable<EacTemplates::Modules::Ancestor>]
+      def ancestors_uncached
+        the_module.ancestors.map { |a| ::EacTemplates::Modules::Ancestor.new(self, a) }
+      end
+
+      # @return [EacTemplates::Modules::Ancestor]
+      def self_ancestor_uncached
+        ancestors.find { |a| a.ancestor == the_module } || ibr
+      end
+
+      require_sub __FILE__
     end
   end
 end

data/lib/eac_templates/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_templates
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_config
@@ -19,7 +19,7 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,21 @@ dependencies:
         version: '0.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.121'
+        version: '0.122'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,7 @@ files:
 - lib/eac_templates/abstract/fs_object.rb
 - lib/eac_templates/abstract/fs_object_by_pathname.rb
 - lib/eac_templates/abstract/not_found_error.rb
+- lib/eac_templates/abstract/with_directory_file_methods.rb
 - lib/eac_templates/core_ext.rb
 - lib/eac_templates/interface_methods.rb
 - lib/eac_templates/modules.rb
@@ -78,6 +79,9 @@ files:
 - lib/eac_templates/modules/ancestor/file.rb
 - lib/eac_templates/modules/ancestor/fs_object.rb
 - lib/eac_templates/modules/base.rb
+- lib/eac_templates/modules/base/directory.rb
+- lib/eac_templates/modules/base/file.rb
+- lib/eac_templates/modules/base/fs_object.rb
 - lib/eac_templates/patches.rb
 - lib/eac_templates/patches/module.rb
 - lib/eac_templates/patches/module/erb_template.rb