jekyll-attendease 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6d2a59f330d1e40082dc6c2894f1662e024c31c
-  data.tar.gz: c32997bd96d2f403625ed705536095e47020f62b
+  metadata.gz: bd5a69a540b248bf67785ce3845b8a6e1230fed2
+  data.tar.gz: 3c96284cfdc27734e9497b149d8b4dadaa421a58
 SHA512:
-  metadata.gz: 2f548aca262b8d887feb3c9563c878ca43f28ee45332385a9c8ae5131d45da5157f1b5358329dc4556897961882dbca4f01e13762256b5cd12dfa563a893cd6c
-  data.tar.gz: 149e23c7d3efc40532483fa7c4f45f948c3340e59642ffdabfec1ec3b37c0dd39e56d2369a1eb6d939878a1d2c4c9389acc7b825734e5e71490b4ef91babd3b4
+  metadata.gz: 420ffd467a791c03541a344c2e47d4c6dd726e82e3212ee0bf49ac458ba4ad66b2639473941eb42475a58d04d57c7eab79ec654aaf29565b3b24702e7ddd48bd
+  data.tar.gz: 7508996f41f5fb93879e74666de9ae269d1855825fda2da77c6b867cd09fcfcb66f354b94c3af940a3176763d21d260256f8053ab91c41b8e7a5503224f293b0

data/lib/jekyll/attendease_plugin.rb

@@ -33,6 +33,7 @@ require 'jekyll/attendease_plugin/sponsors_index_page'
 require 'jekyll/attendease_plugin/venues_index_page'
 require 'jekyll/attendease_plugin/venue_page'
 require 'jekyll/attendease_plugin/site_page'
+require 'jekyll/attendease_plugin/site_page_data'
 
 # Ve.rs.ion
 require 'jekyll/attendease_plugin/version'

data/lib/jekyll/attendease_plugin/config_mixin.rb

@@ -18,4 +18,8 @@ module AttendeaseJekyllConfigMixin
   def live_mode?
     !!attendease['live_mode']
   end
+
+  def private_site?
+    !!attendease['private_site']
+  end
 end

data/lib/jekyll/attendease_plugin/site_page_data.rb

@@ -0,0 +1,106 @@
+module Jekyll
+  module AttendeasePlugin
+    class SitePageData < Page
+      attr_reader :page
+      attr_reader :site
+
+      PLACEHOLDER_REGEX = /\{\{/.freeze
+
+      def initialize(site, base, page, private_site)
+        @site = site
+        @base = base
+        @dir = page['slug']
+        @page = page
+        @name = "index#{private_site ? '-private' : ''}.json"
+
+        # The Jekyll::Regenerator expects data to exist and crashes without it.
+        # https://github.com/jekyll/jekyll/blob/v3.3.1/lib/jekyll/regenerator.rb#L166
+        @data = {}
+
+        self.process(@name)
+      end
+
+      def render_with_liquid?
+        false
+      end
+
+      def place_in_layout?
+        false
+      end
+
+      # Override the accessor:
+      #
+      # https://github.com/jekyll/jekyll/blob/v3.3.1/lib/jekyll/renderer.rb#L78
+      #
+      # The Jekyll::Rendereer calls document.content, so this seems like the
+      # best way to set our "page" content with what we want.
+      #
+      def content
+        zones = {}
+        keys = %w[content preferences]
+
+        if page['block_instances'].length
+          # create zone buckets
+          page['block_instances'].each do |i|
+            # go through all content
+            if site.config.event?
+              keys.each do |key|
+                i[key].each do |k, v|
+                  if placeholder?(v)
+                    # maintain the {{ t.foo }} variables
+                    v.gsub!(/(\{\{\s*t\.[a-z_.]+\s*\}\})/, '{% raw %}\1{% endraw %}')
+                    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
+
+          # sort each bucket by widget weight
+          zones.each do |k, zone|
+            zone.sort! { |x, y| x['weight'] <=> y['weight'] }
+          end
+        end
+
+        zones.to_json
+      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/site_pages_generator.rb

@@ -2,8 +2,6 @@ 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
       #    To check the structure sample go in your vagrant to
@@ -15,84 +13,10 @@ module Jekyll
 
             page['name'] = CGI.escapeHTML(page['name']) if page['name']
             site.pages << SitePage.new(site, site.source, page)
-
-            zones = {}
-            keys = %w[content preferences]
-
-            if page['block_instances'].length
-              # create zone buckets
-              page['block_instances'].each do |i|
-                # go through all content
-                if site.config.event?
-                  keys.each do |key|
-                    i[key].each do |k, v|
-                      if placeholder?(v)
-                        # maintain the {{ t.foo }} variables
-                        v.gsub!(/(\{\{\s*t\.[a-z_.]+\s*\}\})/, '{% raw %}\1{% endraw %}')
-                        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
-
-              # sort each bucket by widget weight
-              zones.each do |k, zone|
-                zone.sort! { |x, y| x['weight'] <=> y['weight'] }
-              end
-
-              page_source_path = File.join(site.source, page['slug'])
-              FileUtils.mkdir_p(page_source_path) unless File.exists?(page_source_path)
-
-              json_filename = site.config.attendease['private_site'] ? 'index-private.json' : 'index.json'
-
-              File.open(File.join(page_source_path, json_filename), 'w') do |f|
-                f.write zones.to_json
-                f.close
-              end
-
-              site.static_files << StaticFile.new(site, site.source, File.join('', page['slug']), json_filename)
-            end
+            site.pages << SitePageData.new(site, site.source, page, site.config.private_site?)
           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,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.9.6'
+    VERSION = '0.9.7'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Michael Wood
@@ -184,6 +184,7 @@ files:
 - lib/jekyll/attendease_plugin/schedule_session_page.rb
 - lib/jekyll/attendease_plugin/schedule_sessions_page.rb
 - lib/jekyll/attendease_plugin/site_page.rb
+- lib/jekyll/attendease_plugin/site_page_data.rb
 - lib/jekyll/attendease_plugin/site_pages_generator.rb
 - lib/jekyll/attendease_plugin/sponsor_generator.rb
 - lib/jekyll/attendease_plugin/sponsors_index_page.rb