lm_docstache 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3268400635c8fd94b49786b4509b78f3acc649e8fb1bea2b65ba4a7f520b6b22
-  data.tar.gz: 19a429793e0699e2026a726c73d8c579f3644b4f88425ef57944dada31e878cc
+  metadata.gz: f6ab6dff16fa851d40af9c350e4be33c01536dc9a8a9df53f7fd543cb81a9b31
+  data.tar.gz: 92514737372741fdadd2fbf84ed8d00617a1d7ba0e07c54f9e0cb08c829c665e
 SHA512:
-  metadata.gz: a902c19fa827102d3396d317e977031db56071d3bead3900f83f67583f41e96bca042c4f9ab54d215058c0af3d76ff492bc059d17d22c3c710a6ee7aa637492d
-  data.tar.gz: deb3bda8b3ce6ea84f6334197bf93fd7e10950e84386731ad9426f9f746ab1967485b54b312160c98bae2eac7a1752b0c35e65e36c54208ea8177af03db730ec
+  metadata.gz: c5232508c9ddd3eeaf52df714639d934baba80c613c35fa42239b242aad0243fff39f73b781b1392394cdb9c57bf702146a95d2456bc061382cd7f9d76b51385
+  data.tar.gz: c3a81aea4a97040b5f7157f727c4c616810a676e7d38038b50564bee3fbf8d4739b04f19310c2ccd78e7ff59e0d9eb3eb2a09d1d127931f98344787e9ea7025b

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 1.3.5
+* Replace signatures by roles. Add unique roles name collector. 
+
 ## 1.3.4
 * Change signature signs identifiers to be braces instead of brackets.
 

data/lib/lm_docstache/document.rb

@@ -1,7 +1,7 @@
 module LMDocstache
   class Document
     TAGS_REGEXP = /\{\{.+?\}\}/
-    SIGNATURE_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?
       @path = paths.shift
@@ -17,33 +17,36 @@ module LMDocstache
       find_documents_to_interpolate
     end
 
-    def signature_tags
+    def role_tags
       @documents.values.flat_map do |document|
-        document.text.strip.scan(SIGNATURE_REGEXP)
+        document.text.strip.scan(ROLES_REGEXP)
           .map {|r| r.first }
       end
     end
 
-    def usable_signature_tags
+    def usable_role_tags
       @documents.values.flat_map do |document|
         document.css('w|p')
-          .select { |tag| tag.text =~ SIGNATURE_REGEXP }
+          .select { |tag| tag.text =~ ROLES_REGEXP }
           .flat_map { |tag|
-            tag.text.scan(SIGNATURE_REGEXP)
+            tag.text.scan(ROLES_REGEXP)
               .map {|r| r.first }
           }
       end
     end
 
-    def usable_signature_tag_names
-      self.usable_signature_tags.map do |tag|
-        tag.scan(SIGNATURE_REGEXP)
-          .map {|r| r.first }
-      end.compact.uniq
+    def unique_role_tag_names
+      @documents.values.flat_map do |document|
+        document.css('w|p')
+          .select { |tag| tag.text =~ ROLES_REGEXP }
+          .flat_map { |tag|
+            tag.text.scan(ROLES_REGEXP).map {|r| r[3].strip }
+          }.compact.uniq
+      end
     end
 
-    def unusable_signature_tags
-      unusable_signature_tags = signature_tags
+    def unusable_role_tags
+      unusable_signature_tags = role_tags
       unusable_signature_tags.each do |usable_tag|
         index = unusable_signature_tags.index(usable_tag)
         unusable_signature_tags.delete_at(index) if index
@@ -54,14 +57,14 @@ module LMDocstache
     def tags
       @documents.values.flat_map do |document|
         document.text.strip.scan(TAGS_REGEXP)
-          .select {|t| !(t =~ SIGNATURE_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 =~ SIGNATURE_REGEXP) }
+          .select { |tag| tag.text =~ TAGS_REGEXP && !(tag.text =~ ROLES_REGEXP) }
           .flat_map { |tag| tag.text.scan(TAGS_REGEXP) }
       end
     end

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/spec/integration_spec.rb

@@ -67,12 +67,16 @@ describe 'integration test', integration: true do
       expect(document.usable_tags.count).to be(30)
     end
 
-    it 'has the expected amount of signature tags' do
-      expect(document.signature_tags.count).to be(6)
+    it 'has the expected amount of role tags' do
+      expect(document.role_tags.count).to be(6)
     end
 
-    it 'has the expected amount of usable signature tags' do
-      expect(document.usable_signature_tags.count).to be(6)
+    it 'has the expected amount of uniq role tags' do
+      expect(document.unique_role_tag_names.count).to be(5)
+    end
+
+    it 'has the expected amount of usable roles tags' do
+      expect(document.usable_role_tags.count).to be(6)
     end
 
     it 'has the expected amount of unique tag names' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Roey Chasman
@@ -121,6 +121,7 @@ files:
 - spec/example_input/ExampleTemplate2.docx
 - spec/example_input/blank.docx
 - spec/example_input/word/document.xml
+- spec/example_input/~$ampleTemplate2.docx
 - spec/integration_spec.rb
 - spec/spec_helper.rb
 - spec/template_processor_spec.rb
@@ -155,6 +156,7 @@ test_files:
 - spec/example_input/ExampleTemplate2.docx
 - spec/example_input/blank.docx
 - spec/example_input/word/document.xml
+- spec/example_input/~$ampleTemplate2.docx
 - spec/integration_spec.rb
 - spec/spec_helper.rb
 - spec/template_processor_spec.rb