jekyll-attendease 0.9.9.4 → 0.9.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc33afe7c8adcbfe1d2f8353a7648b073d6bdec
-  data.tar.gz: 77b7b2e73dd60f0566afd2e3f294daaba4a31eb2
+  metadata.gz: 46e8707284c8b17f30a38284e1598992f7395a3f
+  data.tar.gz: 91c357817a6f786c3400a5c3acbe4b4565b3d5da
 SHA512:
-  metadata.gz: 7865c50680f237a6375ec73e56d4ceb60b3ac5dbfda4efc5713cebe0903054aeeb1a8b49b6ac4456d88bbe37d49193621ef8b90b19dfab9fd300cc913f75c2fd
-  data.tar.gz: b1610024647e63234b8ff31e9332d81230665a99bd6247c9974bddb2a0a917dc95379ffdcc4653b8c5d0dc926f4f2341755486432b9c5398d1c25f6347a5d841
+  metadata.gz: 3701c04f666d235d305549e7192d8369d12610b0ce8a31266930492bf341a4f347c7e87d89e391e4ed0097f578e25948a7c411ca911d0153bb62c913d4b15c03
+  data.tar.gz: b592f4e1f79bc3f90296e6846ef07fac577ac47ecf02a74c2be4060e4322b20c6389fbb25b50d4a142a8266f559149ecc8c6f7a5597cbf17e75311c78a5507c0

data/lib/jekyll/attendease_plugin/event_layout_generator.rb

@@ -21,7 +21,8 @@ module Jekyll
         cms_layouts = []
         begin
           Dir.glob(File.join(layouts_path, '*.html')).each do |l|
-            html = File.read(l)
+            html = File.read(l, encoding: 'UTF-8')
+            
             if html =~ %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
               data = YAML.load(Regexp.last_match(1))
               if data['cms_layout']
@@ -29,7 +30,8 @@ module Jekyll
               end
             end
           end
-        rescue
+        rescue => e
+          puts "Failed retrieviing CMS layouts. Message: #{e.message}"
         end
 
         cms_layouts.each do |layout|
@@ -77,7 +79,7 @@ module Jekyll
           unless File.exists?(File.join(attendease_precompiled_theme_email_layouts_path, "#{layout}.html"))
             site.pages << EventLayoutPage.new(site, site.source, 'attendease_layouts/emails', "#{layout}.html", base_email_layout, layout.capitalize)
           end
-        end
+        end        
       end
     end
   end

data/lib/jekyll/attendease_plugin/organization_data_generator.rb

@@ -18,7 +18,7 @@ module Jekyll
 
           FileUtils.mkdir_p(@attendease_data_path) unless File.exists?(@attendease_data_path)
 
-          data_files = %w{ pages site_settings }.map { |m| "#{m}.json"}
+          data_files = %w{ pages site_settings mappable }.map { |m| "#{m}.json"}
 
           data_files.each do |filename|
             update_data = true
@@ -47,6 +47,7 @@ module Jekyll
               options = {}
               options.merge!(:headers => {'X-User-Token' => site.config.attendease['access_token']})
 
+              url = "#{site.config.attendease['api_host']}api/#{filename}"
               response = get("#{site.config.attendease['api_host']}api/#{filename}", options)
 
               if (!response.nil? && response.response.is_a?(Net::HTTPOK))
@@ -74,6 +75,4 @@ module Jekyll
       end
     end
   end
-end
-
-
+end

data/lib/jekyll/attendease_plugin/site_page_data.rb

@@ -42,23 +42,22 @@ module Jekyll
         if page['block_instances'].length
           # create zone buckets
           page['block_instances'].each do |i|
-            # go through all content
-            if site.config.event?
-              keys.each do |key|
-                i[key].each do |k, v|
-                  if placeholder?(v)
-                    # maintain the {{ t.foo }} variables
-                    v.gsub!(/(\{\{\s*t\.[a-z_.]+\s*\}\})/, '{% raw %}\1{% endraw %}')
-                    i[key][k] = render_with_substitutions(v, 'event' => site.data['event'], 'mappable' => site.data['mappable'])
-                  end
+            # go through all content and perform substitutions
+            keys.each do |key|
+              i[key].each do |k, v|
+                if placeholder?(v)
+                  # maintain the {{ t.foo }} variables
+                  v.gsub!(/(\{\{\s*t\.[a-z_.]+\s*\}\})/, '{% raw %}\1{% endraw %}')
+                  i[key][k] = render_with_substitutions(v, 'event' => site.data['event'], 'mappable' => site.data['mappable'])
                 end
               end
+            end
 
-              unless site.data['mappable'].nil? || site.data['mappable'].empty?
-                perform_substitution!(i, 'mappable' => site.data['mappable'])
-              end
+            unless site.data['mappable'].nil? || site.data['mappable'].empty?
+              perform_substitution!(i, 'mappable' => site.data['mappable'])
             end
 
+
             zones[i['zone']] = [] if zones[i['zone']].nil?
             zones[i['zone']] << i
           end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.9.9.4'
+    VERSION = '0.9.9.6'
   end
 end

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

@@ -44,6 +44,11 @@ RSpec.describe Jekyll::AttendeasePlugin::EventDataGenerator do
       expect(site.data['pages'].length).to eq(7)
     end
 
+    it 'populates a site wide mappable array' do
+      expect(site.data['mappable'].class).to eq(Array)
+      expect(site.data['mappable'].length).to eq(1)
+    end
+
     it 'populates a site wide event object' do
       expect(site.data['event'].class).to eq(Hash)
     end

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

@@ -14,6 +14,11 @@ RSpec.describe Jekyll::AttendeasePlugin::OrganizationDataGenerator do
       expect(site.data['site_settings']['look_and_feel']['body_font_family']).to eq('serif')
     end
 
+    it 'populates a site wide mappable array' do
+      expect(site.data['mappable'].class).to eq(Array)
+      expect(site.data['mappable'].length).to eq(1)
+    end
+
     it 'responds to GET from HTTParty' do
       expect(subject).to respond_to(:get)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.9.9.4
+  version: 0.9.9.6
 platform: ruby
 authors:
 - Michael Wood
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty