metanorma-plugin-glossarist 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1130c9f69e99794177efc000503b204ab4be39df69c5f3178043016beae858f
-  data.tar.gz: d0743287efaea1d5fa1702c7aec7f82050b8f6d43bcf4815129b9af9506a0eb4
+  metadata.gz: 04a2e374136e18d7fdd6884930ebcd2d6646ea7861b9bb3cea1b0887668a1c82
+  data.tar.gz: 3e402d75262a6a4b30bc5907dbb76bee97f9288b7dad75eec3f2b4ca0cafb5c2
 SHA512:
-  metadata.gz: 1d33f20252ce0db1b55d61f453f54a69f915ea227fe868c23c4daa8b36e2eea7755b546ef6526f7e94071fbfbf24c43d7d8aabe9715d8701c64500583a6fb1cd
-  data.tar.gz: 2a07cc65110876baaef8c0ddb0018d088521326f0d2f5e9ee5e4a95abacf4124f0fe8d0b33062e3b9a4efaf6bbdd934afd3efbe62ea5937a1c0abdd6671cc761
+  metadata.gz: 13f003cc43b2ee0d1cc9accbcd0fcf73242738efe0438a19c97fcd375633b58425f4795aac5061fd5a15a7338a17cc66fe74681377f9d7def0140fd5ec86a03b
+  data.tar.gz: 232855236acb718effcfba7db26db3609b4fdaf772063ecd3e8e7a249c964d3a87070f21cacd96d4516cd7c6c5e208aab66b25c21f686bef4c2be78ca8484e74

data/Gemfile

@@ -6,8 +6,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gem "metanorma-standoc"
 gem "pry"
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.6"
 
 gemspec
 

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

@@ -52,6 +52,7 @@ module Metanorma
           @title_depth = { value: 2 }
           @rendered_bibliographies = {}
           @seen_glossarist = []
+          @context_names = []
         end
 
         def process(document, reader)
@@ -130,8 +131,8 @@ module Metanorma
 
         def process_dataset_tag(document, input_lines, liquid_doc, match)
           @seen_glossarist << "x"
-          @context_names = prepare_dataset_contexts(document, match[1])
-
+          @context_names << prepare_dataset_contexts(document, match[1])
+          @context_names.flatten!
           dataset_section = <<~TEMPLATE
             #{prepare_document(document, input_lines)}
           TEMPLATE
@@ -179,8 +180,8 @@ module Metanorma
         def get_context_path(document, key) # rubocop:disable Metrics/MethodLength
           context_path = nil
           # try to get context_path from glossarist-dataset definition
-          if @context_names
-            context_names = @context_names.split(",").map(&:strip)
+          if @context_names && !@context_names.empty?
+            context_names = @context_names.map(&:strip)
             context_path = context_names.find do |context|
               context_name, = context.split("=")
               context_name == key
@@ -231,14 +232,15 @@ module Metanorma
           @seen_glossarist << "x"
           dataset_name, concept_name = match[1].split(",").map(&:strip)
           concept = get_concept(dataset_name, concept_name)
-
-          liquid_doc.add_content(
-            concept_bibliography(concept),
-          )
+          bibliography = concept_bibliography(concept)
+          if bibliography
+            liquid_doc.add_content(bibliography)
+          end
         end
 
-        def concept_bibliography(concept) # rubocop:disable Metrics/AbcSize
+        def concept_bibliography(concept) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
           sources = concept.data.localizations["eng"].data.sources
+          return nil if sources.nil? || sources.empty?
 
           bibliography = sources.map do |source|
             ref = source.origin.text
@@ -252,7 +254,7 @@ module Metanorma
         end
 
         def prepare_dataset_contexts(document, contexts)
-          context_names = contexts.split(";").map do |context|
+          contexts.split(";").map do |context|
             context_name, file_path = context.split(":").map(&:strip)
             path = relative_file_path(document, file_path)
 
@@ -262,8 +264,6 @@ module Metanorma
 
             "#{context_name}=#{path}"
           end
-
-          context_names.join(",")
         end
 
         def relative_file_path(document, file_path)
@@ -367,12 +367,15 @@ module Metanorma
           result = []
 
           sources.each do |source|
-            if source.origin.text && source.origin.text != ""
+            if source.origin.text &&
+                source.origin.text != "" &&
+                source.origin.locality.type == "clause"
               source_origin_text = source.origin.text
                 .gsub(" ", "_")
                 .gsub("/", "_")
                 .gsub(":", "_")
-              source_content = "#{source_origin_text},#{source.origin.clause}"
+              source_content = "#{source_origin_text}," \
+                               "#{source.origin.locality.reference_from}"
               content = <<~SOURCES
                 [.source]
                 <<#{source_content}>>

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.2.4".freeze
+      VERSION = "0.2.6".freeze
     end
   end
 end

data/metanorma-plugin-glossarist.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.0" # rubocop:disable Gemspec/RequiredRubyVersion
 
-  spec.add_dependency "asciidoctor", "~> 2.0.0"
-  spec.add_dependency "glossarist", "~> 2.3.6"
-  spec.add_dependency "liquid", "~> 5"
+  spec.add_dependency "asciidoctor"
+  spec.add_dependency "glossarist", "~> 2.3.7"
+  spec.add_dependency "liquid"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-glossarist
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-05 00:00:00.000000000 Z
+date: 2025-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: glossarist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 description: Metanorma plugin for glossarist
 email:
 - open.source@ribose.com