metanorma-plugin-glossarist 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c8561ae2833ab723f05a6f26ee240108fc0ae7af69b894dddb35ddb4c4745e
-  data.tar.gz: 7204ff398a95968f62494a013ada1c501f7688242ddc66484533181aacbab50a
+  metadata.gz: 12c432cfc7a1397fe5a88e961db51aa103712a0a81bc1eca871e073774c60fbe
+  data.tar.gz: a8d24f1c847b536dae718dc96ba559a8f5e83f8213c6a9490b3f173a3b88e881
 SHA512:
-  metadata.gz: c9671b8af358591e2496abde27a5201c4ad69f4a0063c59172bfc5403fb83791f60129045ff28f76dd4403ac5a3c7d3690320bde966b12876dfa6a5983ff4b97
-  data.tar.gz: 80bf6e1c675c189d5f94f2382afddcf08b80926c6acdf52ab7f778e832dada7d90b9b9f5b97e3524d49da84b977df05ae0563f930bf32a563d849b398a8dca8f
+  metadata.gz: 7acd13849a68c375d9113a8a93dc4abe55df7d6c9a72f3aeb1fbd10f0b3c8e746c2f06f203fe85718f6e5306132211fac8fea044fe346350e9abd6914958ce4e
+  data.tar.gz: 4dd925541b2181f9301b838eb1c4b5c2a52b7e7e458334b25956c18ee1511b10d4c18f0b58680e6ab8087323978851d8f3ed2afee7241fc089fb38e22ae62abd

data/lib/liquid/drops/concepts_drop.rb

@@ -3,9 +3,9 @@
 module Liquid
   module Drops
     class ConceptsDrop < Liquid::Drop
-      # rubocop:disable Lint/MissingSuper
-      NON_LANGUAGE_FIELDS = %w[term termid groups].freeze
+      NON_LANGUAGE_FIELDS = %w[identifier localized_concepts groups term].freeze
 
+      # rubocop:disable Lint/MissingSuper
       def initialize(managed_concept_collection, filters = {})
         @concepts_collection = managed_concept_collection
         @concepts_map = {}
@@ -36,35 +36,21 @@ module Liquid
         sort_filter = concept_filters.delete('sort_by')
         group_filter = concept_filters.delete('group')
 
-        concepts = concepts_collection.to_h["managed_concepts"].map do |concept|
-          filtered_concept = concept.dup
-          filtered_concept.each do |field, concept_hash|
-            next if NON_LANGUAGE_FIELDS.include?(field)
-
-            unless allowed_language?(field, language_filter)
-              filtered_concept.delete(field)
-              next
-            end
+        concepts = concepts_collection.map do |concept|
+          filtered_concept = concept.to_h["data"]
+          filtered_concept["term"] = concept.default_designation
 
-            concept_filters.each do |name, value|
-              fields = extract_nested_field_names(name)
-              if fields.last.start_with?("start_with")
-                value = fields.last.gsub(/start_with\(([^\)]*)\)/, '\1')
-                fields = fields[0..-2]
-
-                unless filtered_concept.dig(*fields).start_with?(value)
-                  filtered_concept.delete(field)
-                end
-              elsif filtered_concept.dig(*fields) != value
-                filtered_concept.delete(field)
-              end
-            end
-          end
+          filtered_concept = filtered_concept.merge(
+            extract_localized_concepts(
+              concept,
+              language_filter,
+            ),
+          )
 
-          if filtered_concept.keys & NON_LANGUAGE_FIELDS == filtered_concept.keys
-            nil
-          else
+          if retain_concept?(filtered_concept, concept_filters)
             filtered_concept
+          else
+            nil
           end
         end.compact
 
@@ -72,6 +58,41 @@ module Liquid
         apply_sort_filter(concepts, sort_filter)
       end
 
+      def extract_localized_concepts(concept, languages)
+        localized_concepts = {}
+
+        if !languages || languages.empty?
+          concept.localized_concepts.each do |lang, localized_concept_uuid|
+            localized_concepts[lang] = concept.localizations[lang].to_h["data"]
+          end
+        else
+          languages.split(",").each do |lang|
+            localization = concept.localizations[lang]&.to_h&.dig("data")
+            localized_concepts[lang] = localization if localization
+          end
+        end
+
+        localized_concepts
+      end
+
+      def retain_concept?(filtered_concept, concept_filters)
+        concept_filters.each do |name, value|
+          fields = extract_nested_field_names(name)
+          if fields.last.start_with?("start_with")
+            value = fields.last.gsub(/start_with\(([^\)]*)\)/, '\1')
+            fields = fields[0..-2]
+
+            unless filtered_concept.dig(*fields).start_with?(value)
+              return false
+            end
+          elsif filtered_concept.dig(*fields) != value
+            return false
+          end
+        end
+
+        filtered_concept.keys & NON_LANGUAGE_FIELDS != filtered_concept.keys
+      end
+
       def apply_sort_filter(concepts, sort_by)
         return concepts unless sort_by
 

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.1.7"
+      VERSION = "0.1.8"
     end
   end
 end

data/metanorma-plugin-glossarist.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
-  spec.add_dependency "glossarist"
+  spec.add_dependency "glossarist", "~> 2.0.1"
   spec.add_dependency "liquid", "~> 5"
 
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-glossarist
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -28,16 +28,16 @@ dependencies:
   name: glossarist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement