lm_docstache 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b345230c53f335f5de05dccdaca946bf30edaee21031c219dbdad1315c61c915
-  data.tar.gz: 554faf30a6988614877f20d72d172d1a66c11bcb2a145f4eb4efd45f7a598fb0
+  metadata.gz: 47845e207f960356863df098a2631bc36d931322a7e40b6186d3d47370019691
+  data.tar.gz: 638c0ff557da45899078382405d497f425aa44e9ba3b7e1a0c65f04d75936b95
 SHA512:
-  metadata.gz: 66732e83ef4cbd515c10904dd293a29346bb1278f1bcfa3ad7becc6e027798f8ca2ca1534f2a9ffc86ee1e4db2d632cd6c926fd703975f386524fd42ccd48516
-  data.tar.gz: f3ff05f0d5e5b55e3c6eb3e070713b625f74544d667816a71a761d48521ffda12146ff72b3a1189b9a794b8a190a60ea7227a374c0c58711471fba1786de0ce4
+  metadata.gz: d6ba622f15f7c430cf806ee4cb93174e8daa9d3d5651106093f1e6e64bb429788747ef9a47b9dc0ee937da20ccaf4f9641514742b65445c463ce7cadea6fa36c
+  data.tar.gz: 9f9bc5d175c63671065accb0dbe7f2db5a127a6e159338f38f40c6fec967a4209ab28167616a320cd90d8692a42857a977634fcb221d8e4c22806ffbb8b5c626

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

@@ -0,0 +1,42 @@
+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/.github/workflows/ruby.yml

@@ -0,0 +1,29 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: push
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: 2.6
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: rspec

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.2.1
+* Fix inline conditional issues such as no support for multi conditionals.
+
 ## 1.2.0
 * Add support for inline conditionals.
 * Add some tests.

data/Gemfile.lock

@@ -2,17 +2,28 @@ 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)
@@ -35,6 +46,10 @@ GEM
       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

data/lib/lm_docstache/block.rb

@@ -45,7 +45,7 @@ module LMDocstache
             if match.elements.any?
               find_all(name: name, data: data, elements: match.elements, inverted: inverted, condition: condition, child: true)
             else
-              extract_block_from_element(name: name, data: data, element: match, inverted: inverted, condition: condition)
+              extract_block_from_element(name, data, match, inverted, condition)
             end
           end
         else
@@ -64,7 +64,7 @@ module LMDocstache
       end
     end
 
-    def self.extract_block_from_element(name: name, data: data, element: element, inverted: inverted, condition: condition)
+    def self.extract_block_from_element(name, data, element, inverted, condition)
       return Block.new(name: name, data: data, opening_element: element.parent.previous, content_elements: [element.parent], closing_element: element.parent.next, inverted: inverted, condition: condition, inline: true)
     end
   end

data/lib/lm_docstache/renderer.rb

@@ -43,7 +43,7 @@ module LMDocstache
     def expand_and_replace_block(block)
       case block.type
       when :conditional
-        condition = get_condition(block)
+        condition = get_condition(block.name, block.condition, block.inverted)
         unless condition
           block.content_elements.each(&:unlink)
         end
@@ -69,13 +69,13 @@ module LMDocstache
     end
 
     def replace_conditionals(block)
-      condition = get_condition(block)
-
       @content.css('w|t').each do |text_el|
         rendered_string = text_el.text
 
         if !(results = rendered_string.scan(/{{#(.*?)}}(.*?){{\/(.*?)}}/)).empty?
           results.each do |r|
+            vals = r[0].split('==')
+            condition = get_condition(vals[0].strip, "== #{vals[1]}")
             if condition
               rendered_string.sub!("{{##{r[0]}}}", "")
               rendered_string.sub!("{{/#{r[2]}}}", "")
@@ -86,10 +86,12 @@ module LMDocstache
         end
 
         # the only difference in this code block is caret instead of pound in three places,
-        # and the condition being inverted. maybe combine them?
+        # the inverted value passed to get_condition, and the condition being inverted. maybe combine them?
         if !(results = rendered_string.scan(/{{\^(.*?)}}(.*?){{\/(.*?)}}/)).empty?
           results.each do |r|
-            if !condition
+            vals = r[0].split('==')
+            condition = get_condition(vals[0].strip, "== #{vals[1]}", true)
+            if condition
               rendered_string.sub!("{{^#{r[0]}}}", "")
               rendered_string.sub!("{{/#{r[2]}}}", "")
             else
@@ -117,14 +119,14 @@ module LMDocstache
 
     private
 
-    def get_condition(block)
-      case condition = @data.get(block.name, condition: block.condition)
+    def get_condition(name, condition, inverted = false)
+      case condition = @data.get(name, condition: condition)
       when Array
         condition = !condition.empty?
       else
         condition = !!condition
       end
-      condition = !condition if block.inverted
+      condition = !condition if inverted
 
       condition
     end

data/lib/lm_docstache/version.rb

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

data/lm_docstache.gemspec

@@ -19,6 +19,7 @@ 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'

data/spec/conditional_block_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 require 'nokogiri'
 
 module LMDocstache
-  module TestData
+  module BlockTestData
     DATA = {
       gender: 'Male',
+      num: '2',
       first_name: 'Hector',
       last_name: 'Jones'
     }
@@ -12,7 +13,7 @@ module LMDocstache
 end
 
 describe LMDocstache::Renderer do
-  let(:data) { Marshal.load(Marshal.dump(LMDocstache::TestData::DATA)) } # deep copy
+  let(:data) { Marshal.load(Marshal.dump(LMDocstache::BlockTestData::DATA)) } # deep copy
   let(:base_path) { SPEC_BASE_PATH.join('example_input') }
   let(:blank_doc_path) { "#{base_path}/blank.docx" }
   let(:blank_doc) { LMDocstache::Document.new(blank_doc_path) }
@@ -64,6 +65,24 @@ describe LMDocstache::Renderer do
     expect(result_text).to eq(expected_text)
   end
 
+  it 'should handle multiple positive checks in one line' do
+    result_text = render_docx("Refer to the matter as {{#gender == 'Male'}}him{{/gender}}{{#gender == 'Female'}}her{{/gender}} please")
+    expected_text = "Refer to the matter as him please"
+    expect(result_text).to eq(expected_text)
+  end
+
+  it 'should handle multiple positive checks and multiple negative checks in one line' do
+    result_text = render_docx("be {{#num == 1}}1{{/num}}{{#num == 2}}2{{/num}} and {{^num == 2}}!2{{/num}}{{^num == 1}}!1{{/num}} please")
+    expected_text = "be 2 and !1 please"
+    expect(result_text).to eq(expected_text)
+  end
+
+  it 'should handle multiple types of conditionals in one line' do
+    result_text = render_docx("be{{#gender == Male}} he {{/gender}}{{#num == 1}}1{{/num}}{{#num == 2}}2{{/num}} and {{^num == 2}}!2{{/num}}{{^num == 1}}!1{{/num}} please")
+    expected_text = "be he 2 and !1 please"
+    expect(result_text).to eq(expected_text)
+  end
+
   it 'should handle multiline conditional tags' do
     text = [
       "Refer to the matter as",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lm_docstache
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Roey Chasman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -40,6 +40,20 @@ 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
@@ -78,6 +92,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile