metanorma-plugin-glossarist 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035bbab9dbca5a50d31568ac38270873b5d0adba5bc7be42f69f5cfc90930e2b
-  data.tar.gz: 226a954bac71bd41894a46692f7610b9b7d04f3d44444494acb4d73e6fbfb053
+  metadata.gz: 55d315bc6cddf69dfc612fa0f19f6b7fb2161333f765a525befffb6e83000185
+  data.tar.gz: db3d207cb5be69640cd4e137c79853ee5d008537743f6d24763ae687f464923c
 SHA512:
-  metadata.gz: 0353502cfb820476dca14b27c428475feb7ac33a6badaf0d84517540c7b5466f410eb2b1025f26eca5f9dc0e1cf5d90c170e7222cd90a72fad0db258267c8d95
-  data.tar.gz: 1fefdf7694567c819f7789f96494e8dd4fbc54ddfeea801686924c524ed064ddf263dadd497b84c60deb763341b347d0c4bc87c64fb845a6cb2ab02eafcc70d2
+  metadata.gz: 164ee3cb6feb6b609cc4bb28541f539e9fd2c7354a05dded59863b9d81405ae0f42bc68a618f5b5fecb02b503bf628a6101c9ab0a3ffae0c54c502ecd0db9e63
+  data.tar.gz: b014dcaa771d6e67dac030f6ffaf0b662cfc9e5f2471ec8a482c38006ff2dcdd321c568a3c8f3fa3026170dd19c497dcbff0c21c8e25c7f19fd373e5af463792

data/.gitignore

@@ -9,7 +9,7 @@
 
 # rspec failure tracking
 .rspec_status
-Gemfile.lock
 
 .rubocop-https--*
 *.log.txt
+Gemfile.lock

data/Gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gem "glossarist"
 gem "metanorma", github: "metanorma/metanorma", branch: "main"
 gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml",
                                branch: "main"

data/README.adoc

@@ -271,7 +271,7 @@ Multiple filters can be applied by separating them with a semicolon `;`.
 ====
 [source,adoc]
 ------
-[glossarist,dataset,filter='group=foo;sort_by=term',concepts]
+[glossarist,dataset,filter='domain=foo;sort_by=term',concepts]
 ----
 ...
 ----
@@ -287,7 +287,7 @@ which concepts are loaded into the block.
 `sort_by=<field name>`::: Sorts the dataset in ascending order of the given
 field values. The field `term` is a special case, where it sorts according to
 the `default_designation` of the term. Nested attribute paths are supported
-using dot notation (e.g., `data.id`) and bracket notation for hash/array access
+using dot notation (e.g., `data.identifier`) and bracket notation for hash/array access
 (e.g., `data.localizations['eng'].data.terms[0].designation`).
 Nested path sorts use natural ordering so that version-like identifiers
 (e.g., `3.1.1.10`) sort correctly after `3.1.1.2`. Concepts missing the
@@ -299,7 +299,7 @@ specified path are sorted last.
 default term (which is the first English designation, at `data.localizations['eng'].data.terms[0].designation`).
 
 [example]
-`sort_by=data.id` will sort concepts by their identifier.
+`sort_by=data.identifier` will sort concepts by their identifier.
 
 [example]
 `sort_by=data.localizations['eng'].data.terms[0].designation` will sort concepts
@@ -311,11 +311,18 @@ alphabetically by the English designation.
 [example]
 `lang=ara` loads all localized concepts of Arabic for all concepts.
 
-`group=<group name>`::: Loads concepts that belong to the specified group. Group is a dataset-specific
-field that can be used to categorize concepts.
+`domain=<domain name>`::: Loads concepts that belong to the specified domain.
+Domains are `ConceptReference` objects (with `concept_id` and `ref_type: "domain"`)
+that categorize concepts into subject areas.
 +
 [example]
-`group=foo` will only load concepts that have a group named `foo`.
+`domain=foo` will only load concepts that have a domain with `concept_id` "foo".
+
+`group=<group name>`::: Legacy alias for `domain`. Loads concepts that belong to
+the specified domain. Provided for backward compatibility with existing documents.
++
+[example]
+`group=foo` will only load concepts that have a domain with `concept_id` "foo".
 
 Field filters:: These filters are applied to individual fields of the concepts
 and affect which concepts are included in the block based on the values of those
@@ -724,14 +731,14 @@ System for identifying position in the real world
 ====
 
 [example]
-.Applying sorting and filtering by group
+.Applying sorting and filtering by domain
 ====
-Using the same dataset as above, but with sorting and filtering by the "terminology" group:
+Using the same dataset as above, but with sorting and filtering by the "terminology" domain:
 
 [source,asciidoc]
 ------
 === Terms and definitions
-[glossarist, /path/to/glossarist-dataset, filter='group=terminology;sort_by=term', dataset]
+[glossarist, /path/to/glossarist-dataset, filter='domain=terminology;sort_by=term', dataset]
 ----
 {%- for concept in dataset -%}
 ==== {{ concept.data.localizations['eng'].data.terms[0].designation }}
@@ -761,7 +768,7 @@ Using the same dataset, but filtering for terms related to addressing:
 [source,asciidoc]
 ------
 === Terms and definitions
-[glossarist, /path/to/glossarist-dataset, filter='group=addressing', dataset]
+[glossarist, /path/to/glossarist-dataset, filter='domain=addressing', dataset]
 ----
 {%- for concept in dataset -%}
 ==== {{ concept.data.localizations['eng'].data.terms[0].designation }}

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

@@ -4,7 +4,8 @@ module Metanorma
   module Plugin
     module Glossarist
       class ConceptFilter
-        COLLECTION_FILTERS = %w[lang group sort_by].freeze
+        COLLECTION_FILTERS = %w[lang domain group sort_by].freeze
+        SORT_LAST = ["￿"].freeze
 
         def initialize(filters)
           @filters = filters || {}
@@ -13,7 +14,9 @@ module Metanorma
         def apply(collection)
           result = collection
           result = filter_by_lang(result) if @filters.key?("lang")
-          result = filter_by_group(result) if @filters.key?("group")
+          if @filters.key?("domain") || @filters.key?("group")
+            result = filter_by_domain(result)
+          end
           result = filter_by_field(result) if field_filter?
           result = sort(result) if @filters.key?("sort_by")
           result
@@ -34,9 +37,11 @@ module Metanorma
           collection.reject { |c| c.localization(lang).nil? }
         end
 
-        def filter_by_group(collection)
-          group = @filters["group"]
-          collection.select { |c| c.data.groups&.include?(group) }
+        def filter_by_domain(collection)
+          domain = @filters["domain"] || @filters["group"]
+          collection.select do |c|
+            c.data.domains&.any? { |d| d.concept_id == domain }
+          end
         end
 
         def sort(collection)
@@ -58,10 +63,9 @@ module Metanorma
           value.nil? ? SORT_LAST : natural_sort_key(value.to_s)
         end
 
-        SORT_LAST = ["￿"].freeze
-
         def natural_sort_key(str)
-          str.scan(/(\d+)|(\D+)/).map { |num, txt| num ? num.to_i : txt.downcase }
+          str.scan(/(\d+)|(\D+)/)
+            .map { |num, txt| num ? num.to_i : txt.downcase }
         end
 
         def filter_by_field(collection)

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

@@ -9,94 +9,18 @@ module Metanorma
         end
 
         def to_h
-          { "data" => concept_data_hash }
+          data = @concept.data.to_hash
+          data["localizations"] = localizations_hash unless @concept.localizations.empty?
+          { "data" => data.compact }
         end
 
         private
 
-        def concept_data_hash
-          {
-            "id" => @concept.data.id,
-            "identifier" => @concept.data.id,
-            "localized_concepts" => @concept.data.localized_concepts,
-            "groups" => @concept.data.groups.to_a,
-            "localizations" => localizations_hash,
-            "sources" => sources_to_h(@concept.data.sources),
-          }.compact
-        end
-
         def localizations_hash
           @concept.localizations.to_h do |l10n|
-            [l10n.language_code, localized_concept_hash(l10n)]
-          end
-        end
-
-        def localized_concept_hash(l10n)
-          {
-            "data" => localized_concept_data_hash(l10n),
-            "classification" => l10n.classification,
-            "review_type" => l10n.review_type,
-          }.compact
-        end
-
-        def localized_concept_data_hash(l10n)
-          {
-            "terms" => l10n.terms.map { |t| designation_to_h(t) },
-            "definition" => definitions_to_h(l10n.definition),
-            "examples" => definitions_to_h(l10n.examples),
-            "notes" => definitions_to_h(l10n.notes),
-            "sources" => sources_to_h(l10n.sources),
-            "language_code" => l10n.language_code,
-            "entry_status" => l10n.entry_status,
-          }.compact
-        end
-
-        def designation_to_h(designation)
-          {
-            "type" => designation.type,
-            "designation" => designation.designation,
-            "normative_status" => designation.normative_status,
-            "geographical_area" => designation.geographical_area,
-          }.compact
-        end
-
-        def definitions_to_h(definitions)
-          definitions.map do |d|
-            { "content" => d.content,
-              "sources" => sources_to_h(d.sources) }.compact
+            [l10n.language_code, l10n.to_hash]
           end
         end
-
-        def sources_to_h(sources)
-          return [] unless sources
-
-          sources.map do |source|
-            {
-              "type" => source.type,
-              "origin" => citation_to_h(source.origin),
-              "modification" => source.modification,
-            }.compact
-          end
-        end
-
-        def citation_to_h(citation)
-          return nil unless citation
-
-          hash = {}
-          hash["text"] = citation.text if citation.text && !citation.text.empty?
-          hash["ref"] = citation.text if citation.text && !citation.text.empty?
-
-          if citation.locality
-            hash["locality"] = {
-              "type" => citation.locality.type,
-              "reference_from" => citation.locality.reference_from,
-            }
-            hash["clause"] = citation.locality.reference_from
-          end
-
-          hash["link"] = citation.link if citation.link
-          hash
-        end
       end
     end
   end

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

@@ -3,7 +3,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.3.1"
+      VERSION = "0.3.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-glossarist
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 2026-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor