jekyll-attendease 0.6.21 → 0.6.22a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e279fedbad97f9c4681cbf2d4449f2623de3235
-  data.tar.gz: 3b6ccc2841c4a29fda4ac0023376e4708f54cc89
+  metadata.gz: 1cbd2a27d1b20b5ba0309789ac4e4d58e2478049
+  data.tar.gz: 404cfa1f4e3e0b1741a2dcebb7b4ac69ccacaff8
 SHA512:
-  metadata.gz: 1df3172e859538a3af5c7c36bda3b66e4e35bac41642036d9e9fa6f3b9a206f499b3b1a82b9c856d366d833c24182aa1bf033f283af2485b5a6eb977c57f10d3
-  data.tar.gz: 5851bad6000e6d3fa434935b6587c835677dd9b20c6aba0626d132409cbaae58da4e15911efab9cb4dfbc7990f10e980ef90324df01ea2d2a6ec3bd19274a6b0
+  metadata.gz: 0e5d8715a3efd3455f323816b1969b0a9d9a681f96cc6e2e3819af34204db4e966db08efb6b323f2832632c400b1e220ea274eaa5425f68c39a9c83b169ef8be
+  data.tar.gz: 980883b62aaf20fa61e226f952b60d9b9754b7dc24db6138eaa71fa7edd6889bdb2ea71f05f050d22a313cfaeaadb06e4269665e9f6b6e2f10f0cbf257e4ebb9

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.21'
+    VERSION = '0.6.22a'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.21
+  version: 0.6.22a
 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-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -210,9 +210,9 @@ 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