lm_docstache 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47845e207f960356863df098a2631bc36d931322a7e40b6186d3d47370019691
-  data.tar.gz: 638c0ff557da45899078382405d497f425aa44e9ba3b7e1a0c65f04d75936b95
+  metadata.gz: 7ae5d34672eaa5bce54718805fd2984f6a016b258f0376f3aa6707bb7c04d701
+  data.tar.gz: d9aacd28e9f78e7b194e6fd32fa9948d997b171427f8e425f376214eda044602
 SHA512:
-  metadata.gz: d6ba622f15f7c430cf806ee4cb93174e8daa9d3d5651106093f1e6e64bb429788747ef9a47b9dc0ee937da20ccaf4f9641514742b65445c463ce7cadea6fa36c
-  data.tar.gz: 9f9bc5d175c63671065accb0dbe7f2db5a127a6e159338f38f40c6fec967a4209ab28167616a320cd90d8692a42857a977634fcb221d8e4c22806ffbb8b5c626
+  metadata.gz: ea353f13320611862bb5081806a05320b99d76fb1ae4cdc5693af1d75c9419d997458b0319142825fc76f302c19613aafc7e232cd506b9ba1134570317db7b5f
+  data.tar.gz: fbbb70c2866c3c344efeb5c99ff748d7b53c51796512c0e485718523f1894aa7dff40a03f5a4fc3b4c9f3cff1f87ec082b3f3d1ad2159acb43d3b907d14441c7

data/.gitignore

@@ -2,3 +2,4 @@
 spec/example_input/tmp
 .idea/
 *.gem
+Gemfile.lock

data/CHANGELOG.md

@@ -1,4 +1,15 @@
 # Changelog
+## 1.3.0
+* Add support for e-signature tags
+
+## 1.2.4
+* Add support for pipe character in merge tags so we can use as a modifier for the context of merge tag.
+
+## 1.2.3
+* Fix issue where some paragraphs do not contain text as their first block. If this is the case, we just use the first block that does contain text.
+
+## 1.2.2
+* Remove uneccessary runtime dependency on active support.
 
 ## 1.2.1
 * Fix inline conditional issues such as no support for multi conditionals.

data/lib/lm_docstache/document.rb

@@ -15,6 +15,36 @@ module LMDocstache
       find_documents_to_interpolate
     end
 
+    def signature_tags
+      @documents.values.flat_map do |document|
+        document.text.strip.scan(/\[\[sig_.+?\]\]/)
+      end
+    end
+
+    def usable_signature_tags
+      @documents.values.flat_map do |document|
+        document.css('w|t')
+          .select { |tag| tag.text =~ /\[\[sig_.+?\]\]/ }
+          .flat_map { |tag| tag.text.scan(/\[\[sig_.+?\]\]/) }
+      end
+    end
+
+    def usable_signature_tag_names
+      self.usable_signature_tags.map do |tag|
+        tag.scan(/\[\[sig_(.+?)\]\]/)
+        $1
+      end.compact.uniq
+    end
+
+    def unusable_signature_tags
+      unusable_signature_tags = signature_tags
+      unusable_signature_tags.each do |usable_tag|
+        index = unusable_signature_tags.index(usable_tag)
+        unusable_signature_tags.delete_at(index) if index
+      end
+      return unusable_signature_tags
+    end
+
     def tags
       @documents.values.flat_map do |document|
         document.text.strip.scan(/\{\{.+?\}\}/)
@@ -58,10 +88,10 @@ module LMDocstache
       File.open(path, "w") { |f| f.write buffer.string }
     end
 
-    def render_file(output, data={})
+    def render_file(output, data={}, remove_signature_tags = false)
       rendered_documents = Hash[
         @documents.map do |(path, document)|
-          [path, LMDocstache::Renderer.new(document.dup, data).render]
+          [path, LMDocstache::Renderer.new(document.dup, data, remove_signature_tags).render]
         end
       ]
       buffer = zip_buffer(rendered_documents)
@@ -111,7 +141,12 @@ module LMDocstache
 
     def flatten_paragraph(p)
       runs = p.css('w|r')
+
       host_run = runs.shift
+      until host_run.at_css('w|t').present? || runs.size == 0 do
+        host_run = runs.shift
+      end
+
       runs.each do |run|
         host_run.at_css('w|t').content += run.text
         run.unlink

data/lib/lm_docstache/renderer.rb

@@ -2,14 +2,16 @@ module LMDocstache
   class Renderer
     BLOCK_REGEX = /\{\{([\#\^])([\w\.]+)(?:(\s(?:==|~=)\s?.+?))?\}\}.+?\{\{\/\k<2>\}\}/m
 
-    def initialize(xml, data)
+    def initialize(xml, data, remove_signature_tags = false)
       @content = xml
       @data = DataScope.new(data)
+      @remove_signature_tags = remove_signature_tags
     end
 
     def render
       find_and_expand_blocks
       replace_tags(@content, @data)
+      remove_signature_tags(@content) if @remove_signature_tags
       return @content
     end
 
@@ -106,7 +108,7 @@ module LMDocstache
 
     def replace_tags(elements, data)
       elements.css('w|t').each do |text_el|
-        if !(results = text_el.text.scan(/\{\{([\w\.]+)\}\}/).flatten).empty?
+        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)
@@ -117,6 +119,20 @@ module LMDocstache
       return elements
     end
 
+    def remove_signature_tags(elements)
+      elements.css('w|t').each do |text_el|
+        if !(results = text_el.text.scan(/\[\[sig_(.+?)\]\]/).flatten).empty?
+          rendered_string = text_el.text
+          results.each do |r|
+            padding = "".ljust(r.length + 8, " ")
+            rendered_string.gsub!("[[sig_#{r}]]", padding)
+          end
+          text_el.content = rendered_string
+        end
+      end
+      return elements
+    end
+
     private
 
     def get_condition(name, condition, inverted = false)

data/lib/lm_docstache/version.rb

@@ -1,3 +1,3 @@
 module LMDocstache
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lm_docstache.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
   s.add_runtime_dependency 'rubyzip', '~> 1.1'
-  s.add_runtime_dependency 'activesupport', '6.0.3.2'
 
-  s.add_development_dependency 'rspec', '>= 3.1.0'
-  s.add_development_dependency 'pry-byebug', '>= 1'
+  s.add_development_dependency 'rspec', '~> 3.1', '>= 3.1.0'
+  s.add_development_dependency 'pry-byebug', '~> 1'
+  s.add_development_dependency 'activesupport', '~> 3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Roey Chasman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -40,20 +40,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.0.3.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.0.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,20 +57,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Integrates data into MS Word docx template files. Processing supports
   loops and replacement of strings of data both outside and within loops.
 email:
@@ -92,12 +98,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/gem-push.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/.github/workflows/gem-push.yml

@@ -1,42 +0,0 @@
-name: Ruby Gem
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    name: Build + Publish
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-        OWNER: ${{ github.repository_owner }}
-
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: .
-  specs:
-    lm_docstache (1.2.0)
-      activesupport (= 6.0.3.2)
-      nokogiri (~> 1.6)
-      rubyzip (~> 1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.4.4)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubyzip (1.3.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  lm_docstache!
-  pry-byebug (>= 1)
-  rspec (>= 3.1.0)
-
-BUNDLED WITH
-   1.17.2