txbr 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cd2b1c7f112ffc17ecc1c94b5554a6f317e30052aabb0a8e5c6166cc85c329
-  data.tar.gz: be7802bd15965b7123abb22bf3e27fbccfe62660eaac9738c55a8e35cfd24f9e
+  metadata.gz: af6782638d9d86f0593f7d1bd4066684dcb447f805e5c324fa1471e8f28bc3bc
+  data.tar.gz: 565be3c3aba1c78725433ab38d54bfb6930bd05afb40e385157e14a4233d1855
 SHA512:
-  metadata.gz: eb9e39e6d90512286d9f48f83b70cda2bfdcfeebbf4021c970e171a00ca20a7afdd32729c5470c650b31f3fe15b61634f65b162d85a60cab74beaf46ef13657c
-  data.tar.gz: 5d97695feea4607cf5746af8ea7f3cb30bd60d3e385104d3ea2d32b8aa67c17271c9af79d35631bc05e52818eb6375979bb581ac256de1772ac50c9c82dbf170
+  metadata.gz: 2945218cdb7970b015336e857d4cd766ffdbc9bc25459c27bd2c69fc630c3df00368c24c2584bd762f9e50535b4e479738492d5876e42b7c272dc96db4285a52
+  data.tar.gz: 6a1cb78704a76414ce698a637e9f80e65577c4d85baa024ea49f22bcea71b15203f048931c91c110c2b7f7253483a57b715e5fd294dd7a64281348f5bf43478d

data/lib/txbr/template.rb

@@ -69,10 +69,24 @@ module Txbr
     # Otherwise, transform the var into something Liquid-friendly so it
     # doesn't jam up the parser.
     def prerender(source, variables)
-      source.gsub(/\{\{\s*(?:[\w\-\.\[\]]+\.)?\$\{\s*[\w\-\.\[\]]+\s*\}\s*\}\s*\}/) do |orig|
-        orig = orig[2..-3]  # remove curlies
-        next variables[orig] if variables.include?(orig)
-        "{{#{normalize_braze_var(orig)}}}"
+      source.gsub(/\{\s*\{\s*(?:[\w\-\_\.\[\]]+\.)?\$\{\s*[\w\-\.\[\]]+\s*\}?\s*\}?\s*\}?/) do |orig|
+        plain = orig.sub(/\A\{\{/, '').sub(/\}\}\z/, '')
+
+        result = if val = variables[plain]
+          "\"#{val}\""
+        else
+          normalize_braze_var(orig)
+        end
+
+        if orig.tr(' ', '').start_with?('{{')
+          result = "{{#{result}"
+        end
+
+        if orig.tr(' ', '').end_with?('}}')
+          result << '}}'
+        end
+
+        result
       end
     end
 

data/lib/txbr/version.rb

@@ -1,3 +1,3 @@
 module Txbr
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end

data/spec/template_spec.rb

@@ -9,6 +9,7 @@ describe Txbr::Template do
     <<~SRC
       <h1>Braze campaign is {{campaign.${api_id}}}</h1>
       <h2>Hello, {{${first_name}}}</h2>
+      <h3>I speak {{custom_attributes.${preferred_language} | default: 'en'}}</h3>
     SRC
   end
 
@@ -24,13 +25,18 @@ describe Txbr::Template do
       expect(subject.render).to eq(<<~TEXT)
         <h1>Braze campaign is abc123</h1>
         <h2>Hello, Dwight</h2>
+        <h3>I speak en</h3>
       TEXT
     end
   end
 
   context 'with no variable replacements' do
     it 'renders without erroring' do
-      expect { subject.render }.to_not raise_error
+      expect(subject.render).to eq(<<~TEXT)
+        <h1>Braze campaign is </h1>
+        <h2>Hello, </h2>
+        <h3>I speak en</h3>
+      TEXT
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txbr
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad