metanorma-plugin-glossarist 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91df61d3e70bbb70519cd36984e7edf0ec4fb3758a8d650690991db6b865f4c4
-  data.tar.gz: d8729435c15a4402525c16d426014d0ce88f4ac6f1414781792331665490ae6e
+  metadata.gz: 1043e5407c7af6aa051428f9bfa0667e4422c3b0fb7f707e0e1c0db8f08efbfe
+  data.tar.gz: a3619b1cfaa97a50a643dd1f8d9c664624ad12646d0d7784662d27b7ecf75ded
 SHA512:
-  metadata.gz: eccf04cfaf2dbe3de1acda9c7a3a7ad3855b80fde9937c2486601c59c45ebea2f4f6e486507f6612b236344536936057a993e4f75cf544982d820f903fb1f2b2
-  data.tar.gz: b790fa9ac8144256d48a0ab038a3e316a46ebb48f8b3f35b2628147ce35b2557ffc6a43964b08011673331c8f947efcc2b9ddab8e71e8f51ba8bceb177b3e6dd
+  metadata.gz: 78d679c48e16f20965d4698862634a26348e27b07043891ab30bb985d0967693d3a50cd7b03bf6c95ba4072397d2e070b198c8b5b547ac0f1667dca1ca2d6972
+  data.tar.gz: ead8270343941ff967df7a2b21279f6c740ffe496b14e77e88cb1d07a2fe69dd8e8c9ac762ce055d3ba1bbb5af8ae905f587d45fbd5ebaa8592f3d11e0760ca6

data/.github/workflows/rake.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: rake
 
 on:
@@ -8,6 +10,6 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: release
 
 on:
@@ -8,14 +10,15 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
 
 jobs:
   release:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
-      event_name: ${{ github.event_name }}
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+

data/.gitignore

@@ -11,5 +11,4 @@
 .rspec_status
 Gemfile.lock
 
-.hound.yml
-.rubocop*
+.rubocop-https--*

data/.hound.yml

@@ -0,0 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,10 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+# ...
+
+AllCops:
+  TargetRubyVersion: 2.5

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

@@ -59,20 +59,23 @@ module Metanorma
         #     format
         def initialize(config = {})
           super
-          @document = Document.new
+          @config = config
           @datasets = {}
           @rendered_bibliographies = {}
         end
 
         def process(document, reader)
           input_lines = reader.readlines.to_enum
+
           file_system = ::Liquid::LocalFileSystem.new(
             relative_file_path(document, ""),
           )
 
+          @config[:file_system] = file_system
+
           processed_doc = prepare_document(document, input_lines)
           Asciidoctor::Reader.new(
-            processed_doc.render_liquid(file_system: file_system).split("\n"),
+            processed_doc.to_s.split("\n"),
           )
         end
 
@@ -80,6 +83,7 @@ module Metanorma
 
         def prepare_document(document, input_lines, end_mark = nil)
           liquid_doc = Document.new
+          liquid_doc.file_system = @config[:file_system]
 
           loop do
             current_line = input_lines.next
@@ -120,7 +124,10 @@ module Metanorma
             {% endwith_glossarist_context %}
           TEMPLATE
 
-          liquid_doc.add_content(dataset_section)
+          liquid_doc.add_content(
+            dataset_section,
+            render: true,
+          )
         end
 
         def process_glossarist_block(document, liquid_doc, input_lines, match)
@@ -135,7 +142,10 @@ module Metanorma
             {% endwith_glossarist_context %}
           TEMPLATE
 
-          liquid_doc.add_content(glossarist_section)
+          liquid_doc.add_content(
+            glossarist_section,
+            render: true,
+          )
         end
 
         def prepare_glossarist_block_params(document, match)
@@ -193,6 +203,7 @@ module Metanorma
         def concept_bibliography(concept)
           bibliography = concept["eng"]["sources"].map do |source|
             ref = source["origin"]["ref"]
+
             next if @rendered_bibliographies[ref]
 
             @rendered_bibliographies[ref] = ref.gsub(/[ \/:]/, '_')

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

@@ -4,23 +4,27 @@ module Metanorma
   module Plugin
     module Glossarist
       class Document
-        attr_accessor :content, :bibliographies
+        attr_accessor :content, :bibliographies, :file_system
 
         def initialize
           @content = []
           @bibliographies = []
         end
 
-        def add_content(content)
-          @content << content
+        def add_content(content, options = {})
+          @content << if options[:render]
+                        render_liquid(content)
+                      else
+                        content
+                      end
         end
 
         def to_s
           @content.compact.join("\n")
         end
 
-        def render_liquid(file_system)
-          template = Liquid::Template.parse(to_s)
+        def render_liquid(file_content)
+          template = Liquid::Template.parse(file_content)
           template.registers[:file_system] = file_system
           template.render(strict_variables: false, error_mode: :warn)
         end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Glossarist
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/lib/metanorma-plugin-glossarist.rb

@@ -9,4 +9,8 @@ module Metanorma
       # Your code goes here...
     end
   end
+
+  Asciidoctor::Extensions.register do
+    preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
+  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-new"
+  spec.add_dependency "glossarist"
   spec.add_dependency "liquid", "~> 4"
 
   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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: glossarist-new
+  name: glossarist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,7 +104,9 @@ files:
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt