jekyll-attendease 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f496291ebc4d6359cac73f3a3eee3c84768744594126c8d80ae394d797190ffa
-  data.tar.gz: 86a4d88e946251c8def7844b9404284f423d3ca199de33c030fac53b62792f9d
+SHA1:
+  metadata.gz: f34a3a54e23f0d3b76b52f58ab12428d001bb44f
+  data.tar.gz: 7ccb50dc81a6afa20724df44d60fdf2481603a66
 SHA512:
-  metadata.gz: 87d208fcee1792a570b9c1d09ba825d8fe01ec552d0fd7ec4afb7bca9328a791c1e22a1fe8d358bff272de8ffef1ca01fcf25319d1f69fa3ca4d832cec103e1e
-  data.tar.gz: b98b38e79b3e73a194794507febc8297e256e266bcea91da418c9ca76a519c2e2fc88097040fa63069ec13cacd49560ead3ae5a58736f65c961b931389870647
+  metadata.gz: e2eafd219f7d4901da9cc9da5927385ee45ae83a298c920fb3b07285f5247d086e4ff5ae51e96e9c0b656bf2a53be4985a0ff3da5586a32b9679c450f474979e
+  data.tar.gz: 34457707f96c7b80acab36729f5ffc9a0b8b6203a16e4cf0cf5ba13e05aa539bb31c64136e92ee74650ad27eb583187cb6d57883bbe19c6feb852b057242e4df

data/lib/jekyll/attendease_plugin/_config.yaml

@@ -17,4 +17,3 @@ attendease:
   has_rooms:                false
   has_filters:              false
   has_venues:               false
-  has_mappable:             false

data/lib/jekyll/attendease_plugin/site_pages_generator.rb

@@ -2,6 +2,7 @@ module Jekyll
   module AttendeasePlugin
     class SitePagesGenerator < Generator
       safe true
+      PLACEHOLDER_REGEX = /\{\{/.freeze
 
       # site.config:
       #    Is where you can find the configs generated for your site
@@ -25,14 +26,19 @@ module Jekyll
                 if site.config.event?
                   keys.each do |key|
                     i[key].each do |k, v|
-                      if v.is_a?(String) && v.match(/\{\{/)
+                      if placeholder?(v)
                         # maintain the {{ t.foo }} variables
                         v.gsub!(/(\{\{\s*t\.[a-z_.]+\s*\}\})/, '{% raw %}\1{% endraw %}')
-                        i[key][k] = Liquid::Template.parse(v).render('event' => site.data['event'], 'mappable' => site.data['mappable'])
+                        i[key][k] = render_with_substitutions(v, 'event' => site.data['event'], 'mappable' => site.data['mappable'])
                       end
                     end
                   end
+
+                  unless site.data['mappable'].nil? || site.data['mappable'].empty?
+                    perform_substitution!(i, 'mappable' => site.data['mappable'])
+                  end
                 end
+
                 zones[i['zone']] = [] if zones[i['zone']].nil?
                 zones[i['zone']] << i
               end
@@ -57,6 +63,36 @@ module Jekyll
           end
         end
       end
+
+      private
+
+      def perform_substitution!(object, substitution_lookup)
+        if object.is_a?(Hash)
+          object.each_pair do |k, v|
+            if placeholder?(v)
+              object[k] = render_with_substitutions(v, substitution_lookup)
+            else
+              perform_substitution!(v, substitution_lookup)
+            end
+          end
+        elsif object.is_a?(Array)
+          object.each_with_index do |e, i|
+            if placeholder?(e)
+              object[i] = render_with_substitutions(e, substitution_lookup)
+            else
+              perform_substitution!(e, substitution_lookup)
+            end
+          end
+        end
+      end
+
+      def placeholder?(object)
+        object.is_a?(String) && object =~ PLACEHOLDER_REGEX
+      end
+
+      def render_with_substitutions(template_string, substitution_lookup)
+        Liquid::Template.parse(template_string).render(substitution_lookup)
+      end
     end
   end
 end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.9.2'
+    VERSION = '0.9.3'
   end
 end
+

data/spec/lib/jekyll/attendease_plugin/site_pages_generator_spec.rb

@@ -23,6 +23,14 @@ RSpec.describe Jekyll::AttendeasePlugin::SitePagesGenerator do
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
+
+    it 'parses mappable placeholders' do
+      slug = page['slug']
+      file = File.join(site.config['destination'], slug, 'index.json')
+      json = JSON.parse(File.read(file))
+      expect(json['dropzone1'][0]['content']['text']).to eq('Hello world')
+      expect(json['dropzone1'][0]['preferences']['foo']).to eq('Hello world')
+    end
   end
 
   context 'page with XSS' do

data/spec/spec_helper.rb

@@ -83,6 +83,7 @@ RSpec.configure do |config|
         'has_rooms'                => true,
         'has_filters'              => true,
         'has_venues'               => true,
+        'has_mappable'             => true,
         'environment'              => 'test',
         'locale'                   => 'en',
         'source_id'                => 'foobar',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Michael Wood
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll