eac_tools 0.60.3 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d93cbf1d3d3ff2f5b76c8fffeae344c0025b822fcfd9fac2a2f4aabffd92cf
-  data.tar.gz: c1a141d90c59c987c7f2f08a1aed69561782042a04ff42cf238b5c78baa996dc
+  metadata.gz: 88b13d61ea11ac15cc3677a1cf5ec17f1381f8f87ab25074f8cf7be2804e0679
+  data.tar.gz: 4432b02f679cabc7aa8ac455599e2bdfa653a02c973a05f02315a7992b50665e
 SHA512:
-  metadata.gz: 201e612bf01ed05f4c1e2f7478591cb6aecfbdc526af61931cc05aebaf916e4ed00592ffb7d66e86d90e48074d264f96d18b91d17f4cc49aad5db6450a9ec3a6
-  data.tar.gz: 1372d4f44f77b4ea330e6233509faee81f6ac75e0316f6e18517fbafebe270c475826272edc28b62663667cb13ac0edb4ad5c220290a9f5650974e31224174ea
+  metadata.gz: 0e4a6b279e9e1ee080a4fdf0f390187330bf84b36b022816cb807fa2274bf338c7c894587bd2938f9d71b72b45da42d2df6de2609ef9c783a42a4d063642685a
+  data.tar.gz: 2731fdeb08a1110cabba28cab3ccc98a60d8530e5d8a16c08a91459524952c98cccf7550cbcb6f21ccfcbdff8917c083d4911418ad91d6dc843e6e9f02fff58f

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    eac_tools (0.60.3)
+    eac_tools (0.61.0)
       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)
@@ -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)
@@ -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.0'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_tools
 version: !ruby/object:Gem::Version
-  version: 0.60.3
+  version: 0.61.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: avm-eac_generic_base0
   requirement: !ruby/object:Gem::Requirement
@@ -412,12 +406,16 @@ files:
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/breadcrumbs_macro_value.rb
-- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/child_docs_macro_value.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/media.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/deploy.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/base.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/breadcrumbs.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/child_docs.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/child_docs/document_builder.rb
+- sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/instances/macros/default_body.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/source_generators/base.rb
 - sub/avm-eac_asciidoctor_base0/lib/avm/eac_asciidoctor_base0/sources.rb

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

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacAsciidoctorBase0
-    module Instances
-      class Build
-        class Document
-          class BreadcrumbsMacroValue
-            enable_method_class
-            common_constructor :document
-
-            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
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'eac_ruby_utils/core_ext'
-
-module Avm
-  module EacAsciidoctorBase0
-    module Instances
-      class Build
-        class Document
-          class ChildDocsMacroValue
-            enable_method_class
-            common_constructor :document
-
-            # @return [Array<String>]
-            def result
-              document.children.map { |child_doc| ChildDocLine.new(document, child_doc) }.sort
-                      .map(&:result)
-            end
-
-            class ChildDocLine
-              common_constructor :document, :child
-              compare_by :title, :address
-
-              # @return [Pathname]
-              def address
-                document.href_to_other_body(child)
-              end
-
-              # @return [String]
-              def link
-                "link:#{address}[#{title}]"
-              end
-
-              # @return [String]
-              def result
-                "* #{link}"
-              end
-
-              # @return [String]
-              def title
-                child.source_document.title
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end