metanorma-plugin-lutaml 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb3bd82b6d23d6684bd1ca4793eb9d423dbe8132bf9e303bf5be17369fbd9e3
-  data.tar.gz: 9112fcf75f2cf32ac4f18e4e6dc0b7ef5385b247ca7293fafb9dd0d9185a4c0c
+  metadata.gz: a24226ddaa6e87bf2622c963e3a95d9abb9527e4067dc78836a605c35baa2e10
+  data.tar.gz: c0e3cc93d034f8b66219feb004aba88ae685fe1e1cbc4c0e78698cf51da3c3b5
 SHA512:
-  metadata.gz: e71b2f2667ad1f77bedcdd7459ff3b4ef19889a625cd14573741e855f6b97a1910f2a35198190f397f0158a23f9a49f24daaadb2ecc86bc59e948245c5e515f9
-  data.tar.gz: 253186ae00898321c291cdca4f5c5f118fff2072845977540cefaeb1b55a7bc326cba50649a1481e8b90e8565ce76df129d280ccbdf045c5336b5a9a921c9254
+  metadata.gz: 3a61f3035a98479f58c01d84b55f262ca300876d72952d90d1fc10fbd5d3faaaa75eaa73b91c369c4c4108a765067eab3b81b5c0cbc3b8f2f6bd763306a537f8
+  data.tar.gz: 8ac5a2a497f0223b828ae6409b56bdc97e03750efbf1513f477774e1d13f749757372fabfca1c5a54cd665105acc00c23ce1c439d2c5dbb3cf420765e9379bdb

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

@@ -88,8 +88,8 @@ module Metanorma
               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'])))
+              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
@@ -101,9 +101,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
@@ -112,9 +112,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)
@@ -154,7 +154,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 "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,
@@ -62,11 +67,11 @@ module Metanorma
         end
 
         def express_write_cache(path, repository, document)
-          root_path = Pathname.new(relative_file_path(document, ''))
+          root_path = Pathname.new(relative_file_path(document, ""))
           Expressir::ExpressExp::Cache
             .to_file(path,
-              repository,
-              root_path: root_path)
+                     repository,
+                     root_path: root_path)
         end
 
         def express_from_path(document, path)
@@ -84,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.1".freeze
+      VERSION = "0.3.2".freeze
     end
   end
 end

data/metanorma-plugin-lutaml.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-plugin-lutaml
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reverse_adoc
+  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
@@ -233,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