jekyll-attendease 0.6.43.3 → 0.6.44b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd982ba5a7fab63d1dd6c4fedc02de729f5b22e
-  data.tar.gz: f40d85fcabf1092cfd65ef5e39812764c570002a
+  metadata.gz: e03d31c7ddea1090c096541f92f9a3689449431a
+  data.tar.gz: 3016f4e2680178023dbcc678ea14e5b583c750f2
 SHA512:
-  metadata.gz: 9c484e974e21529b3cbc326b8af17fe10c236ee22746ae550a063f1eeeb44e22eb901d8e78c56f1096c1b4c6c88cbb032e1224cb4d8f826ed1bcd8fd6ee4477a
-  data.tar.gz: f5787c010552bef0e81779f2200db19e0a48f57a9060c49a9a2f09f5afcbeefdea17f9e567887d1b700bb9342bef8ab72a0fbf29259a1657011d9f16e90defc6
+  metadata.gz: 9ca2980db60b358afb8e18fef67b2983e64e86b0827401584a2a261a3bee3549beece2cf06eb470dc2ad3b527f2d5e64477a68f6876e5a6c679c49460a6eb8da
+  data.tar.gz: 4aa473baa8f564fec7085feaa28e467f1a3cc8f0914c5121ff0454d5f30d6c5e9ff4d628323f2f65d8d246ae3385253c9161ad63617cc0aa24373e9f9b00bc2d

data/lib/jekyll/attendease_plugin/helpers.rb

@@ -35,7 +35,27 @@ module Jekyll
                     'ø' => 'o', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u',
                     'ý' => 'y', 'ÿ' => 'y' }
         s.encode('ASCII',
-        fallback: lambda { |c| fallback.key?(c) ? fallback[c] : undefined })
+                 fallback: lambda { |c| fallback.key?(c) ? fallback[c] : undefined })
+      end
+
+      PAGE_KEYS = %w[id name href weight root children parent].freeze
+
+      # filter the raw pages for what's safe to make public
+      def self.public_pages(pages)
+        pages
+          .select { |p| p['root'] }
+          .reject { |p| p['hidden'] && (p['slug'] != '' || p['external'] == true) }
+          .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
     end
   end

data/lib/jekyll/attendease_plugin/tags.rb

@@ -163,43 +163,9 @@ module Jekyll
 
         parent_pages_are_clickable = config['parent_pages_are_clickable']
 
-        page_keys = %w[id name href weight active root children parent]
-
-        pages = {}
-        pages = context.registers[:site].data['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'] }
-
-        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
-
+        pages = Helpers.public_pages(context.registers[:site].data['pages'])
 
+        portal_pages = Helpers.public_pages(context.registers[:site].data['portal_pages']) || []
         env = config['environment']
 
         # IMPORTANT NOTE: The script variables below must NOT be changed without making sure that blockrenderer.js and other

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.43.3'
+    VERSION = '0.6.44b'
   end
 end

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

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::Helpers do
-  context '#parameterize' do
+  describe '#parameterize' do
     it 'converts a typical filter item into a predictable CSS-friendly class name' do
       expect(Jekyll::AttendeasePlugin::Helpers.parameterize('Super Hyper Advanced', '-')).to eq('super-hyper-advanced')
     end
@@ -23,4 +23,47 @@ RSpec.describe Jekyll::AttendeasePlugin::Helpers do
       expect(Jekyll::AttendeasePlugin::Helpers.parameterize('-, What--the--hell? ::')).to eq('what_the_hell')
     end
   end
+
+  describe '#convert_to_ascii' do
+    it 'converts accented characters to plain letters' do
+      expect(Jekyll::AttendeasePlugin::Helpers.convert_to_ascii('café')).to eq('cafe')
+    end
+  end
+
+  describe '#public_pages' do
+    let(:pages) { JSON.parse(File.read(fixtures_path.join('_attendease', 'data', 'pages.json'))) }
+    let(:public_pages) { Jekyll::AttendeasePlugin::Helpers.public_pages(pages) }
+    let(:all_pages_hidden) do
+      hidden_pages = pages.map { |p| p['hidden'] = true; p }
+      Jekyll::AttendeasePlugin::Helpers.public_pages(hidden_pages)
+    end
+
+    it 'sorts pages by weight' do
+      expect(public_pages[0]['weight']).to eq(0)
+      expect(public_pages[0]['href']).to eq('/')
+
+      expect(public_pages[1]['weight']).to eq(1)
+      expect(public_pages[1]['href']).to eq('/product/')
+
+      expect(public_pages[2]['weight']).to eq(2)
+      expect(public_pages[2]['href']).to eq('/agenda/')
+
+      expect(public_pages[3]['weight']).to eq(3)
+      expect(public_pages[3]['href']).to eq('/sponsors/')
+    end
+
+    it 'sorts children by weight' do
+      expect(public_pages[1]['children'][0]['name']).to eq('Product Child 2')
+      expect(public_pages[1]['children'][1]['name']).to eq('Product Child 1')
+    end
+
+    it 'publishes the home page regardless of hidden status' do
+      expect(all_pages_hidden.length).to eq(1)
+      expect(all_pages_hidden[0]['href']).to eq('/')
+    end
+
+    it 'only has the declared keys in each page object' do
+      expect(public_pages[0].keys.length).to eq(7)
+    end
+  end
 end

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

@@ -83,16 +83,22 @@ RSpec.describe "Jekyll Attendease tags" do
 
   context "{% attendease_block_renderer %} for event" do
     subject { render("{% attendease_block_renderer %}") }
-
-    it { is_expected.to match(/locale: "en"/) }
-    it { is_expected.to match(/siteName: "My Attendease Test Event"/) }
-    it { is_expected.to match(/eventApiEndpoint: "https:\/\/foobar\/api"/) }
-    it { is_expected.to match(/eventId: "foobar"/) }
-    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/) }
-    it { is_expected.to_not match(/orgLocales/) }
+    let(:foo) { render("{% attendease_block_renderer %}") }
+
+    describe 'expected output' do
+      require 'pry'
+      
+
+      it { binding.pry; is_expected.to match(/locale: "en"/) }
+      it { is_expected.to match(/siteName: "My Attendease Test Event"/) }
+      it { is_expected.to match(/eventApiEndpoint: "https:\/\/foobar\/api"/) }
+      it { is_expected.to match(/eventId: "foobar"/) }
+      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/) }
+      it { is_expected.to_not match(/orgLocales/) }
+    end
   end
 
   context "{% attendease_block_renderer %} with custom bundle URL" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.43.3
+  version: 0.6.44b
 platform: ruby
 authors:
 - Michael Wood
@@ -234,12 +234,12 @@ 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
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll