jekyll-attendease 0.6.24 → 0.6.25b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6beeaeee0dec5362fb346a24db9601ffe018e511
-  data.tar.gz: 17c150fbfdf0a77c76864a9aa08c1ac037336ca6
+  metadata.gz: 298b49dc03d53f5a61bb2b34da0efe4fd5146562
+  data.tar.gz: 3481dab008802f780c60d3850aae451424872da0
 SHA512:
-  metadata.gz: d4a7377680f70e405f170ca7fe3b34a5f267669c40ad3e6db787f8b0e06a1783d4e7eeab71de778a5ffbdaafce394d142e4c17a544c3ca83d50e983fc4482d86
-  data.tar.gz: 3e7f96e19bef5524f9cd9dd4208ebaf88a18b205b31b3ca7ac34dd5030793fa0c35c8e56abec4fe7c9701b64525181746bd2bf4f460064d569b5bc66d7dcf6cc
+  metadata.gz: 1f6567967bfaac467e1fd297d39475374cd55c76541f194fd0e85f769467055eadf0e9bdf9a74689d227dbf4689f6df5fe359b0f6d0999699d2e104a0cb46d15
+  data.tar.gz: 205d2f3a17a1c765fb64f0cb83a5bbe6eb95f9ec6d94634773565319bd99ba0fb6d405027366d5de0c1add8fc05281dd9fc71c3517e049855f317152740d7905

data/lib/jekyll-attendease.rb

@@ -13,5 +13,6 @@ Liquid::Template.register_tag('attendease_locales_script',   Jekyll::AttendeaseP
 Liquid::Template.register_tag('attendease_auth_account',     Jekyll::AttendeasePlugin::AuthAccountTag)
 Liquid::Template.register_tag('attendease_auth_action',      Jekyll::AttendeasePlugin::AuthActionTag)
 Liquid::Template.register_tag('attendease_t',                Jekyll::AttendeasePlugin::TranslateTag)
+Liquid::Template.register_tag('attendease_nav',              Jekyll::AttendeasePlugin::NavigationTag)
 
 Liquid::Template.register_filter(Jekyll::AttendeasePlugin::Filters)

data/lib/jekyll/attendease_plugin.rb

@@ -8,6 +8,7 @@ require 'jekyll/attendease_plugin/event_template_generator'
 require 'jekyll/attendease_plugin/home_page_generator'
 require 'jekyll/attendease_plugin/schedule_generator'
 require 'jekyll/attendease_plugin/sponsor_generator'
+require 'jekyll/attendease_plugin/site_pages_generator'
 require 'jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator'
 
 # Redirect page
@@ -30,6 +31,7 @@ require 'jekyll/attendease_plugin/schedule_session_page'
 require 'jekyll/attendease_plugin/sponsors_index_page'
 require 'jekyll/attendease_plugin/venues_index_page'
 require 'jekyll/attendease_plugin/venue_page'
+require 'jekyll/attendease_plugin/site_page'
 
 # Ve.rs.ion
 require 'jekyll/attendease_plugin/version'

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -34,7 +34,7 @@ module Jekyll
 
             FileUtils.mkdir_p(@attendease_data_path)
 
-            data_files = %w{ site event sessions presenters rooms filters venues sponsors }.map { |m| "#{m}.json"} << 'lingo.yml'
+            data_files = %w{ site event sessions presenters rooms filters venues sponsors pages }.map { |m| "#{m}.json"} << 'lingo.yml'
 
             data_files.each do |file_name|
               update_data = true
@@ -87,6 +87,7 @@ module Jekyll
 
               # make this data available to anything that wants it
               site.config['attendease'][File.basename(file_name, '.*')] = data
+              site.data[File.basename(file_name, '.*')] = data
 
               if data.is_a?(Hash)
                 if file_name == 'site.json'

data/lib/jekyll/attendease_plugin/event_template_generator.rb

@@ -25,7 +25,7 @@ module Jekyll
         Jekyll.logger.info "[Attendease] Generating theme templates..."
 
         # Generate the template files if they don't yet exist.
-        %w{ schedule presenters venues sponsors}.each do |p|
+        %w{ schedule presenters venues sponsors pages }.each do |p|
           path = File.join(site.source, '_attendease', 'templates', p)
           FileUtils.mkdir_p(path)
           raise "Could not create #{path}." unless File.exists?(path)
@@ -54,6 +54,7 @@ EOF
           venues/index
           venues/venue
           sponsors/index
+          pages/default
         }.each do |page|
           destination_file = File.join(site.source, '_attendease', 'templates', "#{page}.html")
 

data/lib/jekyll/attendease_plugin/site_page.rb

@@ -0,0 +1,20 @@
+module Jekyll
+  module AttendeasePlugin
+    class SitePage < Page
+      def initialize(site, base, page)
+        @site = site
+        @base = base
+        @dir = page['slug']
+        @name = 'index.html'
+
+        self.process(@name)
+
+        self.read_yaml(File.join(base, '_attendease', 'templates', 'pages'), 'default.html')
+
+        self.data['title'] = page['title']
+
+        self.data['site_page'] = page
+      end
+    end
+  end
+end

data/lib/jekyll/attendease_plugin/site_pages_generator.rb

@@ -0,0 +1,14 @@
+module Jekyll
+  module AttendeasePlugin
+    class SitePagesGenerator < Generator
+      safe true
+
+      def generate(site)
+        site.config['attendease']['pages'].each do |page|
+          site.pages << SitePage.new(site, site.source, page)
+
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/attendease_plugin/tags.rb

@@ -80,6 +80,45 @@ module Jekyll
         '<div id="attendease-auth-action"></div>'
       end
     end
+
+    #require 'pry'
+
+    class NavigationTag < Liquid::Block
+      def initialize(tag_name, params, tokens)
+        super
+        @options = {}
+        params.split(/\s/).each do |keypair|
+          opt = keypair.split('=')
+          @options[opt[0]] = opt[1] if opt.length == 2
+        end
+      end
+
+      def render(context)
+        pages = context.registers[:site].data['pages']
+
+        config = context.registers[:site].config['attendease']
+
+        nav = []
+        if pages.is_a?(Array)
+          pages.sort! { |a, b| a['weight'] <=> b['weight'] }
+          key_mapping = { 'schedule' => 'sessions' }
+          pages.select { |p| p['top_level'] }.each do |page|
+            if page['active'] || !page['hidden']
+              # only activate nav links if there is content
+              config_key = "has_#{key_mapping[page['page_key']] || page['page_key']}"
+              if config[config_key].nil? || (!config[config_key].nil? && config[config_key] == true)
+                template = Liquid::Template.parse(super)
+                template.assigns['page'] = page
+                nav << template.render
+              end
+            end
+          end
+          nav.join("\n")
+        else
+          ''
+        end
+      end
+    end
   end
 end
 

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.24'
+    VERSION = '0.6.25b'
   end
 end

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

@@ -2,8 +2,50 @@ require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
 
+  before(:all) do
+    @event_data_generator = find_generator(described_class)
+  end
   #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)
+  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)
+  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)
+  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)
+  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)
+  end
+
+  it 'populates a site wide days array' do
+    expect(@site.config['attendease']['days'].class).to eq(Array)
+    expect(@site.config['attendease']['days'].length).to eq(2)
+  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)
+  end
+
+  it 'populates a site wide event object' do
+    expect(@site.config['attendease']['event'].class).to eq(Hash)
+  end
+
 
 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 }.each do |layout|
+    %w{ layout register surveys pages }.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/tags_spec.rb

@@ -50,6 +50,11 @@ RSpec.describe "Jekyll Attendease tags" do
       expect(subject.gsub(' ', '').gsub("\n", '')).to eq(schedule_widget_data.gsub(' ', '').gsub("\n", ''))
     end
   end
+
+  context "{% attendease_nav %}" do
+    subject { render("{% attendease_nav %}{% raw %}<li><a href=\"/{{ page.slug }}/\">{{ page.name }}</a></li>{% endraw %}{% endattendease_nav %}") }
+    it { is_expected.to match(/<li><a href="\/schedule\/"/) }
+  end
 end
 
 def schedule_widget_data

data/spec/spec_helper.rb

@@ -65,7 +65,7 @@ RSpec.configure do |config|
         'generate_schedule_pages' => true,
         'has_sessions'            => true,
         'has_presenters'          => true,
-        'has_sponsors'            => true,
+        'has_sponsors'            => false,
         'has_rooms'               => true,
         'has_filters'             => true,
         'has_venues'              => true
@@ -75,7 +75,7 @@ RSpec.configure do |config|
 
   def build_site(config = {})
     site = Jekyll::Site.new(site_configuration(config))
-    foo = site.process
+    site.process
     site
   end
 

data/templates/attendease/pages/default.html

@@ -0,0 +1,3 @@
+<div class="attendease-page-content">
+  {{ page.site_page.content }}
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.24
+  version: 0.6.25b
 platform: ruby
 authors:
 - Michael Wood
@@ -139,6 +139,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: Bring your event data into Jekyll for amazing event websites.
 email: support@attendease.com
 executables: []
@@ -165,6 +179,8 @@ files:
 - lib/jekyll/attendease_plugin/schedule_index_page.rb
 - lib/jekyll/attendease_plugin/schedule_session_page.rb
 - lib/jekyll/attendease_plugin/schedule_sessions_page.rb
+- lib/jekyll/attendease_plugin/site_page.rb
+- lib/jekyll/attendease_plugin/site_pages_generator.rb
 - lib/jekyll/attendease_plugin/sponsor_generator.rb
 - lib/jekyll/attendease_plugin/sponsors_index_page.rb
 - lib/jekyll/attendease_plugin/tags.rb
@@ -183,6 +199,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/fixtures_helpers.rb
 - templates/attendease/index.html
+- templates/attendease/pages/default.html
 - templates/attendease/presenters/index.html
 - templates/attendease/presenters/presenter.html
 - templates/attendease/schedule/day.html
@@ -210,9 +227,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.2.5