lm_docstache 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be114eecf9628a2857266505227f566f92f18bf78b403b1c0705f7b99624bdcd
-  data.tar.gz: 4193a1325ae93ef3dcc14331d20b0ce4eadb07aa2688b25b415628f2840fa6a1
+  metadata.gz: a232c835166c36e1ec8b49e14881d256a648831dd6fe799453cd8472ad43314e
+  data.tar.gz: 518e61a524ecdb2b8e74b504f02c5411979ebea4b18d10675ebc02c7e654bb31
 SHA512:
-  metadata.gz: 2a9796a3eb07ec1a64569d69513ef548bb6f1ecad43c6eb3f5c58ce5bb3218a4b7d66e0cfafe46628bdb64a1939582fc3d8ffc5056d66c6612f7415a8f64c923
-  data.tar.gz: b58f16601f0d5ae7091a2f3ab34b951581db79f03ed3f6c2837a3aa183e5509e6400f27801e67782ea3be09f7b24d685d1da2db957cd35862c9d65e1665b7314
+  metadata.gz: dd072339bf46460c662552c68a4cfff8dcfacc68ffd65b97bd612adeccc46015a036c3635ad93d1e5306e3072d9b602f38935e68d6bfde5d1c36d08fbf89765b
+  data.tar.gz: 97506e402af04f22899a1dcc3df6250c5bbdaf2eae39cd62f3dafa430b6aba2bdc3f91d2569938766d4b542cf81eba8979277bc063df25e305dd14dc301c40cc

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.3.9
+* Fix bug on Renderer Class remove_role_tags method that was replacing the entire line instead of just the role tag.
+
 ## 1.3.8
 * Fix bug on Renderer Class remove_role_tags method that wasn't replacing the roles.
 

data/lib/lm_docstache/document.rb

@@ -26,7 +26,7 @@ module LMDocstache
 
     def usable_role_tags
       @documents.values.flat_map do |document|
-        document.css('w|p')
+        document.css('w|t')
           .select { |tag| tag.text =~ ROLES_REGEXP }
           .flat_map { |tag|
             tag.text.scan(ROLES_REGEXP)
@@ -47,20 +47,19 @@ module LMDocstache
     def tags
       @documents.values.flat_map do |document|
         document.text.strip.scan(TAGS_REGEXP)
-          .select {|t| !(t =~ ROLES_REGEXP)}
       end
     end
 
     def usable_tags
       @documents.values.flat_map do |document|
         document.css('w|t')
-          .select { |tag| tag.text =~ TAGS_REGEXP && !(tag.text =~ ROLES_REGEXP) }
+          .select { |tag| tag.text =~ TAGS_REGEXP }
           .flat_map { |tag| tag.text.scan(TAGS_REGEXP) }
       end
     end
 
     def usable_tag_names
-      self.usable_tags.map do |tag|
+      self.usable_tags.select {|t| !(t =~ ROLES_REGEXP)}.map do |tag|
         tag.scan(/\{\{[\/#^]?(.+?)(?:(\s((?:==|~=))\s?.+?))?\}\}/)
         $1
       end.compact.uniq

data/lib/lm_docstache/renderer.rb

@@ -10,7 +10,7 @@ module LMDocstache
 
     def render
       find_and_expand_blocks
-      replace_tags(@data)
+      replace_tags(@content, @data)
       remove_role_tags if @remove_role_tags
       @content
     end
@@ -105,9 +105,9 @@ module LMDocstache
       end
     end
 
-    def replace_tags(data)
-      @content.css('w|t').each do |text_el|
-        if !(results = text_el.text.scan(/\{\{([\w\.\|]+)\}\}/).flatten).empty?
+    def replace_tags(elements, data)
+      elements.css('w|t').select {|t| !(t.text =~ Document::ROLES_REGEXP)}.each do |text_el|
+        if !(results = text_el.text.scan(/\{\{([\w\.\|]+)\}\}/).flatten).empty? &&
           rendered_string = text_el.text
           results.each do |r|
             rendered_string.gsub!("{{#{r}}}", data.get(r).to_s)
@@ -115,10 +115,11 @@ module LMDocstache
           text_el.content = rendered_string
         end
       end
+      elements
     end
 
     def remove_role_tags
-      @content.css('w|p').each do |text_el|
+      @content.css('w|t').each do |text_el|
         results = text_el.text.scan(Document::ROLES_REGEXP).map {|r| r.first }
         unless results.empty?
           rendered_string = text_el.text

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

data/spec/integration_spec.rb

@@ -72,6 +72,7 @@ describe 'integration test', integration: true do
     end
 
     it 'has the expected amount of usable roles tags' do
+      document.fix_errors
       expect(document.usable_role_tags.count).to be(6)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Roey Chasman
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri