jekyll-attendease 0.6.4 → 0.6.5.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d42713f38f6ac2e2b80dcb0fcd05006ef5d57599
+  data.tar.gz: 6185913b55bb21f09c8962471cfc5a2e6423dc27
+SHA512:
+  metadata.gz: 9562d7c55430c5fcc29d07639e76a45ea6c516e46ad38807c95f4a1077ef434f96099212428f1291fe382b514d37ccb5988f2b33b27feab461c8e7dedc3653b0
+  data.tar.gz: 87d5ba4337fcd5cd758bc9b38186c503b6c887c595861d2826b9ef800e3de05d3305cc00b9789cfa5d9708419105e6a4f4bd20b5f4935020d02972228deae716

data/lib/jekyll/attendease_plugin/schedule_data_parser.rb

@@ -0,0 +1,149 @@
+module Jekyll
+  module AttendeasePlugin
+    class ScheduleDataParser
+
+      attr_accessor :site
+
+      def initialize(site)
+        @site = site
+      end
+
+      def event
+        site.config['attendease']['event']
+      end
+
+      def presenters
+        raw_presenters.each do |presenter|
+          presenter['slug'] = Helpers.parameterize("#{presenter['first_name']} #{presenter['last_name']}") + '.html'
+        end
+      end
+
+      def venues
+        raw_venues.each do |venue|
+          venue['slug'] = Helpers.parameterize(venue['name']) + '.html'
+        end
+      end
+
+      def rooms
+        raw_rooms
+      end
+
+      def sessions
+        raw_sessions.each do |session|
+          if site.config['attendease']['session_slug_uses_code']
+            session['slug'] = session['code'] + '.html'
+          else
+            session['slug'] = Helpers.parameterize(session['name']) + '.html'
+          end
+        end
+
+        populate_sessions_with_related_data!(raw_sessions)
+      end
+
+      def filters
+        raw_filters
+      end
+
+      protected 
+
+      def raw_presenters
+        @raw_presenters ||= JSON.parse(File.read("#{data_path}/presenters.json")).sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
+      end
+
+      def raw_venues
+        @raw_venues ||= JSON.parse(File.read("#{data_path}/venues.json")).sort{|v1, v2| v1['name'] <=> v2['name']}
+      end
+
+      def raw_rooms
+        @raw_rooms ||= JSON.parse(File.read("#{data_path}/rooms.json")).sort{|r1, r2| r1['name'] <=> r2['name']}
+      end
+
+      def raw_sessions
+        @raw_sessions ||= JSON.parse(File.read("#{data_path}/sessions.json")).sort{|s1, s2| s1['name'] <=> s2['name']}
+      end
+
+      def raw_filters
+        @raw_filters ||= JSON.parse(File.read("#{data_path}/filters.json")).sort{|f1, f2| f1['name'] <=> f2['name']}
+      end
+
+      def data_path
+        File.join(site.config['source'], '_attendease', 'data')
+      end
+
+      def populate_sessions_with_related_data!(sessions)
+        sessions.inject([]) do |memo, s|
+          session = s.select do |k, v| 
+            %w{ id name description code speaker_ids slug }.include?(k)
+          end
+
+          session['presenters'] = get_session_presenters(s)
+          populate_session_filters!(session, s)
+          session['instances'] = get_session_instances(s)
+
+          memo << session
+        end
+      end
+
+      def get_session_presenters(session)
+        session_presenters = presenters.select do |presenter| 
+          session['speaker_ids'].include?(presenter['id'])
+        end
+          
+        session_presenters.inject([]) do |memo, presenter|
+          memo << presenter.select do |k, v| 
+            %w{ id first_name last_name company title profile_url slug }.include?(k)
+          end
+        end
+      end
+
+      # Populates filter realted data into session,
+      # from source.
+      def populate_session_filters!(session, source)
+        filters_for_session_hash = {}
+        filters.each do |filter|
+          filter['filter_items'].each_with_index do |filter_item, index|
+            if source['filters'].include?(filter_item['id'])
+              filters_for_session_hash[filter['name']] ||= []
+              filters_for_session_hash[filter['name']] << {
+                'name' => filter_item['name'],
+                'index' => index,
+              }
+              if event['primary_filter_id'] && event['primary_filter_id'] == filter['id']
+                session['primary_filter_name'] = filter['name']
+                session['primary_filter'] = filter_item['name']
+              end
+            end
+          end
+        end
+
+        session['filters'] = filters_for_session_hash.map { |key, value| { 'name' => key, 'items' => value } }
+        session['filter_tags'] = get_session_filter_tags(session['filters'])
+      end
+
+      def get_session_filter_tags(session_filters)
+        session_filters.inject([]) do |memo, filter|
+          filter['items'].each do |item|
+            memo << Helpers.parameterize('attendease-filter-' + filter['name'] + "-" + item['name'], '-')
+          end
+          memo
+        end.join(" ")
+      end
+
+      def get_session_instances(session)
+        session['instances'] ||= []
+        session['instances'].inject([]) do |memo, i|
+          instance = i.select do |k, v| 
+            %w{ id date time end_time duration date_formatted time_formatted end_time_formatted duration_formatted room_id }.include?(k)
+          end
+
+          room  = rooms.select { |r| r['id'] == i['room_id'] }.first
+          venue = venues.select { |v| v['id'] == room['venue_id'] }.first
+          instance['room'] = room.merge({ 'venue_name' => venue['name'] })
+          instance['venue_slug'] = venue['slug']
+
+          memo << instance
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/attendease_plugin/schedule_generator.rb

@@ -12,37 +12,7 @@ module Jekyll
       def generate(site)
         if site.config['attendease'] && site.config['attendease']['api_host'] && site.config['attendease']['generate_schedule_pages']
 
-          # Fetch all the session data!
-          attendease_api_host = site.config['attendease']['api_host']
-          attendease_access_token = site.config['attendease']['access_token']
-
-          attendease_data_path = File.join(site.source, '_attendease', 'data')
-
-          @event = site.config['attendease']['event']
-
-          sessions = JSON.parse(File.read("#{attendease_data_path}/sessions.json")).sort{|s1, s2| s1['name'] <=> s2['name']}
-          @presenters = JSON.parse(File.read("#{attendease_data_path}/presenters.json")).sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
-          @rooms = JSON.parse(File.read("#{attendease_data_path}/rooms.json")).sort{|r1, r2| r1['name'] <=> r2['name']}
-          @filters = JSON.parse(File.read("#{attendease_data_path}/filters.json")).sort{|f1, f2| f1['name'] <=> f2['name']}
-          @venues = JSON.parse(File.read("#{attendease_data_path}/venues.json")).sort{|v1, v2| v1['name'] <=> v2['name']}
-
-          @presenters.each do |presenter|
-            presenter['slug'] = Helpers.parameterize("#{presenter['first_name']} #{presenter['last_name']}") + '.html'
-          end
-
-          @venues.each do |venue|
-            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'] = Helpers.parameterize(session['name']) + '.html'
-            end
-          end
-
-          @sessions = sessions_with_all_data(@event, sessions, @presenters, @rooms, @venues, @filters)
+          schedule_data = ScheduleDataParser.new(site)
 
           #
           # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -51,18 +21,18 @@ module Jekyll
 
           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'])
+              site.pages << ScheduleIndexPage.new(site, site.source, File.join(dir), schedule_data.event['dates'])
             else
-              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir), @event['dates'].first, @sessions, @event['dates'])
+              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir), schedule_data.event['dates'].first, schedule_data.sessions, schedule_data.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'), schedule_data.sessions, schedule_data.event['dates'])
 
-            @event['dates'].each do |day|
-              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir, day['date']), day, @sessions, @event['dates'])
+            schedule_data.event['dates'].each do |day|
+              site.pages << ScheduleDayPage.new(site, site.source, File.join(dir, day['date']), day, schedule_data.sessions, schedule_data.event['dates'])
             end
 
-            @sessions.each do |session|
+            schedule_data.sessions.each do |session|
               site.pages << ScheduleSessionPage.new(site, site.source, File.join(dir, 'sessions'), session)
             end
           end
@@ -72,11 +42,11 @@ module Jekyll
           dir = site.config['attendease']['presenters_path_name']
 
           unless dir.nil?
-            @presenters.each do |presenter|
-              site.pages << PresenterPage.new(site, site.source, dir, presenter, @sessions)
+            schedule_data.presenters.each do |presenter|
+              site.pages << PresenterPage.new(site, site.source, dir, presenter, schedule_data.sessions)
             end
 
-            site.pages << PresentersIndexPage.new(site, site.source, File.join(dir), @presenters)
+            site.pages << PresentersIndexPage.new(site, site.source, File.join(dir), schedule_data.presenters)
           end
 
           # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -84,77 +54,13 @@ module Jekyll
           dir = site.config['attendease']['venues_path_name']
 
           unless dir.nil?
-            @venues.each do |venue|
+            schedule_data.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)
-          end
-        end
-      end
-
-      def sessions_with_all_data(event, sessions, presenters, rooms, venues, filters)
-        sessionsData = []
-
-        sessions.each do |s|
-          session = s.select { |k, v| %w{ id name description code speaker_ids slug }.include?(k) }
-          session['presenters'] = []
-          presenters.select{|presenter| s['speaker_ids'].include?(presenter['id'])}.each do |presenter|
-            session['presenters'] << presenter.select { |k, v| %w{ id first_name last_name company title profile_url slug }.include?(k) }
-          end
-
-          filters_for_session_hash = {}
-          filters.each do |filter|
-            filter['filter_items'].each do |filter_item|
-              if s['filters'].include?(filter_item['id'])
-                filters_for_session_hash[filter['name']] = [] unless filters_for_session_hash[filter['name']]
-                filters_for_session_hash[filter['name']] << {
-                  'name' => filter_item['name']
-                }
-                if event['primary_filter_id'] && event['primary_filter_id'] == filter['id']
-                  session['primary_filter_name'] = filter['name']
-                  session['primary_filter'] = filter_item['name']
-                end
-              end
-            end
-          end
-
-          filters_for_session = filters_for_session_hash.map { |key, value| { 'name' => key, 'items' => value } }
-
-          session['filters'] = filters_for_session
-
-          filter_tags = []
-          filters_for_session.each do |filter|
-            item_names = []
-            if !filter['items'].nil?
-              filter['items'].each do |item|
-                filter_tags << Helpers.parameterize('attendease-filter-' + filter['name'] + "-" + item['name'], '-')
-              end
-            end
-          end
-          session['filter_tags'] = filter_tags.join(" ")
-
-          if s['instances']
-            instances = []
-            s['instances'].each do |i|
-              instance = i.select { |k, v| %w{ id date time end_time duration date_formatted time_formatted end_time_formatted duration_formatted room_id }.include?(k) }
-
-              room  = rooms.select { |room| room['id'] == i['room_id'] }.first
-              venue = venues.select { |venue| venue['id'] == room['venue_id'] }.first
-              instance['room'] = room.merge({ 'venue_name' => venue['name'] })
-              instance['venue_slug'] = venue['slug']
-
-              instances << instance
-            end
-            session['instances'] = instances
-          else
-            session['instances'] = []
+            site.pages << VenuesIndexPage.new(site, site.source, File.join(dir), schedule_data.venues)
           end
-
-          sessionsData << session
         end
-
-        sessionsData
       end
     end
   end

data/lib/jekyll/attendease_plugin/tags.rb

@@ -1,5 +1,25 @@
 module Jekyll
   module AttendeasePlugin
+    class ScheduleWidgetTag < Liquid::Tag
+      def render(context)
+        schedule_data = ScheduleDataParser.new(context.registers[:site])
+        base = File.join(context.registers[:site].config['source'])
+
+        instances = schedule_data.sessions.inject([]) do |memo, s|
+          s['instances'].each do |instance|
+            instance['session'] = s
+            memo << instance
+          end
+          memo
+        end
+        instances.sort!{|x,y| [x['time'], x['session']['name']] <=> [y['time'], y['session']['name']]}
+
+        source_template_path = File.join(base, '_attendease', 'templates', 'schedule', 'widget.html')
+
+        Liquid::Template.parse(File.read(source_template_path)).render('instances' => instances, 'filters' => schedule_data.filters)
+      end
+    end
+
     class AuthScriptTag < Liquid::Tag
       def render(context)
         api_host = context.registers[:site].config['attendease']['api_host']

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = "0.6.4"
+    VERSION = "0.6.5.pre"
   end
 end
 

data/lib/jekyll/attendease_plugin.rb

@@ -1,13 +1,22 @@
+# Helper class that handles loading & parsing schedule data.
+require 'jekyll/attendease_plugin/schedule_data_parser'
+
+# Generators:
 require 'jekyll/attendease_plugin/event_data_generator'
 require 'jekyll/attendease_plugin/event_layout_generator'
 require 'jekyll/attendease_plugin/schedule_generator'
 require 'jekyll/attendease_plugin/sponsor_generator'
 require 'jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator'
+
+# Redirect page
 require 'jekyll/attendease_plugin/redirect_page'
+
+# Tags, filters and helpers
 require 'jekyll/attendease_plugin/tags'
 require 'jekyll/attendease_plugin/filters'
 require 'jekyll/attendease_plugin/helpers'
 
+# Pages
 require 'jekyll/attendease_plugin/event_layout_page'
 require 'jekyll/attendease_plugin/presenters_index_page'
 require 'jekyll/attendease_plugin/presenter_page'

data/lib/jekyll-attendease.rb

@@ -5,6 +5,7 @@ require 'i18n'
 
 require 'jekyll/attendease_plugin'
 
+Liquid::Template.register_tag('attendease_schedule_widget', Jekyll::AttendeasePlugin::ScheduleWidgetTag)
 Liquid::Template.register_tag('attendease_auth_script', Jekyll::AttendeasePlugin::AuthScriptTag)
 Liquid::Template.register_tag('attendease_scheduler_script', Jekyll::AttendeasePlugin::SchedulerScriptTag)
 Liquid::Template.register_tag('attendease_locales_script', Jekyll::AttendeasePlugin::LocalesScriptTag)

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

@@ -5,15 +5,13 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
   before(:all) do
     @schedule_generator = find_generator(described_class)
     @date = @schedule_generator.event['dates'].first['date']
-    @index_file = 'index.html'
     @session_slug = @schedule_generator.sessions.first['slug']
     @presenter_slug = @schedule_generator.presenters.first['slug']
-    @presenter_social = @schedule_generator.presenters.first['social']
     @venue_slug = Jekyll::AttendeasePlugin::Helpers.parameterize(@schedule_generator.venues.first['name'], '_') + '.html'
   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.config['destination'], @site.config['attendease']['presenters_path_name'], 'index.html')
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
@@ -25,7 +23,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
   end
 
   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.config['destination'], @site.config['attendease']['venues_path_name'], 'index.html')
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
@@ -37,20 +35,20 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
   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.config['destination'], @site.config['attendease']['schedule_path_name'], 'index.html')
     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.config['destination'], @site.config['attendease']['schedule_path_name'], @date, 'index.html')
     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.config['destination'], @site.config['attendease']['schedule_path_name'], 'index.html'))).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.config['destination'], @site.config['attendease']['schedule_path_name'], 'sessions', 'index.html')
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end
@@ -63,7 +61,7 @@ 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.config['destination'], @site.config['attendease']['presenters_path_name'], 'index.html'))).to include @presenter_slug
     end
 
     it 'links presenters correctly from the session page' do
@@ -71,27 +69,9 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     end
   end
 
-  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.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']}"
-    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.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"
-    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.config['destination'], @site.config['attendease']['venues_path_name'], 'index.html'))).to include @venue_slug
     end
 
     it 'links venues correctly from the presenter page' do
@@ -106,7 +86,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
   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 } })
-      expect(File.read(File.join(site.config['destination'], site.config['attendease']['schedule_path_name'], @index_file))).to_not include 'attendease-session-and-instance'
+      expect(File.read(File.join(site.config['destination'], site.config['attendease']['schedule_path_name'], 'index.html'))).to_not include 'attendease-session-and-instance'
     end
   end
 

data/templates/_includes/attendease/presenters/index.html

@@ -22,41 +22,6 @@
       <div class="attendease-presenter-company">
         {{ presenter.company }}
       </div>
-
-      {% if presenter.social %}
-        <div class="attendease-presenter-social">
-          {% if presenter.social.twitter and presenter.social.twitter != '' %}
-            <a class="attendease-social-icon twitter" href="https://twitter.com/{{ presenter.social.twitter }}" target="_blank">
-              <i class="fa fa-twitter-square fa-3"></i>
-              <span class="attendease-social-network">Twitter</span>
-              <span class="attendease-social-handle">@{{ presenter.social.twitter }}</span>
-              <span class="attendease-social-url">https://twitter.com/{{ presenter.social.twitter }}</span>
-            </a>
-          {% endif %}
-          {% if presenter.social.facebook and presenter.social.facebook != '' %}
-            <a class="attendease-social-icon facebook" href="https://www.facebook.com/{{ presenter.social.facebook }}" target="_blank">
-              <i class="fa fa-facebook-square fa-3"></i>
-              <span class="attendease-social-network">Facebook</span>
-              <span class="attendease-social-handle">{{ presenter.social.facebook }}</span>
-              <span class="attendease-social-url">https://www.facebook.com/{{ presenter.social.facebook }}</span>
-            </a>
-          {% endif %}
-          {% if presenter.social.linkedin and presenter.social.linkedin != '' %}
-            <a class="attendease-social-icon linkedin" href="{{ presenter.social.linkedin }}" target="_blank">
-              <i class="fa fa-linkedin-square"></i>
-              <span class="attendease-social-network">LinkedIn</span>
-              <span class="attendease-social-url">{{ presenter.social.linkedin }}</span>
-            </a>
-          {% endif %}
-          {% if presenter.social.googleplus and presenter.social.googleplus != '' %}
-            <a class="attendease-social-icon googleplus" href="{{ presenter.social.googleplus }}" target="_blank">
-              <i class="fa fa-google-plus-square"></i>
-              <span class="attendease-social-network">Google+</span>
-              <span class="attendease-social-url">{{ presenter.social.googleplus }}</span>
-            </a>
-          {% endif %}
-        </div>
-      {% endif %}
     </div>
   {% endfor %}
 </div>

data/templates/_includes/attendease/presenters/presenter.html

@@ -16,41 +16,6 @@
       {{ page.presenter.company }}
     </div>
 
-    {% if page.presenter.social %}
-      <div class="attendease-presenter-social">
-        {% if page.presenter.social.twitter and page.presenter.social.twitter != '' %}
-          <a class="attendease-social-icon twitter" href="https://twitter.com/{{ page.presenter.social.twitter }}" target="_blank">
-            <i class="fa fa-twitter-square fa-3"></i>
-            <span class="attendease-social-network">Twitter</span>
-            <span class="attendease-social-handle">@{{ page.presenter.social.twitter }}</span>
-            <span class="attendease-social-url">https://twitter.com/{{ page.presenter.social.twitter }}</span>
-          </a>
-        {% endif %}
-        {% if page.presenter.social.facebook and page.presenter.social.facebook != '' %}
-          <a class="attendease-social-icon facebook" href="https://www.facebook.com/{{ page.presenter.social.facebook }}" target="_blank">
-            <i class="fa fa-facebook-square fa-3"></i>
-            <span class="attendease-social-network">Facebook</span>
-            <span class="attendease-social-handle">{{ page.presenter.social.facebook }}</span>
-            <span class="attendease-social-url">https://www.facebook.com/{{ page.presenter.social.facebook }}</span>
-          </a>
-        {% endif %}
-        {% if page.presenter.social.linkedin and page.presenter.social.linkedin != '' %}
-          <a class="attendease-social-icon linkedin" href="{{ page.presenter.social.linkedin }}" target="_blank">
-            <i class="fa fa-linkedin-square"></i>
-            <span class="attendease-social-network">LinkedIn</span>
-            <span class="attendease-social-url">{{ page.presenter.social.linkedin }}</span>
-          </a>
-        {% endif %}
-        {% if page.presenter.social.googleplus and page.presenter.social.googleplus != '' %}
-          <a class="attendease-social-icon googleplus" href="{{ page.presenter.social.googleplus }}" target="_blank">
-            <i class="fa fa-google-plus-square"></i>
-            <span class="attendease-social-network">Google+</span>
-            <span class="attendease-social-url">{{ page.presenter.social.googleplus }}</span>
-          </a>
-        {% endif %}
-      </div>
-    {% endif %}
-
     <div class="attendease-presenter-bio">
       {{ page.presenter.bio | markdownify }}
     </div>

data/templates/_includes/attendease/schedule/widget.html

@@ -0,0 +1,22 @@
+<div class="attendease-schedule-widget">
+  {% for instance in instances %}
+    <div class="attendease-session-and-instance {{ instance.session.filter_tags }}" data-instance-id="{{ instance.id }}" data-session-id="{{ instance.session.id }}">
+      <div class="attendease-instance-details">
+        <div class="attendease-instance-detail attendease-time-range" data-duration="{{ instance.duration }}" data-start-time="{{ instance.time }}">
+          {{ instance.time_formatted }} - {{ instance.end_time_formatted}}
+
+          <div class="attendease-duration" data-duration="{{ instance.duration }}">
+            {{ instance.duration_formatted }}
+          </div>
+        </div>
+      </div>
+      <div class="attendease-name">
+        {% for tag in instance.session.filter_tags %}
+        <span class="{{ tag }}">{{ tag }}</span>
+        {% endfor %}
+        <h2>{{ instance.session.name }}</h2>
+      </div>
+    </div>
+  {% endfor %}
+</div>
+

data/templates/_includes/attendease/sponsors/index.html

@@ -1,6 +1,6 @@
 <div class="attendease-sponsors">
   <div class="attendease-header">
-    <h1>{% t event.lingo.sponsors %}</h1>
+    <h1>Sponsors</h1>
   </div>
 
   {% for level in page.sponsor_levels %}

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.6.5.pre
 platform: ruby
 authors:
 - Michael Wood
@@ -16,119 +15,104 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -147,6 +130,8 @@ 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
@@ -156,6 +141,7 @@ files:
 - lib/jekyll/attendease_plugin/presenter_page.rb
 - lib/jekyll/attendease_plugin/presenters_index_page.rb
 - lib/jekyll/attendease_plugin/redirect_page.rb
+- lib/jekyll/attendease_plugin/schedule_data_parser.rb
 - lib/jekyll/attendease_plugin/schedule_day_page.rb
 - lib/jekyll/attendease_plugin/schedule_generator.rb
 - lib/jekyll/attendease_plugin/schedule_index_page.rb
@@ -167,8 +153,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
@@ -176,44 +170,34 @@ files:
 - templates/_includes/attendease/schedule/index.html
 - templates/_includes/attendease/schedule/session.html
 - templates/_includes/attendease/schedule/sessions.html
+- templates/_includes/attendease/schedule/widget.html
 - templates/_includes/attendease/sponsors/index.html
 - 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
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Attendease event helper for Jekyll
 test_files:
 - spec/lib/jekyll/attendease_plugin/event_data_generator_spec.rb
@@ -226,3 +210,4 @@ test_files:
 - spec/lib/jekyll/attendease_plugin/tags_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures_helpers.rb
+has_rdoc: