eac_tools 0.60.3 → 0.61.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d93cbf1d3d3ff2f5b76c8fffeae344c0025b822fcfd9fac2a2f4aabffd92cf
-  data.tar.gz: c1a141d90c59c987c7f2f08a1aed69561782042a04ff42cf238b5c78baa996dc
+  metadata.gz: a00f661cc45fae52c9754c08ad739ca0b401f18eab714f32624cd3fc43617873
+  data.tar.gz: e9f70e33cb5d6cb6b82e9ab47baa474717b65566533aab724494cf604234ba59
 SHA512:
-  metadata.gz: 201e612bf01ed05f4c1e2f7478591cb6aecfbdc526af61931cc05aebaf916e4ed00592ffb7d66e86d90e48074d264f96d18b91d17f4cc49aad5db6450a9ec3a6
-  data.tar.gz: 1372d4f44f77b4ea330e6233509faee81f6ac75e0316f6e18517fbafebe270c475826272edc28b62663667cb13ac0edb4ad5c220290a9f5650974e31224174ea
+  metadata.gz: 97736cf986ece6075c9c7b019021e2d84fc7b82c8e3a146f7a52d34460825047bcf9c45cce03664ddfd9a4a1d9acab72c88052770c024056c74dab8b30b21182
+  data.tar.gz: 665937d9379e2fd16de13e599c59d623d101c18f271bf45085a99f9d5c57847b41649580af8447848847b0164621abaf6af32ad18dbd657f93e7954def080474

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.60.3)
+    eac_tools (0.61.1)
       avm (~> 0.67, >= 0.67.1)
-      avm-eac_asciidoctor_base0 (~> 0.18, >= 0.18.1)
+      avm-eac_asciidoctor_base0 (~> 0.19)
       avm-eac_generic_base0 (~> 0.12)
       avm-eac_latex_base0 (~> 0.3, >= 0.3.1)
       avm-eac_php_base0 (~> 0.4, >= 0.4.2)
@@ -16,7 +16,7 @@ PATH
       avm-eac_ruby_base1 (~> 0.30, >= 0.30.2)
       avm-eac_webapp_base0 (~> 0.15)
       avm-eac_wordpress_base0 (~> 0.3, >= 0.3.1)
-      avm-git (~> 0.13, >= 0.13.1)
+      avm-git (~> 0.13, >= 0.13.2)
       avm-tools (~> 0.145, >= 0.145.1)
       eac_ruby_utils (~> 0.112)
 
@@ -34,7 +34,7 @@ PATH
 PATH
   remote: sub/avm-eac_asciidoctor_base0
   specs:
-    avm-eac_asciidoctor_base0 (0.18.1)
+    avm-eac_asciidoctor_base0 (0.19.0)
       asciidoctor (~> 2.0, >= 2.0.18)
       avm-eac_webapp_base0 (~> 0.15)
       eac_ruby_utils (~> 0.112)
@@ -153,19 +153,19 @@ PATH
 PATH
   remote: sub/avm-files
   specs:
-    avm-files (0.6.1)
+    avm-files (0.6.2)
       avm (~> 0.67, >= 0.67.1)
       eac_cli (~> 0.30, >= 0.30.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
-      eac_templates (~> 0.4)
+      eac_templates (~> 0.5)
 
 PATH
   remote: sub/avm-git
   specs:
-    avm-git (0.13.1)
-      avm (~> 0.64, >= 0.64.2)
-      avm-files (~> 0.6)
+    avm-git (0.13.2)
+      avm (~> 0.67, >= 0.67.1)
+      avm-files (~> 0.6, >= 0.6.2)
       eac_git (~> 0.14, >= 0.14.1)
       eac_ruby_utils (~> 0.112)
       git (~> 1.18)
@@ -263,7 +263,7 @@ PATH
 PATH
   remote: sub/eac_templates
   specs:
-    eac_templates (0.4.0)
+    eac_templates (0.5.0)
       eac_config (~> 0.12)
       eac_ruby_utils (~> 0.112)
 
@@ -287,7 +287,7 @@ GEM
       parslet (~> 2.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
-    eac_envs-http (0.3.0)
+    eac_envs-http (0.3.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
       faraday (~> 2.7, >= 2.7.4)
@@ -295,8 +295,8 @@ GEM
       faraday-gzip (~> 0.1)
       faraday-multipart (~> 1.0, >= 1.0.4)
       faraday-retry (~> 2.1)
-    eac_rest (0.7.3)
-      eac_envs-http (~> 0.2)
+    eac_rest (0.8.0)
+      eac_envs-http (~> 0.3, >= 0.3.1)
       eac_fs (~> 0.16)
       eac_ruby_utils (~> 0.112)
     eac_ruby_gem_support (0.5.1)

data/lib/eac_tools/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacTools
-  VERSION = '0.60.3'
+  VERSION = '0.61.1'
 end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb

@@ -45,7 +45,7 @@ module Avm
 
             # @return [String]
             def breadcrumbs_lines
-              ['[.normal]', document.breadcrumbs_macro_value]
+              ['[.normal]', document.macro_lines(:breadcrumbs)]
             end
 
             # @return [Array<String>]

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb

@@ -11,8 +11,10 @@ module Avm
             enable_method_class
             enable_simple_cache
 
-            MACRO_PARSER = %r{\A\s*//\#(\S+.*)}.to_parser do |m|
-              m[1]
+            ARGUMENT_SEPARATOR = ','
+            MACRO_PARSER = %r{\A\s*//\#(\S+)(?:\s+(.+))?\s*?\z}.to_parser do |m|
+              ::Struct.new(:name, :arguments).new(m[1],
+                                                  m[2].to_s.split(ARGUMENT_SEPARATOR).map(&:strip))
             end
 
             common_constructor :document, :line
@@ -30,18 +32,28 @@ module Avm
               macro_name.present?
             end
 
+            # @return [Array<String>, nil]
+            def macro_arguments
+              parsed_macro.if_present(&:arguments)
+            end
+
+            # @return [String, nil]
+            def macro_name
+              parsed_macro.if_present(&:name)
+            end
+
             def macro_parser
               MACRO_PARSER
             end
 
             # @return [Array<String>]
             def macro_value
-              document.send("#{macro_name}_macro_value")
+              document.macro_lines(macro_name, macro_arguments)
             end
 
             private
 
-            def macro_name_uncached
+            def parsed_macro_uncached
               macro_parser.parse(line)
             end
           end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'asciidoctor'
+require 'avm/eac_asciidoctor_base0/instances/macros'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -22,6 +23,15 @@ module Avm
             other.body_target_path.relative_path_from(body_target_path.dirname)
           end
 
+          # @return [Enumerable<String>]
+          def body_source_lines
+            if source_document.body_path.file?
+              source_document.body_path.read.each_line
+            else
+              default_body_source_lines
+            end
+          end
+
           # Absolute path to the output of Asciidoctor's source file.
           #
           # @return [Pathname]
@@ -56,6 +66,18 @@ module Avm
             source_document.root_path
           end
 
+          # @return [Enumerable<String>]
+          def default_body_source_lines
+            macro_lines(:default_body)
+          end
+
+          # @param name [String]
+          # @return [Array<String>]
+          def macro_lines(name, arguments = [])
+            ::Avm::EacAsciidoctorBase0::Instances::Macros.const_get(name.to_s.camelize)
+                                                         .new(self, arguments).result
+          end
+
           def perform
             perform_self
             perform_children
@@ -74,7 +96,7 @@ module Avm
           # @return [String]
           def pre_processed_body_source_content
             (
-              header_lines + [''] + source_document.body_path.read.each_line
+              header_lines + [''] + body_source_lines
               .flat_map { |line| pre_process_line(line.rstrip) }
             ).map { |line| "#{line.rstrip}\n" }.join
           end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        class Base
+          enable_abstract_methods
+          common_constructor :document, :arguments, default: [[]]
+
+          # @return [Array<String>]
+          def result
+            raise_abstract_method __method__
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/breadcrumbs.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        class Breadcrumbs < ::Avm::EacAsciidoctorBase0::Instances::Macros::Base
+          NODE_SEPARATOR = ' » '
+          ROOT_DOCUMENT_TITLE = 'Home'
+
+          # @return [Array<String>]
+          def result
+            trail_nodes.join(NODE_SEPARATOR)
+          end
+
+          def trail_nodes
+            r = []
+            current = document
+            while current.present?
+              r.unshift(Node.new(document, current))
+              current = current.parent_document
+            end
+            r
+          end
+
+          class Node
+            common_constructor :current, :document
+
+            # @return [String]
+            def address
+              current.href_to_other_body(document)
+            end
+
+            # @return [String]
+            def title
+              if document.parent_document.present?
+                document.source_document.title
+              else
+                ROOT_DOCUMENT_TITLE
+              end
+            end
+
+            # @return [String]
+            def to_s
+              "link:#{address}[#{title}]"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/child_docs/document_builder.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        class ChildDocs < ::Avm::EacAsciidoctorBase0::Instances::Macros::Base
+          class DocumentBuilder
+            common_constructor :child_docs, :document, :depth, default: [0]
+            compare_by :title, :address
+
+            # @return [Pathname]
+            def address
+              root_document.href_to_other_body(document)
+            end
+
+            # @return [Array] Document's children mapped to document builders.
+            def children
+              document.children.map { |c| self.class.new(child_docs, c, depth + 1) }.sort
+            end
+
+            # @return [Boolean]
+            def lines_for_children?
+              child_docs.maximum_depth.negative? || child_docs.maximum_depth <= depth
+            end
+
+            # @return [String]
+            def link
+              "link:#{address}[#{title}]"
+            end
+
+            # @return [Array<String>]
+            def result
+              children.flat_map do |child|
+                r = [child.self_line]
+                r += child.result if lines_for_children?
+                r
+              end
+            end
+
+            # @return [Avm::EacAsciidoctorBase0::Instances::Build::Document]
+            def root_document
+              child_docs.document
+            end
+
+            # @return [String]
+            def self_line
+              "#{'*' * depth} #{link}"
+            end
+
+            # @return [String]
+            def title
+              document.source_document.title
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/child_docs.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        class ChildDocs < ::Avm::EacAsciidoctorBase0::Instances::Macros::Base
+          DEFAULT_MAXIMUM_DEPTH = -1
+
+          # @return [Array<String>]
+          def result
+            document_builder_class.new(self, document).result
+          end
+
+          # @return [Integer]
+          def maximum_depth
+            arguments[0].if_present(DEFAULT_MAXIMUM_DEPTH, &:to_i)
+          end
+
+          private
+
+          # @return [Class]
+          def document_builder_class
+            ::Avm::EacAsciidoctorBase0::Instances::Macros::ChildDocs::DocumentBuilder
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/default_body.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        class DefaultBody < ::Avm::EacAsciidoctorBase0::Instances::Macros::Base
+          RESULT_LINES = ['== Índice', '', '//#child_docs'].freeze
+
+          # @return [Array<String>]
+          def result
+            RESULT_LINES
+          end
+        end
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      module Macros
+        require_sub __FILE__
+      end
+    end
+  end
+end

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources/base.rb

@@ -8,9 +8,13 @@ module Avm
   module EacAsciidoctorBase0
     module Sources
       class Base < ::Avm::EacWebappBase0::Sources::Base
+        require_sub __FILE__
+
         CONTENT_DIRECTORY_SUBPATH = ::Pathname.new('content')
         CONTENT_DOCUMENT_BASENAME = ::Pathname.new('body.adoc')
-        MAIN_FILE_SUBPATH = CONTENT_DIRECTORY_SUBPATH.join(CONTENT_DOCUMENT_BASENAME)
+        MAIN_FILE_SUBPATH = CONTENT_DIRECTORY_SUBPATH.join(
+          ::Avm::EacAsciidoctorBase0::Sources::Base::Document::TITLE_BASENAME
+        )
 
         require_sub __FILE__, include_modules: true
 

data/sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.18.1'
+    VERSION = '0.19.0'
   end
 end

data/sub/avm-files/avm-files.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'eac_cli', '~> 0.30', '>= 0.30.1'
   s.add_dependency 'eac_fs', '~> 0.16'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
-  s.add_dependency 'eac_templates', '~> 0.4'
+  s.add_dependency 'eac_templates', '~> 0.5'
 
   s.add_development_dependency 'eac_ruby_gem_support', '~> 0.5.1'
 end

data/sub/avm-files/lib/avm/files/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Files
-    VERSION = '0.6.1'
+    VERSION = '0.6.2'
   end
 end

data/sub/avm-git/avm-git.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{lib,locale}/**/*']
 
-  s.add_dependency 'avm', '~> 0.64', '>= 0.64.2'
-  s.add_dependency 'avm-files', '~> 0.6'
+  s.add_dependency 'avm', '~> 0.67', '>= 0.67.1'
+  s.add_dependency 'avm-files', '~> 0.6', '>= 0.6.2'
   s.add_dependency 'eac_git', '~> 0.14', '>= 0.14.1'
   s.add_dependency 'eac_ruby_utils', '~> 0.112'
   s.add_dependency 'git', '~> 1.18'

data/sub/avm-git/lib/avm/git/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Git
-    VERSION = '0.13.1'
+    VERSION = '0.13.2'
   end
 end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+require 'eac_templates/abstract/fs_object'
+require 'eac_templates/variables/directory'
+
+module EacTemplates
+  module Abstract
+    class Directory < ::EacTemplates::Abstract::FsObject
+      enable_abstract_methods
+      delegate(*::EacTemplates::InterfaceMethods::DIRECTORY - %i[child chidren], to: :applier)
+
+      # @param basename [Pathname]
+      # @return [EacTemplates::Abstract::FsObject
+      def build_child(child_basename, child_type)
+        child_basename = child_basename.to_pathname
+        child_type = type_list.value_validate!(child_type)
+        category_module.const_get(child_type.to_s.camelize)
+          .new(owner, self, child_basename, options)
+      end
+
+      # @param basename [Pathname]
+      # @return [EacTemplates::Abstract::FsObject]
+      def child(basename)
+        basename = basename.to_pathname
+        children.find { |c| c.basename == basename } ||
+          raise_not_found("No child found with basename \"#{basename}\"")
+      end
+
+      # @return [Enumerable<EacTemplates::Abstract::FsObject>]
+      def children
+        children_basenames.map { |c_basename, c_type| build_child(c_basename, c_type) }
+      end
+
+      # @return [Hash<Pathname, Symbol>]
+      def children_basenames
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/interface_methods'
+require 'eac_templates/abstract/fs_object'
+require 'eac_templates/variables/file'
+
+module EacTemplates
+  module Abstract
+    class File < ::EacTemplates::Abstract::FsObject
+      enable_abstract_methods
+      delegate(*::EacTemplates::InterfaceMethods::FILE - %i[content path], to: :applier)
+
+      # @return [String]
+      def content
+        path.read
+      end
+
+      # @return [Pathname]
+      def path
+        raise_abstract_method __method__
+      end
+    end
+  end
+end

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

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_templates/abstract/fs_object_by_pathname'
+require 'eac_templates/abstract/not_found_error'
+
+module EacTemplates
+  module Abstract
+    class FsObject
+      class << self
+        # @param obj [Object]
+        # @return [EacTemplates::Abstract::FsObject, EacTemplates::Abstracts::FsObjectByPathname]
+        def assert(obj)
+          if obj.is_a?(self)
+            obj
+          else
+            ::EacTemplates::Abstract::FsObjectByPathname.new(obj)
+          end
+        end
+
+        # @param owner [Object]
+        # @param parent_object [Object, nil]
+        # @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)
+            parent_object = r
+          end
+          r || raise("Subpath is empty: #{subpath}")
+        end
+      end
+
+      enable_abstract_methods
+      enable_simple_cache
+      enable_listable
+      lists.add_symbol :option, :source_set
+      lists.add_symbol :type, :directory, :file
+      common_constructor :owner, :parent_object, :basename, :options, default: [{}] do
+        self.basename = basename.present? ? basename.to_pathname : ::Pathname.new('')
+        self.options = ::EacTemplates::Abstract::FsObject.lists.option.hash_keys_validate!(options)
+      end
+
+      # @return [EacTemplates::Variables::Directory, EacTemplates::Variables::File]
+      def applier
+        applier_class.new(self)
+      end
+
+      # @return [Class]
+      def applier_class
+        ::EacTemplates::Variables.const_get(type.to_s.camelize)
+      end
+
+      # @return [Module]
+      def category_module
+        self.class.module_parent
+      end
+
+      # @return [Pathname]
+      def path_for_search
+        if parent_object.present?
+          parent_object.path_for_search.join(basename)
+        else
+          path_for_search_prefix.join(basename)
+        end
+      end
+
+      # @return [Pathname]
+      def path_for_search_prefix
+        raise_abstract_method __method__
+      end
+
+      def raise_not_found(message)
+        raise ::EacTemplates::Abstract::NotFoundError, message
+      end
+
+      # @return [EacTemplates::Sources::Set]
+      def source_set
+        options[OPTION_SOURCE_SET] || ::EacTemplates::Sources::Set.default
+      end
+
+      # @return [Symbol]
+      def type
+        type_list.value_validate!(self.class.name.demodulize.underscore.to_sym)
+      end
+
+      # @return [EacRubyUtils::Listable::SymbolList]
+      def type_list
+        ::EacTemplates::Abstract::FsObject.lists.type
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/abstract/fs_object_by_pathname.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacTemplates
+  module Abstract
+    class FsObjectByPathname
+      common_constructor :path do
+        self.path = path.to_pathname
+      end
+    end
+  end
+end

data/sub/eac_templates/lib/eac_templates/abstract/not_found_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module EacTemplates
+  module Abstract
+    class NotFoundError < ::RuntimeError
+    end
+  end
+end