jekyll-attendease 0.6.1 → 0.6.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c6babd1870a4e7bf21953cac303f50e3279816
-  data.tar.gz: 42ddbde603be6c2d82b25ad25becd8248f4a88cf
+  metadata.gz: 5e82bfbb32172afdd9527910b6ee9aa514ac7424
+  data.tar.gz: 6a0f6cf1dfcd936ccf12fcea52de932872392c41
 SHA512:
-  metadata.gz: 3028a82d5c90d131c9cdfc2579d1ff3347ae14eaa1c97bffee5ecdab9cc7cae97004c338dbbaa7ca051d84f49c0a6d8da7c82e8dbd270b6a1d6dd27390bedfd2
-  data.tar.gz: a08e3ff4945fa97061a8e2575bc7c24085ffa35d2f6512fe381893bab7ea94403e17133b88d2a6793170990c983b22768157561b19ec634a14d8a121ea1a7ff3
+  metadata.gz: 9bc7cff588bb05f24d406bb88a172408aa96b9cdd4afd315cbe07491de670bacc0a8193d354b2279ee1770e5b9d5c67eca41bc2c6b4ff117fbae6ff181171713
+  data.tar.gz: 9f6cade078d100bd60d7b69ff566b14781587d636c969f9ad4de85e069224a65272c942c65f6a3d6acc7b3c89754de0b9bb726ccc58f7508c263f4ccd8588859

data/lib/jekyll/attendease_plugin.rb

@@ -8,6 +8,7 @@ require 'jekyll/attendease_plugin/tags'
 require 'jekyll/attendease_plugin/filters'
 require 'jekyll/attendease_plugin/helpers'
 
+require 'jekyll/attendease_plugin/event_layout_page'
 require 'jekyll/attendease_plugin/presenters_index_page'
 require 'jekyll/attendease_plugin/presenter_page'
 require 'jekyll/attendease_plugin/schedule_day_page'

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    class EventDataGenerator < ::Jekyll::Generator
+    class EventDataGenerator < Generator
       safe true
 
       priority :highest

data/lib/jekyll/attendease_plugin/event_layout_generator.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    class EventLayoutGenerator < ::Jekyll::Generator
+    class EventLayoutGenerator < Generator
       safe true
 
       priority :high
@@ -8,35 +8,78 @@ module Jekyll
       def generate(site)
         Jekyll.logger.debug "[Attendease] Generating theme layouts..."
 
-        attendease_precompiled_theme_layouts_path = File.join(site.source, 'attendease_layouts')
+        attendease_precompiled_theme_layouts_path = File.join(site.source, 'attendease_layouts') # These are compiled to the html site.
+        attendease_precompiled_theme_email_layouts_path = File.join(site.source, 'attendease_layouts', 'emails') # These are compiled for email.
+        attendease_theme_layouts_path = File.join(site.source, '_attendease', 'layouts') # These are used for page generation (no output html file needed)
 
         FileUtils.mkdir_p(attendease_precompiled_theme_layouts_path)
+        FileUtils.mkdir_p(attendease_theme_layouts_path)
 
-        base_layout = site.config['attendease']['base_layout']
 
-        layouts_to_precompile = %w{ layout register schedule presenters venues sponsors }
+        # Precompiled layouts for attendease app and jekyll generated pages.
+        base_layout = site.config['attendease']['base_layout'] || 'layout'
 
-        # Precompiled layout for website sections.
+        base_layout_file = File.join(site.source, '_layouts', "#{base_layout}.html")
+        unless File.exists?(base_layout_file)
+          # Generate an extremely simple base layout if it does not exist.
+          File.open(base_layout_file, 'w+') { |f| f.write("{{ content }}") }
+        end
+
+        layouts_to_precompile = %w{ layout register surveys } # These are compiled to the html site.
         layouts_to_precompile.each do |layout|
-          if File.exists?(File.join(site.source, 'attendease_layouts', "#{base_layout}.html"))
-            # create a layout file if it already doesn't exist.
-            # the layout file will be used by attendease to wrap /register, /schedule, /presenters in the
-            # look the compiled file defines.
-            # ensure {{ content }} is in the file so we can render content in there!
-            unless File.exists?(File.join(attendease_precompiled_theme_layouts_path, "#{layout}.html"))
-              FileUtils.cp File.join(site.source, 'attendease_layouts', "#{base_layout}.html"), File.join(site.source, 'attendease_layouts', "#{layout}.html")
-              #site.pages << LayoutPage.new(site, site.source, 'attendease_layouts', "#{layout}.html", base_layout)
-            end
-          else
-            Jekyll.logger.debug "Could not find attendease_layouts/#{base_layout}.html in your site source. Using the built-in template from jekyll-attendease."
-            #FileUtils.cp File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'templates', 'layout.html')), File.join(site.source, 'attendease_layouts', "#{base_layout}.html")
+          # create a layout file if it already doesn't exist.
+          # the layout file will be used by attendease to wrap /register, /schedule, /presenters, '/surveys'
+          # in the look these compiled file define.
+          # ensure {{ content }} is in the file so we can render content in there!
+          unless File.exists?(File.join(attendease_precompiled_theme_layouts_path, "#{layout}.html"))
+            site.pages << EventLayoutPage.new(site, site.source, 'attendease_layouts', "#{layout}.html", base_layout, layout.capitalize)
+          end
+        end
+
+
+        # Precompiled layouts for attendease email
+        base_email_layout = site.config['attendease']['base_email_layout'] || 'email'
+        base_email_layout_file = File.join(site.source, '_layouts', "#{base_email_layout}.html")
+        unless File.exists?(base_email_layout_file)
+          # Generate an extremely simple base email layout if it does not exist.
+          File.open(base_email_layout_file, 'w+') { |f| f.write("{{ content }}") }
+        end
+
+        layouts_to_precompile = %w{ layout } # These are pre-compiled for email.
+        layouts_to_precompile.each do |layout|
+          # create a layout file if it already doesn't exist.
+          unless File.exists?(File.join(attendease_precompiled_theme_email_layouts_path, "#{layout}.html"))
+            site.pages << EventLayoutPage.new(site, site.source, 'attendease_layouts/emails', "#{layout}.html", base_email_layout, layout.capitalize)
+          end
+        end
+
+
+        # Layouts to use for page generation. (These layouts do not need to be part of the html output)
+        layouts_for_page_generation = %w{ layout schedule presenters venues sponsors }
+
+        source_template = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'templates', 'layout.html'))
+        html = Liquid::Template.parse(File.read(source_template)).render('page' => { 'base_layout' => base_layout })
+
+        layouts_for_page_generation.each do |layout|
+          base_layout_path = File.join(site.source, '_layouts', "#{base_layout}.html")
+
+          unless File.exists?(base_layout_path)
+            Jekyll.logger.debug "Could not find _layouts/#{base_layout}.html in your site source. Using the built-in template from jekyll-attendease."
+
             source_template = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'templates', 'layout.html'))
             html = Liquid::Template.parse(File.read(source_template)).render('page' => { 'base_layout' => base_layout })
 
-            File.open(File.join(site.source, 'attendease_layouts', "#{base_layout}.html"), 'w') { |f| f.write(html) }
-            #site.pages << LayoutPage.new(site, site.source, 'attendease_layouts', "#{layout}.html", base_layout)
+            File.open(base_layout_path, 'w') { |f| f.write(html) }
+          end
+
+          layout_path = File.join(attendease_theme_layouts_path, "#{layout}.html")
+
+          unless File.exists?(layout_path)
+            #puts "generating #{layout}.html..."
+            File.open(layout_path, 'w') { |f| f.write(html) }
           end
         end
+
       end
     end
   end

data/lib/jekyll/attendease_plugin/event_layout_page.rb

@@ -0,0 +1,27 @@
+module Jekyll
+  module AttendeasePlugin
+    class EventLayoutPage < Page
+      def initialize(site, base, dir, name, base_layout, title_prefix)
+        @site = site
+        @base = base
+        @dir = dir
+        @name = name
+
+        self.process(name)
+
+        self.read_yaml(File.join(base, '_layouts'), "#{base_layout}.html")
+
+        self.data = {}
+
+        self.data['layout'] = base_layout
+        self.data['base_layout'] = base_layout
+
+        title_prefix = 'Hello' if title_prefix == 'Layout' # Use "Hello" for the title of the main layout page.
+
+        self.data['title'] = title_prefix
+
+        self.content = "{% raw %}{{ content }}{% endraw %}"
+      end
+    end
+  end
+end

data/lib/jekyll/attendease_plugin/presenter_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'presenters.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'presenters.html')
 
         presenter_page_title = site.config['presenter_page_title'] ? site.config['presenter_page_title'] : 'Presenter: %s'
         self.data['title'] = sprintf(presenter_page_title, presenter['first_name'] + ' ' + presenter['last_name'])

data/lib/jekyll/attendease_plugin/presenters_index_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'presenters.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'presenters.html')
 
         self.data['title'] = site.config['presenters_index_title'] || 'Presenters'
 

data/lib/jekyll/attendease_plugin/redirect_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'layout.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'layout.html')
         self.data = {}
 
         self.data['redirect_url'] = redirect_url

data/lib/jekyll/attendease_plugin/schedule_day_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'schedule.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'schedule.html')
 
         session_day_title_prefix = site.config['schedule_day_title_prefix'] || 'Schedule: '
         self.data['title'] = "#{session_day_title_prefix}#{day['date_formatted']}"

data/lib/jekyll/attendease_plugin/schedule_index_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'schedule.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'schedule.html')
 
         self.data['title'] = site.config['schedule_index_title_prefix'] || 'Schedule'
 

data/lib/jekyll/attendease_plugin/schedule_session_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'schedule.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'schedule.html')
 
         schedule_session_page_title = site.config['schedule_session_page_title'] || 'Schedule: %s'
         self.data['title'] = sprintf(schedule_session_page_title, session['name'])

data/lib/jekyll/attendease_plugin/schedule_sessions_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'schedule.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'schedule.html')
 
         self.data['title'] = site.config['schedule_sessions_title'] || 'Schedule: Sessions'
 

data/lib/jekyll/attendease_plugin/sponsor_generator.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    class SponsorGenerator < ::Jekyll::Generator
+    class SponsorGenerator < Generator
       safe true
 
       def generate(site)

data/lib/jekyll/attendease_plugin/sponsors_index_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'sponsors.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'sponsors.html')
 
         self.data['title'] = site.config['sponsors_index_title'] || 'Sponsors'
 

data/lib/jekyll/attendease_plugin/venue_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'venues.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'venues.html')
 
         venue_page_title = site.config['venue_page_title'] ? site.config['venue_page_title'] : 'Venue: %s'
         self.data['title'] = sprintf(venue_page_title, venue['name'])

data/lib/jekyll/attendease_plugin/venues_index_page.rb

@@ -9,7 +9,7 @@ module Jekyll
 
         self.process(@name)
 
-        self.read_yaml(File.join(base, 'attendease_layouts'), 'venues.html')
+        self.read_yaml(File.join(base, '_attendease', 'layouts'), 'venues.html')
 
         self.data['title'] = site.config['venues_index_title'] || 'Venues'
 

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = "0.6.1"
+    VERSION = "0.6.2.pre"
   end
 end
 

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

@@ -2,9 +2,21 @@ require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::EventLayoutGenerator do
 
-  it 'creates the layout stubs' do
-    %w{ layout register schedule presenters venues sponsors }.each do |layout|
-      expect(File.exists?(File.join(@site.source, 'attendease_layouts', "#{layout}.html"))).to eq(true)
+  it 'creates the generated page layout stubs' do
+    %w{ layout schedule presenters venues sponsors }.each do |layout|
+      expect(File.exists?(File.join(@site.source, '_attendease', 'layouts', "#{layout}.html"))).to eq(true)
+    end
+  end
+
+  it 'creates the pre-compiled layout stubs' do
+    %w{ layout register surveys }.each do |layout|
+      expect(File.exists?(File.join(@site.config['destination'], 'attendease_layouts', "#{layout}.html"))).to eq(true)
+    end
+  end
+
+  it 'creates the pre-compiled email layout stubs' do
+    %w{ layout }.each do |layout|
+      expect(File.exists?(File.join(@site.config['destination'], 'attendease_layouts', 'emails', "#{layout}.html"))).to eq(true)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2.pre
 platform: ruby
 authors:
 - Michael Wood
@@ -16,98 +16,98 @@ dependencies:
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -130,8 +130,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/jekyll-attendease.rb
+- lib/jekyll/attendease_plugin.rb
 - lib/jekyll/attendease_plugin/event_data_generator.rb
 - lib/jekyll/attendease_plugin/event_layout_generator.rb
+- lib/jekyll/attendease_plugin/event_layout_page.rb
 - lib/jekyll/attendease_plugin/filters.rb
 - lib/jekyll/attendease_plugin/helpers.rb
 - lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator.rb
@@ -149,8 +152,16 @@ files:
 - lib/jekyll/attendease_plugin/venue_page.rb
 - lib/jekyll/attendease_plugin/venues_index_page.rb
 - lib/jekyll/attendease_plugin/version.rb
-- lib/jekyll/attendease_plugin.rb
-- lib/jekyll-attendease.rb
+- spec/lib/jekyll/attendease_plugin/event_data_generator_spec.rb
+- spec/lib/jekyll/attendease_plugin/event_layout_generator_spec.rb
+- spec/lib/jekyll/attendease_plugin/filters_spec.rb
+- spec/lib/jekyll/attendease_plugin/helpers_spec.rb
+- spec/lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator_spec.rb
+- spec/lib/jekyll/attendease_plugin/schedule_generator_spec.rb
+- spec/lib/jekyll/attendease_plugin/sponsor_generator_spec.rb
+- spec/lib/jekyll/attendease_plugin/tags_spec.rb
+- spec/spec_helper.rb
+- spec/support/fixtures_helpers.rb
 - templates/_includes/attendease/presenters/index.html
 - templates/_includes/attendease/presenters/presenter.html
 - templates/_includes/attendease/redirect.html
@@ -162,16 +173,6 @@ files:
 - templates/_includes/attendease/venues/index.html
 - templates/_includes/attendease/venues/venue.html
 - templates/layout.html
-- spec/lib/jekyll/attendease_plugin/event_data_generator_spec.rb
-- spec/lib/jekyll/attendease_plugin/event_layout_generator_spec.rb
-- spec/lib/jekyll/attendease_plugin/filters_spec.rb
-- spec/lib/jekyll/attendease_plugin/helpers_spec.rb
-- spec/lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator_spec.rb
-- spec/lib/jekyll/attendease_plugin/schedule_generator_spec.rb
-- spec/lib/jekyll/attendease_plugin/sponsor_generator_spec.rb
-- spec/lib/jekyll/attendease_plugin/tags_spec.rb
-- spec/spec_helper.rb
-- spec/support/fixtures_helpers.rb
 homepage: https://attendease.com/
 licenses:
 - MIT
@@ -182,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll