metanorma-plugin-lutaml 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b289ab4f617cefd59b1fe794d256b1e903fdbbf419b2fba937fed2ef686969bc
-  data.tar.gz: f1a0678e22c0e703b031de634a48851d76ec474403a39cf626c9df31e36d8f4f
+  metadata.gz: d99e7b02bf3bfbddcf2d2f81d47e0a83e33abdc0617a9032a106e6930cb05f30
+  data.tar.gz: bfc083ccb6fbd3e7824805e90515340812a1a44ba9522485d5b7a9969c36de2a
 SHA512:
-  metadata.gz: 20c54f6adb3963c4db9be07adc77c0518f2d3140588a99fe68f177cdc2c927fc4996c3db0bf3a6bcd5ced2147d53ac877c3909ff025b6baa5498e1e491f8f761
-  data.tar.gz: 4479579349a783361f97c4066fb78d3abb538fcfbc1d6250e9daf9aecc465fa0e93d1240ee1de6b01f9a8750ad89d6e20e77cdfb26aebcf002d95416937eb86b
+  metadata.gz: 4f4f9659c0cc4b62cfdd16e43d771eda047ff29c9731d9b397d186a6f0d214681c9c05f7a09f5ccfc70382fcfafae7df0ff833966d8454be2f947ca3ced9e376
+  data.tar.gz: dc4de40cee4c6ea453936fe4097f732bea18aa5c92ecedbf9789a9719a994edb4afd0088d9b13fffdfc811b960be391c4272282cb39c063685c46e8865fad2b6

data/Makefile

@@ -0,0 +1,2 @@
+fix-lint-staged:
+	git status --short | egrep '^(A|M)' | awk '{ print $$2}' | grep -v db/schema.rb | xargs bundle exec rubocop -a

data/lib/metanorma/plugin/lutaml/liquid/custom_filters.rb

@@ -0,0 +1,15 @@
+require "reverse_adoc"
+
+module Metanorma
+  module Plugin
+    module Lutaml
+      module Liquid
+        module CustomFilters
+          def html2adoc(input)
+            ReverseAdoc.convert(input)
+          end
+        end
+      end
+    end
+  end
+end

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
@@ -82,11 +83,17 @@ module Metanorma
             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'])))
+            from_files = content_from_files(document, file_paths)
+            # TODO: decide how to handle expressir multiply file parse as one object and lutaml
+            if from_files.is_a?(Array)
+              result.push(*from_files.map(&:to_liquid))
+            else
+              from_files = from_files.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.push(from_files)
           end
           result
         end
@@ -95,9 +102,9 @@ module Metanorma
           options = parse_options(block_match[3])
           contexts_items(block_match, document, express_indexes)
             .map do |items|
-              if items['schemas']
-                items['schemas'] = items['schemas'].map do |j|
-                  opts = options.merge('relative_path_prefix' => j['relative_path_prefix'])
+              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
@@ -106,9 +113,9 @@ module Metanorma
                                   context_items: items,
                                   context_name: block_match[2].strip)
             end.flatten
-        rescue StandardError => e
-          document.logger.warn("Failed to parse lutaml block: #{e.message}")
-          []
+          rescue StandardError => e
+            document.logger.warn("Failed to parse lutaml block: #{e.message}")
+            []
         end
 
         def parse_options(options_string)
@@ -148,7 +155,8 @@ module Metanorma
           render_result, errors = Utils.render_liquid_string(
             template_string: context_lines.join("\n"),
             context_items: context_items,
-            context_name: context_name
+            context_name: context_name,
+            document: document
           )
           Utils.notify_render_errors(document, errors)
           render_result.split("\n")

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

@@ -60,7 +60,8 @@ module Metanorma
           render_result, errors = Utils.render_liquid_string(
             template_string: table_template,
             context_items: entity_definition,
-            context_name: "definition"
+            context_name: "definition",
+            document: document
           )
           Utils.notify_render_errors(document, errors)
           render_result.split("\n")

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

@@ -1,4 +1,7 @@
-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)
 
 module Metanorma
   module Plugin
@@ -19,8 +22,10 @@ module Metanorma
         end
 
         def render_liquid_string(template_string:, context_items:,
-                                 context_name:)
-          liquid_template = Liquid::Template.parse(template_string)
+                                 context_name:, document:)
+          liquid_template = ::Liquid::Template.parse(template_string)
+          # Allow includes for the template
+          liquid_template.registers[:file_system] = ::Liquid::LocalFileSystem.new(Utils.relative_file_path(document, ""))
           rendered_string = liquid_template
             .render(context_name => context_items,
                     strict_variables: true,
@@ -48,11 +53,12 @@ module Metanorma
             express_write_cache(cache_full_path, wrapper.original_document, document)
           end
           wrapper
+        rescue Expressir::Error
+          FileUtils.rm_rf(cache_full_path)
+          process_express_index(path, cache_path, document, true)
         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)
@@ -61,11 +67,11 @@ module Metanorma
         end
 
         def express_write_cache(path, repository, document)
-          root_path = Pathname.new(relative_file_path(document, ''))
-          Expressir::ExpressExp::Cache
+          root_path = Pathname.new(relative_file_path(document, ""))
+          Expressir::Express::Cache
             .to_file(path,
-              repository,
-              root_path: root_path)
+                     repository,
+                     root_path: root_path)
         end
 
         def express_from_path(document, path)
@@ -83,24 +89,24 @@ module Metanorma
 
         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'])))
+          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']
+          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
+            .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

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

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

data/metanorma-plugin-lutaml.gemspec

@@ -24,16 +24,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "liquid"
-  spec.add_dependency "lutaml", "~> 0.5.0"
-  spec.add_dependency "lutaml-uml", "~> 0.2.0"
+  spec.add_dependency "lutaml"
   spec.add_dependency "metanorma"
   spec.add_dependency "relaton-cli"
+  spec.add_dependency "reverse_adoc"
 
   spec.add_development_dependency "byebug"
   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.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -28,32 +28,32 @@ dependencies:
   name: lutaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: lutaml-uml
+  name: metanorma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: metanorma
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: reverse_adoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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
@@ -247,12 +247,14 @@ files:
 - Dockerfile
 - Gemfile
 - LICENSE
+- Makefile
 - README.adoc
 - Rakefile
 - bin/console
 - bin/setup
 - lib/metanorma-plugin-lutaml.rb
 - lib/metanorma/plugin/lutaml/express_remarks_decorator.rb
+- lib/metanorma/plugin/lutaml/liquid/custom_filters.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
@@ -279,7 +281,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