jekyll-attendease 0.6.35 → 0.6.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6834d5e7fc8f967800886cd50777404496db56ac
-  data.tar.gz: 10c4bffd6d79a7676bd841c9f98fcad866df5f06
+SHA256:
+  metadata.gz: 91f26e90c3718351baba3daf388a84933d521404a7696fdad1f4282b28af3f0a
+  data.tar.gz: 346e48fdbae2dbf2da200949d89d443c641878180c3d3028e27e102fd0826eb5
 SHA512:
-  metadata.gz: 99f958de8eebfc428d04e61acddf6bb45041222ca1fb6d26a0a596f827739ac4ebfe4125510d998fa189636d78d8910467a68e25645192dfd4e21e4cda583b41
-  data.tar.gz: 55b9177d22c4aa8bf01be24fbc27bcdf6a18f851469ea4464f1e1f279f01494aae200df514d2ebdc3e64c5f2d495dc6e1a650a032fbb489c91f51a094e03f91a
+  metadata.gz: add92b15d90cf2bd82612410f13af598d96981889c9129c11eb09e5c4ae7e8e7ca78bedde369fd1fcc7e7c8a36603f2edabeabc12a7413e1680604001f76bd7e
+  data.tar.gz: 416469c348ba3c9ea0fb02aba0cb86b62011cfe1e00a6b8b622cbb6bc7dfd4630f658c2129f6dee0b8b7cd00384b1845ba714b59c1aa54d21aa53f9c6b3bc115

data/lib/jekyll/attendease_plugin/tags.rb

@@ -151,7 +151,31 @@ module Jekyll
 
       def render(context)
         config = context.registers[:site].config['attendease']
-        #data = context.registers[:site].data
+        site_settings = context.registers[:site].data['site_settings']
+        parent_pages_are_clickable = config['parent_pages_are_clickable']
+
+        page_data_source = if site_settings['advanced'] && site_settings['advanced']['portal_pages_in_the_event_website']
+                             'portal_pages'
+                           else
+                             'pages'
+                           end
+
+        page_keys = %w[id name href weight active root children parent]
+
+        pages = context.registers[:site].data[page_data_source]
+          .reject { |p| p['hidden'] }
+          .map do |page|
+            page = page.select { |key| page_keys.include?(key) }
+
+            page['children'] = page['children']
+              .reject { |p| p['hidden'] }
+              .map { |child| child.select { |key| page_keys.include?(key) } }
+              .sort_by { |p| p['weight'] }
+
+            page
+          end
+          .sort_by { |p| p['weight'] }
+
         env = config['environment']
 
         if config['mode'] == 'organization'
@@ -165,7 +189,9 @@ module Jekyll
     privateSite: #{ config['private_site'] },
     authApiEndpoint: "#{ config['auth_host'] }api",
     orgLocales: #{ config['available_portal_locales'] },
-    features: #{ config['features'].to_json }
+    features: #{ config['features'].to_json },
+    pages: #{ pages.to_json },
+    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} }
   }
 })(window)
 </script>
@@ -183,7 +209,9 @@ _EOT
     orgId: "#{ config['organization_id'] }",
     privateSite: #{ config['private_site'] },
     authApiEndpoint: "#{ config['auth_host'] }api",
-    features: #{ config['features'].to_json }
+    features: #{ config['features'].to_json },
+    pages: #{ pages.to_json },
+    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} }
   }
 })(window)
 </script>

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.35'
+    VERSION = '0.6.36'
   end
 end

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

@@ -41,7 +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(6)
+      expect(site.data['pages'].length).to eq(7)
     end
 
     it 'populates a site wide event object' do
@@ -59,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(6)
+      expect(site.data['pages'].length).to eq(7)
     end
 
     it 'populates a site wide event object' do

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(6)
+      expect(site.data['pages'].length).to eq(7)
     end
 
     it 'populates a site wide settings object' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.35
+  version: 0.6.36
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll