metanorma-plugin-lutaml 0.2.4.pre.alpha.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72d3bfa8e8dd1e0a8321f97d9f32b46652e7961036d623d293ed07a0a19c6b1
-  data.tar.gz: 18a4eec7fba09c7f1466ae46fdf33d07e70855a9f00b1e4490252c22a7529ed7
+  metadata.gz: b289ab4f617cefd59b1fe794d256b1e903fdbbf419b2fba937fed2ef686969bc
+  data.tar.gz: f1a0678e22c0e703b031de634a48851d76ec474403a39cf626c9df31e36d8f4f
 SHA512:
-  metadata.gz: 5440d8e90b6184ab41d1969e6520d3745013aa987314b9f50a524066d810497f0be86481bdcd6195bfe2982e1c8de4562226f373746e18bbd4f173796d043f5d
-  data.tar.gz: ee100c14d0bf8a945732da8ed86f8816ca67ce02dbe7fea80f14a04ac74fcd4efda65cedff89e5262725f044b3a69de85461d6fb5c724392cf01642b6afdf317
+  metadata.gz: 20c54f6adb3963c4db9be07adc77c0518f2d3140588a99fe68f177cdc2c927fc4996c3db0bf3a6bcd5ced2147d53ac877c3909ff025b6baa5498e1e491f8f761
+  data.tar.gz: 4479579349a783361f97c4066fb78d3abb538fcfbc1d6250e9daf9aecc465fa0e93d1240ee1de6b01f9a8750ad89d6e20e77cdfb26aebcf002d95416937eb86b

data/.github/workflows/rake.yml

@@ -1,8 +1,10 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: rake
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master, main  ]
     tags: [ v* ]
   pull_request:
 
@@ -14,52 +16,38 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: Update gems
-        run: bundle install --jobs 4 --retry 3
+      - uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
 
-      - name: Install Grpahviz Ubuntu
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get install graphviz
+      - run: bundle exec rake
 
-      - name: Install Grpahviz macOS
-        if: matrix.os == 'macos-latest'
-        run: brew install graphviz
-
-      - name: Install Grpahviz Windows
-        if: matrix.os == 'windows-latest'
-        uses: nick-invision/retry@v1
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
         with:
-          polling_interval_seconds: 5
-          timeout_minutes: 5
-          max_attempts: 3
-          command: choco install --no-progress graphviz
-
-      - name: Check dot command
-        if: matrix.os == 'windows-latest'
-        run: |
-          dot -?
-
-      - name: Run specs
-        run: bundle exec rake
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: notify
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/Dockerfile

@@ -0,0 +1,4 @@
+FROM ruby:2.6
+COPY . .
+RUN gem install bundler:2.1.4
+RUN bundle install

data/README.adoc

@@ -83,6 +83,36 @@ Will produce this output:
 
 This macro also supports `.lutaml` files.
 
+Instead of using the direct path to the file one can use `lutaml-express-index` document attribute to supply directory with express files or yaml index file to parse as well as the cache file location. The syntax is as follows:
+
+[source,adoc]
+-----
+:lutaml-express-index: my_custom_name; dir_or_index_path[; cache=cache_path]
+-----
+
+Where:
+
+* `my_custom_name` - is name of the parsed express files context for the later use with lutaml macro
+
+* `dir_or_index_path` - location of directory with express files or path to yaml index file to parse
+
+* `cache_path` - optional, location of the expressir cache file to use
+
+Example of real usage:
+
+[source,adoc]
+-----
+= Document title
+Author
+:lutaml-express-index: my_custom_name; /path/to/express_files; cache=/path/to/cache_file.yaml
+[lutaml,my_custom_name,my_context]
+----
+{% for schema in my_context.schemas %}
+== {{schema.id}}
+{% endfor %}
+----
+-----
+
 === Usage, `lutaml_uml_attributes_table` macro
 
 This macro allows to quickly render datamodel attributes/values tables. Given `example.lutaml` file with the content:

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

@@ -2,7 +2,7 @@ module Metanorma
   module Plugin
     module Lutaml
       class ExpressRemarksDecorator
-        RELATIVE_PREFIX_MACRO_REGEXP = /^(\* <<express.+?>>;|link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
+        RELATIVE_PREFIX_MACRO_REGEXP = /^(link|image|video|audio|include)(:+)?(?![^\/:]+:\/\/|[A-Z]:\/|\/)([^:\[]+)(\[.*\])?$/.freeze
 
         attr_reader :remark, :options
 

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

@@ -27,10 +27,11 @@ module Metanorma
 
         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
@@ -72,25 +73,37 @@ module Metanorma
 
         def contexts_items(block_match, document, express_indexes)
           contexts_names = block_match[1].split(";").map(&:strip)
-          contexts_names.each_with_object([]) do |path, res|
+          file_paths = []
+          result = contexts_names.each_with_object([]) do |path, res|
             if express_indexes[path]
-              res.push(*express_indexes[path])
+              res.push(express_indexes[path])
             else
-              res.push(content_from_file(document, path)
-                        .to_liquid
-                        .merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(path))))
+              file_paths.push(path)
+            end
+          end
+          if !file_paths.empty?
+            from_files = content_from_files(document, file_paths).to_liquid
+            from_files['schemas'] = from_files['schemas'].map do |n|
+              n.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(n['file'])))
             end
+            result.push(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 |context_items|
+            .map do |items|
+              if items['schemas']
+                items['schemas'] = items['schemas'].map do |j|
+                  opts = options.merge('relative_path_prefix' => j['relative_path_prefix'])
+                  decorate_context_items(j, opts)
+                end
+              end
               parse_context_block(document: document,
                                   context_lines: current_block,
-                                  context_items: decorate_context_items(context_items,
-                                                    options.merge('relative_path_prefix' => context_items['relative_path_prefix'])),
+                                  context_items: items,
                                   context_name: block_match[2].strip)
             end.flatten
         rescue StandardError => e

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)

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

@@ -1,8 +1,12 @@
+require "expressir/express_exp/cache"
+
 module Metanorma
   module Plugin
     module Lutaml
       # Helpers for lutaml macroses
       module Utils
+        LUTAML_EXP_IDX_TAG = /^:lutaml-express-index:(?<index_name>.+?);(?<index_path>.+?);?(\s*cache=(?<cache_path>.+))?$/.freeze
+
         module_function
 
         def relative_file_path(document, file_path)
@@ -32,19 +36,75 @@ module Metanorma
           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
-              idxs[name]
-                .push(::Lutaml::Parser.parse(File.new(path, encoding: "UTF-8")).to_liquid)
-                .merge("relative_path_prefix" => folder)
-            rescue StandardError => e
-              document.logger.warn("Failed to load #{path}: #{e.message}")
-            end
+        def process_express_index(path, cache_path, document, force_read = false)
+          cache_full_path = Utils.relative_file_path(document, cache_path) if cache_path
+          if !force_read && cache_full_path && File.file?(cache_full_path)
+            return express_from_cache(cache_full_path)
+          end
+
+          full_path = Utils.relative_file_path(document, path)
+          wrapper = express_from_path(document, full_path)
+          if cache_full_path && !File.file?(cache_full_path)
+            express_write_cache(cache_full_path, wrapper.original_document, document)
+          end
+          wrapper
+        rescue StandardError => e
+          document.logger.warn("Failed to load #{full_path}: #{e.message}")
+          nil
+        rescue Expressir::ExpressExp::CacheLoadError
+          process_express_index(path, cache_path, document, true)
+        end
+
+        def express_from_cache(path)
+          ::Lutaml::Parser
+            .parse(File.new(path), ::Lutaml::Parser::EXPRESS_CACHE_PARSE_TYPE)
+        end
+
+        def express_write_cache(path, repository, document)
+          root_path = Pathname.new(relative_file_path(document, ''))
+          Expressir::ExpressExp::Cache
+            .to_file(path,
+              repository,
+              root_path: root_path)
+        end
+
+        def express_from_path(document, path)
+          if File.directory?(path)
+            return express_from_folder(path)
+          end
+
+          express_from_index(document, path)
+        end
+
+        def express_from_folder(folder)
+          files = Dir["#{folder}/*.exp"].map { |nested_path| File.new(nested_path, encoding: "UTF-8") }
+          ::Lutaml::Parser.parse(files)
+        end
+
+        def express_decorate_wrapper(wrapper, document)
+          serialized = wrapper.to_liquid
+          serialized['schemas'] = serialized['schemas'].map do |j|
+            j.merge('relative_path_prefix' => Utils.relative_file_path(document, File.dirname(j['file'])))
+          end
+          serialized
+        end
+
+        def express_from_index(document, path)
+          yaml_content = YAML.safe_load(File.read(path))
+          root_path = yaml_content['path']
+          schemas_paths = yaml_content
+                            .fetch('schemas')
+                            .map do |(schema_name, schema_values)|
+                              if schema_values['path']
+                                schema_values['path']
+                              else
+                                File.join(root_path.to_s, "#{schema_name}.exp")
+                              end
+                            end
+          files_to_load = schemas_paths.map do |path|
+            File.new(Utils.relative_file_path(document, path), encoding: "UTF-8")
           end
+          ::Lutaml::Parser.parse(files_to_load)
         end
 
         def parse_document_express_indexes(document, input_lines)
@@ -53,14 +113,15 @@ module Metanorma
             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
-              )
+            match = line.match(LUTAML_EXP_IDX_TAG)
+            if match
+              name = match[:index_name]
+              path = match[:index_path]
+              cache = match[:cache_path]
+              repositories = process_express_index(path.strip, cache, document)
+              if repositories
+                express_indexes[name.strip] = express_decorate_wrapper(repositories, document)
+              end
             end
           end
           express_indexes

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.2.4-alpha.2".freeze
+      VERSION = "0.3.0".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.4.1.pre.alpha.1"
+  spec.add_dependency "lutaml", "~> 0.5.0"
   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.4.pre.alpha.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-03-16 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.4.1.pre.alpha.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1.pre.alpha.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,7 @@ files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.adoc
@@ -274,9 +275,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: