lm_docstache 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 805d05c9872a3562ac59527ada43842f4f28412d4a273d3010986f1182ee8421
-  data.tar.gz: 1c0ecd9d43788420553310cefcba6bcca8fe24cd6dc14ff3cbac27f2cfb8ac8f
+  metadata.gz: e91a22653fad2e7b3afb24e170d5c8ccc8d7c5153b2a8b7cdc8caae19643e158
+  data.tar.gz: 9225014ab71170af0d2cfba5050d1202a531daf125a56b7c921b9beaeb3e2fa4
 SHA512:
-  metadata.gz: 66881d21495aa30890ebfc392e4292bfd6ef0bccb9b31d147381b606478996707d82cb745d3dd387f98a793b743f54d695be7149282add2b4707438262bc1a0e
-  data.tar.gz: 0a75364125a98fbd22150cbcde7e3826ab2a8d28705e321e0a471290838867d211ebda8a9181fcf7bf4a1428c6351fa1e93fc0ad33c200f850ae71bed3a0808d
+  metadata.gz: 2fa5b87cddcbb5e3d6c43dc8f0f4a27f2b3f0a192c9a8dd8973ea7107d69ed53959d95c8d17dc422360e225b3c3943519a46491988e03c64da494c01da4b801c
+  data.tar.gz: fb75e6b190061328b857a82a967514fe4ba28a8ff983ad314d3f6fcebd2c3135b3700cc28a8353fcbad0eddcb488806fcd78ea8c51bafe0d3ee28ad5447d10ab

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.0.1
+
+### Improvements and bugfixes
+
+* Improve the approach on fixing errors around paragraphs that have tags through
+  multiple `w:r` elements, by merging only `w:r` that have same styles.
+
 ## 2.0.0
 
 ### Breaking changes

data/lib/lm_docstache/document.rb

@@ -1,7 +1,7 @@
 module LMDocstache
   class Document
     TAGS_REGEXP = /{{.+?}}/
-    ROLES_REGEXP = /(\{\{(sig|sigfirm|date|check|text|initial)\|(req|noreq)\|(.+?)\}\})/
+    ROLES_REGEXP = /({{(sig|sigfirm|date|check|text|initial)\|(req|noreq)\|(.+?)}})/
 
     def initialize(*paths)
       raise ArgumentError if paths.empty?
@@ -65,7 +65,7 @@ module LMDocstache
     end
 
     def fix_errors
-      problem_paragraphs.each { |p| flatten_paragraph(p) if p.present? }
+      problem_paragraphs.each { |pg| flatten_paragraph(pg) if pg }
     end
 
     def errors?
@@ -125,15 +125,21 @@ module LMDocstache
     end
 
     def flatten_paragraph(paragraph)
-      run_nodes = paragraph.css('w|r')
-      host_run_node = run_nodes.shift
+      return if (run_nodes = paragraph.css('w|r')).size < 2
 
-      until host_run_node.at_css('w|t') || run_nodes.size == 0
-        host_run_node = run_nodes.shift
-      end
+      while run_node = run_nodes.pop
+        next if run_nodes.empty?
+
+        style_node = run_node.at_css('w|rPr')
+        style_html = style_node ? style_node.inner_html : ''
+        previous_run_node = run_nodes.last
+        previous_style_node = previous_run_node.at_css('w|rPr')
+        previous_style_html = previous_style_node ? previous_style_node.inner_html : ''
+
+        next if style_html != previous_style_html
 
-      run_nodes.each do |run_node|
-        host_run_node.at_css('w|t').content += run_node.text
+        previous_text_node = previous_run_node.at_css('w|t')
+        previous_text_node.content = previous_text_node.text + run_node.text
         run_node.unlink
       end
     end

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/integration_spec.rb

@@ -58,22 +58,26 @@ describe 'integration test', integration: true do
     end
 
     it 'fixes nested xml errors breaking tags' do
-      expect(document.send(:problem_paragraphs)).to_not be_empty
-      document.fix_errors
-      expect(document.send(:problem_paragraphs)).to be_empty
+      expect { document.fix_errors }.to change {
+        document.send(:problem_paragraphs).size
+      }.from(6).to(1)
+
+      expect(document.send(:problem_paragraphs).first.text).to eq(
+        '{{TAG123-\\-//WITH WE👻IRD CHARS}}'
+      )
     end
 
     it 'has the expected amount of usable tags' do
-      expect(document.usable_tags.count).to be(30)
+      expect(document.usable_tags.count).to eq(43)
     end
 
     it 'has the expected amount of usable roles tags' do
       document.fix_errors
-      expect(document.usable_role_tags.count).to be(6)
+      expect(document.usable_role_tags.count).to eq(6)
     end
 
     it 'has the expected amount of unique tag names' do
-      expect(document.usable_tag_names.count).to be(18)
+      expect(document.usable_tag_names.count).to eq(19)
     end
 
     it 'renders file using data' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Roey Chasman
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri