jekyll-attendease 0.6.22a → 0.6.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cbd2a27d1b20b5ba0309789ac4e4d58e2478049
-  data.tar.gz: 404cfa1f4e3e0b1741a2dcebb7b4ac69ccacaff8
+  metadata.gz: 74e4aad9a016036b9d44d8584e782831e1302968
+  data.tar.gz: c85a1535d087ce3bf4ce6cbb9ea488ec811d131c
 SHA512:
-  metadata.gz: 0e5d8715a3efd3455f323816b1969b0a9d9a681f96cc6e2e3819af34204db4e966db08efb6b323f2832632c400b1e220ea274eaa5425f68c39a9c83b169ef8be
-  data.tar.gz: 980883b62aaf20fa61e226f952b60d9b9754b7dc24db6138eaa71fa7edd6889bdb2ea71f05f050d22a313cfaeaadb06e4269665e9f6b6e2f10f0cbf257e4ebb9
+  metadata.gz: f54461a779c9022009a7eeb0aa9abf05ca81a572cfdc4c82703c7c01795686e99f6c6b2cd2f65b84b545006993152328eb11b8fe103d2dc15a95ccabb61a84b4
+  data.tar.gz: 16b774d288820a5f2e342d2665d519106de463e350a10ece54e1a79c98e281b4c17186e9e39bc3759535c96561d5fac2e9f9b5f35f0baf386065f994ea65b7bb

data/lib/jekyll-attendease.rb

@@ -2,6 +2,7 @@ require 'jekyll'
 require 'httparty'
 require 'json'
 require 'i18n'
+require 'digest'
 
 require 'jekyll/attendease_plugin'
 

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -92,7 +92,6 @@ 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]
@@ -105,8 +104,7 @@ module Jekyll
                     # TODO: update all themes to not use attendease_ variables
                     #       and then retire them from the ThemeManager.
                     if tag.match(/^attendease_/)
-                      # only set keys that aren't already defined from the theme
-                      site.config['attendease']['data']['core'][tag.gsub(/^attendease_/, '')] = data[tag]
+                      site.config['attendease']['data'][tag.gsub(/^attendease_/, '')] = data[tag]
                     end
                   end
                 end
@@ -118,9 +116,23 @@ module Jekyll
             site.config['attendease']['event'] = event
 
             if @attendease_config['copy_data']
-              FileUtils.cp_r(@attendease_data_path, File.join(site.source, 'attendease_data'))
+              data_dir = File.join(site.source, 'attendease_data')
+              FileUtils.mkdir(data_dir) unless File.exists?(data_dir)
+              site.config['attendease']['data_files'] = {}
+
+              Dir.chdir(@attendease_data_path) do
+                extension = '.json'
+                Dir.glob('*.json').each do |f|
+                  base_name = File.basename(f, extension)
+                  digest = Digest::SHA2.file(f).hexdigest
+                  digest_file = "#{base_name}-#{digest}.json"
+                  FileUtils.cp(f, File.join(data_dir, digest_file))
+                  site.config['attendease']['data_files'][base_name] = digest_file
+                end
+              end
+
               # tell Jekyll about these new static files to publish
-              site.read_directories 'attendease_data'
+              site.reader.read_directories 'attendease_data'
             end
           end
 

data/lib/jekyll/attendease_plugin/schedule_generator.rb

@@ -15,7 +15,7 @@ module Jekyll
           # /schedule pages.
           dir = site.config['attendease']['schedule_path_name']
 
-          unless dir.nil?
+          if dir
             if (site.config['attendease'] && site.config['attendease']['show_schedule_index'])
               site.pages << ScheduleIndexPage.new(site, site.source, File.join(dir), @schedule_data.event['dates'])
             else
@@ -37,7 +37,7 @@ module Jekyll
           # /presenters pages.
           dir = site.config['attendease']['presenters_path_name']
 
-          unless dir.nil?
+          if dir
             @schedule_data.presenters.each do |presenter|
               site.pages << PresenterPage.new(site, site.source, dir, presenter, @schedule_data.sessions)
             end
@@ -53,7 +53,7 @@ module Jekyll
           if @schedule_data.venues.length == 1
             dir = site.config['attendease']['venue_path_name']
 
-            unless dir.nil?
+            if dir
               site.pages << VenuePage.new(site, site.source, dir, @schedule_data.venues.first, true)
             end
           end
@@ -61,7 +61,7 @@ module Jekyll
           # Create a list of venues and venue pages to keep backwards compatibility.
           dir = site.config['attendease']['venues_path_name']
 
-          unless dir.nil?
+          if dir
             @schedule_data.venues.each do |venue|
               site.pages << VenuePage.new(site, site.source, dir, venue)
             end

data/lib/jekyll/attendease_plugin/sponsor_generator.rb

@@ -24,7 +24,7 @@ module Jekyll
           # /sponsors pages.
           dir = site.config['attendease']['sponsors_path_name']
 
-          unless dir.nil?
+          if dir
             site.pages << SponsorsIndexPage.new(site, site.source, File.join(dir), site.config['attendease']['sponsor_levels'])
           end
 

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.22a'
+    VERSION = '0.6.22'
   end
 end

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

@@ -170,25 +170,25 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
 
   context 'in a site with the page paths set to nil' do
     it 'no schedule folder exists' do
-      @site = build_site({ 'attendease' => { 'schedule_path_name' => nil } })
+      @site = build_site({ 'attendease' => { 'schedule_path_name' => false } })
 
       expect(File.exists?(File.join(@site.config['destination'], 'schedule'))).to eq(false)
     end
 
     it 'no presenters folder exists' do
-      @site = build_site({ 'attendease' => { 'presenters_path_name' => nil } })
+      @site = build_site({ 'attendease' => { 'presenters_path_name' => false } })
 
       expect(File.exists?(File.join(@site.config['destination'], 'presenters'))).to eq(false)
     end
 
     it 'no venues folder exists' do
-      @site = build_site({ 'attendease' => { 'venues_path_name' => nil, 'venue_path_name' => nil } })
+      @site = build_site({ 'attendease' => { 'venues_path_name' => false, 'venue_path_name' => false } })
 
       expect(File.exists?(File.join(@site.config['destination'], 'venues'))).to eq(false)
     end
 
     it 'no sponsors folder exists' do
-      @site = build_site({ 'attendease' => { 'sponsors_path_name' => nil } })
+      @site = build_site({ 'attendease' => { 'sponsors_path_name' => false } })
 
       expect(File.exists?(File.join(@site.config['destination'], 'sponsors'))).to eq(false)
     end

data/spec/spec_helper.rb

@@ -41,7 +41,7 @@ RSpec.configure do |config|
   end
 
   def build_configs(overrides, base_hash = Jekyll::Configuration::DEFAULTS)
-    base_hash.deep_merge(overrides)
+    Jekyll::Utils.deep_merge_hashes(base_hash, overrides)
   end
 
   def find_generator(generator_class)
@@ -49,7 +49,7 @@ RSpec.configure do |config|
   end
 
   def site_configuration(overrides = {})
-    build_configs({
+    Jekyll::Utils.deep_merge_hashes(build_configs({
       'source'               => fixtures_path.to_s,
       'destination'          => @dest.to_s,
       'attendease'           => {
@@ -70,7 +70,7 @@ RSpec.configure do |config|
         'has_filters'             => true,
         'has_venues'              => true
       }
-    }.deep_merge(overrides))
+    }), overrides)
   end
 
   def build_site(config = {})
@@ -81,7 +81,7 @@ RSpec.configure do |config|
 
   config.after(:all) do
     @dest.rmtree if @dest.exist?
-    fixtures_path.join('_attendease', 'templates').rmtree
-    fixtures_path.join('attendease_layouts').rmtree
+    fixtures_path.join('_attendease', 'templates').rmtree if fixtures_path.join('_attendease', 'templates').exist?
+    fixtures_path.join('attendease_layouts').rmtree if fixtures_path.join('attendease_layouts').exist?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.22a
+  version: 0.6.22
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -55,20 +55,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.9
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,16 +101,16 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -210,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.5