jekyll-attendease 0.6.25d → 0.6.25e

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2682b13d063e900381c199e06fd1fa3f29e3479
-  data.tar.gz: e8271f92791ca4a8933cb8b0d351bce140c08cbb
+  metadata.gz: 29fc7316fdea55a13715da1405c0fa533a0c338a
+  data.tar.gz: 5c1123aee2a2ec7c18c0f49536fe304df1c33cb0
 SHA512:
-  metadata.gz: 38cd3072e343f68d7e84c380df2ed6f03c11e4d4e93f036af53f7530b0103d276a535d6747cb9fcb61291f547a396363f8698eb399b86b20cf361b9c52957fc0
-  data.tar.gz: 2dbd99cb83d75e4f2148168416a381e36d496742653113d0cffda84dd58677258346d01fd0662184ea3839832c8d556a005e17076f1ff1c18c1ddc52520fef60
+  metadata.gz: 59c3c70100643723ffbc86968bb7fd3c35a41a6ad0b241327b341857e779881ca3728979824f71449acfd0b6e6a2e9f3626c5f2e3ccf59bed6d5615e5b884343
+  data.tar.gz: e41413d559fe17acbb88e877c7929b5e2298867c2ebe0e119fe51f3912f0d8c806bf06be5a00290a5bd3fa9b87ddc744206b9683f3b93934038325f1840264ee

data/lib/jekyll/attendease_plugin/schedule_data_parser.rb

@@ -59,23 +59,23 @@ module Jekyll
       protected
 
       def raw_presenters
-        @raw_presenters ||= @site.config['attendease']['presenters'].sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
+        @raw_presenters ||= @site.data['presenters'].sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
       end
 
       def raw_venues
-        @raw_venues ||= @site.config['attendease']['venues'].sort{|v1, v2| v1['name'] <=> v2['name']}
+        @raw_venues ||= @site.data['venues'].sort{|v1, v2| v1['name'] <=> v2['name']}
       end
 
       def raw_rooms
-        @raw_rooms ||= @site.config['attendease']['rooms'].sort{|r1, r2| r1['name'] <=> r2['name']}
+        @raw_rooms ||= @site.data['rooms'].sort{|r1, r2| r1['name'] <=> r2['name']}
       end
 
       def raw_sessions
-        @raw_sessions ||= @site.config['attendease']['sessions'].sort{|s1, s2| s1['name'] <=> s2['name']}
+        @raw_sessions ||= @site.data['sessions'].sort{|s1, s2| s1['name'] <=> s2['name']}
       end
 
       def raw_filters
-        @raw_filters ||= @site.config['attendease']['filters'].sort{|f1, f2| f1['name'] <=> f2['name']}
+        @raw_filters ||= @site.data['filters'].sort{|f1, f2| f1['name'] <=> f2['name']}
       end
 
       def data_path

data/lib/jekyll/attendease_plugin/site_page_blocks_json.rb

@@ -27,7 +27,7 @@ module Jekyll
 
         # sort each bucket by widget weight
         zones.each do |k, zone|
-          zone.sort! { |x, y| y['weight'] <=> x['weight'] }
+          zone.sort! { |x, y| x['weight'] <=> y['weight'] }
           self.data[k] = ''
           zone.each do |i|
             self.data[k] << i['rendered_html']

data/lib/jekyll/attendease_plugin/site_pages_generator.rb

@@ -5,31 +5,33 @@ module Jekyll
 
       def generate(site)
         site.config['attendease']['pages'].each do |page|
-          site.pages << SitePage.new(site, site.source, page)
+          if !page['permanent']
+            site.pages << SitePage.new(site, site.source, page)
 
-          zones = {}
+            zones = {}
 
-          if page['block_instances'].length
-            # create zone buckets
-            page['block_instances'].each do |i|
-              zones[i['zone']] = [] if zones[i['zone']].nil?
-              zones[i['zone']] << i
-            end
+            if page['block_instances'].length
+              # create zone buckets
+              page['block_instances'].each do |i|
+                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| y['weight'] <=> x['weight'] }
-            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)
+              page_source_path = File.join(site.source, page['slug'])
+              FileUtils.mkdir_p(page_source_path) unless File.exists?(page_source_path)
 
-            File.open(File.join(page_source_path, 'index.json'), 'w') do |f|
-              f.write zones.to_json
-              f.close
-            end
+              File.open(File.join(page_source_path, 'index.json'), 'w') do |f|
+                f.write zones.to_json
+                f.close
+              end
 
-            site.static_files << StaticFile.new(site, site.source, File.join('', page['slug']), 'index.json')
+              site.static_files << StaticFile.new(site, site.source, File.join('', page['slug']), 'index.json')
+            end
           end
         end
       end

data/lib/jekyll/attendease_plugin/sponsor_generator.rb

@@ -5,8 +5,7 @@ module Jekyll
 
       def generate(site)
         if site.config['attendease']['has_sponsors']
-          @attendease_data_path = File.join(site.source, '_attendease', 'data')
-          sponsors = JSON.parse(File.read("#{@attendease_data_path}/sponsors.json"))
+          sponsors = site.data['sponsors']
 
           sponsor_levels = site.config['attendease']['event']['sponsor_levels']
           sponsor_levels.each do |level|

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.25d'
+    VERSION = '0.6.25e'
   end
 end

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

@@ -8,28 +8,28 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
   #pending 'downloads data and populates the site.config variable' do
   #end
   it 'populates a site wide presenters array' do
-    expect(@site.config['attendease']['presenters'].class).to eq(Array)
-    expect(@site.config['attendease']['presenters'].length).to eq(2)
+    expect(@site.data['presenters'].class).to eq(Array)
+    expect(@site.data['presenters'].length).to eq(2)
   end
 
   it 'populates a site wide rooms array' do
-    expect(@site.config['attendease']['rooms'].class).to eq(Array)
-    expect(@site.config['attendease']['rooms'].length).to eq(1)
+    expect(@site.data['rooms'].class).to eq(Array)
+    expect(@site.data['rooms'].length).to eq(1)
   end
 
   it 'populates a site wide sessions array' do
-    expect(@site.config['attendease']['sessions'].class).to eq(Array)
-    expect(@site.config['attendease']['sessions'].length).to eq(3)
+    expect(@site.data['sessions'].class).to eq(Array)
+    expect(@site.data['sessions'].length).to eq(3)
   end
 
   it 'populates a site wide venues array' do
-    expect(@site.config['attendease']['venues'].class).to eq(Array)
-    expect(@site.config['attendease']['venues'].length).to eq(2)
+    expect(@site.data['venues'].class).to eq(Array)
+    expect(@site.data['venues'].length).to eq(2)
   end
 
   it 'populates a site wide filters array' do
-    expect(@site.config['attendease']['filters'].class).to eq(Array)
-    expect(@site.config['attendease']['filters'].length).to eq(1)
+    expect(@site.data['filters'].class).to eq(Array)
+    expect(@site.data['filters'].length).to eq(1)
   end
 
   it 'populates a site wide days array' do
@@ -38,12 +38,17 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
   end
 
   it 'populates a site wide sponsors array' do
-    expect(@site.config['attendease']['sponsors'].class).to eq(Array)
-    expect(@site.config['attendease']['sponsors'].length).to eq(1)
+    expect(@site.data['sponsors'].class).to eq(Array)
+    expect(@site.data['sponsors'].length).to eq(1)
+  end
+
+  it 'populates a site wide pages array' do
+    expect(@site.data['pages'].class).to eq(Array)
+    expect(@site.data['pages'].length).to eq(10)
   end
 
   it 'populates a site wide event object' do
-    expect(@site.config['attendease']['event'].class).to eq(Hash)
+    expect(@site.data['event'].class).to eq(Hash)
   end
 
 

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe Jekyll::AttendeasePlugin::EventLayoutGenerator do
 
   it 'creates the pre-compiled layout stubs' do
-    %w{ layout register surveys pages }.each do |layout|
+    %w{ layout register surveys }.each do |layout|
       expect(File.exists?(File.join(@site.config['destination'], 'attendease_layouts', "#{layout}.html"))).to eq(true)
     end
   end

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

@@ -13,38 +13,38 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
   end
 
   it 'creates a presenters index page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file)
+    file = File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
 
   it 'creates a presenter page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug)
+    file = File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
 
   it 'creates a schedule index page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], @index_file)
+    file = File.join(@site.dest, @site.config['attendease']['schedule_path_name'], @index_file)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
 
   it 'creates a schedule day index page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], @date, @index_file)
+    file = File.join(@site.dest, @site.config['attendease']['schedule_path_name'], @date, @index_file)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
-    expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], @index_file))).to include 'attendease-session-and-instance'
+    expect(File.read(File.join(@site.dest, @site.config['attendease']['schedule_path_name'], @index_file))).to include 'attendease-session-and-instance'
   end
 
   it 'creates a schedule sessions index page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', @index_file)
+    file = File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', @index_file)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
 
   it 'creates a schedule session page' do
-    file = File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug)
+    file = File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug)
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
@@ -61,7 +61,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     end
 
     it 'creates a schedule session page for the name' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug_localized)
+      file = File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug_localized)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
@@ -71,7 +71,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     end
 
     it 'creates a presenter page' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug_localized)
+      file = File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug_localized)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
@@ -81,7 +81,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     end
 
     it 'creates a venue page' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['venues_path_name'], @venue_slug_localized)
+      file = File.join(@site.dest, @site.config['attendease']['venues_path_name'], @venue_slug_localized)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
@@ -89,17 +89,17 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
 
   context 'presenter linking' do
     it 'links presenters correctly from the presenter index page' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file))).to include @presenter_slug
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file))).to include @presenter_slug
     end
 
     it 'links presenters correctly from the session page' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug))).to include @presenter_slug
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug))).to include @presenter_slug
     end
   end
 
   context 'a single venue' do
     pending 'creates a venue index page' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['venue_path_name'], @index_file)
+      file = File.join(@site.dest, @site.config['attendease']['venue_path_name'], @index_file)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
@@ -107,13 +107,13 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
 
   context 'multiple venues' do
     it 'creates a venue index page' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['venues_path_name'], @index_file)
+      file = File.join(@site.dest, @site.config['attendease']['venues_path_name'], @index_file)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
 
     it 'creates a venue page' do
-      file = File.join(@site.config['destination'], @site.config['attendease']['venues_path_name'], @venue_slug)
+      file = File.join(@site.dest, @site.config['attendease']['venues_path_name'], @venue_slug)
       expect(File.exists?(file)).to eq(true)
       expect(File.file?(file)).to eq(true)
     end
@@ -121,40 +121,40 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
 
   context 'presenter social links' do
     it 'includes the included social links' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file))).to include "twitter.com/#{@presenter_social['twitter']}"
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file))).to include "facebook.com/#{@presenter_social['facebook']}"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file))).to include "twitter.com/#{@presenter_social['twitter']}"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file))).to include "facebook.com/#{@presenter_social['facebook']}"
 
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include "twitter.com/#{@presenter_social['twitter']}"
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include "facebook.com/#{@presenter_social['facebook']}"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include "twitter.com/#{@presenter_social['twitter']}"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include "facebook.com/#{@presenter_social['facebook']}"
     end
 
     it 'does not include social links that are not there' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file))).to_not include "linkedin"
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @index_file))).to_not include "googleplus"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file))).to_not include "linkedin"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @index_file))).to_not include "googleplus"
 
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug))).to_not include "linkedin"
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug))).to_not include "googleplus"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug))).to_not include "linkedin"
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug))).to_not include "googleplus"
     end
   end
 
   context 'venue linking' do
     it 'links venues correctly from the venue index page' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['venues_path_name'], @index_file))).to include @venue_slug
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['venues_path_name'], @index_file))).to include @venue_slug
     end
 
     it 'links venues correctly from the presenter page' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include @venue_slug
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['presenters_path_name'], @presenter_slug))).to include @venue_slug
     end
 
     it 'links venues correctly from the session page' do
-      expect(File.read(File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug))).to include @venue_slug
+      expect(File.read(File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', @session_slug))).to include @venue_slug
     end
   end
 
   context 'in a site with attendease.show_schedule_index = true' do
     it 'creates the day index page and show schedule widget' do
       site = build_site({ 'attendease' => { 'show_schedule_index' => true } })
-      expect(File.read(File.join(site.config['destination'], site.config['attendease']['schedule_path_name'], @index_file))).to include 'attendease-schedule-widget'
+      expect(File.read(File.join(site.dest, site.config['attendease']['schedule_path_name'], @index_file))).to include 'attendease-schedule-widget'
     end
   end
 
@@ -164,7 +164,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
       @schedule_generator = find_generator(described_class)
       session_slug = @schedule_generator.schedule_data.sessions.first['slug']
 
-      expect(File.exists?(File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', session_slug))).to eq(true)
+      expect(File.exists?(File.join(@site.dest, @site.config['attendease']['schedule_path_name'], 'sessions', session_slug))).to eq(true)
     end
   end
 
@@ -172,25 +172,25 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     it 'no schedule folder exists' do
       @site = build_site({ 'attendease' => { 'schedule_path_name' => false } })
 
-      expect(File.exists?(File.join(@site.config['destination'], 'schedule'))).to eq(false)
+      expect(File.exists?(File.join(@site.dest, 'schedule', 'index.html'))).to eq(false)
     end
 
     it 'no presenters folder exists' do
       @site = build_site({ 'attendease' => { 'presenters_path_name' => false } })
 
-      expect(File.exists?(File.join(@site.config['destination'], 'presenters'))).to eq(false)
+      expect(File.exists?(File.join(@site.dest, 'presenters', 'index.html'))).to eq(false)
     end
 
     it 'no venues folder exists' do
       @site = build_site({ 'attendease' => { 'venues_path_name' => false, 'venue_path_name' => false } })
 
-      expect(File.exists?(File.join(@site.config['destination'], 'venues'))).to eq(false)
+      expect(File.exists?(File.join(@site.dest, 'venues', 'index.html'))).to eq(false)
     end
 
     it 'no sponsors folder exists' do
       @site = build_site({ 'attendease' => { 'sponsors_path_name' => false } })
 
-      expect(File.exists?(File.join(@site.config['destination'], 'sponsors'))).to eq(false)
+      expect(File.exists?(File.join(@site.dest, 'sponsors', 'index.html'))).to eq(false)
     end
   end
 

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

@@ -5,7 +5,7 @@ RSpec.describe Jekyll::AttendeasePlugin::SitePage do
     @site_page = find_page(described_class, Proc.new { |p| p.data['site_page']['slug'] == 'test' })
   end
 
-  it 'fills the page zones with the rendered html' do
+  pending 'fills the page zones with the rendered html' do
     expect(@site_page.data['dropzone1']).to eq('<h1>Hello world</h1>')
   end
 end

data/spec/spec_helper.rb

@@ -77,7 +77,7 @@ RSpec.configure do |config|
         'generate_schedule_pages' => true,
         'has_sessions'            => true,
         'has_presenters'          => true,
-        'has_sponsors'            => false,
+        'has_sponsors'            => true,
         'has_rooms'               => true,
         'has_filters'             => true,
         'has_venues'              => true
@@ -93,7 +93,12 @@ RSpec.configure do |config|
 
   config.after(:all) do
     @dest.rmtree if @dest.exist?
-    fixtures_path.join('_attendease', 'templates').rmtree if fixtures_path.join('_attendease', 'templates').exist?
-    fixtures_path.join('attendease_layouts').rmtree if fixtures_path.join('attendease_layouts').exist?
+    fixtures_path.join('_attendease', 'templates').rmtree if File.exists?(fixtures_path.join('_attendease', 'templates'))
+    fixtures_path.join('attendease_layouts').rmtree if File.exists?(fixtures_path.join('attendease_layouts'))
+    Dir.glob(File.join(@source, '**', 'index.json')).map do |i|
+      puts "Removing #{Pathname.new(i).parent}"
+
+      FileUtils.rm_r Pathname.new(i).parent
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.25d
+  version: 0.6.25e
 platform: ruby
 authors:
 - Michael Wood