avm-eac_asciidoctor_base0 0.22.1 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6745f7f5eff86a2f74fd7d6d777ab5f476206537190a08b270a31d82328338f
-  data.tar.gz: 857ca6e7ccd6e55f9e5e5f82f7d0036dd194ddf7afd1c2998c73926f2224f0e3
+  metadata.gz: 86a2fbf3a41bc705973e5d72606bb82f9e490c2dc1be92e69374c1daaaede203
+  data.tar.gz: bae73a31143d7ab4f3bcd3b792087780b72a613173828751341ed7e0280345a1
 SHA512:
-  metadata.gz: 9a2120098e809b1ee1e512ba591179bd436ab9e4658954efcd01e91804ec04245214238c539d52416983b69c859d821b9ca0ab209ac926bec012ae5aa9f72b85
-  data.tar.gz: 884f24cb149209e5a2b5e825e76e0c862387e49fb0d18fb0f10f2d9ae49a1fe776ff412a902c39e1a050d9c8b552b885029b85fc0c422c86c98585e06826d3e3
+  metadata.gz: 7b9de587064b412d52b4d081780f484edb1112544edcbd2c7fbce3c77098136e76246f328063b751bd41baefaaff03b7ea5767f9c9082351ec73aecdf484e594
+  data.tar.gz: 90eee15a5f8dfb0a8aeb93c947d3b29c0e6a6cce830ab5d4915126af4cc14c2a8358a98eaa314ee2c0ae42c19bb7e9b32859a76e3d6b99d7fd352ee0a6c85a43

data/lib/avm/eac_asciidoctor_base0/documents_owner.rb

@@ -13,7 +13,7 @@ module Avm
       # @raise [KeyError]
       def document(subpath)
         documents.find { |d| d.subpath.to_pathname == subpath.to_pathname } ||
-          raise(::KeyError, "Document not found with subáth = \"#{subpath}\"")
+          raise(::KeyError, "Document not found with subpath = \"#{subpath}\"")
       end
 
       # @return [Enumerable<Avm::EacAsciidoctorBase0::Sources::Document>]

data/lib/avm/eac_asciidoctor_base0/instances/build/document/body_target.rb

@@ -2,6 +2,7 @@
 
 require 'asciidoctor'
 require 'avm/eac_asciidoctor_base0/instances/macros'
+require 'avm/eac_asciidoctor_base0/logging/catcher'
 require 'eac_ruby_utils/core_ext'
 
 module Avm
@@ -23,6 +24,15 @@ module Avm
 
             # @return [Asciidoctor::Document]
             def body_target_write
+              ::Avm::EacAsciidoctorBase0::Logging::Catcher.on do
+                body_target_write_without_logging_catch
+              end
+            end
+
+            protected
+
+            # @return [Asciidoctor::Document]
+            def body_target_write_without_logging_catch
               ::Asciidoctor.convert(
                 pre_processed_body_source_content,
                 base_dir: convert_base_dir,

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

@@ -56,17 +56,17 @@ module Avm
                 breadcrumbs_lines
             end
 
+            # @return [Pathname]
+            def relative_path_to_stylesheet
+              build.theme.target_stylesheet_path
+                .relative_path_from(document.body_target_path.dirname)
+            end
+
             # @return [String]
             def stylesheet_line
               attribute_line('stylesheet', stylesheet_path)
             end
 
-            # @return [Pathname]
-            def stylesheet_path
-              source_document.source.theme_stylesheet_path
-                .relative_path_from(document.convert_base_dir)
-            end
-
             # @return [String]
             def title_line
               "= #{source_document.title}"
@@ -75,6 +75,15 @@ module Avm
             def website
               instance.web_url
             end
+
+            protected
+
+            # @return [Pathname]
+            def stylesheet_path_uncached
+              temp = ::EacRubyUtils::Fs::Temp.file
+              temp.write("@import '#{relative_path_to_stylesheet}'\n")
+              temp.to_pathname
+            end
           end
         end
       end

data/lib/avm/eac_asciidoctor_base0/instances/build/theme.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/instances/macros'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Instances
+      class Build
+        class Theme
+          TARGET_SUBPATH = '_theme'
+
+          common_constructor :build
+
+          # @return [void]
+          def perform
+            copy_theme_to_target
+          end
+
+          # @return [Pathname]
+          def target_path
+            build.target_directory.join(TARGET_SUBPATH)
+          end
+
+          # @return [Pathname]
+          def target_stylesheet_path
+            target_path
+              .join(Avm::EacAsciidoctorBase0::Sources::Base::Theme::THEME_STYLESHEET_BASENAME)
+          end
+
+          protected
+
+          # @return [void]
+          def copy_theme_to_target
+            build.source.copy_theme_directory_to(target_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_asciidoctor_base0/instances/build.rb

@@ -23,11 +23,13 @@ module Avm
         def perform
           infov 'Documents to build', root_document.tree_documents_count
           target_directory.clear
+          theme.perform
           root_document.perform
         end
 
+        # @return [Pathname]
         def default_target_directory
-          source.path.join('build')
+          source.path.join('build/site')
         end
 
         def root_document
@@ -45,6 +47,13 @@ module Avm
             options[OPTION_TARGET_DIRECTORY] || default_target_directory
           )
         end
+
+        private
+
+        # @return [Avm::EacAsciidoctorBase0::Instances::Build::Theme]
+        def theme_uncached
+          ::Avm::EacAsciidoctorBase0::Instances::Build::Theme.new(self)
+        end
       end
     end
   end

data/lib/avm/eac_asciidoctor_base0/logging/catcher.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'avm/eac_asciidoctor_base0/logging/error'
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Logging
+      class Catcher < ::SimpleDelegator
+        CATCH_LEVEL = ::Logger::ERROR
+        LOGGER_METHODS = %i[unknown fatal error warn info debug].freeze
+
+        class << self
+          # @param [String]
+          # @return [Integer]
+          def level_by_method(method_name)
+            ::Logger.const_get(method_name.to_s.underscore.upcase)
+          end
+
+          # @return [Hash<Symbol, Integer]
+          def methods_levels
+            LOGGER_METHODS.to_h { |method_name| [method_name, level_by_method(method_name)] }
+          end
+
+          def on
+            real_logger = ::Asciidoctor::LoggerManager.logger
+            begin
+              ::Asciidoctor::LoggerManager.logger = new(real_logger)
+              yield
+            ensure
+              ::Asciidoctor::LoggerManager.logger = real_logger
+            end
+          end
+        end
+
+        methods_levels.each do |method_name, level|
+          define_method method_name do |*args, &block|
+            __getobj__.send(method_name, *args, &block)
+            return unless level >= CATCH_LEVEL
+
+            raise ::Avm::EacAsciidoctorBase0::Logging::Error.new(level, *args, &block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_asciidoctor_base0/logging/error.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module EacAsciidoctorBase0
+    module Logging
+      class Error < ::RuntimeError
+        attr_reader :level
+
+        def initialize(level, *args)
+          @level = level
+          super(*args)
+        end
+      end
+    end
+  end
+end

data/lib/avm/eac_asciidoctor_base0/logging.rb

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

data/lib/avm/eac_asciidoctor_base0/sources/base/theme.rb

@@ -12,6 +12,12 @@ module Avm
           DEFAULT_THEME_DIRECTORY_SUBPATH = 'theme'
           THEME_STYLESHEET_BASENAME = 'main.css'
 
+          # @param target_directory_path [Pathname]
+          def copy_theme_directory_to(target_directory_path)
+            target_directory_path.parent.mkpath
+            ::FileUtils.copy_entry(theme_directory, target_directory_path)
+          end
+
           # @return [Pathname]
           def default_theme_directory
             path.join(DEFAULT_THEME_DIRECTORY_SUBPATH)

data/lib/avm/eac_asciidoctor_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacAsciidoctorBase0
-    VERSION = '0.22.1'
+    VERSION = '0.24.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_asciidoctor_base0
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -19,7 +19,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.0.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,41 +29,69 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: avm-eac_webapp_base0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.20'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: 0.20.1
+- !ruby/object:Gem::Dependency
+  name: eac_fs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_gem_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !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: os
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +174,7 @@ files:
 - lib/avm/eac_asciidoctor_base0/instances/build/document/header_lines.rb
 - lib/avm/eac_asciidoctor_base0/instances/build/document/media.rb
 - lib/avm/eac_asciidoctor_base0/instances/build/document/pre_process_line.rb
+- lib/avm/eac_asciidoctor_base0/instances/build/theme.rb
 - lib/avm/eac_asciidoctor_base0/instances/deploy.rb
 - lib/avm/eac_asciidoctor_base0/instances/macros.rb
 - lib/avm/eac_asciidoctor_base0/instances/macros/base.rb
@@ -153,6 +182,9 @@ files:
 - lib/avm/eac_asciidoctor_base0/instances/macros/child_docs.rb
 - lib/avm/eac_asciidoctor_base0/instances/macros/child_docs/document_builder.rb
 - lib/avm/eac_asciidoctor_base0/instances/macros/default_body.rb
+- lib/avm/eac_asciidoctor_base0/logging.rb
+- lib/avm/eac_asciidoctor_base0/logging/catcher.rb
+- lib/avm/eac_asciidoctor_base0/logging/error.rb
 - lib/avm/eac_asciidoctor_base0/source_generators.rb
 - lib/avm/eac_asciidoctor_base0/source_generators/base.rb
 - lib/avm/eac_asciidoctor_base0/sources.rb