metanorma-standoc 1.6.0 → 1.6.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: iev
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +66,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: metanorma-plugin-datastruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: metanorma-plugin-lutaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sterile
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fontist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -357,9 +399,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
@@ -376,7 +416,6 @@ files:
 - bin/rspec
 - docs/quickstart.adoc
 - lib/asciidoctor/standoc/base.rb
-- lib/asciidoctor/standoc/base_structured_text_preprocessor.rb
 - lib/asciidoctor/standoc/basicdoc.rng
 - lib/asciidoctor/standoc/biblio.rng
 - lib/asciidoctor/standoc/blocks.rb
@@ -398,24 +437,26 @@ files:
 - lib/asciidoctor/standoc/front_contributor.rb
 - lib/asciidoctor/standoc/inline.rb
 - lib/asciidoctor/standoc/isodoc.rng
-- lib/asciidoctor/standoc/json2_text_preprocessor.rb
 - lib/asciidoctor/standoc/lists.rb
 - lib/asciidoctor/standoc/log.rb
 - lib/asciidoctor/standoc/macros.rb
 - lib/asciidoctor/standoc/macros_plantuml.rb
+- lib/asciidoctor/standoc/macros_terms.rb
 - lib/asciidoctor/standoc/ref.rb
 - lib/asciidoctor/standoc/ref_sect.rb
 - lib/asciidoctor/standoc/reqt.rb
 - lib/asciidoctor/standoc/reqt.rng
 - lib/asciidoctor/standoc/section.rb
 - lib/asciidoctor/standoc/table.rb
+- lib/asciidoctor/standoc/term_lookup_cleanup.rb
 - lib/asciidoctor/standoc/utils.rb
 - lib/asciidoctor/standoc/validate.rb
 - lib/asciidoctor/standoc/validate_section.rb
 - lib/asciidoctor/standoc/views/datamodel/model_representation.adoc.erb
 - lib/asciidoctor/standoc/views/datamodel/plantuml_representation.adoc.erb
-- lib/asciidoctor/standoc/yaml2_text_preprocessor.rb
 - lib/liquid/custom_blocks/key_iterator.rb
+- lib/liquid/custom_blocks/with_json_nested_context.rb
+- lib/liquid/custom_blocks/with_yaml_nested_context.rb
 - lib/liquid/custom_filters/values.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/standoc.rb
@@ -424,6 +465,7 @@ files:
 - metanorma-standoc.gemspec
 - spec/asciidoctor-standoc/base_spec.rb
 - spec/asciidoctor-standoc/blocks_spec.rb
+- spec/asciidoctor-standoc/cleanup_sections_spec.rb
 - spec/asciidoctor-standoc/cleanup_spec.rb
 - spec/asciidoctor-standoc/datamodel/attributes_table_preprocessor_spec.rb
 - spec/asciidoctor-standoc/datamodel/diagram_preprocessor_spec.rb
@@ -431,6 +473,8 @@ files:
 - spec/asciidoctor-standoc/isobib_cache_spec.rb
 - spec/asciidoctor-standoc/lists_spec.rb
 - spec/asciidoctor-standoc/macros_json2text_spec.rb
+- spec/asciidoctor-standoc/macros_lutaml_spec.rb
+- spec/asciidoctor-standoc/macros_plantuml_spec.rb
 - spec/asciidoctor-standoc/macros_spec.rb
 - spec/asciidoctor-standoc/macros_yaml2text_spec.rb
 - spec/asciidoctor-standoc/refs_dl_spec.rb
@@ -497,17 +541,20 @@ files:
 - spec/examples/rice_images/rice_image3_1.png
 - spec/examples/rice_images/rice_image3_2.png
 - spec/examples/rice_images/rice_image3_3.png
+- spec/fixtures/diagram_definitions.lutaml
 - spec/fixtures/macros_datamodel/address_class_profile.xml
 - spec/fixtures/macros_datamodel/address_component_profile.xml
 - spec/fixtures/macros_datamodel/blank_definition_profile.xml
 - spec/fixtures/macros_datamodel/common_models_diagram.xml
 - spec/fixtures/macros_datamodel/top_down_diagram.xml
+- spec/fixtures/test.exp
 - spec/metanorma/processor_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/structured_data_2_text_preprocessor.rb
 - spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml
 - spec/vcr_cassettes/isobib_get_123.yml
 - spec/vcr_cassettes/isobib_get_123_1.yml
+- spec/vcr_cassettes/isobib_get_123_1_fr.yml
 - spec/vcr_cassettes/isobib_get_123_2001.yml
 - spec/vcr_cassettes/isobib_get_124.yml
 - spec/vcr_cassettes/rfcbib_get_rfc8341.yml

data/.github/workflows/macos.yml

@@ -1,41 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          brew install plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,45 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        uses: nick-invision/retry@v1
-        with:
-          polling_interval_seconds: 5
-          timeout_minutes: 5
-          max_attempts: 3
-          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,43 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install PlantUML
-        run: |
-          cinst -y plantuml
-      - name: Run specs
-        run: |
-          bundle exec rake

data/lib/asciidoctor/standoc/base_structured_text_preprocessor.rb

@@ -1,123 +0,0 @@
-# frozen_string_literal: true
-
-require "liquid/custom_blocks/key_iterator"
-require "liquid/custom_filters/values"
-
-Liquid::Template.register_tag("keyiterator", Liquid::CustomBlocks::KeyIterator)
-Liquid::Template.register_filter(Liquid::CustomFilters)
-
-module Asciidoctor
-  module Standoc
-    # Base class for processing structured data blocks(yaml, json)
-    class BaseStructuredTextPreprocessor < Asciidoctor::Extensions::Preprocessor
-      BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/
-      BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/
-
-      def process(document, reader)
-        input_lines = reader.readlines.to_enum
-        Reader.new(processed_lines(document, input_lines))
-      end
-
-      protected
-
-      def content_from_file(_document, _file_path)
-        raise ArgumentError, "Implement `content_from_file` in your class"
-      end
-
-      private
-
-      def processed_lines(document, input_lines)
-        result = []
-        loop do
-          result.push(*process_text_blocks(document, input_lines))
-        end
-        result
-      end
-
-      def relative_file_path(document, file_path)
-        docfile_directory = File.dirname(document.attributes["docfile"] || ".")
-        document
-          .path_resolver
-          .system_path(file_path, docfile_directory)
-      end
-
-      def process_text_blocks(document, input_lines)
-        line = input_lines.next
-        block_match = line.match(/^\[#{config[:block_name]},(.+?),(.+?)\]/)
-        return [line] if block_match.nil?
-
-        mark = input_lines.next
-        current_block = []
-        while (block_line = input_lines.next) != mark
-          current_block.push(block_line)
-        end
-        read_content_and_parse_template(document,
-                                        current_block,
-                                        block_match)
-      end
-
-      def read_content_and_parse_template(document, current_block, block_match)
-        transformed_liquid_lines = current_block
-          .map(&method(:transform_line_liquid))
-        context_items = content_from_file(document, block_match[1])
-        parse_context_block(document: document,
-                            context_lines: transformed_liquid_lines,
-                            context_items: context_items,
-                            context_name: block_match[2])
-      rescue StandardError => exception
-        document.logger
-          .warn("Failed to parse #{config[:block_name]} \
-            block: #{exception.message}")
-        []
-      end
-
-      def transform_line_liquid(line)
-        if line.match?(BLOCK_START_REGEXP)
-          line.gsub!(BLOCK_START_REGEXP,
-                     '{% keyiterator \1, \2 %}')
-        end
-
-        if line.strip.match?(BLOCK_END_REGEXP)
-          line.gsub!(BLOCK_END_REGEXP, "{% endkeyiterator %}")
-        end
-        line
-          .gsub(/(?<!{){(?!%)([^{}]+)(?<!%)}(?!})/, '{{\1}}')
-          .gsub(/[a-z\.]+\#/, "index")
-          .gsub(/{{(.+)\s+\+\s+(\d+)\s*?}}/, '{{ \1 | plus: \2 }}')
-          .gsub(/{{(.+)\s+\-\s+(\d+)\s*?}}/, '{{ \1 | minus: \2 }}')
-          .gsub(/{{(.+).values(.*?)}}/,
-                '{% assign custom_value = \1 | values %}{{custom_value\2}}')
-      end
-
-      def parse_context_block(context_lines:,
-                              context_items:,
-                              context_name:,
-                              document:)
-        render_result, errors = render_liquid_string(
-          template_string: context_lines.join("\n"),
-          context_items: context_items,
-          context_name: context_name
-        )
-        notify_render_errors(document, errors)
-        render_result.split("\n")
-      end
-
-      def render_liquid_string(template_string:, context_items:, context_name:)
-        liquid_template = Liquid::Template.parse(template_string)
-        rendered_string = liquid_template
-          .render(context_name => context_items,
-                  strict_variables: true,
-                  error_mode: :warn)
-        [rendered_string, liquid_template.errors]
-      end
-
-      def notify_render_errors(document, errors)
-        errors.each do |error_obj|
-          document
-            .logger
-            .warn("Liquid render error: #{error_obj.message}")
-        end
-      end
-    end
-  end
-end