metanorma-plugin-glossarist 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d98a873073dcda160a7b6f3ee5e61c994c50c418007e0dd2861c231c16ac65d
-  data.tar.gz: 2d3c3cc14fcaed9644f72fe7626e7aa8ebfd65d7b88ce4144c697b5cb3e123b2
+  metadata.gz: df92f7c76b0f53a2ab86ce33202371f17a4d83a7c9f781196d2ffc8d88477102
+  data.tar.gz: 10c0cb1fa52fc6d9bd7b60a30910e78fe8f2dda1f23ea280b2ab84f9f2cf8a0d
 SHA512:
-  metadata.gz: f9b86a8598407a6172693189fb1e89e7faa2d49673035a74f895ec0bb43886d3205fbd77cf620090f4ed157a4c4512367ca3479fc598f5e7259f724f1c9db53e
-  data.tar.gz: 49cb457f4154355f6c9484754704e0063c70df33e396600c5ac8ad2b2705bc8994fdbe38ed4463683c3e7f7668873eceb1f4f837d999115e34dc1f54fac70e9c
+  metadata.gz: ba5db22578e76a38145ded8c9fd81cfa6dd5bf5752b4e502e232ef1586ac502450918c9a7d450646407d3165f5cffafdc93571e19eb2cc5819d9106bf036a126
+  data.tar.gz: a27d8568b1a1dcdcc779374c0be6e13709cb68d921ac2ebbb0d7db3595680714c7e88d3db509574fdd717782c5827ac347bef1979d1aed707c8a6831bb740a5f

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-09 09:31:05 UTC using RuboCop version 1.86.1.
+# on 2026-06-13 04:20:36 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,18 +11,61 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'metanorma-plugin-glossarist.gemspec'
 
-# Offense count: 25
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/BlockEndNewline:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
+# SupportedStylesAlignWith: start_of_line, relative_to_receiver
+Layout/IndentationWidth:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 32
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
+    - 'lib/metanorma-plugin-glossarist.rb'
     - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
     - 'lib/metanorma/plugin/glossarist/liquid.rb'
     - 'lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb'
     - 'lib/metanorma/plugin/glossarist/liquid/drop_bracket_access.rb'
     - 'lib/metanorma/plugin/glossarist/liquid/drops/managed_concept_data_drop.rb'
+    - 'lib/metanorma/plugin/glossarist/section_filter.rb'
     - 'spec/metanorma/plugin/glossarist/bibliography_renderer_spec.rb'
     - 'spec/metanorma/plugin/glossarist/bibliography_scope_spec.rb'
     - 'spec/metanorma/plugin/glossarist/concept_filter_spec.rb'
@@ -30,21 +73,44 @@ Layout/LineLength:
     - 'spec/metanorma/plugin/glossarist/liquid/drops/localization_collection_drop_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/with_glossarist_context_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/MultilineBlockLayout:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowInHeredoc.
+Layout/TrailingWhitespace:
+  Exclude:
+    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# NotImplementedExceptions: NotImplementedError
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
+
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 8
+# Offense count: 11
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
     - 'lib/metanorma/plugin/glossarist/bibliography_renderer.rb'
     - 'lib/metanorma/plugin/glossarist/concept_filter.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
+    - 'lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb'
     - 'lib/metanorma/plugin/glossarist/template_renderer.rb'
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -53,12 +119,12 @@ Metrics/CyclomaticComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 22
+  Max: 24
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -66,13 +132,7 @@ Metrics/PerceivedComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_filter.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 1
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'lib/metanorma/plugin/glossarist/bibliography_renderer.rb'
-
-# Offense count: 17
+# Offense count: 19
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -85,23 +145,23 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/bibliography_scope_spec.rb'
 
-# Offense count: 19
+# Offense count: 27
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 35
 
-# Offense count: 22
+# Offense count: 31
 RSpec/MultipleExpectations:
-  Max: 3
+  Max: 4
 
-# Offense count: 25
+# Offense count: 33
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/dataset_preprocessor_spec.rb'
 
-# Offense count: 28
+# Offense count: 30
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
@@ -120,6 +180,31 @@ RSpec/SpecFilePathFormat:
     - 'spec/metanorma/plugin/glossarist/liquid/drops/managed_concept_data_drop_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/drops/managed_concept_drop_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# AllowedMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, AllowComments.
+# SupportedStyles: empty, nil, both
+Style/EmptyElse:
+  Exclude:
+    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/MultilineIfModifier:
+  Exclude:
+    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
+
 # Offense count: 2
 # Configuration parameters: Max.
 Style/SafeNavigationChainLength:

data/lib/metanorma/plugin/glossarist/concept_path_resolver.rb

@@ -61,32 +61,49 @@ module Metanorma
           when Array
             nil
           when ::Lutaml::Model::Serializable
-            resolve_attribute(obj, key)
+            read_attribute(obj, key)
           when Hash
             obj[key] || obj[key.to_s]
           end
         end
 
         def resolve_managed_concept(concept, key)
-          return concept.data.public_send(key) if DELEGATED_TO_DATA.include?(key)
+          if DELEGATED_TO_DATA.include?(key)
+            return read_attribute(concept.data,
+                                  key)
+          end
 
-          resolve_attribute(concept, key) { concept.public_send(key.to_sym) }
+          read_attribute(concept, key) { read_method(concept, key) }
         rescue NoMethodError
           nil
         end
 
         def resolve_data_attribute(data, key)
           aliased = DATA_ALIASES[key]
-          return data.public_send(aliased) if aliased && data.class.attributes.key?(aliased)
+          if aliased && data.class.attributes.key?(aliased)
+            return read_attribute(data, aliased)
+          end
 
-          resolve_attribute(data, key)
+          read_attribute(data, key)
         end
 
-        def resolve_attribute(obj, key)
+        # Reads a validated public attribute from a Lutaml::Model::Serializable
+        # object. Uses public_send because the attribute name is determined at
+        # runtime from path strings. Falls back to the block for non-attribute
+        # public methods (e.g., ManagedConcept#default_designation).
+        def read_attribute(obj, key)
           sym = key.to_sym
-          return obj.public_send(sym) if obj.class.attributes.key?(sym)
+          if obj.class.respond_to?(:attributes) && obj.class.attributes.key?(sym)
+            obj.public_send(sym)
+          elsif block_given?
+            yield
+          end
+        end
 
-          yield if block_given?
+        # Calls a public method by name on the object. Used as a fallback for
+        # methods that aren't lutaml-model attributes (e.g., computed accessors).
+        def read_method(obj, key)
+          obj.public_send(key.to_sym)
         end
 
         def access_index(obj, index)

data/lib/metanorma/plugin/glossarist/dataset_preprocessor.rb

@@ -10,6 +10,7 @@ module Metanorma
       class DatasetPreprocessor < Asciidoctor::Extensions::Preprocessor
         DATASET_ATTR_REGEX = /^:glossarist-dataset:\s*(.*?)$/m
         IMPORT_REGEX = /^glossarist::import\[(.*?)\]$/m
+        IMPORT_SECTIONS_REGEX = /^glossarist::import_sections\[(.*?)\]$/m
         RENDER_REGEX = /^glossarist::render\[(.*?)\]$/m
         BLOCK_REGEX = /^\[glossarist,(.+?),(.+?)\]$/m
         BIBLIOGRAPHY_REGEX = /^glossarist::render_bibliography\[(.*?)\]$/m
@@ -26,6 +27,7 @@ module Metanorma
           input_lines = reader.lines.to_enum
           @config[:file_system] = relative_file_path(document, "")
           @registry = DatasetRegistry.new
+          @renderer = TemplateRenderer.new(file_system: @config[:file_system])
           @rendered_concepts = []
           @title_depth = 2
           @existing_bib_anchors = []
@@ -71,6 +73,8 @@ module Metanorma
             process_dataset_tag(document, input_lines, liquid_doc, match)
           elsif (match = current_line.match(RENDER_REGEX))
             process_render_tag(liquid_doc, match)
+          elsif (match = current_line.match(IMPORT_SECTIONS_REGEX))
+            process_import_sections_tag(document, liquid_doc, match)
           elsif (match = current_line.match(IMPORT_REGEX))
             process_import_tag(liquid_doc, match)
           elsif (match = current_line.match(BIBLIOGRAPHY_REGEX))
@@ -150,7 +154,7 @@ module Metanorma
           return unless concept
 
           @rendered_concepts << concept
-          renderer = TemplateRenderer.new(file_system: @config[:file_system])
+          renderer = @renderer
           rendered = renderer.render_concept(concept,
                                              depth: @title_depth,
                                              anchor_prefix: options["anchor-prefix"])
@@ -171,13 +175,54 @@ module Metanorma
           concepts = ConceptFilter.new(filter_options).apply(dataset)
           concepts = concepts.select(&:default_designation)
           @rendered_concepts.concat(concepts)
-          renderer = TemplateRenderer.new(file_system: @config[:file_system])
+          renderer = @renderer
           rendered = renderer.render_concepts(concepts,
                                               depth: @title_depth,
                                               anchor_prefix: options["anchor-prefix"])
           liquid_doc.add_content("\n#{rendered}")
         end
 
+        def process_import_sections_tag(_document, liquid_doc, match)
+          @seen_glossarist = true
+          matches = match[1].split(",").map(&:strip)
+          context_name = matches[0]
+          options = parse_options(matches[1..])
+
+          sections = @registry.register_sections(context_name)
+          return unless sections && !sections.empty?
+
+          dataset = @registry.resolve_dataset(nil, context_name)
+          return unless dataset
+
+          renderer = @renderer
+          sort_by = options["sort_by"] || "term"
+          section_filter = SectionFilter.new(
+            exclude: (options["section_exclude"] || "").split("|"),
+            include: (options["section_include"] || "").split("|"),
+          )
+          filtered = section_filter.apply(sections)
+          parts = render_section_concepts(filtered, dataset, renderer,
+                                          sort_by, options)
+          liquid_doc.add_content("\n#{parts.join("\n\n")}")
+        end
+
+        def render_section_concepts(sections, dataset, renderer, sort_by,
+                                    options)
+          sections.filter_map do |section|
+            filter_options = { "section" => section.id, "sort_by" => sort_by }
+            concepts = ConceptFilter.new(filter_options).apply(dataset)
+            concepts = concepts.select(&:default_designation)
+            next if concepts.empty?
+
+            @rendered_concepts.concat(concepts)
+            heading = "#{'=' * (@title_depth + 1)} #{section.name || section.id}"
+            rendered = renderer.render_concepts(concepts,
+                                                depth: @title_depth + 1,
+                                                anchor_prefix: options["anchor-prefix"])
+            "#{heading}\n\n#{rendered}"
+          end
+        end
+
         def process_bibliography(document, liquid_doc, match)
           @seen_glossarist = true
           dataset_name = match[1].strip

data/lib/metanorma/plugin/glossarist/dataset_registry.rb

@@ -56,6 +56,16 @@ module Metanorma
           found&.split("=")&.last&.strip
         end
 
+        def register_sections(context_name)
+          dataset_path = context_path(context_name)
+          return nil unless dataset_path
+
+          @register_cache ||= {}
+          @register_cache[dataset_path] ||=
+            ::Glossarist::DatasetRegister.from_directory(dataset_path)
+          @register_cache[dataset_path]&.sections
+        end
+
         def bibliography_data
           @bibliography_data
         end

data/lib/metanorma/plugin/glossarist/document.rb

@@ -15,6 +15,7 @@ module Metanorma
                         LiquidRendering.render(
                           content,
                           include_paths: [file_system,
+                                          TEMPLATES_DIR,
                                           options[:template]].compact,
                           patterns: LiquidRendering::DOCUMENT_PATTERNS,
                           registry: registry,

data/lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Metanorma
   module Plugin
     module Glossarist

data/lib/metanorma/plugin/glossarist/liquid_templates/_concept.liquid

@@ -1,4 +1,5 @@
-{{ depth_marker }} {{ l10n.data.terms[0].designation }}
+{% if anchor %}[[{{ anchor }}]]
+{% endif %}{{ depth_marker }} {{ l10n.data.terms[0].designation }}
 {%- for term in l10n.data.terms offset:1 %}
 {%- if term.normative_status == "preferred" %}
 preferred:[{{ term.designation }}]

data/lib/metanorma/plugin/glossarist/section_filter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Glossarist
+      # Filters an array of Glossarist::Section objects by include/exclude patterns.
+      #
+      # Pattern matching uses *substring* matching against section IDs
+      # (e.g., pattern "3" matches sections with IDs "3", "3.1", "34").
+      # For the common _arm/_mim filtering, use patterns like "_arm" and "_mim"
+      # which are specific enough to avoid false positives.
+      #
+      # @example Exclude _arm and _mim sections
+      #   SectionFilter.new(exclude: ["_arm", "_mim"]).apply(sections)
+      #
+      # @example Include only _arm sections
+      #   SectionFilter.new(include: ["_arm"]).apply(sections)
+      class SectionFilter
+        # @param exclude [Array<String>] substring patterns; sections whose ID
+        #   contains any of these are removed
+        # @param include [Array<String>] substring patterns; only sections whose
+        #   ID contains at least one of these are kept (empty = include all)
+        def initialize(exclude: [], include: [])
+          @exclude = exclude.reject(&:empty?)
+          @include = include.reject(&:empty?)
+        end
+
+        # @param sections [Array<Glossarist::Section>]
+        # @return [Array<Glossarist::Section>]
+        def apply(sections)
+          sections.select { |s| matches?(s) }
+        end
+
+        private
+
+        def matches?(section)
+          !excluded?(section) && included?(section)
+        end
+
+        def excluded?(section)
+          @exclude.any? { |p| section.id.include?(p) }
+        end
+
+        def included?(section)
+          @include.empty? || @include.any? { |p| section.id.include?(p) }
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/plugin/glossarist/template_renderer.rb

@@ -4,7 +4,6 @@ module Metanorma
   module Plugin
     module Glossarist
       class TemplateRenderer
-        TEMPLATES_DIR = File.join(File.dirname(__FILE__), "liquid_templates")
         DEFAULT_TEMPLATE = File.join(TEMPLATES_DIR, "_concept.liquid")
 
         def initialize(file_system:, lang: "eng")

data/lib/metanorma/plugin/glossarist/version.rb

@@ -3,7 +3,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.3.6"
+      VERSION = "0.3.7"
     end
   end
 end

data/lib/metanorma-plugin-glossarist.rb

@@ -7,6 +7,9 @@ require "glossarist"
 module Metanorma
   module Plugin
     module Glossarist
+      TEMPLATES_DIR = File.join(File.dirname(__FILE__), "metanorma",
+                                "plugin", "glossarist", "liquid_templates").freeze
+
       autoload :BibliographyRenderer,
                "metanorma/plugin/glossarist/bibliography_renderer"
       autoload :ConceptFilter, "metanorma/plugin/glossarist/concept_filter"
@@ -19,6 +22,7 @@ module Metanorma
       autoload :Liquid, "metanorma/plugin/glossarist/liquid"
       autoload :LiquidRendering, "metanorma/plugin/glossarist/liquid_rendering"
       autoload :Sanitize, "metanorma/plugin/glossarist/sanitize"
+      autoload :SectionFilter, "metanorma/plugin/glossarist/section_filter"
       autoload :TemplateRenderer,
                "metanorma/plugin/glossarist/template_renderer"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-glossarist
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-09 00:00:00.000000000 Z
+date: 2026-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -112,6 +112,7 @@ files:
 - lib/metanorma/plugin/glossarist/liquid_rendering.rb
 - lib/metanorma/plugin/glossarist/liquid_templates/_concept.liquid
 - lib/metanorma/plugin/glossarist/sanitize.rb
+- lib/metanorma/plugin/glossarist/section_filter.rb
 - lib/metanorma/plugin/glossarist/template_renderer.rb
 - lib/metanorma/plugin/glossarist/version.rb
 - metanorma-plugin-glossarist.gemspec