jekyll-attendease 0.6.37 → 0.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: adfee171d0c1f66d494c12a096c87bd2b64032fa689a95dff42405e4faefd627
-  data.tar.gz: 4763d446b8e8fa7677a2250793986fd2433b7a47b9a5d631456425594aeb0e4b
+SHA1:
+  metadata.gz: f595d607f6427a967ba807233e0f6b1e1d55a510
+  data.tar.gz: 57ec4f0a60928244e36ab44403a9434f5c785a52
 SHA512:
-  metadata.gz: f12ada600304e8eade0fdabd9bdc030965e37662aab91b0654a88b1329aa7a494087c026535e557a132840e14c828174942c889350f7de7e849df598b5023038
-  data.tar.gz: e5efd65aab925c61dceac9688004fd8d13670c59d686b938328da44e66a252595239d0e478be452ee21334245d17b7fb43d345b49cd0461b76ddaa644e312cb3
+  metadata.gz: d46fac7405d254dbbab9b5211b9a1502aebc012aa57266390a043effe6a3f892feb7390c427986bbce972690762ba78e7efeebfe0b70836e3d6df4c5a18b0ca1
+  data.tar.gz: 5bdcf31ac6b82a30c14768802cad1907efa8b876ccfad18538bd1bf8418fad02979cb813ab9ebbc0bc772ad6ef213cd37e309c8f95af89839526d9f5cfc9a791

data/lib/jekyll/attendease_plugin/tags.rb

@@ -151,18 +151,19 @@ module Jekyll
 
       def render(context)
         config = context.registers[:site].config['attendease']
-        site_settings = context.registers[:site].data['site_settings']
-        parent_pages_are_clickable = config['parent_pages_are_clickable']
+        siteSettings = context.registers[:site].data['site_settings'].delete_if {|key, value| ['analytics', 'meta'].include? key }
 
-        page_data_source = if site_settings['advanced'] && site_settings['advanced']['portal_pages_in_the_event_website']
-                             'portal_pages'
-                           else
-                             'pages'
-                           end
+        organizationSiteSettings = {}
+        if context.registers[:site].data['organization_site_settings']
+          organizationSiteSettings = context.registers[:site].data['organization_site_settings'].delete_if {|key, value| ['analytics', 'meta'].include? key }
+        end
+
+        parent_pages_are_clickable = config['parent_pages_are_clickable']        
 
         page_keys = %w[id name href weight active root children parent]
 
-        pages = context.registers[:site].data[page_data_source]
+        pages = {}
+        pages = context.registers[:site].data['pages']
           .select { |p| p['root'] }
           .reject { |p| p['hidden'] }
           .map do |page|
@@ -177,6 +178,25 @@ module Jekyll
           end
           .sort_by { |p| p['weight'] }
 
+        portal_pages = {}
+        if (context.registers[:site].data['portal_pages'])
+          portal_pages = context.registers[:site].data['portal_pages']
+            .select { |p| p['root'] }
+            .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'] }
+        end
+
+
         env = config['environment']
 
         if config['mode'] == 'organization'
@@ -185,14 +205,15 @@ module Jekyll
 (function(w) {
   w.AttendeaseConstants = {
     locale: "en",
-    orgApiEndpoint: "#{ config['api_host'] }api",
+    orgURL: "#{ config['api_host'] }",
     orgId: "#{ config['source_id'] }",
     privateSite: #{ config['private_site'] },
     authApiEndpoint: "#{ config['auth_host'] }api",
     orgLocales: #{ config['available_portal_locales'] },
     features: #{ config['features'].to_json },
     pages: #{ pages.to_json },
-    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} }
+    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} },
+    siteSettings: #{ siteSettings.to_json }
   }
 })(window)
 </script>
@@ -206,13 +227,16 @@ _EOT
     locale: "#{ config['locale'] }",
     eventApiEndpoint: "#{ config['api_host'] }api",
     eventId: "#{ config['source_id'] }",
-    orgApiEndpoint: "#{ config['organization_url'] }api",
+    orgURL: "#{ config['organization_url'] }",
     orgId: "#{ config['organization_id'] }",
     privateSite: #{ config['private_site'] },
     authApiEndpoint: "#{ config['auth_host'] }api",
     features: #{ config['features'].to_json },
     pages: #{ pages.to_json },
-    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} }
+    portalPages: #{ portal_pages.to_json },
+    settings: { parentPagesAreClickable: #{!!parent_pages_are_clickable} },
+    siteSettings: #{ siteSettings.to_json },
+    organizationSiteSettings: #{ organizationSiteSettings.to_json }
   }
 })(window)
 </script>

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.37'
+    VERSION = '0.6.38'
   end
 end

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

@@ -87,7 +87,7 @@ RSpec.describe "Jekyll Attendease tags" do
     it { is_expected.to match(/locale: "en"/) }
     it { is_expected.to match(/eventApiEndpoint: "https:\/\/foobar\/api"/) }
     it { is_expected.to match(/eventId: "foobar"/) }
-    it { is_expected.to match(/orgApiEndpoint: "https:\/\/foobar\.org\/api"/) }
+    it { is_expected.to match(/orgURL: "https:\/\/foobar.org\/"/) }
     it { is_expected.to match(/orgId: "batbaz"/) }
     it { is_expected.to match(/authApiEndpoint: "https:\/\/foobar.auth\/api"/) }
     it { is_expected.to match(/dashboard.attendease.com\/webpack_assets\/blockrenderer.bundle.js/) }
@@ -104,7 +104,7 @@ RSpec.describe "Jekyll Attendease tags" do
     subject { org_render("{% attendease_block_renderer %}") }
 
     it { is_expected.to match(/locale: "en"/) }
-    it { is_expected.to match(/orgApiEndpoint: "https:\/\/foobar\/api"/) }
+    it { is_expected.to match(/orgURL: "https:\/\/foobar\/"/) }
     it { is_expected.to match(/orgId: "foobar"/) }
     it { is_expected.to match(/authApiEndpoint: "https:\/\/foobar.auth\/api"/) }
     it { is_expected.to match(/dashboard.attendease.com\/webpack_assets\/blockrenderer.bundle.js/) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.37
+  version: 0.6.38
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-09-25 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.7.7
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll