jekyll-attendease 0.6.24c → 0.6.24d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd404c5c2d84e5bb31ab7a41e464e8c40b578e6a
-  data.tar.gz: 1afd125825c8f7e378c0210e8b8233748dd98e8d
+  metadata.gz: c7412519dd3e7988174c88272b3b73c64593e7ae
+  data.tar.gz: 2c8b08224cc7fd657e7c530c72e5862aa5684552
 SHA512:
-  metadata.gz: db5a98eb2ef40597fc72f71f4494e0174aaf0c04f5f4047ecf7d8a8205c55b4c0d3e2517706a7be6be1e72f2a66c6625b4877fd4a47443856c80418b0d2b0d74
-  data.tar.gz: e9a134841e66726f8d0118b62ea9da51480cba8c27e4fc557f55a0ed81c0e7feffbad7a9665426c811906be75413127cee425e8fac58858f2a1e94777b939fcb
+  metadata.gz: 6fd685368fb40503d6cd332f0e985ffea4f57aa8b1d84226cccdca9d7c14a87a1f061e686bc6643187ae6519f14d649b36c5f75ccee0f2710d92beabdad26ebc
+  data.tar.gz: f700d746f5d7e5cfcf1f40be736ae5c8cd80e8fe6311829eefc6ec5a08f92fbfbd4d79b36f83d7e589c942626663e0b690362012070d17af387e75abb16c077a

data/lib/jekyll/attendease_plugin/filters.rb

@@ -4,9 +4,15 @@ module Jekyll
       def slugify(string)
         Helpers.parameterize(string, '_')
       end
+
       def json(obj)
         obj.to_json
       end
+
+      def awesome_inspect(obj)
+        require 'awesome_print'
+        obj.ai(html: true)
+      end
     end
   end
 end

data/lib/jekyll/attendease_plugin/schedule_data_parser.rb

@@ -59,23 +59,23 @@ module Jekyll
       protected
 
       def raw_presenters
-        @raw_presenters ||= JSON.parse(File.read("#{data_path}/presenters.json")).sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
+        @raw_presenters ||= @site.config['attendease']['presenters'].sort{|p1, p2| p1['last_name'] <=> p2['last_name']}
       end
 
       def raw_venues
-        @raw_venues ||= JSON.parse(File.read("#{data_path}/venues.json")).sort{|v1, v2| v1['name'] <=> v2['name']}
+        @raw_venues ||= @site.config['attendease']['venues'].sort{|v1, v2| v1['name'] <=> v2['name']}
       end
 
       def raw_rooms
-        @raw_rooms ||= JSON.parse(File.read("#{data_path}/rooms.json")).sort{|r1, r2| r1['name'] <=> r2['name']}
+        @raw_rooms ||= @site.config['attendease']['rooms'].sort{|r1, r2| r1['name'] <=> r2['name']}
       end
 
       def raw_sessions
-        @raw_sessions ||= JSON.parse(File.read("#{data_path}/sessions.json")).sort{|s1, s2| s1['name'] <=> s2['name']}
+        @raw_sessions ||= @site.config['attendease']['sessions'].sort{|s1, s2| s1['name'] <=> s2['name']}
       end
 
       def raw_filters
-        @raw_filters ||= JSON.parse(File.read("#{data_path}/filters.json")).sort{|f1, f2| f1['name'] <=> f2['name']}
+        @raw_filters ||= @site.config['attendease']['filters'].sort{|f1, f2| f1['name'] <=> f2['name']}
       end
 
       def data_path
@@ -108,17 +108,18 @@ module Jekyll
         end
       end
 
-      # Populates filter realted data into session,
+      # Populates filter related data into session,
       # from source.
       def populate_session_filters!(session, source)
         filters_for_session_hash = {}
         filters.each do |filter|
           filter['filter_items'].each_with_index do |filter_item, index|
             if source['filters'].include?(filter_item['id'])
-              filters_for_session_hash[filter['name']] ||= []
-              filters_for_session_hash[filter['name']] << {
-                'name' => filter_item['name'],
-                'index' => index,
+              filters_for_session_hash[filter['name']] ||= { :colour => filter['colour'], :items => [] }
+              filters_for_session_hash[filter['name']][:items] << {
+                'name'   => filter_item['name'],
+                'colour' => filter_item['colour'],
+                'index'  => index,
               }
               if event['primary_filter_id'] && event['primary_filter_id'] == filter['id']
                 session['primary_filter_name'] = filter['name']
@@ -128,7 +129,7 @@ module Jekyll
           end
         end
 
-        session['filters'] = filters_for_session_hash.map { |key, value| { 'name' => key, 'items' => value } }
+        session['filters'] = filters_for_session_hash.map { |key, value| { 'name' => key, 'items' => value[:items], 'colour' => value[:colour] } }
         session['filter_tags'] = get_session_filter_tags(session['filters'])
       end
 

data/lib/jekyll/attendease_plugin/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.24c
+  version: 0.6.24d
 platform: ruby
 authors:
 - Michael Wood
@@ -55,6 +55,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement