jekyll-attendease 0.6.20 → 0.6.21.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8a566cbcf8a099ac4981501601531674b92f77
-  data.tar.gz: 33dbf644a8ceab90cba41488b9f535494e8efb0e
+  metadata.gz: 8ee28c7855280197ea3d0716d1b93b33721ffbb2
+  data.tar.gz: 26c73366a0fbda99092b40b27698d7ab2a714872
 SHA512:
-  metadata.gz: c8d0b54a220bb5b076ca0149555b0767fe712c763445a4a1cf16bacfacecb7d67116e529848f418f95e9d9ed5e2578feb7304b2471bb231ae1d31e132426588d
-  data.tar.gz: d2b6bfc557e18de56aac6b351714e8697207b679a667aa7cae5253c40ba6124ddd414557ce6784c70411bb437eaa15ee2147810132b41e6d30b2bd4d945051ff
+  metadata.gz: 73bdb0d6d3c26e26320812d02d1358ab5410995fe71d0e838fb2a1eaeeb09afc05e9996e663881d5d3a4bc54c7b9055286f4c3dc1dfa6e37dd8093d34303f403
+  data.tar.gz: e605f30b6dd3e74bd4e1443b221677f9751db7224ecba72fb74822493aa41173eecb5c7eb2fe0a5625c1cd9b4025184dbead2a523518bd0c8a0d11ba486ab9c2

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -92,6 +92,7 @@ module Jekyll
                 if file_name == 'site.json'
                   # Adding to site config so we can access these variables globally wihtout using a Liquid Tag so we can use if/else
                   site.config['attendease']['data'] = {}
+                  site.config['attendease']['data']['core'] = {}
 
                   data.keys.each do |tag|
                     site.config['attendease']['data'][tag] = data[tag]
@@ -104,7 +105,8 @@ module Jekyll
                     # TODO: update all themes to not use attendease_ variables
                     #       and then retire them from the ThemeManager.
                     if tag.match(/^attendease_/)
-                      site.config['attendease']['data'][tag.gsub(/^attendease_/, '')] = data[tag]
+                      # only set keys that aren't already defined from the theme
+                      site.config['attendease']['data']['core'][tag.gsub(/^attendease_/, '')] = data[tag]
                     end
                   end
                 end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.20'
+    VERSION = '0.6.21.pre'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21.pre
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -210,12 +210,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.4.8
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Attendease event helper for Jekyll