metanorma-standoc 1.5.2 → 1.6.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -67,19 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
-  name: relaton
+  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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: latexmath
+  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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -343,9 +385,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"
@@ -367,6 +407,7 @@ files:
 - lib/asciidoctor/standoc/blocks.rb
 - lib/asciidoctor/standoc/blocks_notes.rb
 - lib/asciidoctor/standoc/cleanup.rb
+- lib/asciidoctor/standoc/cleanup_amend.rb
 - lib/asciidoctor/standoc/cleanup_block.rb
 - lib/asciidoctor/standoc/cleanup_boilerplate.rb
 - lib/asciidoctor/standoc/cleanup_footnotes.rb
@@ -386,7 +427,6 @@ files:
 - lib/asciidoctor/standoc/log.rb
 - lib/asciidoctor/standoc/macros.rb
 - lib/asciidoctor/standoc/macros_plantuml.rb
-- lib/asciidoctor/standoc/macros_yaml2text.rb
 - lib/asciidoctor/standoc/ref.rb
 - lib/asciidoctor/standoc/ref_sect.rb
 - lib/asciidoctor/standoc/reqt.rb
@@ -398,21 +438,26 @@ files:
 - 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/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
-- lib/metanorma/standoc/latexml_requirement.rb
 - lib/metanorma/standoc/processor.rb
-- lib/metanorma/standoc/requirement.rb
 - lib/metanorma/standoc/version.rb
 - 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
 - spec/asciidoctor-standoc/inline_spec.rb
 - 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_spec.rb
 - spec/asciidoctor-standoc/macros_yaml2text_spec.rb
 - spec/asciidoctor-standoc/refs_dl_spec.rb
@@ -484,11 +529,14 @@ files:
 - 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,46 +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: Install LaTeXML
-        run: |
-          brew install libxml2 cpanminus
-          env PATH=$(brew --prefix libxml2)/bin:$PATH \
-            cpanm --notest XML::LibXSLT@1.96 git://github.com/brucemiller/LaTeXML.git@9a0e7dc5
-      - name: Install PlantUML
-        run: |
-          brew install plantuml
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          env PATH=$(brew --prefix perl)/bin:$PATH bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,49 +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 LaTeXML
-        run: |
-          sudo snap install latexml --edge
-          echo "::add-path::/snap/bin"
-      - 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,53 +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: Install MN Windows dependencies
-        shell: pwsh
-        run: |
-          choco install --no-progress plantuml make sed gnuwin32-coreutils.install grep
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Install LaTeXML
-        shell: cmd
-        run: |
-          cinst -y latexml
-          refreshenv
-          set PATH=C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;%PATH%
-          where latexmlmath
-      - name: Run specs
-        shell: pwsh
-        run: |
-          $env:Path = "C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;$env:Path"
-          bundle exec rake

data/lib/asciidoctor/standoc/macros_yaml2text.rb

@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-require 'ostruct'
-
-module Asciidoctor
-  module Standoc
-    class YamlBlockStruct < OpenStruct
-      def to_a
-        @table.to_h.keys
-      end
-
-      def values
-        @table.to_h.values
-      end
-
-      def each
-        return to_a.each unless block_given?
-
-        to_a.each do |key|
-          yield(key)
-        end
-      end
-    end
-
-    class YamlContextRenderer
-      attr_reader :context_object, :context_name
-
-      def initialize(context_object:, context_name:)
-        @context_object = context_object
-        @context_name = context_name
-      end
-
-      def respond_to_missing?(name)
-        respond_to?(name)
-      end
-
-      def method_missing(name, *_args)
-        return context_object if name.to_s == context_name
-
-        super
-      end
-
-      def render(template)
-        ERB.new(template).result(binding)
-      end
-    end
-
-    class Yaml2TextPreprocessor < Asciidoctor::Extensions::Preprocessor
-      BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/
-      BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/
-      # search document for block `yaml2text`
-      #   after that take template from block and read file into this template
-      #   example:
-      #     [yaml2text,foobar.yaml]
-      #     ----
-      #     === {item.name}
-      #     {item.desc}
-      #
-      #     {item.symbol}:: {item.symbol_def}
-      #     ----
-      #
-      #   with content of `foobar.yaml` file equal to:
-      #     - name: spaghetti
-      #       desc: wheat noodles of 9mm diameter
-      #       symbol: SPAG
-      #       symbol_def: the situation is message like spaghetti at a kid's
-      #
-      #   will produce:
-      #     === spaghetti
-      #     wheat noodles of 9mm diameter
-      #
-      #     SPAG:: the situation is message like spaghetti at a kid's meal
-      def process(document, reader)
-        input_lines = reader.readlines.to_enum
-        Reader.new(processed_lines(document, input_lines))
-      end
-
-      private
-
-      def processed_lines(document, input_lines)
-        result = []
-        current_macro_line_num = 0
-        loop do
-          line = input_lines.next
-          current_macro_line_num += 1
-          if yaml_block_match = line.match(/^\[yaml2text,(.+?),(.+?)\]/)
-            mark = input_lines.next
-            current_yaml_block = []
-            while (yaml_block_line = input_lines.next) != mark
-              current_yaml_block.push(yaml_block_line)
-            end
-            result.push(*read_yaml_and_parse_template(current_yaml_block,
-                                                      document,
-                                                      yaml_block_match,
-                                                      current_macro_line_num))
-          else
-            result.push(line)
-          end
-        end
-        result
-      end
-
-      def read_yaml_and_parse_template(current_yaml_block, document, yaml_block_match, current_macro_line_num)
-        content = nested_open_struct_from_yaml(yaml_block_match[1], document)
-        parse_blocks_recursively(lines: current_yaml_block,
-                                 attributes: content,
-                                 context_name: yaml_block_match[2])
-      rescue StandardError => exception
-        document
-          .logger
-          .warn("Failed to parse yaml2text block on line #{current_macro_line_num}: #{exception.message}")
-        []
-      end
-
-      def nested_open_struct_from_yaml(file_path, document)
-        docfile_directory = File.dirname(document.attributes['docfile'] || '.')
-        yaml_file_path = document
-                         .path_resolver
-                         .system_path(file_path, docfile_directory)
-        content = YAML.safe_load(File.read(yaml_file_path))
-        # Load content as json, then parse with JSON as nested open_struct
-        JSON.parse(content.to_json, object_class: YamlBlockStruct)
-      end
-
-      def parse_blocks_recursively(lines:,
-                                   attributes:,
-                                   context_name:)
-        lines = lines.to_enum
-        result = []
-        loop do
-          line = lines.next
-          if line.match?(BLOCK_START_REGEXP)
-            line.gsub!(BLOCK_START_REGEXP,
-                       '<% \1.each&.with_index do |\2,index| %>')
-          end
-
-          if line.strip.match?(BLOCK_END_REGEXP)
-            line.gsub!(BLOCK_END_REGEXP, '<% end %>')
-          end
-          line.gsub!(/{\s*if\s*([^}]+)}/, '<% if \1 %>')
-          line.gsub!(/{\s*?end\s*?}/, '<% end %>')
-          line = line
-                 .gsub(/{(.+?[^}]*)}/, '<%= \1 %>')
-                 .gsub(/[a-z\.]+\#/, 'index')
-          result.push(line)
-        end
-        result = parse_context_block(context_lines: result,
-                                     context_items: attributes,
-                                     context_name: context_name)
-        result
-      end
-
-      def parse_context_block(context_lines:,
-                              context_items:,
-                              context_name:)
-        renderer = YamlContextRenderer
-                   .new(
-                     context_object: context_items,
-                     context_name: context_name
-                   )
-        renderer.render(context_lines.join("\n")).split("\n")
-      end
-    end
-  end
-end