metanorma-plugin-glossarist 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e98a4e95056510d3c6071f7c46e4bd378b2898e7fa75b44e14d5ca423efc4ca
-  data.tar.gz: ebbf812935c1fb98b523675892813de831c1ec87d152d0de78d1fd9103d6342d
+  metadata.gz: b7f273c4d3190131198e62d21b17f06ba86cba920e649b148f6eb5b739382b5b
+  data.tar.gz: 9d6341ea4819346714bc9bd8432f4a43f308a6b66fbb16e1783a9c19a3280fbe
 SHA512:
-  metadata.gz: 99d6b54e76a006d51f7f657e5d408139e0dbcb1af14545f17d8f08f157d7c197c52a88934c84238560d5860dc0131fe78b4b4933c155934aea11410239a8cf6e
-  data.tar.gz: 34f5d1c25bb615c2a2a3efdac7710b9dd8e06d0c98c4f63bc4f8846475a952715fdf2269ca4dbc970a9bd5e0bdc17327f9f8204ef2c3a5ba42ed30a75d299747
+  metadata.gz: 4432be1f049b3c52f6ae6473189adac86b65f9d14c2b20929b0974016398bc7e8032a4e82649c4dcbbbb9e16b88e943d999f14441c1fbca2a0e4b34e4ceb32c5
+  data.tar.gz: 10a9aa8898e1e7d0cef5af135a515c0b3c53c1edbe97844adb9446c253293d24d6540be35460edc46f64167b06b86fc75a85e876f7dfa424b31ff559ce046a33

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-06-13 04:20:36 UTC using RuboCop version 1.86.1.
+# on 2026-07-05 06:01:54 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,106 +11,41 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'metanorma-plugin-glossarist.gemspec'
 
-# 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
+# Offense count: 37
 # 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'
-    - 'spec/metanorma/plugin/glossarist/concept_path_resolver_spec.rb'
-    - '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'
+  Enabled: false
 
 # Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
-    - 'spec/metanorma/plugin/glossarist/section_spec.rb'
+    - 'lib/metanorma/plugin/glossarist/field_filter.rb'
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
 
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
-# NotImplementedExceptions: NotImplementedError
-Lint/UnusedMethodArgument:
+Lint/StructNewOverride:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
 
 # Offense count: 1
 Lint/UselessConstantScoping:
   Exclude:
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 11
+# Offense count: 10
 # 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: 6
+# Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -119,12 +54,12 @@ Metrics/CyclomaticComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_path_resolver.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 14
+# Offense count: 15
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 24
+  Max: 17
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -132,7 +67,7 @@ Metrics/PerceivedComplexity:
     - 'lib/metanorma/plugin/glossarist/concept_filter.rb'
     - 'lib/metanorma/plugin/glossarist/dataset_preprocessor.rb'
 
-# Offense count: 19
+# Offense count: 25
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -145,23 +80,28 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/bibliography_scope_spec.rb'
 
-# Offense count: 27
+# Offense count: 45
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 35
 
-# Offense count: 31
+# Offense count: 1
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/metanorma/plugin/glossarist/field_filter_spec.rb'
+
+# Offense count: 66
 RSpec/MultipleExpectations:
   Max: 4
 
-# Offense count: 33
+# Offense count: 38
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/dataset_preprocessor_spec.rb'
 
-# Offense count: 30
+# Offense count: 34
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 6
@@ -171,45 +111,21 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/metanorma/plugin/glossarist/concept_path_resolver_spec.rb'
 
-# Offense count: 3
+# Offense count: 5
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
+    - 'spec/metanorma/plugin/glossarist/liquid/custom_filters_spec.rb'
+    - 'spec/metanorma/plugin/glossarist/liquid/drop_bracket_access_spec.rb'
     - 'spec/metanorma/plugin/glossarist/liquid/drops/localization_collection_drop_spec.rb'
     - '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:
   Exclude:
-    - 'lib/metanorma/plugin/glossarist/dataset_registry.rb'
     - 'lib/metanorma/plugin/glossarist/template_renderer.rb'
 
 # Offense count: 1

data/Gemfile

@@ -12,8 +12,11 @@ gem "rubocop-rspec"
 
 gemspec
 
-group :test do
-  gem "metanorma"
-  gem "metanorma-plugin-lutaml"
-  gem "metanorma-standoc"
-end
+# metanorma / metanorma-standoc / metanorma-plugin-lutaml are needed by
+# spec_helper.rb at test time, but live in the default group (not :test)
+# so the release workflow's `bundle install --without development test`
+# still installs them. Bundler otherwise fails `bundle exec rake release`
+# with GemNotFound when the resolver walks the Gemfile.
+gem "metanorma"
+gem "metanorma-plugin-lutaml"
+gem "metanorma-standoc"

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

@@ -111,7 +111,7 @@ module Metanorma
           l10n.examples&.each { |e| parts << e.content.to_s }
           return [] if parts.empty?
 
-          Sanitize.extract_xrefs(parts.join(" "))
+          MentionExtractor.new(parts.join(" ")).bibliography_ids
         end
       end
     end

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

@@ -20,6 +20,7 @@ module Metanorma
         def initialize(filters)
           @filters = filters || {}
           @resolver = ConceptPathResolver.new
+          @field_filters = build_field_filters
         end
 
         # Applies all configured filters in canonical order.
@@ -38,15 +39,18 @@ module Metanorma
                                        register)
           end
           result = filter_by_tag(result) if @filters.key?("tag")
-          result = filter_by_field(result) if field_filters?
+          result = filter_by_field(result) unless @field_filters.empty?
           result = sort(result) if @filters.key?("sort_by")
           result
         end
 
         private
 
-        def field_filters?
-          (@filters.keys - COLLECTION_FILTERS).any?
+        def build_field_filters
+          field_keys = @filters.keys - COLLECTION_FILTERS
+          field_keys.map do |key|
+            FieldFilter.from_options_entry(key, @filters[key])
+          end
         end
 
         def filter_by_lang(collection)
@@ -103,33 +107,10 @@ module Metanorma
         end
 
         def filter_by_field(collection)
-          path, value, start_with = field_filter_spec
-          start_with_match_value = extract_start_with_value(path, value)
-          path, match_value = if start_with_match_value
-                                [start_with_match_value[:path],
-                                 start_with_match_value[:value]]
-                              else
-                                [path, value]
-                              end
-
           collection.select do |concept|
-            actual = @resolver.resolve(concept, path)
-            start_with ? actual&.start_with?(match_value) : actual == value
+            @field_filters.all? { |filter| filter.match?(@resolver, concept) }
           end
         end
-
-        def field_filter_spec
-          path = (@filters.keys - COLLECTION_FILTERS).first
-          start_with = path.include?(".start_with(")
-          [path, @filters[path], start_with]
-        end
-
-        def extract_start_with_value(path, _value)
-          match = path.match(/^([^.]+(?:\.[^.]+)*)\.start_with\(([^)]+)\)$/)
-          return nil unless match
-
-          { path: match[1], value: match[2] }
-        end
       end
     end
   end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "asciidoctor"
 require "asciidoctor/reader"
-require "glossarist"
 
 module Metanorma
   module Plugin
@@ -108,14 +106,13 @@ module Metanorma
           if (match = current_line.match(BIB_ANCHOR_REGEX))
             @existing_bib_anchors << match[1]
           end
-          liquid_doc.add_content(current_line)
+          liquid_doc.add_raw(current_line)
         end
 
         def process_dataset_tag(document, input_lines, liquid_doc, match)
           @seen_glossarist = true
           @registry.register(document, match[1])
-          liquid_doc.add_content(prepare_document(document, input_lines).to_s,
-                                 render: false)
+          liquid_doc.add_raw(prepare_document(document, input_lines).to_s)
         end
 
         def process_glossarist_block(document, liquid_doc, input_lines, match)
@@ -129,9 +126,11 @@ module Metanorma
             {% endwith_glossarist_context %}
           SECTION
 
-          options = { render: true }
-          options[:template] = template if template
-          liquid_doc.add_content(section, options)
+          if template
+            liquid_doc.add_rendered(section, template: template)
+          else
+            liquid_doc.add_rendered(section)
+          end
         end
 
         def prepare_glossarist_block_params(document, match)
@@ -175,7 +174,7 @@ module Metanorma
                                              depth: @title_depth,
                                              anchor_prefix: options["anchor-prefix"],
                                              non_verbal: non_verbal_for(context_name))
-          liquid_doc.add_content("\n#{rendered}")
+          liquid_doc.add_raw("\n#{rendered}")
         end
 
         RENDER_OPTIONS = %w[anchor-prefix].freeze
@@ -198,7 +197,7 @@ module Metanorma
                                               depth: @title_depth,
                                               anchor_prefix: options["anchor-prefix"],
                                               non_verbal: non_verbal_for(context_name))
-          liquid_doc.add_content("\n#{rendered}")
+          liquid_doc.add_raw("\n#{rendered}")
         end
 
         def process_import_sections_tag(_document, liquid_doc, match)
@@ -215,7 +214,7 @@ module Metanorma
           return unless dataset
 
           parts = render_sections(dataset, register, sections, context_name, options)
-          liquid_doc.add_content("\n#{parts.join("\n\n")}")
+          liquid_doc.add_raw("\n#{parts.join("\n\n")}")
         end
 
         def render_sections(dataset, register, sections, context_name, options)
@@ -266,7 +265,7 @@ module Metanorma
             existing_anchors: @existing_bib_anchors,
             bibliography: @registry.bibliography_for(dataset_name),
           )
-          liquid_doc.add_content(renderer.render_all(concepts))
+          liquid_doc.add_raw(renderer.render_all(concepts))
         end
 
         def process_bibliography_entry(document, liquid_doc, match)
@@ -280,7 +279,7 @@ module Metanorma
             bibliography: @registry.bibliography_for(dataset_name),
           )
           entry = renderer.render_entry(concept)
-          liquid_doc.add_content(entry) if entry
+          liquid_doc.add_raw(entry) if entry
         end
 
         # Renders all dataset-level entities of a non-verbal kind
@@ -295,7 +294,7 @@ module Metanorma
 
           renderer = NonVerbalRenderer.new(collections: { kind => collection })
           rendered = renderer.render_kind(kind)
-          liquid_doc.add_content("\n#{rendered}") unless rendered.empty?
+          liquid_doc.add_raw("\n#{rendered}") unless rendered.empty?
         end
 
         def relative_file_path(document, file_path)

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "glossarist"
-
 module Metanorma
   module Plugin
     module Glossarist

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

@@ -10,19 +10,18 @@ module Metanorma
           @content = []
         end
 
-        def add_content(content, options = {})
-          @content << if options[:render]
-                        LiquidRendering.render(
-                          content,
-                          include_paths: [file_system,
-                                          TEMPLATES_DIR,
-                                          options[:template]].compact,
-                          patterns: LiquidRendering::DOCUMENT_PATTERNS,
-                          registry: registry,
-                        )
-                      else
-                        content
-                      end
+        def add_raw(content)
+          @content << content
+        end
+
+        def add_rendered(content, template: nil)
+          include_paths = [file_system, TEMPLATES_DIR, template].compact
+          @content << LiquidRendering.render(
+            content,
+            include_paths: include_paths,
+            patterns: LiquidRendering::DOCUMENT_PATTERNS,
+            registry: registry,
+          )
         end
 
         def to_s

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Glossarist
+      # A single field-based filter specification: a path through the concept
+      # graph, a matcher kind, and the comparison value.
+      #
+      # FieldFilter is the structured representation behind ConceptFilter's
+      # field-filter DSL. ConceptFilter parses the legacy pseudo-syntax
+      # (e.g. +key.start_with(pattern)=ignored+) into FieldFilter instances;
+      # future syntaxes (regex, contains) only need a new matcher symbol.
+      FieldFilter = Struct.new(:path, :matcher, :value, keyword_init: true) do
+        START_WITH_SUFFIX = /\.start_with\(([^)]+)\)\z/
+
+        # Parses a single filter hash entry (path-key, optional value) into
+        # a FieldFilter. Two shapes are recognized:
+        #
+        #   - "data.path" => "value" → matcher :eq, value "value"
+        #   - "data.path.start_with(pattern)" => _ → matcher :start_with,
+        #     value "pattern" (the hash value is ignored)
+        #
+        # @param path [String] raw filter key
+        # @param raw_value [String, nil] raw filter value
+        # @return [FieldFilter]
+        def self.from_options_entry(path, raw_value)
+          if (match = path.match(START_WITH_SUFFIX))
+            FieldFilter.new(
+              path: match.pre_match,
+              matcher: :start_with,
+              value: match[1],
+            )
+          else
+            FieldFilter.new(path: path, matcher: :eq, value: raw_value)
+          end
+        end
+
+        # Applies the filter to a single concept via the given path resolver.
+        # @param resolver [ConceptPathResolver]
+        # @param concept [ManagedConcept]
+        def match?(resolver, concept)
+          actual = resolver.resolve(concept, path)
+          case matcher
+          when :start_with then actual&.start_with?(value.to_s)
+          else actual == value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -31,7 +31,7 @@ module Metanorma
 
             @contexts.each do |local_context|
               path = local_context[:file_path].strip
-              collection = registry ? registry.concepts_at(path) : load_collection(path)
+              collection = concepts_for(registry, path)
               filtered = ConceptFilter.new(@raw_filters).apply(collection)
               context[local_context[:name]] = filtered.map do |c|
                 ManagedConceptDrop.new(c)
@@ -51,10 +51,14 @@ module Metanorma
             end
           end
 
-          def load_collection(folder_path)
-            collection = ::Glossarist::ManagedConceptCollection.new
-            collection.load_from_files(folder_path)
-            collection
+          def concepts_for(registry, path)
+            return registry.concepts_at(path) if registry
+
+            fallback_store(path).concepts
+          end
+
+          def fallback_store(path)
+            ::Glossarist::GlossaryStore.new.load_directory(path)
           end
         end
       end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "liquid"
-
 module Metanorma
   module Plugin
     module Glossarist
@@ -16,7 +14,10 @@ module Metanorma
             Liquid::LocalFileSystem.new(include_paths, patterns)
           template.registers[:dataset_registry] = registry if registry
           rendered = template.render(assigns)
-          raise template.errors.first.cause if template.errors.any?
+          if template.errors.any?
+            error = template.errors.first
+            raise error.cause || error
+          end
 
           rendered
         end

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

@@ -29,9 +29,14 @@ domain:[{{ l10n.data.domain }}]
 {% for note in l10n.data.notes.definitions -%}
 [NOTE]
 ====
-{{ note.content | sanitize_references }}
-====
+{{ note.content | sanitize_references }}{% for example in note.examples %}
 
+[example]
+====
+{{ example.content | sanitize_references }}
+====
+{% endfor %}
+====
 {% endfor %}
 {% if l10n.data.annotations -%}
 {% for annotation in l10n.data.annotations.definitions -%}

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Metanorma
+  module Plugin
+    module Glossarist
+      # Extracts bibliography-citable mention IDs from concept text using
+      # +Glossarist::ReferenceExtractor+ as the single canonical parser.
+      #
+      # Bibliography relevance = +BibliographicReference+ (from +<<anchor>>+
+      # xrefs) and +ConceptReference+ instances whose +#cite?+ is true (from
+      # +{{cite:id}}+ mentions). Other mention kinds (fig/table/formula/urn)
+      # reference assets or concepts, not bibliography entries.
+      class MentionExtractor
+        def initialize(text)
+          @text = text
+        end
+
+        def bibliography_ids
+          refs = ::Glossarist::ReferenceExtractor.new
+            .extract_from_text(@text.to_s)
+          refs.filter_map { |ref| bibliography_id(ref) }.uniq
+        end
+
+        private
+
+        def bibliography_id(ref)
+          case ref
+          when ::Glossarist::BibliographicReference
+            ref.anchor
+          when ::Glossarist::ConceptReference
+            ref.concept_id if ref.cite?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,6 @@ module Metanorma
     module Glossarist
       module Sanitize
         REF_REGEX = /{{(urn:[^,{}]+),([^}]+?)}}(.*)$/m
-        XREF_REGEX = /<<((?>[^,>\n]+))(?:,[^>\n]*)?>>/
 
         def self.references(str)
           return str unless str&.match?(REF_REGEX)
@@ -16,12 +15,6 @@ module Metanorma
             "{{#{urn},#{m[2]}}}#{m[3]}"
           end
         end
-
-        def self.extract_xrefs(text)
-          return [] unless text
-
-          text.scan(XREF_REGEX).map(&:first).uniq
-        end
       end
     end
   end

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

@@ -9,7 +9,6 @@ module Metanorma
         def initialize(file_system:, lang: "eng")
           @file_system = file_system
           @lang = lang
-          @template_cache = {}
         end
 
         def render_concepts(concepts, depth:, anchor_prefix: nil,
@@ -30,8 +29,7 @@ module Metanorma
             "depth_marker" => "=" * (depth + 1),
             "anchor" => build_anchor(concept.data.id.to_s, anchor_prefix),
           }
-          template_content = cached_template(concept)
-          rendered = render_template(template_content, context)
+          rendered = render_template(File.read(DEFAULT_TEMPLATE), context)
           if non_verbal
             rendered += "\n\n#{non_verbal.render_concept_refs(concept)}"
           end
@@ -40,14 +38,6 @@ module Metanorma
 
         private
 
-        def cached_template(concept)
-          version = concept.schema_version
-          @template_cache[version] ||= begin
-            path = File.join(TEMPLATES_DIR, "_concept_#{version}.liquid")
-            File.exist?(path) ? File.read(path) : File.read(DEFAULT_TEMPLATE)
-          end
-        end
-
         def render_tree_node((concept, children), depth, anchor_prefix,
                              non_verbal)
           result = render_concept(concept, depth: depth,

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

@@ -3,7 +3,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.3.10"
+      VERSION = "0.4.0"
     end
   end
 end

data/lib/metanorma-plugin-glossarist.rb

@@ -19,8 +19,11 @@ module Metanorma
                "metanorma/plugin/glossarist/dataset_preprocessor"
       autoload :DatasetRegistry, "metanorma/plugin/glossarist/dataset_registry"
       autoload :Document, "metanorma/plugin/glossarist/document"
+      autoload :FieldFilter, "metanorma/plugin/glossarist/field_filter"
       autoload :Liquid, "metanorma/plugin/glossarist/liquid"
       autoload :LiquidRendering, "metanorma/plugin/glossarist/liquid_rendering"
+      autoload :MentionExtractor,
+               "metanorma/plugin/glossarist/mention_extractor"
       autoload :NonVerbalFormatters,
                "metanorma/plugin/glossarist/non_verbal_formatters"
       autoload :NonVerbalRenderer,

data/metanorma-plugin-glossarist.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_dependency "asciidoctor"
-  spec.add_dependency "glossarist", "~> 2.8", ">= 2.8.16"
+  spec.add_dependency "glossarist", "~> 2.8", ">= 2.9.0"
   spec.add_dependency "liquid"
   spec.add_dependency "metanorma-utils"
   spec.metadata["rubygems_mfa_required"] = "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-glossarist
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-06-20 00:00:00.000000000 Z
+date: 2026-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -33,7 +33,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.16
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.16
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - lib/metanorma/plugin/glossarist/dataset_preprocessor.rb
 - lib/metanorma/plugin/glossarist/dataset_registry.rb
 - lib/metanorma/plugin/glossarist/document.rb
+- lib/metanorma/plugin/glossarist/field_filter.rb
 - lib/metanorma/plugin/glossarist/liquid.rb
 - lib/metanorma/plugin/glossarist/liquid/custom_blocks/with_glossarist_context.rb
 - lib/metanorma/plugin/glossarist/liquid/custom_filters.rb
@@ -111,6 +112,7 @@ files:
 - lib/metanorma/plugin/glossarist/liquid/multiply_local_file_system.rb
 - lib/metanorma/plugin/glossarist/liquid_rendering.rb
 - lib/metanorma/plugin/glossarist/liquid_templates/_concept.liquid
+- lib/metanorma/plugin/glossarist/mention_extractor.rb
 - lib/metanorma/plugin/glossarist/non_verbal_formatters.rb
 - lib/metanorma/plugin/glossarist/non_verbal_formatters/base.rb
 - lib/metanorma/plugin/glossarist/non_verbal_formatters/figure.rb