lm_docstache 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d27b230b05c9271e1d519b9b946b829da7041d32b1a99a9ae7c29c86326dedd6
-  data.tar.gz: 34798fa630422bfa320deb756c445142d67bf17dcd120b246d3b5ab7290246ba
+  metadata.gz: b414a4508c323651394880630f25af46409778dfc205ebc5621d72e07a6e69a3
+  data.tar.gz: 896ce5a0ef359f2b3a77646a631b66ef74a67fb6f5d8fa2ac218a3d346b8f0f8
 SHA512:
-  metadata.gz: 1950a09e8be9fc31324f7b94733de31c7eedb99f3867addca8ad9dcc4ce0ac9ad240bbccccf26bcc412b7138fc5e30dca14807452962d1768df3aa8b68ece95c
-  data.tar.gz: 33c5485fb1fc5e5e7fe135bff40a06ca2d24a61412cce787c2f54af089aa90976fd12ba5e4bda8db2a823e692d5c53ff43508fc8e3c825c21fa2e76d7447ac6e
+  metadata.gz: e14266f143047c25ee683b6544ddca31648ac83b51a7a72756f3f01dfa1800353f684d3c1a82e878f523a29ef829389f99c7e4f60b0c6d5c46708eccffc5c36c
+  data.tar.gz: 0f5ee3910f3a77519fec6ee1db604954c49f3ecc5b0e12af4bcc4d7844b0f10bc9ee410070291381fbd90cce25f974c246a8bca6a107b8d63021b8e38ed3cef9

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.0.8
+
+#### Bug fixes
+
+* Fix a bug on `usable_tags` method, so it now properly and expectedly
+  includes conditional tag names that have its opening tag markup as the sole
+  content of paragraphs (which represents conditional blocks where both
+  opening and closing tags are in separate parapraghs sorrounding one or more
+  paragraphs as its conditional block content).
+
 ## 3.0.7
 
 #### Bug fixes

data/lib/lm_docstache/document.rb

@@ -38,7 +38,7 @@ module LMDocstache
     def tags
       @documents.values.flat_map do |document|
         document_text = document.text
-        extract_tag_names(document_text) + extract_tag_names(document_text, true)
+        extract_tag_names(document_text) + extract_tag_names(document_text, :full_block)
       end
     end
 
@@ -47,7 +47,8 @@ module LMDocstache
         document.css('w|t').reduce(tags) do |document_tags, text_node|
           text = text_node.text
           document_tags.push(*extract_tag_names(text))
-          document_tags.push(*extract_tag_names(text, true))
+          document_tags.push(*extract_tag_names(text, :start_block))
+          document_tags.push(*extract_tag_names(text, :full_block))
         end
       end
     end
@@ -62,20 +63,10 @@ module LMDocstache
     end
 
     def unusable_tags
-      conditional_start_tags = text_nodes_containing_only_starting_conditionals.map(&:text)
-
       usable_tags.reduce(tags) do |broken_tags, usable_tag|
         next broken_tags unless index = broken_tags.index(usable_tag)
 
         broken_tags.delete_at(index) && broken_tags
-      end.reject do |broken_tag|
-        operator = broken_tag.is_a?(Regexp) ? :=~ : :==
-        start_tags_index = conditional_start_tags.find_index do |start_tag|
-          broken_tag.send(operator, start_tag)
-        end
-
-        conditional_start_tags.delete_at(start_tags_index) if start_tags_index
-        !!start_tags_index
       end
     end
 
@@ -123,23 +114,17 @@ module LMDocstache
         .gsub('\\ ', ' ')
     end
 
-    def text_nodes_containing_only_starting_conditionals
-      @documents.values.flat_map do |document|
-        document.css('w|t').select do |paragraph|
-          paragraph.text =~ WHOLE_BLOCK_START_REGEX
+    def extract_tag_names(text, tag_type = :variable)
+      text, regex, extractor =
+        if tag_type == :variable
+          [text, Parser::VARIABLE_MATCHER, ->(match) { "{{%s}}" % match }]
+        else
+          extractor = ->(match) { /#{Regexp.escape("{{%s%s %s %s}}" % match)}/ }
+          tag_type == :full_block ? [text, Parser::BLOCK_MATCHER, extractor] :
+            [text.strip, WHOLE_BLOCK_START_REGEX, extractor]
         end
-      end
-    end
 
-    def extract_tag_names(text, conditional_tag = false)
-      if conditional_tag
-        text.scan(Parser::BLOCK_MATCHER).map do |match|
-          start_block_tag = "{{#{match[0]}#{match[1]} #{match[2]} #{match[3]}}}"
-          /#{Regexp.escape(start_block_tag)}/
-        end
-      else
-        text.scan(Parser::VARIABLE_MATCHER).map { |match| "{{#{match[0]}}}" }
-      end
+      text.scan(regex).map(&extractor)
     end
 
     def render_documents(data, text = nil, render_options = {})

data/lib/lm_docstache/version.rb

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

data/spec/integration_spec.rb

@@ -70,7 +70,9 @@ describe 'integration test', integration: true do
     end
 
     it 'has the expected amount of usable tags' do
-      expect(document.usable_tags.count).to eq(28)
+      expect { document.fix_errors }.to change {
+        document.usable_tags.count
+      }.from(29).to(34)
     end
 
     it 'has the expected amount of usable roles tags' do

metadata

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