lm_docstache 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8db9e1f7f1a534059ed080bfd89005372b334cc203b66cfbb45323b8116b980
-  data.tar.gz: 4af011e633d34a62fcc0ed24fa639e04ce88937423b8570ae4f3a8fd4ff8fe70
+  metadata.gz: 233db6459ecd3c23c9d566659730ce1e4f2fcfb11b0ad4054dd83631375587ec
+  data.tar.gz: 344689f276e851c835b550f6197cc11dc2c698842b57efc29fc981fbb0026238
 SHA512:
-  metadata.gz: e3c0630c4472b5d5b8f2a479a7b201411a817069221026778f86581146f4ef797dd586d2a0b299df4281394edf7878f1536ceda0d59f766a737255960a07d450
-  data.tar.gz: df59e4c7c9750e75f976d47ee6d8d632c795702863cdb332627497f88026efa70a2eac2b01520c615a8faf042f677e547d3fec8ae09dc470d50383e1e5ed5548
+  metadata.gz: 342e46c6da0b34131af9cabd468fcae78e1dd272a8e08f4b395abfa2343f51b592d88ada3885c0c7db13d1ef89b66df30f49ff7237c1fba6f61356d5130e3e52
+  data.tar.gz: 03f3a44bf4a93b5d066cb141fabb9a2d6317940f9705213183ece98cdc2861bb41e7a0d12f399b80d4f6217f92be72bf96ca62a91ddbc790d9ccb57f4bf8d25c

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 # Changelog
 
+## 3.0.3
+
+### Bugfix
+
+* Hide custom tags arguments was pushing blocks tags to end of paragraph. There are cases this approach
+ doesn't work. I changed to be an ordered replacement when we match hide tags.
+* Avoid to merge Tab tags on fix errors methods. This was causing unexpected document changes.  
+
 ## 3.0.2
 
 ### Bugfix
 
 * Fix replacing tags related to hidden custom tags regexp formats. E.g. tab characters.
 
-
 ## 3.0.1
 
 ### Bugfix

data/lib/lm_docstache/document.rb

@@ -138,6 +138,10 @@ module LMDocstache
         previous_text_node = previous_run_node.at_css('w|t')
         current_text_node = run_node.at_css('w|t')
 
+        # avoid to merge blocks with tabs
+        next if run_node.at_css('w|tab')
+        next if previous_run_node.at_css('w|tab')
+
         next if style_html != previous_style_html
         next if current_text_node.nil? || previous_text_node.nil?
 

data/lib/lm_docstache/hide_custom_tags.rb

@@ -30,15 +30,15 @@ module LMDocstache
           while run_node = run_nodes.shift
             next unless run_node.at_css('w|t')
             next unless run_node.text =~ full_pattern
-            remainder_run_node = run_node.clone
-            run_node.unlink
-            tag_contents = split_tag_content(remainder_run_node.text, full_pattern)
+            tag_contents = split_tag_content(run_node.text, full_pattern)
+            replacement_nodes = []
             tag_contents[:content_list].each_with_index do |content, idx|
+              remainder_run_node = run_node.clone
               replace_content(remainder_run_node, content)
               matched_tag = tag_contents[:matched_tags][idx]
-              nodes_list = [remainder_run_node]
+              replacement_nodes << remainder_run_node
               if matched_tag
-                run_node_with_match = remainder_run_node.dup
+                run_node_with_match = run_node.clone
                 replace_style(run_node_with_match)
                 matched_content = matched_tag
                 if value
@@ -47,11 +47,11 @@ module LMDocstache
                        value.to_s
                 end
                 replace_content(run_node_with_match, matched_content)
-                nodes_list << run_node_with_match
+                replacement_nodes << run_node_with_match
               end
-              paragraph << Nokogiri::XML::NodeSet.new(document, nodes_list)
-              remainder_run_node = remainder_run_node.clone
             end
+            run_node.add_next_sibling(Nokogiri::XML::NodeSet.new(document, replacement_nodes))
+            run_node.unlink
           end
         end
       end

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/spec/integration_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'securerandom'
 require 'active_support/core_ext/object/blank.rb'
 
 module LMDocstache
@@ -139,5 +140,30 @@ describe 'integration test', integration: true do
         expect(output).to include('<w:t xml:space="preserve">Test Multiple text in the same line </w:t>')
       end
     end
+
+    context "yoooo" do
+      let(:input_file) { "#{base_path}/multi_o.docx" }
+      let(:render_options) {
+        {
+          special_variable_replacements: { "(date|sig|sigfirm|text|check|initial|initials)\\|(req|noreq)\\|(.+?)" => false }.freeze,
+          hide_custom_tags: ['(?:sig|sigfirm|date|check|text|initial)\|(?:req|noreq)\|.+?']
+        }
+      }
+      let(:document) { LMDocstache::Document.new(input_file) }
+
+      it 'should have content replacement aligned with hide custom tags' do
+        doc = document
+        doc.fix_errors
+        new_file_path = "#{Time.now.to_i}-#{SecureRandom.uuid}.docx"
+        n = doc.render_file(new_file_path, { 'full_name' => 'fred document01' }, render_options)
+        noko = doc.render_xml({ 'full_name' => 'fred document01' }, render_options)
+        output = noko['word/document.xml'].to_xml
+        #puts output
+        #doc.render_file(new_file_path, { 'full_name' => 'fred document01' }, render_options)
+        #noko = doc.render_xml({ 'full_name' => 'fred document01' }, render_options)
+        #output = noko['word/document.xml'].to_xml
+        #puts output
+      end
+    end
   end
 end

metadata

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