jekyll-attendease 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80cd553e269268d96d6e3d33d06be1d4b80a36f0
-  data.tar.gz: 1d431f5ea201940d4c49417bc2fc5d6385d7b6d3
+  metadata.gz: 00c6babd1870a4e7bf21953cac303f50e3279816
+  data.tar.gz: 42ddbde603be6c2d82b25ad25becd8248f4a88cf
 SHA512:
-  metadata.gz: 0f860101c55c37f8c446edc468517f21a0e05ec2fd87c92a968c0a3de76f12ca64790502116d3cba71fc40901fee65f546eaed46b59a8e263c2e121541146b7b
-  data.tar.gz: b08a45e2f9b07ce9cd974cd3d4362929068c56379eb92042418765ce1637dadd6e30ef5c7edc0d2667d2bd9b6ab408fbf4f78f19a2fadd360ac35ef9e1551bd7
+  metadata.gz: 3028a82d5c90d131c9cdfc2579d1ff3347ae14eaa1c97bffee5ecdab9cc7cae97004c338dbbaa7ca051d84f49c0a6d8da7c82e8dbd270b6a1d6dd27390bedfd2
+  data.tar.gz: a08e3ff4945fa97061a8e2575bc7c24085ffa35d2f6512fe381893bab7ea94403e17133b88d2a6793170990c983b22768157561b19ec634a14d8a121ea1a7ff3

data/lib/jekyll/attendease_plugin.rb

@@ -6,6 +6,7 @@ require 'jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator'
 require 'jekyll/attendease_plugin/redirect_page'
 require 'jekyll/attendease_plugin/tags'
 require 'jekyll/attendease_plugin/filters'
+require 'jekyll/attendease_plugin/helpers'
 
 require 'jekyll/attendease_plugin/presenters_index_page'
 require 'jekyll/attendease_plugin/presenter_page'

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -16,21 +16,6 @@ module Jekyll
         end
       end
 
-      def self.parameterize(source, sep = '-')
-        return '' if source.nil?
-        string = source.downcase
-        # Turn unwanted chars into the separator
-        string.gsub!(/[^a-z0-9\-_]+/, sep)
-        unless sep.nil? || sep.empty?
-          re_sep = Regexp.escape(sep)
-          # No more than one of the separator in a row.
-          string.gsub!(/#{re_sep}{2,}/, sep)
-          # Remove leading/trailing separator.
-          string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
-        end
-        string
-      end
-
       def use_cache?(file)
         (Time.now.to_i - File.mtime(file).to_i) <= (@attendease_config['cache_expiry'].nil? ? 30 : @attendease_config['cache_expiry'])  # file is less than 30 seconds old
       end
@@ -53,6 +38,7 @@ module Jekyll
 
             data_files.each do |file_name|
               update_data = true
+              data = nil
 
               file = File.join(@attendease_data_path, file_name)
               if File.exists?(file) && use_cache?(file)
@@ -82,45 +68,48 @@ module Jekyll
                 options.merge!(:headers => {'X-Event-Token' => @attendease_config['access_token']}) if @attendease_config['access_token']
 
                 request_filename = file_name.gsub(/yml$/, 'yaml')
-                data = get("#{@attendease_config['api_host']}api/#{request_filename}", options)
+                response = get("#{@attendease_config['api_host']}api/#{request_filename}", options)
 
                 #if (file_name.match(/yaml$/) || data.is_a?(Hash) && !data['error']) || data.is_a?(Array)
-                if (!data.nil? && data.response.is_a?(Net::HTTPOK))
+                if (!response.nil? && response.response.is_a?(Net::HTTPOK))
                   Jekyll.logger.info "[Attendease] Saving #{file_name} data..."
 
                   if file_name.match(/json$/)
-                    File.open(file, 'w+') { |f| f.write(data.parsed_response.to_json) }
-                  else
-                    File.open(file, 'w+') { |f| f.write(data.body) }
+                    data = response.parsed_response
+                    File.open(file, 'w+') { |f| f.write(data.to_json) }
+                  else # yaml
+                    File.open(file, 'w+') { |f| f.write(response.body) }
                   end
                 else
                   raise "Request failed for #{@attendease_config['api_host']}api/#{request_filename}. Is your Attendease api_host site properly in _config.yml?"
                 end
               end
 
-              if file_name == 'site.json'
-                # Adding to site config so we can access these variables globally wihtout using a Liquid Tag so we can use if/else
-                site.config['attendease']['data'] = {}
-
-                data.keys.each do |tag|
-                  site.config['attendease']['data'][tag] = data[tag]
-                  # memorandum from the department of redundancy department:
-                  # --------------------------------------------------------
-                  # support accessing the attendease_* variables without the
-                  # attendease_ prefix because they're already namespaced in
-                  # site.attendease.data
-                  #
-                  # TODO: update all themes to not use attendease_ variables
-                  #       and then retire them from the ThemeManager.
-                  if tag.match(/^attendease_/)
-                    site.config['attendease']['data'][tag.gsub(/^attendease_/, '')] = data[tag]
+              if data.is_a?(Hash)
+                if file_name == 'site.json'
+                  # Adding to site config so we can access these variables globally wihtout using a Liquid Tag so we can use if/else
+                  site.config['attendease']['data'] = {}
+
+                  data.keys.each do |tag|
+                    site.config['attendease']['data'][tag] = data[tag]
+                    # memorandum from the department of redundancy department:
+                    # --------------------------------------------------------
+                    # support accessing the attendease_* variables without the
+                    # attendease_ prefix because they're already namespaced in
+                    # site.attendease.data
+                    #
+                    # TODO: update all themes to not use attendease_ variables
+                    #       and then retire them from the ThemeManager.
+                    if tag.match(/^attendease_/)
+                      site.config['attendease']['data'][tag.gsub(/^attendease_/, '')] = data[tag]
+                    end
                   end
-                end
-              elsif file_name == 'event.json'
-                site.config['attendease']['event'] = {}
+                elsif file_name == 'event.json'
+                  site.config['attendease']['event'] = {}
 
-                data.keys.each do |tag|
-                  site.config['attendease']['event'][tag] = data[tag]
+                  data.keys.each do |tag|
+                    site.config['attendease']['event'][tag] = data[tag]
+                  end
                 end
               end
             end

data/lib/jekyll/attendease_plugin/filters.rb

@@ -2,7 +2,7 @@ module Jekyll
   module AttendeasePlugin
     module Filters
       def slugify(string)
-        EventDataGenerator.parameterize(string, '_')
+        Helpers.parameterize(string, '_')
       end
     end
   end

data/lib/jekyll/attendease_plugin/helpers.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+module Jekyll
+  module AttendeasePlugin
+    class Helpers
+      def self.parameterize(source, sep = '_')
+        return '' if source.nil?
+
+        string = Helpers.convert_to_ascii(source.downcase)
+
+        unless sep.nil? || sep.empty?
+          # Turn unwanted chars into the separator
+          string.gsub!(/[^a-z0-9]+/, sep)
+
+          re_sep = Regexp.escape(sep)
+          # No more than one of the separator in a row.
+          string.gsub!(/#{re_sep}{2,}/, sep)
+          # Remove leading/trailing separator.
+          string.gsub!(/^#{re_sep}|#{re_sep}$/, '')
+        end
+        string
+      end
+
+      def self.convert_to_ascii(s)
+        undefined = ''
+        fallback = {'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A',
+                    'Å' => 'A', 'Æ' => 'AE', 'Ç' => 'C', 'È' => 'E', 'É' => 'E',
+                    'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I',
+                    'Ï' => 'I', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O',
+                    'Õ' => 'O', 'Ö' => 'O', 'Ø' => 'O', 'Ù' => 'U', 'Ú' => 'U',
+                    'Û' => 'U', 'Ü' => 'U', 'Ý' => 'Y', 'à' => 'a', 'á' => 'a',
+                    'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'a', 'æ' => 'ae',
+                    'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e',
+                    'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ñ' => 'n',
+                    'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o',
+                    'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
+                    'ý' => 'y', 'ÿ' => 'y' }
+        s.encode('ASCII',
+        fallback: lambda { |c| fallback.key?(c) ? fallback[c] : undefined })
+      end
+    end
+  end
+end

data/lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator.rb

@@ -24,7 +24,7 @@ module Jekyll
           # sessions
           dir = site.config['attendease']['schedule_path_name']
           schedule_generator.sessions.each do |o|
-            site.pages << RedirectPage.new(site, site.source, File.join(dir, o['code']), File.join('/', dir, o['slug']))
+            site.pages << RedirectPage.new(site, site.source, File.join(dir, o['code']), File.join('/', dir, 'sessions', o['slug']))
           end
         end
       end # end generate

data/lib/jekyll/attendease_plugin/schedule_generator.rb

@@ -27,18 +27,18 @@ module Jekyll
           @venues = JSON.parse(File.read("#{attendease_data_path}/venues.json")).sort{|v1, v2| v1['name'] <=> v2['name']}
 
           @presenters.each do |presenter|
-            presenter['slug'] = EventDataGenerator.parameterize("#{presenter['first_name']} #{presenter['last_name']}", '_') + '.html'
+            presenter['slug'] = Helpers.parameterize("#{presenter['first_name']} #{presenter['last_name']}") + '.html'
           end
 
           @venues.each do |venue|
-            venue['slug'] = EventDataGenerator.parameterize(venue['name'], '_') + '.html'
+            venue['slug'] = Helpers.parameterize(venue['name']) + '.html'
           end
 
           sessions.each do |session|
             if site.config['attendease']['session_slug_uses_code']
               session['slug'] = session['code'] + '.html'
             else
-              session['slug'] = EventDataGenerator.parameterize(session['name'], '_') + '.html'
+              session['slug'] = Helpers.parameterize(session['name']) + '.html'
             end
           end
 
@@ -49,41 +49,47 @@ module Jekyll
           # /schedule pages.
           dir = site.config['attendease']['schedule_path_name']
 
-          if (site.config['attendease'] && site.config['attendease']['show_day_index'])
-            site.pages << ScheduleIndexPage.new(site, site.source, File.join(dir), @event['dates'])
-          else
-            site.pages << ScheduleDayPage.new(site, site.source, File.join(dir), @event['dates'].first, @sessions, @event['dates'])
-          end
+          unless dir.nil?
+            if (site.config['attendease'] && site.config['attendease']['show_day_index'])
+              site.pages << ScheduleIndexPage.new(site, site.source, File.join(dir), @event['dates'])
+            else
+              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir), @event['dates'].first, @sessions, @event['dates'])
+            end
 
-          site.pages << ScheduleSessionsPage.new(site, site.source, File.join(dir, 'sessions'), @sessions, @event['dates'])
+            site.pages << ScheduleSessionsPage.new(site, site.source, File.join(dir, 'sessions'), @sessions, @event['dates'])
 
-          @event['dates'].each do |day|
-            site.pages << ScheduleDayPage.new(site, site.source, File.join(dir, day['date']), day, @sessions, @event['dates'])
-          end
+            @event['dates'].each do |day|
+              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir, day['date']), day, @sessions, @event['dates'])
+            end
 
-          @sessions.each do |session|
-            site.pages << ScheduleSessionPage.new(site, site.source, File.join(dir, 'sessions'), session)
+            @sessions.each do |session|
+              site.pages << ScheduleSessionPage.new(site, site.source, File.join(dir, 'sessions'), session)
+            end
           end
 
           # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
           # /presenters pages.
           dir = site.config['attendease']['presenters_path_name']
 
-          @presenters.each do |presenter|
-            site.pages << PresenterPage.new(site, site.source, dir, presenter, @sessions)
-          end
+          unless dir.nil?
+            @presenters.each do |presenter|
+              site.pages << PresenterPage.new(site, site.source, dir, presenter, @sessions)
+            end
 
-          site.pages << PresentersIndexPage.new(site, site.source, File.join(dir), @presenters)
+            site.pages << PresentersIndexPage.new(site, site.source, File.join(dir), @presenters)
+          end
 
           # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
           # /venue pages.
           dir = site.config['attendease']['venues_path_name']
 
-          @venues.each do |venue|
-            site.pages << VenuePage.new(site, site.source, dir, venue)
-          end
+          unless dir.nil?
+            @venues.each do |venue|
+              site.pages << VenuePage.new(site, site.source, dir, venue)
+            end
 
-          site.pages << VenuesIndexPage.new(site, site.source, File.join(dir), @venues)
+            site.pages << VenuesIndexPage.new(site, site.source, File.join(dir), @venues)
+          end
         end
       end
 
@@ -122,7 +128,7 @@ module Jekyll
             item_names = []
             if !filter['items'].nil?
               filter['items'].each do |item|
-                filter_tags << EventDataGenerator.parameterize('attendease-filter-' + filter['name'] + "-" + item['name'])
+                filter_tags << Helpers.parameterize('attendease-filter-' + filter['name'] + "-" + item['name'], '-')
               end
             end
           end

data/lib/jekyll/attendease_plugin/sponsor_generator.rb

@@ -24,10 +24,12 @@ module Jekyll
           # /sponsors pages.
           dir = site.config['attendease']['sponsors_path_name']
 
-          site.pages << SponsorsIndexPage.new(site, site.source, File.join(dir), site.config['attendease']['sponsor_levels'])
+          unless dir.nil?
+            site.pages << SponsorsIndexPage.new(site, site.source, File.join(dir), site.config['attendease']['sponsor_levels'])
+          end
 
           #sponsors.each do |sponsor|
-          #  site.pages << SponsorPage.new(site, site.source, File.join(dir, EventData.parameterize(sponsor['name']) + '.html', '_'), sponsor)
+          #  site.pages << SponsorPage.new(site, site.source, File.join(dir, Helpers.parameterize(sponsor['name']) + '.html', '_'), sponsor)
           #end
         end
       end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end
 

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe Jekyll::AttendeasePlugin::Helpers do
+  context '#parameterize' do
+    it 'converts a typical filter item into a predictable CSS-friendly class name' do
+      expect(Jekyll::AttendeasePlugin::Helpers.parameterize('Super Hyper Advanced', '-')).to eq('super-hyper-advanced')
+    end
+
+    it 'converts a title to a snake-case style string' do
+      expect(Jekyll::AttendeasePlugin::Helpers.parameterize(' That quick brown fox? Jumps over the lazy dog...')).to eq('that_quick_brown_fox_jumps_over_the_lazy_dog')
+    end
+
+    it 'converts accented characters to an ASCII-equivalent' do
+      expect(Jekyll::AttendeasePlugin::Helpers.parameterize('Pepé Le Pew')).to eq('pepe_le_pew')
+    end
+
+    it 'will not repeat the separator' do
+      expect(Jekyll::AttendeasePlugin::Helpers.parameterize('What--the--hell?')).to eq('what_the_hell')
+    end
+
+    it 'will strip leading and trailing separators' do
+      expect(Jekyll::AttendeasePlugin::Helpers.parameterize('-, What--the--hell? ::')).to eq('what_the_hell')
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     @date = @schedule_generator.event['dates'].first['date']
     @session_slug = @schedule_generator.sessions.first['slug']
     @presenter_slug = @schedule_generator.presenters.first['slug']
-    @venue_slug = Jekyll::AttendeasePlugin::EventDataGenerator.parameterize(@schedule_generator.venues.first['name'], '_') + '.html'
+    @venue_slug = Jekyll::AttendeasePlugin::Helpers.parameterize(@schedule_generator.venues.first['name'], '_') + '.html'
   end
 
   it 'creates a presenters index page' do
@@ -83,7 +83,6 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     end
   end
 
-
   context 'in a site with attendease.show_day_index = true' do
     it 'creates the day index page' do
       site = build_site({ 'attendease' => { 'show_day_index' => true } })
@@ -100,5 +99,32 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
       expect(File.exists?(File.join(@site.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', session_slug))).to eq(true)
     end
   end
+
+  context 'in a site with the page paths set to nil' do
+    it 'no schedule folder exists' do
+      @site = build_site({ 'attendease' => { 'schedule_path_name' => nil } })
+
+      expect(File.exists?(File.join(@site.config['destination'], 'schedule'))).to eq(false)
+    end
+
+    it 'no presenters folder exists' do
+      @site = build_site({ 'attendease' => { 'presenters_path_name' => nil } })
+
+      expect(File.exists?(File.join(@site.config['destination'], 'presenters'))).to eq(false)
+    end
+
+    it 'no venues folder exists' do
+      @site = build_site({ 'attendease' => { 'venues_path_name' => nil } })
+
+      expect(File.exists?(File.join(@site.config['destination'], 'venues'))).to eq(false)
+    end
+
+    it 'no sponsors folder exists' do
+      @site = build_site({ 'attendease' => { 'sponsors_path_name' => nil } })
+
+      expect(File.exists?(File.join(@site.config['destination'], 'sponsors'))).to eq(false)
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Michael Wood
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -133,6 +133,7 @@ files:
 - lib/jekyll/attendease_plugin/event_data_generator.rb
 - lib/jekyll/attendease_plugin/event_layout_generator.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
 - lib/jekyll/attendease_plugin/presenter_page.rb
 - lib/jekyll/attendease_plugin/presenters_index_page.rb
@@ -164,6 +165,7 @@ files:
 - 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
@@ -198,6 +200,7 @@ test_files:
 - 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