stepmod-utils 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296bedce77d49f689fc8161ed77ddd424a1b9022e775af93f6447b296f4dbcd6
-  data.tar.gz: 8993deac9d2b6bd9bb5bd2eec97467cd689c538e68c71854ac0d4f9fb34690e9
+  metadata.gz: 58a97c3c7381351ce5d0ff391e65f6b5d62ce52f541d51975b53c6e4793b5ae0
+  data.tar.gz: dd7d17312e634aaab93688e8f3fdee84e1895c025d74dd0a505fd357ea336756
 SHA512:
-  metadata.gz: 56091728db55f406000ad1d1de90840d847535cb1e5407ee9425e3ded01ccf486938a441d9e52364c3cba7d7b6418492a7fd84f0575a2662a676e59b42d954e3
-  data.tar.gz: 8149e8f62391e52989a51de7bf95d661b8f73d9f687387cb29ad943b7d1c7b8afec89996c39cea23b446e66114fcff37a20a4e0e3bcf5bffb73fdae6a75496a6
+  metadata.gz: 896b518262254a61c6e0e6a5df7fe5fd992eef5f9a1fb1f9136ee0753a6dc649c9c1ba07fe192c939cfa51b545a4749ffa2610aa9dc4c609b2f7e9385f917437
+  data.tar.gz: 54f31dabc624b11cfe48dde83bd0108c07692c4d3d55ee49a7f70ab518cae6914a9013e99f232d1b0c95e2798627904b3f895dad0ff8b47a48d0cd28ed117f21

data/lib/stepmod/utils/changes_extractor.rb

@@ -64,7 +64,7 @@ module Stepmod
             options = {
               schema_name: schema_name,
               version: change_node.attr("version"),
-              description: converted_description(change_node.at("description")),
+              description: converted_description(change_node.xpath("description").first),
             }
 
             MODULE_TYPES.each do |type|
@@ -132,9 +132,11 @@ module Stepmod
 
       def extract_change_edition(schema_changes, options)
         type = options[:type] || "schema"
-        addition_nodes = schema_changes&.xpath("#{type}.additions") || []
-        modification_nodes = schema_changes&.xpath("#{type}.modifications") || []
-        deletion_nodes = schema_changes&.xpath("#{type}.deletions") || []
+        node_type = type.gsub("_longform", "")
+
+        addition_nodes = schema_changes&.xpath("#{node_type}.additions") || []
+        modification_nodes = schema_changes&.xpath("#{node_type}.modifications") || []
+        deletion_nodes = schema_changes&.xpath("#{node_type}.deletions") || []
 
         {
           version: options[:version],

data/lib/stepmod/utils/converters/eqn.rb

@@ -59,7 +59,7 @@ module Stepmod
           internal_content = treat_children(cloned_node, state.merge(equation: true))
           content = Stepmod::Utils::HtmlToAsciimath.new.call(internal_content)
           res = <<~TEMPLATE
-
+            #{source_type_comment(cloned_node)}
             [stem]
             ++++
             #{remove_trash_symbols(content.strip)}
@@ -71,6 +71,10 @@ module Stepmod
           res
         end
 
+        def source_type_comment(node)
+          "\n// source type is bigeqn\n" if node.name == "bigeqn"
+        end
+
         def remove_trash_symbols(content)
           content
             .gsub(/ /, "")
@@ -118,6 +122,7 @@ module Stepmod
       end
 
       ReverseAdoc::Converters.register :eqn, Eqn.new
+      ReverseAdoc::Converters.register :bigeqn, Eqn.new
     end
   end
 end

data/lib/stepmod/utils/converters/table.rb

@@ -4,7 +4,6 @@ module Stepmod
   module Utils
     module Converters
       class Table < Stepmod::Utils::Converters::Base
-
         def self.pattern(state, id)
           if state[:schema_and_entity].nil?
             raise StandardError.new("[table]: no state given, #{id}")
@@ -23,8 +22,14 @@ module Stepmod
           title = node["caption"].to_s
           title = ".#{title}\n" unless title.empty?
           attrs = style(node)
-          "\n\n#{anchor}#{attrs}#{title}|===\n#{treat_children(node,
-                                                               state)}\n|===\n"
+
+          <<~TABLE
+
+
+            #{anchor}#{attrs}#{title}|===
+            #{treat_children(node, state.merge(inside_table: true))}
+            |===
+          TABLE
         end
 
         def frame(node)

data/lib/stepmod/utils/converters/text.rb

@@ -8,7 +8,7 @@ module Stepmod
           if node.text.strip.empty?
             treat_empty(node, state)
           else
-            treat_text(node)
+            treat_text(node, state)
           end
         end
 
@@ -27,21 +27,26 @@ module Stepmod
           end
         end
 
-        def treat_text(node)
+        def treat_text(node, state)
           text = node.text
           text = preserve_nbsp(text)
           text = remove_inner_newlines(text)
           text = remove_border_newlines(text)
 
           text = preserve_keychars_within_backticks(text)
-          preserve_tags(text)
+
+          text = preserve_pipes_within_tables(text, state)
+          text = wrap_if_contains_spaces(text, state)
+          preserve_tags(text, state)
         end
 
         def preserve_nbsp(text)
           text.gsub(/\u00A0/, " ")
         end
 
-        def preserve_tags(text)
+        def preserve_tags(text, state)
+          return text if state[:inside_table]
+
           text.gsub(/[<>]/, ">" => '\>', "<" => '\<')
         end
 
@@ -49,6 +54,12 @@ module Stepmod
           text.gsub(/\A\n+/, "").gsub(/\n+\z/, "")
         end
 
+        def wrap_if_contains_spaces(text, state)
+          return "(#{text})" if state[:equation] && text.strip.match?(/\s/) && text.match?(/^[A-Za-z ]+$/)
+
+          text
+        end
+
         def remove_inner_newlines(text)
           text.tr("\n\t", " ").squeeze(" ")
         end
@@ -58,6 +69,12 @@ module Stepmod
             match.gsub('\_', "_").gsub('\*', "*")
           end
         end
+
+        def preserve_pipes_within_tables(text, state)
+          return text unless state[:inside_table]
+
+          text.gsub("|", "\\|")
+        end
       end
 
       ReverseAdoc::Converters.register :text, Text.new

data/lib/stepmod/utils/version.rb

@@ -1,5 +1,5 @@
 module Stepmod
   module Utils
-    VERSION = "0.4.11".freeze
+    VERSION = "0.4.13".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stepmod-utils
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby