txbr 2.5.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cd2b1c7f112ffc17ecc1c94b5554a6f317e30052aabb0a8e5c6166cc85c329
-  data.tar.gz: be7802bd15965b7123abb22bf3e27fbccfe62660eaac9738c55a8e35cfd24f9e
+  metadata.gz: '0568f2b13442d1b261faf8bb8b617b43eec292b21bacb209d0d0089dec986856'
+  data.tar.gz: fc0d22c2387afd76d9901ff1d3543ff7781b3eb63486634ef57b606ce24b706f
 SHA512:
-  metadata.gz: eb9e39e6d90512286d9f48f83b70cda2bfdcfeebbf4021c970e171a00ca20a7afdd32729c5470c650b31f3fe15b61634f65b162d85a60cab74beaf46ef13657c
-  data.tar.gz: 5d97695feea4607cf5746af8ea7f3cb30bd60d3e385104d3ea2d32b8aa67c17271c9af79d35631bc05e52818eb6375979bb581ac256de1772ac50c9c82dbf170
+  metadata.gz: ba0fe6310e773239d610e3ddc7053210108947318f787c2e4b37b97b144844b6b9c1d0edba846a1c763d0125afecf79436911cd93e8ebc20e82c0db0d714a2f0
+  data.tar.gz: c0bcdedf0d9175df3a143a741db768c568c13f78696731d1646a1fa9d3bfefcf5c606e17313803c282d217775ae5b8d1257c9c4b125c344f4e950b634186e96c

data/lib/txbr/campaigns_api.rb

@@ -15,7 +15,7 @@ module Txbr
       page = 0
 
       loop do
-        campaigns = braze_api.get_json(CAMPAIGN_LIST_PATH, page: page)
+        campaigns = braze_api.get_json(CAMPAIGN_LIST_PATH, page: page, include_archived: false)
         campaigns['campaigns'].each(&block)
         break if campaigns['campaigns'].size < CAMPAIGN_BATCH_SIZE
         page += 1

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.6.1'
 end

data/spec/campaigns_api_spec.rb

@@ -20,13 +20,13 @@ describe Txbr::CampaignsApi do
 
     let(:interactions) do
       [{
-        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 0 } },
+        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 0, include_archived: false } },
         response: { status: 200, body: { campaigns: [{ id: '123abc' }] }.to_json }
       }, {
-        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 1 } },
+        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 1, include_archived: false } },
         response: { status: 200, body: { campaigns: [{ id: '456def' }] }.to_json }
       }, {
-        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 2 } },
+        request: { verb: 'get', url: described_class::CAMPAIGN_LIST_PATH, params: { page: 2, include_archived: false } },
         response: { status: 200, body: { campaigns: [] }.to_json }
       }]
     end

data/spec/template_spec.rb

@@ -9,6 +9,8 @@ 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>
+      <h3>{{'foo bar ' | append: custom_attributes.${foobar}}}</h3>
     SRC
   end
 
@@ -16,7 +18,8 @@ describe Txbr::Template do
     let(:prerender_variables) do
       {
         'campaign.${api_id}' => 'abc123',
-        '${first_name}' => 'Dwight'
+        '${first_name}' => 'Dwight',
+        'custom_attributes.${foobar}' => 'baz'
       }
     end
 
@@ -24,13 +27,20 @@ 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>
+        <h3>foo bar baz</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>
+        <h3>foo bar </h3>
+      TEXT
     end
   end
 end

data/txbr.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'liquid', '~> 4.0'
   s.add_dependency 'sinatra', '~> 1.4'
   s.add_dependency 'sinatra-contrib', '~> 1.4'
-  s.add_dependency 'txgh', '~> 6.6'
+  s.add_dependency 'txgh', '~> 7.0'
 
   s.require_path = 'lib'
   s.files = Dir['{lib,spec}/**/*', 'README.md', 'txbr.gemspec', 'LICENSE']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txbr
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.6'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.6'
+        version: '7.0'
 description: A library for syncing translation resources between Braze and Transifex.
 email:
 - camertron@gmail.com
@@ -162,7 +162,7 @@ files:
 homepage: https://github.com/lumoslabs/txbr
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,9 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.7
+signing_key:
 specification_version: 4
 summary: A library for syncing translation resources between Braze and Transifex.
 test_files: []