metanorma-plugin-lutaml 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24226ddaa6e87bf2622c963e3a95d9abb9527e4067dc78836a605c35baa2e10
-  data.tar.gz: c0e3cc93d034f8b66219feb004aba88ae685fe1e1cbc4c0e78698cf51da3c3b5
+  metadata.gz: bfe1f241f558def33ef0fc13446d842d50aac1b1003cade580fa3b62e730b722
+  data.tar.gz: 2d12efe1688915194f16cd857e6ca4deaf9852b98407112363bf106dcf3e60a9
 SHA512:
-  metadata.gz: 3a61f3035a98479f58c01d84b55f262ca300876d72952d90d1fc10fbd5d3faaaa75eaa73b91c369c4c4108a765067eab3b81b5c0cbc3b8f2f6bd763306a537f8
-  data.tar.gz: 8ac5a2a497f0223b828ae6409b56bdc97e03750efbf1513f477774e1d13f749757372fabfca1c5a54cd665105acc00c23ce1c439d2c5dbb3cf420765e9379bdb
+  metadata.gz: d6c46b1d885bc2cb06ea76c4dd5ff057e2b2944579403c8582b43e8a66fe5cb67046b49c1d00526410aba63c0f1614900d3a65e681d67e5f75a3d9b66fc18fd9
+  data.tar.gz: 3da558c2e348387e60bdc1d0b079150c032e11dcf60731b8083b766dc129b10322c9e3f06892bfc06b8524df1ad453ed1d519153b19f55c7b34734ed20e4f614

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@master
 
@@ -49,5 +39,5 @@ jobs:
         with:
           token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
-          event-type: notify
+          event-type: tests-passed
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

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/lutaml/lutaml_diagram_block.rb

@@ -27,7 +27,7 @@ module Metanorma
         end
 
         def process(parent, reader, attrs)
-          uml_document = ::Lutaml::Uml::Parsers::Dsl.parse(lutaml_temp(reader))
+          uml_document = ::Lutaml::Uml::Parsers::Dsl.parse(lutaml_temp(parent.document, reader))
           filename = generate_file(parent, reader, uml_document)
           through_attrs = generate_attrs(attrs)
           through_attrs["target"] = filename
@@ -39,8 +39,8 @@ module Metanorma
 
         private
 
-        def lutaml_temp(reader)
-          temp_file = Tempfile.new(["lutaml", ".lutaml"])
+        def lutaml_temp(document, reader)
+          temp_file = Tempfile.new(["lutaml", ".lutaml"], Utils.relative_file_path(document, ''))
           temp_file.puts(reader.read)
           temp_file.rewind
           temp_file

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

@@ -21,8 +21,9 @@ module Metanorma
             document,
             input_lines
           )
-          Asciidoctor::Reader
-            .new(processed_lines(document, input_lines, express_indexes))
+          result_content = processed_lines(document, input_lines, express_indexes)
+          result_reader = Asciidoctor::PreprocessorReader.new(document, result_content)
+          result_reader
         end
 
         protected

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

@@ -1,4 +1,4 @@
-require "expressir/express_exp/cache"
+require "expressir/express/cache"
 require "metanorma/plugin/lutaml/liquid/custom_filters"
 
 ::Liquid::Template.register_filter(Metanorma::Plugin::Lutaml::Liquid::CustomFilters)
@@ -53,7 +53,7 @@ module Metanorma
             express_write_cache(cache_full_path, wrapper.original_document, document)
           end
           wrapper
-        rescue Expressir::ExpressExp::CacheLoadError
+        rescue Expressir::Error
           FileUtils.rm_rf(cache_full_path)
           process_express_index(path, cache_path, document, true)
         rescue StandardError => e
@@ -68,7 +68,7 @@ module Metanorma
 
         def express_write_cache(path, repository, document)
           root_path = Pathname.new(relative_file_path(document, ""))
-          Expressir::ExpressExp::Cache
+          Expressir::Express::Cache
             .to_file(path,
                      repository,
                      root_path: root_path)

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

@@ -1,7 +1,7 @@
 module Metanorma
   module Plugin
     module Lutaml
-      VERSION = "0.3.2".freeze
+      VERSION = "0.4.2".freeze
     end
   end
 end

data/metanorma-plugin-lutaml.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml"
   spec.add_development_dependency "metanorma-standoc"
   spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,8 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
@@ -281,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Metanorma plugin for LutaML