lm_docstache 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5fc07cb8e83945cfdf666da91c1128736fe04b268f6650a5e5f7362e73138f1
-  data.tar.gz: 2d9d44dd5fe120c422689218367d811c081f1cf30e7aa30221875ee008134418
+  metadata.gz: 3268400635c8fd94b49786b4509b78f3acc649e8fb1bea2b65ba4a7f520b6b22
+  data.tar.gz: 19a429793e0699e2026a726c73d8c579f3644b4f88425ef57944dada31e878cc
 SHA512:
-  metadata.gz: 8d84deb7909e533b9af7ee3f70ec2201ee95a55d4bc8069b811c3650411ff4a8e0d3ddf9f9007dcb72b9c6b4dcb8aabe05a64d33557879426f98253fb4af1270
-  data.tar.gz: cf3cc3249c5f6e6b70a4d3121993e0cccd09472a08e61e57c33f71266d1b1b8bf52032cfd99a6b97c4957a08e6d8e8661faf93f8512ce30215b8559c5ed8d61c
+  metadata.gz: a902c19fa827102d3396d317e977031db56071d3bead3900f83f67583f41e96bca042c4f9ab54d215058c0af3d76ff492bc059d17d22c3c710a6ee7aa637492d
+  data.tar.gz: deb3bda8b3ce6ea84f6334197bf93fd7e10950e84386731ad9426f9f746ab1967485b54b312160c98bae2eac7a1752b0c35e65e36c54208ea8177af03db730ec

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 1.3.4
+* Change signature signs identifiers to be braces instead of brackets.
+
 ## 1.3.2
 * Fix bug replacing signature tags accross xml nodes.
 

data/lib/lm_docstache/document.rb

@@ -1,5 +1,7 @@
 module LMDocstache
   class Document
+    TAGS_REGEXP = /\{\{.+?\}\}/
+    SIGNATURE_REGEXP = /(\{\{(sig|sigfirm|date|check|text|initial)\|(req|noreq)\|(.+?)\}\})/
     def initialize(*paths)
       raise ArgumentError if paths.empty?
       @path = paths.shift
@@ -17,22 +19,26 @@ module LMDocstache
 
     def signature_tags
       @documents.values.flat_map do |document|
-        document.text.strip.scan(/\[\[sig_.+?\]\]/)
+        document.text.strip.scan(SIGNATURE_REGEXP)
+          .map {|r| r.first }
       end
     end
 
     def usable_signature_tags
       @documents.values.flat_map do |document|
         document.css('w|p')
-          .select { |tag| tag.text =~ /\[\[sig_.+?\]\]/ }
-          .flat_map { |tag| tag.text.scan(/\[\[sig_.+?\]\]/) }
+          .select { |tag| tag.text =~ SIGNATURE_REGEXP }
+          .flat_map { |tag|
+            tag.text.scan(SIGNATURE_REGEXP)
+              .map {|r| r.first }
+          }
       end
     end
 
     def usable_signature_tag_names
       self.usable_signature_tags.map do |tag|
-        tag.scan(/\[\[sig_(.+?)\]\]/)
-        $1
+        tag.scan(SIGNATURE_REGEXP)
+          .map {|r| r.first }
       end.compact.uniq
     end
 
@@ -47,15 +53,16 @@ module LMDocstache
 
     def tags
       @documents.values.flat_map do |document|
-        document.text.strip.scan(/\{\{.+?\}\}/)
+        document.text.strip.scan(TAGS_REGEXP)
+          .select {|t| !(t =~ SIGNATURE_REGEXP)}
       end
     end
 
     def usable_tags
       @documents.values.flat_map do |document|
         document.css('w|t')
-          .select { |tag| tag.text =~ /\{\{.+?\}\}/ }
-          .flat_map { |tag| tag.text.scan(/\{\{.+?\}\}/) }
+          .select { |tag| tag.text =~ TAGS_REGEXP && !(tag.text =~ SIGNATURE_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.2"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Roey Chasman
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -143,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Merges Hash of Data into Word docx template files using mustache syntax