jekyll-attendease 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9de8cd01965b092bb94b68c8b4b23de9fbf34d31
-  data.tar.gz: df6afb7cc94f2db019efc60afd48e217aa04bc67
+SHA256:
+  metadata.gz: 999a2c4542a7a2bf28e57ac2615475b3d039f09df9a7da9058a16630f74a3425
+  data.tar.gz: 1517ab2468ea9b47fc37837a0c450ffbfb83391ff1c1855314e62c87c674cc7a
 SHA512:
-  metadata.gz: 3c8f250f65fb0de0a9bf5c40f7bb5d4869f632adc50c73d8c964b656a6d96e41cd16bdd2d4c787dae6955cdec1c6ce136ab5979f66951181a438adbef33ebfce
-  data.tar.gz: f4210d4786e0fe862502083f25dc13bcb7e545c003bc6027cb7c92d9c9eebd5a69fd8d7ddf33a454ac6f67e27207f5fca2b80c54880bae4ebedea69c924e77a1
+  metadata.gz: 5da335ad61308e783649ddade55747434a564ba68ceef1aa1d3f566afdeac4c44c9f44043b3cb7caa7d1f80c1e95ec13470ec6d02f851ae59853240e45089fc2
+  data.tar.gz: 0ded6a271d2cc4e303402a70856feadeac8e18dcd1d3adb4cb72d497d00ac7b64248c540d57d086184178a48fafbb48450d7663e9b6f5a5bf7df3931fe523d12

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.rb

@@ -12,6 +12,7 @@ module Jekyll
         self.read_yaml(File.join(base, '_layouts'), "#{page['layout']}.html")
 
         self.data['title'] = page['name']
+        self.data['description'] = page['description']
         self.data['layout'] = page['layout']
 
         self.data['site_page'] = page

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
@@ -14,86 +12,12 @@ module Jekyll
             require 'cgi'
 
             page['name'] = CGI.escapeHTML(page['name']) if page['name']
+            page['description'] = CGI.escapeHTML(page['description']) if page['description']
             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/tags.rb

@@ -183,7 +183,8 @@ module Jekyll
             'pages' => pages,
             'settings' => { parentPagesAreClickable: !!parent_pages_are_clickable },
             'siteSettings' => site_settings,
-            'analytics' => analytics
+            'analytics' => analytics,
+            'basePath' => config['base_path']
           }
         else
           constants = {
@@ -201,7 +202,8 @@ module Jekyll
             'settings' => { parentPagesAreClickable: !!parent_pages_are_clickable },
             'siteSettings' => site_settings,
             'organizationSiteSettings' => organization_site_settings,
-            'analytics' => analytics
+            'analytics' => analytics,
+            'basePath' => config['base_path']
         }
         end
 

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.9.5'
+    VERSION = '0.9.8'
   end
 end
-

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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.8
 platform: ruby
 authors:
 - Michael Wood
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -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
@@ -238,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll