glossarist 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b70c846aebbbbd0af25b5ba83b94ea880631518cf60b7a8ce39911275ab44ee4
-  data.tar.gz: bada2553c608f3816aa6532313cededc476680e52f5efdf6bf0285061340ade9
+  metadata.gz: db275fe34501d897cc24b130bf5f0f37a447dc9f440d3aa6a7b0fc1f5ab49051
+  data.tar.gz: 29f0e1559a03e9c6c740f6853db1546091ef9aa3acc7b93b091f01ed9ee6fcee
 SHA512:
-  metadata.gz: 40bd8e71cbb34e419bb1ed4d82f1474666c82d29467afbc9b6e5537f7e706a61f8d53fb6682a25a65040b1e89d7b59ecacec2f9af77e9305ec2ce5f561c6f769
-  data.tar.gz: e39ba317e19833514190bcd693538b44f75241f07ba03ca25e261ac56efaa3671acb2802a505743cfc1bc4d0e52f0a3f11d8f7765be1a64ad44ecd0d8a01f106
+  metadata.gz: a281074b57a07df9792775ccbfff3002be6303049979030ccbe7133de46a9ee04a69a807ef3e65eb9aa82c7ff6c62fdc8b00a5182213650d4af5ba6d9cdf8681
+  data.tar.gz: bf03d853b4406f6fd42ed3379600d75425058150e0247da46833139085d5752c3fe71b62465b29dcdbad00ee53d72159d7f8a449034e6844bf9f7866a56cd4c1

data/CLAUDE.md

@@ -19,7 +19,7 @@ All model classes use `Lutaml::Model::Serializable` for serialization.
 
 ### Core Model Hierarchy
 
-- **`ManagedConceptCollection`** (`managed_concept_collection.rb`) — top-level enumerable collection of ManagedConcepts. Entry point for loading/saving glossaries via `ConceptManager`.
+- **`ManagedConceptCollection`** (`managed_concept_collection.rb`) — legacy enumerable collection of ManagedConcepts. File loading delegates to GlossaryStore via `#load_from_files`; the class is retained as an in-memory accumulator for `STS::Importer` and the legacy `ConceptSet` path. New callers should use GlossaryStore directly.
 - **`ManagedConcept`** (`managed_concept.rb`) — a managed concept with `ManagedConceptData` (groups, localized_concepts map, sources), related concepts, dates, and status. Delegates localization via `add_l10n`/`localization(lang)`.
 - **`Concept`** (`concept.rb`) — base concept with `ConceptData` (definition, terms/designations, notes, examples, sources, dates, language_code). Parent of `LocalizedConcept`.
 - **`LocalizedConcept`** (`localized_concept.rb`) — extends `Concept` with `classification`, `entry_status`, `review_type`.
@@ -62,9 +62,9 @@ Designation inheritance hierarchy (MECE):
 ### Dataset Loading
 
 - **`GlossaryStore`** (`glossary_store.rb`) — the dataset abstraction. Backed by `Lutaml::Store::PackageStore`, handles loading/saving from directories and ZIPs, concept CRUD, metadata, bibliography, images, dataset-level non-verbal entities (`#figures`, `#tables`, `#formulas` lazy-loaded from `figures/`/`tables/`/`formulas/` subdirectories), and stats. Format detection is model-driven via `ConceptDocument.for_version`. **All callers that need to load concepts from a dataset should use GlossaryStore.**
-- **`ConceptCollector`** (`concept_collector.rb`) — legacy scanner with hand-rolled format detection (file-system heuristics, not model-driven). Being replaced by GlossaryStore. Do not add new callers.
-- **`ConceptManager`** (`concept_manager.rb`) — legacy file I/O used by `ManagedConceptCollection`. Being replaced by GlossaryStore. Do not add new callers.
-- **`ManagedConceptCollection`** (`managed_concept_collection.rb`) — legacy collection that loads via ConceptManager. Being replaced by GlossaryStore.
+- **`ConceptCollector`** (`concept_collector.rb`) — legacy scanner with hand-rolled format detection. No production callers; retained for ABI compatibility. Use GlossaryStore.
+- **`ConceptManager`** (`concept_manager.rb`) — legacy file I/O used by `ManagedConceptCollection#load_from_files`. No direct production callers; retained for the legacy collection path. Use GlossaryStore.
+- **`ManagedConceptCollection`** (`managed_concept_collection.rb`) — legacy collection. File loading delegates to GlossaryStore; retained as an in-memory accumulator for `STS::Importer`. `ConceptSet` now uses GlossaryStore directly (previously went through this collection).
 
 ### YAML Serialization
 
@@ -183,7 +183,7 @@ Do not attempt to "parameterize" or "collapse" these into the base class:
 
 See `TODO.improve/` for detailed plans.
 
-1. **Migrate callers to GlossaryStore** — ConceptCollector (8 call sites) and ConceptManager (1 call site) duplicate format detection with file-system heuristics. GlossaryStore is model-driven, framework-aligned, and handles both directory and ZIP. All callers should go through GlossaryStore.
+1. **Phase out `ManagedConceptCollection` entirely** — `ConceptSet` now loads via GlossaryStore directly (PR #212). The only remaining user is `STS::Importer`, which uses the collection as an in-memory accumulator after loading via GlossaryStore/GcrPackage. Migrating STS::Importer to a plain Array would close the legacy chapter.
 
 ### Rejected candidates (do not re-suggest)
 

data/lib/glossarist/concept_set.rb

@@ -4,7 +4,9 @@ require "set"
 
 module Glossarist
   class ConceptSet
-    # a `Glossarist::ManagedConceptCollection` object
+    # An Enumerable of ManagedConcept (Array, GlossaryStore, or
+    # ManagedConceptCollection). Set by `read_concepts` based on what
+    # the caller passed.
     attr_accessor :concepts
 
     # a `BibliographyCollection` object
@@ -14,8 +16,9 @@ module Glossarist
     attr_accessor :assets
 
     # @parameters
-    #   concepts => a `Glossarist::ManagedConceptCollection` object or
-    #               a string containing the path of the folder with concepts
+    #   concepts => an Enumerable of ManagedConcept, a GlossaryStore, a
+    #               ManagedConceptCollection, or a string containing the
+    #               path of the dataset directory
     #   assets => a collection of Glossarist::Asset
     def initialize(concepts, assets, options = {})
       @concepts = read_concepts(concepts)
@@ -30,7 +33,7 @@ module Glossarist
     def to_latex(filename = nil)
       return to_latex_from_file(filename) if filename
 
-      @concepts.map do |concept|
+      concepts.to_a.map do |concept|
         latex_template(concept)
       end.join("\n")
     end
@@ -47,12 +50,16 @@ module Glossarist
       end.join("\n")
     end
 
+    # Loads concepts via GlossaryStore when given a path string. Accepts
+    # an existing Enumerable (Array, GlossaryStore, ManagedConceptCollection)
+    # as-is — callers that already have an in-memory collection can pass
+    # it directly without paying for a re-load.
     def read_concepts(concepts)
-      return concepts if concepts.is_a?(Glossarist::ManagedConceptCollection)
+      return concepts if concepts.is_a?(Enumerable)
 
-      collection = Glossarist::ManagedConceptCollection.new
-      collection.load_from_files(concepts)
-      collection
+      store = GlossaryStore.new
+      store.load(concepts)
+      store.concepts
     end
 
     def latex_template(concept)
@@ -76,7 +83,7 @@ module Glossarist
     end
 
     def concept_map
-      @concept_map ||= concepts.managed_concepts.to_h do |concept|
+      @concept_map ||= concepts.to_a.to_h do |concept|
         [concept.default_designation.downcase, concept]
       end
     end

data/lib/glossarist/version.rb

@@ -4,5 +4,5 @@
 #
 
 module Glossarist
-  VERSION = "2.11.0"
+  VERSION = "2.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glossarist
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model