jekyll-attendease 0.6.26c → 0.6.26d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bfbbef619b2af7fdb902279cda93fff38a0fb48
-  data.tar.gz: 08ad5ab294e3c9dec9ea68a449f4418634056724
+  metadata.gz: 6ebb4b439693d912cd035a3f10d35eba99fb3f7a
+  data.tar.gz: 78bfc9b241f534fd33d79945bcca288568947a34
 SHA512:
-  metadata.gz: 853ea57545323172b35feb61cdad2a848f223879b59d969b5257dcc060a9e666d9a48b140b74fb4ab45ca8e079ca550516aa9eb8759734e81cc3785be873daca
-  data.tar.gz: 2950c22214bfb22b39966c188ab6ee49468aad11f3b65597ea4c6ca2cdd4c5910938bfe8692be84ad28874f4a5a240d38d093d00d0d31a8351b5471e09aad1cc
+  metadata.gz: 18ce2aa1b17a3bc4c9adb6ed8067d2ec638d977ec1ad3075d9497b6c1213a3e20dd650297a226886518d78e829cf31e792574e4fb840164a3201b98020c84c98
+  data.tar.gz: 78d7151f7312771cc50e20974bbb4f69308e04750f8b283d33ab3853722f761f4e03c26687e65f73f62249584400465ee178986db4cbc85a41992d50c89c6b18

data/lib/jekyll/attendease_plugin/site_page_blocks_json.rb

@@ -0,0 +1,42 @@
+module Jekyll
+  module AttendeasePlugin
+    class SitePageBlocksJson < StaticFile
+      def initialize(site, base, page)
+        @site = site
+        @base = base
+        @dir = page['slug']
+        @name = 'index.json'
+
+        self.process(@name)
+
+        #require 'pry'
+        #binding.pry
+        #self.read_yaml(File.join(base, '_attendease', 'templates', 'pages'), 'default.html')
+        self.read_yaml(File.join(base, '_layouts'), "#{page['layout']}.html")
+
+        self.data['title'] = page['title']
+        self.data['layout'] = page['layout']
+
+        zones = {}
+
+        # 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| x['weight'] <=> y['weight'] }
+          self.data[k] = ''
+          zone.each do |i|
+            self.data[k] << i['rendered_html']
+          end
+        end
+
+        self.data['site_page'] = page
+      end
+    end
+  end
+end
+

data/lib/jekyll/attendease_plugin/tags.rb

@@ -94,23 +94,16 @@ module Jekyll
       end
 
       def render(context)
-        portal_pages = context.registers[:site].data['porta_pages']
-
-        config = context.registers[:site].config['attendease']
+        portal_pages = context.registers[:site].data['portal_pages']
 
         nav = []
         if portal_pages.is_a?(Array)
           portal_pages.sort! { |a, b| a['weight'] <=> b['weight'] }
-          key_mapping = { 'schedule' => 'sessions' }
           portal_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
+              template = Liquid::Template.parse(super)
+              template.assigns['page'] = page
+              nav << template.render
             end
           end
           nav.join("\n")
@@ -133,21 +126,14 @@ module Jekyll
       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
+              template = Liquid::Template.parse(super)
+              template.assigns['page'] = page
+              nav << template.render
             end
           end
           nav.join("\n")

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.26c'
+    VERSION = '0.6.26d'
   end
 end

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

@@ -41,12 +41,7 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
 
     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 portal pages array' do
-      expect(site.data['portal_pages'].class).to eq(Array)
-      expect(site.data['portal_pages'].length).to eq(6)
+      expect(site.data['pages'].length).to eq(5)
     end
 
     it 'populates a site wide event object' do
@@ -64,7 +59,7 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
 
     it 'populates a site wide pages array' do
       expect(site.data['pages'].class).to eq(Array)
-      expect(site.data['pages'].length).to eq(10)
+      expect(site.data['pages'].length).to eq(5)
     end
 
     it 'populates a site wide event object' do
@@ -80,6 +75,11 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
       expect(site.data['sponsors']).to be_nil
     end
 
+    it 'populates a site wide portal pages array' do
+      expect(site.data['portal_pages'].class).to eq(Array)
+      expect(site.data['portal_pages'].length).to eq(2)
+    end
+
   end
 
 end

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

@@ -6,7 +6,7 @@ RSpec.describe Jekyll::AttendeasePlugin::OrganizationDataGenerator do
 
     it 'populates a site wide pages array' do
       expect(site.data['pages'].class).to eq(Array)
-      expect(site.data['pages'].length).to eq(10)
+      expect(site.data['pages'].length).to eq(5)
     end
 
     it 'populates a site wide settings object' do

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

@@ -2,12 +2,18 @@ require 'spec_helper'
 
 RSpec.describe "Jekyll Attendease tags" do
   let(:site) { build_site }
+  let(:cms_site) { build_site({ 'attendease' => { 'jekyll33' => true } }) }
   let(:context) { { :registers => { :site => site, :page => {} } } }
+  let(:cms_context) { { :registers => { :site => cms_site, :page => {} } } }
 
   def render(content)
     ::Liquid::Template.parse(content).render({}, context)
   end
 
+  def cms_render(content)
+    ::Liquid::Template.parse(content).render({}, cms_context)
+  end
+
   context "{% attendease_auth_script %}" do
     subject { render("{% attendease_auth_script %}") }
     it { is_expected.to include "assets/attendease_event/auth.js" }
@@ -54,12 +60,20 @@ RSpec.describe "Jekyll Attendease tags" do
   end
 
   context "{% attendease_nav %}" do
-    subject { render("{% attendease_nav %}{% raw %}<li><a href=\"/{{ page.slug }}/\">{{ page.name }}</a></li>{% endraw %}{% endattendease_nav %}") }
+    subject { render("{% attendease_nav %}{% raw %}<li><a href=\"{{ page.href }}\">{{ page.name }}</a></li>{% endraw %}{% endattendease_nav %}") }
     it { is_expected.to match(/<li><a href="\/schedule\/"/) }
 
     # hidden page
     it { is_expected.to_not match(/<li><a href="\/test\/"/) }
   end
+
+  context "{% attendease_portal_nav %}" do
+    subject { cms_render("{% attendease_portal_nav %}{% raw %}<li><a href=\"{{ page.href }}\">{{ page.name }}</a></li>{% endraw %}{% endattendease_portal_nav %}") }
+    it { is_expected.to match(/<li><a href="\/"/) }
+
+    # hidden page
+    it { is_expected.to_not match(/<li><a href="\/test\/"/) }
+  end
 end
 
 def schedule_widget_data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.26c
+  version: 0.6.26d
 platform: ruby
 authors:
 - Michael Wood
@@ -183,6 +183,7 @@ files:
 - 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_page_blocks_json.rb
 - lib/jekyll/attendease_plugin/site_pages_generator.rb
 - lib/jekyll/attendease_plugin/sponsor_generator.rb
 - lib/jekyll/attendease_plugin/sponsors_index_page.rb
@@ -238,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll