metanorma-plugin-lutaml 0.2.3 → 0.2.4.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91024f06594fbe6e771ce88c50ad1685385dfc43c709d8b3e559ca447f593d7
-  data.tar.gz: 7945a746eaddac195273299ea4b8f0acb152aafc3896b48ebfc3f26119e2c292
+  metadata.gz: 74c485317a97c4ab8244b48e78551570a2fcd3f5946735c918a91a5e522af8cb
+  data.tar.gz: de93940324773fafdeb4d841e5fdf509c8499e6fbd0ac426b74747d240ecc6b6
 SHA512:
-  metadata.gz: 4b14175e12a83ab2e38e336bd0a71858764caf04db55c47814bdbcfb5560771b7f5cd9f066b90ded162ff8ec4af24172d50290daafeb8fdcc3e26375fcea20fc
-  data.tar.gz: 0d6f2e23ffcd10ce9a84bb1c4fe10f3190ade34c0ff5b317ad0f25c584ce651d88d212329acaf524942e4f6ed7027e73f57a3b07c8ed0aa443c52a6926b01776
+  metadata.gz: 3aff4cfd2d9201b14937c7b6d6764133b2a09309df16b3368a5f373a092b0a28e23b4a2ab30e44f91e498c6a7a21d2c51c462aef2226b3bf598373203c083622
+  data.tar.gz: 2d1cc114c2c5f3b49d953c29c88880b80ca13e892095629f99fb9635120a21c7b98cec34dee182f0af1425bbeb7369ab67f398f8dd418e5c2d188bdb15df6182

data/.github/workflows/rake.yml

@@ -1,5 +1,3 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: rake
 
 on:
@@ -56,7 +54,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: choco install --no-progress graphviz --version 2.38.0.20190211
+          command: choco install --no-progress graphviz
 
       - name: Check dot command
         if: matrix.os == 'windows-latest'
@@ -65,17 +63,3 @@ jobs:
 
       - name: Run specs
         run: bundle exec rake
-
-  notify:
-    name: Trigger notify workflow
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger notify workflow
-        uses: Sibz/github-status-action@v1
-        with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
-          context: 'tests-passed-successfully'
-          description: 'Tests passed successfully'
-          state: 'success'
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/.gitignore

@@ -1,3 +1,4 @@
 Gemfile.lock
 .rspec_status
-spec/assets/lutaml
+spec/assets/lutaml
+test.err

data/Gemfile

@@ -2,4 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in metanorma-plugin-lutaml.gemspec
 gemspec
-

data/lib/metanorma/plugin/lutaml/express_remarks_decorator.rb

@@ -0,0 +1,77 @@
+module Metanorma
+  module Plugin
+    module Lutaml
+      class ExpressRemarksDecorator
+        RELATIVE_PREFIX_MACRO_REGEXP = /^(link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
+
+        attr_reader :remark, :options
+
+        def self.call(remark, options)
+          new(remark, options).call
+        end
+
+        def initialize(remark, options)
+          @remark = remark
+          @options = options
+        end
+
+        def call
+          result = remark
+          if options["leveloffset"]
+            result = process_remark_offsets(result, options["leveloffset"].to_i)
+          end
+          if options["relative_path_prefix"]
+            result = update_relative_paths(result,
+                                           options["relative_path_prefix"])
+          end
+          result
+        end
+
+        private
+
+        def update_relative_paths(string, path_prefix)
+          string
+            .split("\n")
+            .map do |line|
+              if line.match?(RELATIVE_PREFIX_MACRO_REGEXP)
+                prefix_relative_paths(line, path_prefix)
+              else
+                line
+              end
+            end
+            .join("\n")
+        end
+
+        def prefix_relative_paths(line, path_prefix)
+          line.gsub(RELATIVE_PREFIX_MACRO_REGEXP) do |_match|
+            prefixed_path = File.join(path_prefix, $3.strip)
+            # When we are dealing with arelative path of a template: ../path/to/file we need to transform it into
+            # the absolute one because `image::` macro wont understand it other way
+            prefixed_path = File.absolute_path(prefixed_path) if prefixed_path.start_with?('../')
+            full_path = File.expand_path(prefixed_path)
+            "#{$1}#{$2}#{full_path}#{$4}"
+          end
+        end
+
+        def process_remark_offsets(string, offset)
+          string
+            .split("\n")
+            .map do |line|
+              if line.match?(/^=/)
+                set_string_offsets(line, offset)
+              else
+                line
+              end
+            end
+            .join("\n")
+        end
+
+        def set_string_offsets(string, offset)
+          return "#{'=' * offset}#{string}" if offset.positive?
+
+          string.gsub(/^={#{offset * -1}}/, "")
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/plugin/lutaml/lutaml_diagram_block.rb

@@ -22,7 +22,8 @@ module Metanorma
           create_listing_block(
             parent,
             reader.source,
-            attrs.reject { |k, v| k == 1 })
+            attrs.reject { |k, _v| k == 1 }
+          )
         end
 
         def process(parent, reader, attrs)
@@ -32,35 +33,35 @@ module Metanorma
           through_attrs["target"] = filename
           through_attrs["title"] = uml_document.caption
           create_image_block(parent, through_attrs)
-        rescue => e
+        rescue StandardError => e
           abort(parent, reader, attrs, e.message)
         end
 
         private
 
         def lutaml_temp(reader)
-          temp_file = Tempfile.new(['lutaml', '.lutaml'])
+          temp_file = Tempfile.new(["lutaml", ".lutaml"])
           temp_file.puts(reader.read)
           temp_file.rewind
           temp_file
         end
 
         # if no :imagesdir: leave image file in lutaml
-        def generate_file(parent, reader, uml_document)
+        def generate_file(parent, _reader, uml_document)
           formatter = ::Lutaml::Uml::Formatter::Graphviz.new
           formatter.type = :png
 
-          imagesdir = if parent.document.attr('imagesdir')
-                        File.join(parent.document.attr('imagesdir'), 'lutaml')
+          imagesdir = if parent.document.attr("imagesdir")
+                        File.join(parent.document.attr("imagesdir"), "lutaml")
                       else
-                        'lutaml'
+                        "lutaml"
                       end
           result_path = Utils.relative_file_path(parent.document, imagesdir)
           result_pathname = Pathname.new(result_path)
           result_pathname.mkpath
-          File.writable?(result_pathname) or raise "Destination path #{result_path} not writable for Lutaml!"
+          File.writable?(result_pathname) || raise("Destination path #{result_path} not writable for Lutaml!")
 
-          outfile = Tempfile.new(['lutaml', '.png'])
+          outfile = Tempfile.new(["lutaml", ".png"])
           outfile.binmode
           outfile.puts(formatter.format(uml_document))
 
@@ -74,11 +75,11 @@ module Metanorma
         end
 
         def generate_attrs(attrs)
-          through_attrs = %w(id align float title role width height alt).
-            inject({}) do |memo, key|
-            memo[key] = attrs[key] if attrs.has_key? key
-            memo
-          end
+          %w(id align float title role width height alt)
+            .reduce({}) do |memo, key|
+              memo[key] = attrs[key] if attrs.has_key? key
+              memo
+            end
         end
       end
     end

data/lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb

@@ -5,39 +5,53 @@ require "asciidoctor"
 require "asciidoctor/reader"
 require "lutaml"
 require "metanorma/plugin/lutaml/utils"
+require "metanorma/plugin/lutaml/utils"
+require "metanorma/plugin/lutaml/express_remarks_decorator"
 
 module Metanorma
   module Plugin
     module Lutaml
       # Class for processing Lutaml files
       class LutamlPreprocessor < Asciidoctor::Extensions::Preprocessor
+        REMARKS_ATTRIBUTE = "remarks".freeze
 
         def process(document, reader)
           input_lines = reader.readlines.to_enum
-          Asciidoctor::Reader.new(processed_lines(document, input_lines))
+          express_indexes = Utils.parse_document_express_indexes(
+            document,
+            input_lines
+          )
+          Asciidoctor::Reader
+            .new(processed_lines(document, input_lines, express_indexes))
         end
 
         protected
 
-        def content_from_file(document, file_path)
-          ::Lutaml::Parser
-            .parse(File.new(Utils.relative_file_path(document, file_path),
-                            encoding: "UTF-8"))
+        def content_from_files(document, file_paths)
+          file_list = file_paths.map do |file_path|
+            File.new(Utils.relative_file_path(document, file_path), encoding: "UTF-8")
+          end
+          ::Lutaml::Parser.parse(file_list)
         end
 
         private
 
-        def processed_lines(document, input_lines)
+        def processed_lines(document, input_lines, express_indexes)
           result = []
           loop do
-            result.push(*process_text_blocks(document, input_lines))
+            result
+              .push(*process_text_blocks(
+                document,
+                input_lines,
+                express_indexes
+              ))
           end
           result
         end
 
-        def process_text_blocks(document, input_lines)
+        def process_text_blocks(document, input_lines, express_indexes)
           line = input_lines.next
-          block_match = line.match(/^\[lutaml,(.+?),(.+?)\]/)
+          block_match = line.match(/^\[lutaml,([^,]+)?,?([^,]+)?,?([^,]+)?\]/)
           return [line] if block_match.nil?
 
           end_mark = input_lines.next
@@ -45,7 +59,8 @@ module Metanorma
                          collect_internal_block_lines(document,
                                                       input_lines,
                                                       end_mark),
-                         block_match)
+                         block_match,
+                         express_indexes)
         end
 
         def collect_internal_block_lines(_document, input_lines, end_mark)
@@ -56,17 +71,70 @@ module Metanorma
           current_block
         end
 
-        def parse_template(document, current_block, block_match)
-          context_items = content_from_file(document, block_match[1])
-          parse_context_block(document: document,
-                              context_lines: current_block,
-                              context_items: context_items,
-                              context_name: block_match[2].strip)
-        rescue StandardError => e
-          document.logger
-            .warn("Failed to parse lutaml \
-              block: #{e.message}")
-          []
+        def contexts_items(block_match, document, express_indexes)
+          contexts_names = block_match[1].split(";").map(&:strip)
+          file_paths = []
+          result = contexts_names.each_with_object([]) do |path, res|
+            if express_indexes[path]
+              res.push(*express_indexes[path])
+            else
+              file_paths.push(path)
+            end
+          end
+          if !file_paths.empty?
+            from_files = content_from_files(document, file_paths)
+                          .map do |n|
+                            n.to_liquid.map { |j| j.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(j['file']))) }
+                          end
+                          .flatten
+            result += from_files
+          end
+          result
+        end
+
+        def parse_template(document, current_block, block_match, express_indexes)
+          options = parse_options(block_match[3])
+          contexts_items(block_match, document, express_indexes)
+            .map do |items|
+              opts = options.merge('relative_path_prefix' => items['relative_path_prefix'])
+              parse_context_block(document: document,
+                                  context_lines: current_block,
+                                  context_items: decorate_context_items(items, opts),
+                                  context_name: block_match[2].strip)
+            end.flatten
+        # rescue StandardError => e
+        #   document.logger.warn("Failed to parse lutaml block: #{e.message}")
+        #   []
+        end
+
+        def parse_options(options_string)
+          options_string
+            .to_s
+            .scan(/(.+?)=(\s?[^\s]+)/)
+            .map { |elem| elem.map(&:strip) }
+            .to_h
+        end
+
+        def decorate_context_items(context_items, options)
+          return context_items if !context_items.is_a?(Hash)
+
+          context_items
+            .map do |(key, val)|
+              if val.is_a?(Hash)
+                [key, decorate_context_items(val, options)]
+              elsif key == REMARKS_ATTRIBUTE
+                [key,
+                 val&.map do |remark|
+                   Metanorma::Plugin::Lutaml::ExpressRemarksDecorator
+                     .call(remark, options)
+                 end]
+              elsif val.is_a?(Array)
+                [key, val.map { |n| decorate_context_items(n, options) }]
+              else
+                [key, val]
+              end
+            end
+            .to_h
         end
 
         def parse_context_block(context_lines:,

data/lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb

@@ -29,6 +29,7 @@ module Metanorma
           ::Lutaml::Parser
             .parse(File.new(Utils.relative_file_path(document, file_path),
                             encoding: "UTF-8"))
+            .first
         end
 
         def processed_lines(document, input_lines)
@@ -45,12 +46,12 @@ module Metanorma
 
         def parse_marco(lutaml_path, entity_name, document)
           lutaml_document = lutaml_document_from_file(document, lutaml_path)
-                              .serialized_document
-          entities = [lutaml_document['classes'], lutaml_document['enums']]
-                      .compact
-                      .flatten
-          entity_definition = entities.find do |klass|
-            klass['name'] == entity_name.strip
+            .serialized_document
+          entities = [lutaml_document["classes"], lutaml_document["enums"]]
+            .compact
+            .flatten
+          entity_definition = entities.detect do |klass|
+            klass["name"] == entity_name.strip
           end
           model_representation(entity_definition, document)
         end
@@ -59,12 +60,13 @@ module Metanorma
           render_result, errors = Utils.render_liquid_string(
             template_string: table_template,
             context_items: entity_definition,
-            context_name: 'definition'
+            context_name: "definition"
           )
           Utils.notify_render_errors(document, errors)
           render_result.split("\n")
         end
 
+        # rubocop:disable Layout/IndentHeredoc
         def table_template
           <<~TEMPLATE
           === {{ definition.name }}
@@ -94,6 +96,7 @@ module Metanorma
 
           TEMPLATE
         end
+        # rubocop:enable Layout/IndentHeredoc
       end
     end
   end

data/lib/metanorma/plugin/lutaml/utils.rb

@@ -31,7 +31,46 @@ module Metanorma
               .warn("Liquid render error: #{error_obj.message}")
           end
         end
+
+        def process_express_index(folder, name, idxs, document)
+          idxs[name] = []
+          Dir["#{Utils.relative_file_path(document, folder)}/*"].each do |path|
+            next if [".", ".."].include?(path)
+
+            begin
+              parsed = ::Lutaml::Parser.parse(File.new(path, encoding: "UTF-8"))
+              parsed = parsed.map { |n| n.to_liquid.map { |j| j.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(j['file']))) } }.flatten
+              idxs[name]
+                .push(*parsed)
+            rescue StandardError => e
+              document.logger.warn("Failed to load #{path}: #{e.message}")
+            end
+          end
+        end
+
+        def parse_document_express_indexes(document, input_lines)
+          express_indexes = {}
+          loop do
+            line = input_lines.next
+            break if line.length.zero?
+
+            _, name, folder = line.match(/^:lutaml-express-index:(.+?);(.+?)$/)&.to_a
+            if folder && name
+              process_express_index(
+                folder.strip.gsub(";", ""),
+                name.strip,
+                express_indexes,
+                document
+              )
+            end
+          end
+          express_indexes
+        rescue StopIteration
+          express_indexes
+        ensure
+          input_lines.rewind
+        end
       end
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.2.3".freeze
+      VERSION = "0.2.4-alpha.4".freeze
     end
   end
 end

data/metanorma-plugin-lutaml.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "liquid"
-  spec.add_dependency "lutaml", "~> 0.3.0"
+  spec.add_dependency "lutaml", "0.4.1.pre.alpha.2"
   spec.add_dependency "lutaml-uml", "~> 0.2.0"
   spec.add_dependency "metanorma"
   spec.add_dependency "relaton-cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.pre.alpha.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -28,16 +28,16 @@ dependencies:
   name: lutaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1.pre.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.1.pre.alpha.2
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +251,7 @@ files:
 - bin/console
 - bin/setup
 - lib/metanorma-plugin-lutaml.rb
+- lib/metanorma/plugin/lutaml/express_remarks_decorator.rb
 - lib/metanorma/plugin/lutaml/lutaml_diagram_block.rb
 - lib/metanorma/plugin/lutaml/lutaml_preprocessor.rb
 - lib/metanorma/plugin/lutaml/lutaml_uml_attributes_table_preprocessor.rb
@@ -273,11 +274,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML