lm_docstache 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b414a4508c323651394880630f25af46409778dfc205ebc5621d72e07a6e69a3
-  data.tar.gz: 896ce5a0ef359f2b3a77646a631b66ef74a67fb6f5d8fa2ac218a3d346b8f0f8
+  metadata.gz: b340972dc8dbd8f4f0e2bbdd8b385468d626d9f5f4ea3d9090cd3c96cba5ab05
+  data.tar.gz: f901539b68bff0bf5bb736aaa3c4636ade982fe23adfe7ae70ba41a926186c9a
 SHA512:
-  metadata.gz: e14266f143047c25ee683b6544ddca31648ac83b51a7a72756f3f01dfa1800353f684d3c1a82e878f523a29ef829389f99c7e4f60b0c6d5c46708eccffc5c36c
-  data.tar.gz: 0f5ee3910f3a77519fec6ee1db604954c49f3ecc5b0e12af4bcc4d7844b0f10bc9ee410070291381fbd90cce25f974c246a8bca6a107b8d63021b8e38ed3cef9
+  metadata.gz: 49273e8a8c7133cbf4ef02f0c6bb66b64c19408e75a010cbce313557bcf22407b493efe57e66d760bf9327d68b32a2008981937780d2ce0cb2c047ec0a1c9fae
+  data.tar.gz: bf8a47eea31424c0f2a20c35063c73fd93353d9fd315f028b18591bb1cd3f4d3d52c83ae668713bc74d4618fd95dcc33006523aefb4fc54a1430dfaf38017621

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.0.9
+
+#### Bug fixes
+
+* Text nodes merged in paragraphs with problems through `fix_errors` private
+  method have now the "xml:space" attribute preserved from now on.
+
 ## 3.0.8
 
 #### Bug fixes

data/lib/lm_docstache/document.rb

@@ -6,6 +6,8 @@ module LMDocstache
     BLOCK_CHILDREN_ELEMENTS = 'w|r,w|hyperlink,w|ins,w|del'
     RUN_LIKE_ELEMENTS = 'w|r,w|ins'
 
+    attr_reader :document
+
     def initialize(*paths)
       raise ArgumentError if paths.empty?
 
@@ -172,11 +174,14 @@ module LMDocstache
         previous_style_html = previous_style_node ? previous_style_node.inner_html : ''
         previous_text_node = previous_node.at_css('w|t')
         current_text_node = node.at_css('w|t')
+        whitespace_attr = current_text_node['xml:space']
 
         next if style_html != previous_style_html
         next if current_text_node.nil? || previous_text_node.nil?
 
+        previous_text_node['xml:space'] = whitespace_attr if whitespace_attr
         previous_text_node.content = previous_text_node.text + current_text_node.text
+
         node.unlink
       end
     end

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "3.0.8"
+  VERSION = "3.0.9"
 end

data/spec/integration_spec.rb

@@ -62,7 +62,7 @@ describe 'integration test', integration: true do
     it 'fixes nested xml errors breaking tags' do
       expect { document.fix_errors }.to change {
         document.send(:problem_paragraphs).size
-      }.from(7).to(1)
+      }.from(10).to(1)
 
       expect(document.send(:problem_paragraphs).first.text).to eq(
         '{{TAG123-\\-//WITH WE👻IRD CHARS}}'
@@ -72,7 +72,16 @@ describe 'integration test', integration: true do
     it 'has the expected amount of usable tags' do
       expect { document.fix_errors }.to change {
         document.usable_tags.count
-      }.from(29).to(34)
+      }.from(29).to(37)
+    end
+
+    it 'keeps "xml:space" attribute when fixing errors' do
+      document.fix_errors
+
+      text_node = document.document.css('w|p').last
+        .css('w|t').find { |node| node.text.include?('that occurred on') }
+
+      expect(text_node['xml:space']).to eq('preserve')
     end
 
     it 'has the expected amount of usable roles tags' do
@@ -88,6 +97,7 @@ describe 'integration test', integration: true do
       document.render_file(output_file, data)
     end
   end
+
   context "testing hide custom tags" do
     before do
       FileUtils.rm_rf(output_dir) if File.exist?(output_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Roey Chasman
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri