jekyll-attendease 0.9.3 → 0.9.4a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34a3a54e23f0d3b76b52f58ab12428d001bb44f
-  data.tar.gz: 7ccb50dc81a6afa20724df44d60fdf2481603a66
+  metadata.gz: d562d2bfff2850adba28a3405afb4e4195959e1f
+  data.tar.gz: a433801b7b9dfad45f8f337f7ebf57a93b79633c
 SHA512:
-  metadata.gz: e2eafd219f7d4901da9cc9da5927385ee45ae83a298c920fb3b07285f5247d086e4ff5ae51e96e9c0b656bf2a53be4985a0ff3da5586a32b9679c450f474979e
-  data.tar.gz: 34457707f96c7b80acab36729f5ffc9a0b8b6203a16e4cf0cf5ba13e05aa539bb31c64136e92ee74650ad27eb583187cb6d57883bbe19c6feb852b057242e4df
+  metadata.gz: ca8a2cf0d4708f64c1410a8a15cc2d34d8c6a2fb760f436a7b83a26ed44928d22b9f9c05cd0a7d7d042b0f7803e995a36260afaba9c56f7dd3f4e9e079210a71
+  data.tar.gz: 31ab70fb6ee0f06e53dab866c6ba00e01a5ee519d202f037b0281cca065ebfd0711bec25c9fa525fe8e00118e346394e40ea4add8462c11625719bb80cf6eb31

data/lib/jekyll/attendease_plugin.rb

@@ -45,6 +45,8 @@ Jekyll::Hooks.register :site, :after_reset do |site|
 
   site.config['attendease'] = site.config['attendease'].nil? ? default : Jekyll::Utils.deep_merge_hashes(default['attendease'], site.config['attendease'])
 
+  site.config['attendease_source'] ||= site.config['source']
+
   site.config.extend(AttendeaseJekyllConfigMixin)
 
   if site.config.attendease['api_host'].nil?
@@ -55,11 +57,11 @@ end
 Jekyll::Hooks.register :site, :post_write do |site|
   if pages = site.data['pages']
     pages.each do |page|
-      if File.exists?(file = File.join(site.config['source'], page['slug'], 'index.html'))
+      if File.exists?(file = File.join(site.config['attendease_source'], page['slug'], 'index.html'))
         File.unlink(file)
       end
 
-      if File.exists?(file = File.join(site.config['source'], page['slug'], 'index.json'))
+      if File.exists?(file = File.join(site.config['attendease_source'], page['slug'], 'index.json'))
         File.unlink(file)
       end
     end

data/lib/jekyll/attendease_plugin/config_mixin.rb

@@ -14,4 +14,8 @@ module AttendeaseJekyllConfigMixin
   def cms_theme?
     attendease['jekyll33'] == true
   end
+
+  def live_mode?
+    !!attendease['live_mode']
+  end
 end

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -29,14 +29,14 @@ module Jekyll
             site.config.attendease['api_host'] += '/'
           end
 
-          @attendease_data_path = File.join(site.source, '_attendease', 'data')
+          @attendease_data_path = File.join(site.config['attendease_source'], '_attendease', 'data')
 
           FileUtils.mkdir_p(@attendease_data_path)
 
           if site.config.cms_theme?
-            data_files = %w[ site event pages portal_pages site_settings organization_site_settings mappable ].map { |m| "#{m}.json"} << 'lingo.yml'
+            data_files = %w[site event pages portal_pages site_settings organization_site_settings mappable].map { |m| "#{m}.json"} << 'lingo.yml'
           else
-            data_files = %w[ site event sessions presenters rooms filters venues sponsors pages site_settings mappable ].map { |m| "#{m}.json"} << 'lingo.yml'
+            data_files = %w[site event sessions presenters rooms filters venues sponsors pages site_settings].map { |m| "#{m}.json"} << 'lingo.yml'
           end
 
           # no more site in nextgen themes
@@ -47,6 +47,7 @@ module Jekyll
             data = nil
 
             file = File.join(@attendease_data_path, filename)
+
             if File.exists?(file) && use_cache?(site, file)
               update_data = false
 

data/lib/jekyll/attendease_plugin/event_layout_generator.rb

@@ -16,21 +16,8 @@ module Jekyll
       def generate(site)
         Jekyll.logger.debug "[Attendease] Generating theme 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.
         layouts_path = File.join(site.source, '_layouts')
 
-        FileUtils.mkdir_p(attendease_precompiled_theme_layouts_path)
-
-        # Precompiled layouts for attendease app and jekyll generated pages.
-        base_layout = site.config['attendease']['base_layout'] || 'layout'
-
-        base_layout_file = File.join(layouts_path, "#{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
-
         cms_layouts = []
         begin
           Dir.glob(File.join(layouts_path, '*.html')).each do |l|
@@ -45,6 +32,26 @@ module Jekyll
         rescue
         end
 
+        cms_layouts.each do |layout|
+          site.pages << EventLayoutPage.new(site, site.source, 'attendease_layouts', "cms-#{layout}.html", layout, layout.capitalize)
+        end
+
+        return unless site.config.live_mode?
+
+        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.
+
+        FileUtils.mkdir_p(attendease_precompiled_theme_layouts_path)
+
+        # Precompiled layouts for attendease app and jekyll generated pages.
+        base_layout = site.config['attendease']['base_layout'] || 'layout'
+
+        base_layout_file = File.join(layouts_path, "#{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|
           # create a layout file if it already doesn't exist.
@@ -56,10 +63,6 @@ module Jekyll
           end
         end
 
-        cms_layouts.each do |layout|
-          site.pages << EventLayoutPage.new(site, site.source, 'attendease_layouts', "cms-#{layout}.html", layout, layout.capitalize)
-        end
-
         # Precompiled layouts for attendease email
         base_email_layout = site.config['attendease']['base_email_layout'] || 'email'
         base_email_layout_file = File.join(layouts_path, "#{base_email_layout}.html")

data/lib/jekyll/attendease_plugin/event_template_generator.rb

@@ -22,6 +22,7 @@ module Jekyll
       priority :high
 
       def generate(site)
+        return false if site.config.cms_theme?
         Jekyll.logger.info "[Attendease] Generating theme templates..."
 
         # Generate the template files if they don't yet exist.

data/lib/jekyll/attendease_plugin/schedule_data_parser.rb

@@ -79,7 +79,7 @@ module Jekyll
       end
 
       def data_path
-        File.join(site.config['source'], '_attendease', 'data')
+        File.join(site.config['attendease_source'], '_attendease', 'data')
       end
 
       def populate_sessions_with_related_data!(sessions)

data/lib/jekyll/attendease_plugin/tags.rb

@@ -3,7 +3,7 @@ module Jekyll
     class ScheduleWidgetTag < Liquid::Tag
       def render(context)
         schedule_data = ScheduleDataParser.new(context.registers[:site])
-        base = File.join(context.registers[:site].config['source'])
+        base = File.join(context.registers[:site].config['attendease_source'])
 
         instances = schedule_data.sessions.inject([]) do |memo, s|
           s['instances'].each do |instance|
@@ -63,7 +63,7 @@ module Jekyll
       def render(context)
         I18n::Backend::Simple.include(I18n::Backend::Pluralization)
         I18n.enforce_available_locales = false
-        i18n_path = File.join(context.registers[:site].config['source'], '_attendease', 'data', 'lingo.yml')
+        i18n_path = File.join(context.registers[:site].config['attendease_source'], '_attendease', 'data', 'lingo.yml')
         I18n.load_path << i18n_path unless I18n.load_path.include?(i18n_path)
         I18n.locale = context.registers[:page]['lang'] || context.registers[:site].config['attendease']['locale'] || context.registers[:site].config['attendease']['lang'] || :en
         I18n.t(@key, :count => @options['t_size'])

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.9.3'
+    VERSION = '0.9.4a'
   end
 end
 

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

@@ -1,33 +1,27 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::EventTemplateGenerator do
-  context 'event site' do
+  context 'legacy event site' do
     let(:site) { build_site }
 
     it 'creates the Attendease template files' do
       template_files = Dir.chdir(File.join(@template_root, 'attendease')) { Dir.glob('**/**.html') }
 
       template_files.each do |template_file|
-        path = File.join(site.config['source'], '_attendease', 'templates', template_file)
+        path = File.join(site.config['attendease_source'], '_attendease', 'templates', template_file)
 
+        puts path
         expect(File.exists?(path)).to eq(true)
         expect(File.size(path)).to be > 0
       end
     end
   end
 
-  context 'organization site' do
-    let(:site) { build_org_site }
+  context 'CMS site' do
+    let(:site) { build_cms_site }
 
-    it 'creates the Attendease template files' do
-      template_files = Dir.chdir(File.join(@template_root, 'attendease')) { Dir.glob('**/**.html') }
-
-      template_files.each do |template_file|
-        path = File.join(site.config['source'], '_attendease', 'templates', template_file)
-
-        expect(File.exists?(path)).to eq(true)
-        expect(File.size(path)).to be > 0
-      end
+    it 'skips creating the Attendease template files' do
+      expect(Pathname.new(site.config['attendease_source']).join('templates').exist?).to eq(false)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::SitePagesGenerator do
-  let(:site) { build_site }
+  let(:site) { build_cms_site }
   let(:site_pages_generator) { find_generator(site, described_class) }
   let(:index_file) { 'index.html' }
   let(:page) { site.data['pages'].detect { |p| p['slug'] == 'test' } }

data/spec/spec_helper.rb

@@ -85,6 +85,7 @@ RSpec.configure do |config|
         'has_venues'               => true,
         'has_mappable'             => true,
         'environment'              => 'test',
+        'live_mode'                => true,
         'locale'                   => 'en',
         'source_id'                => 'foobar',
         'auth_host'                => 'https://foobar.auth/',
@@ -106,6 +107,10 @@ RSpec.configure do |config|
     @site
   end
 
+  def build_cms_site
+    build_site({ 'attendease' => { 'jekyll33' => true } })
+  end
+
   def build_org_site
     build_site({ 'attendease' => { 'mode' => 'organization', 'jekyll33' => true } })
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4a
 platform: ruby
 authors:
 - Michael Wood
@@ -234,9 +234,9 @@ 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.6.14.4