txbr 2.5.0 → 2.6.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159bfa45f2d0f53ef30fe11e2bd6dfbf1b07b0ea0e19530ca3ac3d171308c4ac
-  data.tar.gz: 15621955923af3e6aa17933faf75eb344e5be7a8bd34fe52ea526d1f88a01be3
+  metadata.gz: 97f7a283041d7fe496fe0eda6976ed22fe5a60a60b56eee4b3b07b62eb8b3753
+  data.tar.gz: 7440313a8d353ab7e4d9ae22c5dc5de59c5000d3dc33efdd3bd82eb5f55a7203
 SHA512:
-  metadata.gz: 7247f257169835737f3d834d8afc0cba5930314e439a3629acfa526b4f3d7197eece08194c3f85a848a17932a3aea22540a9386a79699d286f860c140cd8f9c7
-  data.tar.gz: 9416bc14041f5b8b261ecad1de0e8aa7ccaf61d3ddc11297cc6d3aa907cf14c029ae9c3e37b45d53325ed8c2bc6e87af44b580189fae59aa5f2cfb3dbddb70fc
+  metadata.gz: 7732388b13d226baaf99fa8f57a3cba3f5b5ce36b4a267bb3fc2aea94b27b072b2628e43298f7f67beadc70c2036e1647bb3a8b8db8e7c4e76da5bb8022a81fc
+  data.tar.gz: e83c060b3286af19562a6c19e321aa6c8afd7b11578b3cd1537952b7eba7792228f200e31a84882834098463e79d3681e64fa82f1d164de38b9c9a4062e2621c

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

@@ -63,15 +63,30 @@ module Txbr
       end
     end
 
-    # Designed to replace special Braze variables like {{campaign.${api_id}}},
-    # which Liquid can't natively handle. If the variable exists in the given
-    # variables hash, replace it with the value directly. Otherwise, transform
-    # the var into something Liquid-friendly so it doesn't jam up the parser.
+    # Designed to replace special Braze variables like {{campaign.${api_id}}}
+    # and ${first_name}, which Liquid can't natively handle. If the variable
+    # exists in the given variables hash, replace it with the value directly.
+    # Otherwise, transform the var into something Liquid-friendly so it
+    # doesn't jam up the parser.
     def prerender(source, variables)
-      source.gsub(/\{\{[\w\-\.\[\]]+\.\$\{[\w\-\.\[\]]+\}\}\}/) 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.0'
+  VERSION = '2.6.1.beta1'
 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

@@ -8,20 +8,39 @@ describe Txbr::Template do
   let(:source) 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
 
   context 'with a direct variable replacement' do
-    let(:prerender_variables) { { 'campaign.${api_id}' => 'abc123' } }
+    let(:prerender_variables) do
+      {
+        'campaign.${api_id}' => 'abc123',
+        '${first_name}' => 'Dwight',
+        'custom_attributes.${foobar}' => 'baz'
+      }
+    end
 
     it 'prerenders correctly' do
-      expect(subject.render.strip).to eq("<h1>Braze campaign is abc123</h1>")
+      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.0
+  version: 2.6.1.beta1
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2021-04-01 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
@@ -173,13 +173,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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: []