metanorma-plugin-glossarist 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07d9ddc6720aac3252656fd0007c0bb94bc3e5c1c5ded611af02d5039522c36
-  data.tar.gz: bd13492bcae100bde31c7a7ebff164df063813e08b3be68c58440c82fbe59fde
+  metadata.gz: 704ad16bc258aaa5af4a78ffdeac527254bf94ca24dfb26dac89e4233f4e625e
+  data.tar.gz: f073009599c27404eb2a7c59d1988892ed954bc70d42e8e7e41990b20b430c1a
 SHA512:
-  metadata.gz: 3a04d8235b07dc11c311ccba9eb15c34e4730c1d526c4e3706b95e2e3c1c1dbe7430b9a1d2f8dadf2f67cad77e7a321c5a8ebb65979f7d0f3b13c015850f0f1d
-  data.tar.gz: 5415870aabbe584b8487073d6773c71830eeab17ed4d839761845cf70970c824b036ee8fe0d78bb1b855f1fea5a40ac77504da031e9e481e3810de546be9df86
+  metadata.gz: 2b7c0b15020b2be901c61bd6d79df81aae2ac2f76f50ac9f6cf49ed4035bb2df7089ac7d70ccec4998023fcb46539f1c902836eb6d62f4f17e6f5bc4ce238513
+  data.tar.gz: 2ac8b854afb2da6692690105c41a8b4a71c2cc69ce367b32a5ec199eaf2850223ade67dacf4b96e9b03512230409ae09772ee6f567e138ea91235d55559c90cc

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

@@ -290,7 +290,7 @@ module Metanorma
           kind = :"#{match[1]}"
           dataset_name = match[2].strip
           collection = @registry.non_verbal_collection(dataset_name, kind)
-          return unless collection
+          return if collection.nil? || collection.empty?
 
           renderer = NonVerbalRenderer.new(collections: { kind => collection })
           rendered = renderer.render_kind(kind)

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

@@ -14,20 +14,16 @@ module Metanorma
         BIBLIOGRAPHY_FILENAME = "bibliography.yaml"
         REGISTER_FILENAME = "register.yaml"
 
-        # Map of plural kind symbol → (collection class, subdirectory name).
-        # Adding a new non-verbal kind = adding one entry here. The accessor
-        # `{kind}_for` and loader are derived from this table.
-        NON_VERBAL_KINDS = {
-          figures: [::Glossarist::Collections::FigureCollection, "figures"],
-          tables: [::Glossarist::Collections::TableCollection, "tables"],
-          formulas: [::Glossarist::Collections::FormulaCollection, "formulas"],
-        }.freeze
+        # Non-verbal entity kinds exposed by GlossaryStore. Each kind
+        # matches a method on +GlossaryStore+ (+#figures+, +#tables+,
+        # +#formulas+) that returns an +Array<Figure|Table|Formula>+,
+        # lazily loaded from +{dataset_path}/{kind}/*.yaml+.
+        NON_VERBAL_KINDS = %i[figures tables formulas].freeze
 
         def initialize
           @stores = {}
           @registers = {}
           @bibliographies = {}
-          @non_verbal = {}
           @context_paths = {}
         end
 
@@ -90,35 +86,39 @@ module Metanorma
           store_for(path).concepts
         end
 
-        # Returns the typed NonVerbalCollection for a registered context
-        # (e.g. FigureCollection), or nil if the dataset has no such
-        # subdirectory. +kind+ is one of the keys of NON_VERBAL_KINDS.
+        # Returns the Array of dataset-level non-verbal entities of the
+        # given kind for a registered context (e.g. +Array<Glossarist::Figure>+),
+        # or +nil+ if the context isn't registered. Empty Array means the
+        # dataset has no +{kind}/+ subdirectory.
+        #
+        # +kind+ must be one of +NON_VERBAL_KINDS+. The kind symbol is the
+        # message sent to +GlossaryStore+ — adding a new kind requires both
+        # a GlossaryStore accessor and an entry here.
         def non_verbal_collection(context_name, kind)
-          unless NON_VERBAL_KINDS.key?(kind)
+          unless NON_VERBAL_KINDS.include?(kind)
             raise ArgumentError, "unknown non-verbal kind: #{kind.inspect}"
           end
 
           path = @context_paths[context_name]
           return nil unless path
 
-          collection_class, subdir = NON_VERBAL_KINDS.fetch(kind)
-          non_verbal_at(path, kind, subdir, collection_class)
+          store_for(path).public_send(kind)
         end
 
-        NON_VERBAL_KINDS.each_key do |kind|
+        NON_VERBAL_KINDS.each do |kind|
           define_method("#{kind}_for") do |context_name|
             non_verbal_collection(context_name, kind)
           end
         end
 
         # Returns all available non-verbal collections for a context as a
-        # hash keyed by kind symbol (e.g. +{ figures: FigureCollection }+).
+        # hash keyed by kind symbol (e.g. +{ figures: Array<Figure> }+).
         # Kinds whose subdirectory doesn't exist are omitted. Convenient
         # for building a NonVerbalRenderer in one call.
         def non_verbal_collections(context_name)
-          NON_VERBAL_KINDS.each_with_object({}) do |(kind, _), memo|
+          NON_VERBAL_KINDS.each_with_object({}) do |kind, memo|
             collection = non_verbal_collection(context_name, kind)
-            memo[kind] = collection if collection
+            memo[kind] = collection if collection && !collection.empty?
           end
         end
 
@@ -149,14 +149,6 @@ module Metanorma
           end
         end
 
-        def non_verbal_at(path, kind, subdir, collection_class)
-          dir = File.join(path, subdir)
-          return nil unless File.directory?(dir)
-
-          @non_verbal[path] ||= {}
-          @non_verbal[path][kind] ||= collection_class.from_directory(dir)
-        end
-
         def relative_file_path(document, file_path)
           return file_path if File.absolute_path?(file_path)
 

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

@@ -11,6 +11,12 @@ module Metanorma
       # Per-kind formatting is delegated to a formatter class registered
       # in +FORMATTERS+. Adding a new kind = adding one formatter class
       # and one entry here; the dispatcher itself never changes shape.
+      #
+      # Collections are +Array<Figure|Table|Formula>+ as returned by
+      # +GlossaryStore#figures/#tables/#formulas+. Lookups by id
+      # (for concept→entity refs) use a lazily-built index that includes
+      # Figure subfigures, preserving the recursive +Figure#find_by_id+
+      # semantics of the previous Collection-based path.
       class NonVerbalRenderer
         FORMATTERS = {
           figures: NonVerbalFormatters::Figure,
@@ -18,13 +24,14 @@ module Metanorma
           formulas: NonVerbalFormatters::Formula,
         }.freeze
 
-        # @param collections [Hash{Symbol => NonVerbalCollection, nil}]
+        # @param collections [Hash{Symbol => Array<NonVerbalEntity>, nil}]
         #   one entry per non-verbal kind, e.g.
-        #   `{ figures: FigureCollection, tables: ..., formulas: ... }`.
+        #   `{ figures: Array<Glossarist::Figure>, ... }`.
         #   Missing or nil entries are silently skipped.
         def initialize(collections:, lang: "eng")
           @collections = collections
           @lang = lang
+          @indices = {}
         end
 
         # Render every entity in the named collection.
@@ -32,11 +39,10 @@ module Metanorma
         # @param kind [Symbol] key in FORMATTERS (e.g. +:figures+)
         # @return [String] AsciiDoc blocks joined by blank lines, or ""
         def render_kind(kind)
-          collection = @collections[kind]
-          return "" if collection.nil? || collection.entries.empty?
+          entities = @collections[kind]
+          return "" if entities.nil? || entities.empty?
 
-          entries = collection.entries
-          "#{entries.map { |e| format_one(kind, e) }.join("\n\n")}\n"
+          "#{entities.map { |e| format_one(kind, e) }.join("\n\n")}\n"
         end
 
         # Render the non-verbal entities referenced by a concept's
@@ -61,10 +67,7 @@ module Metanorma
         private
 
         def render_ref(kind, ref)
-          collection = @collections[kind]
-          return nil unless collection
-
-          entity = collection.by_id(ref.entity_id)
+          entity = index_for(kind)[ref.entity_id]
           return nil unless entity
 
           format_one(kind, entity)
@@ -78,6 +81,27 @@ module Metanorma
           refs = concept.data&.public_send(kind)
           Array(refs)
         end
+
+        # Lazily builds and caches a {id => entity} index for the named
+        # kind. Figures include their subfigures recursively; other kinds
+        # are flat by id. Returns {} for missing/empty collections so
+        # lookups naturally return nil.
+        def index_for(kind)
+          @indices[kind] ||= build_index(@collections[kind])
+        end
+
+        def build_index(entities)
+          return {} if entities.nil? || entities.empty?
+
+          entities.each_with_object({}) { |e, h| index_entity(h, e) }
+        end
+
+        def index_entity(index, entity)
+          index[entity.id] = entity
+          return unless entity.is_a?(::Glossarist::Figure)
+
+          Array(entity.subfigures).each { |sub| index_entity(index, sub) }
+        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.4.1"
+      VERSION = "0.5.0"
     end
   end
 end

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.10.1"
+  spec.add_dependency "glossarist", "~> 2.8", ">= 2.11.1"
   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.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-06 00:00:00.000000000 Z
+date: 2026-07-08 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.10.1
+        version: 2.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement