jekyll-attendease 0.6.18 → 0.6.19.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7815b49b3d439135b7919a804fdf8be4d949a45
-  data.tar.gz: 254887cff948a78acb79e94e0eabe7a80b14258d
+  metadata.gz: adb1b87b00c536f03ba16ae50832f4c438432fef
+  data.tar.gz: e223b30ec085bb2546ff071246cc3ec0615e29c3
 SHA512:
-  metadata.gz: 9e1222e8b7196c4d1cae3abe69a5cf20ab9e8bf524b15697b7ff93a862d72049b77d698be576b1c27f2d090c5a34f40b3d08498facc39ad1fcce976021a1bd24
-  data.tar.gz: ab553510d0635986b845ce111662c3747d0810fe36a62e2f9b90e8a0100536ea2021c4bd475b03e11e1aa0a06f1d11149ce683204c968eacd398f05947dd737a
+  metadata.gz: edf924fd97d9eb8706e26d3afedd5c1f074d30ffc3a382e81e68739902721c82c5be2177a17379318fa00819896c607eaed8dea46dad29f93d5118b1d62d7bda
+  data.tar.gz: 0769ff2897beb16c98843f07cac9a8854ac0b633993846274ce97368a9d4c7624d0cf8bff1485150e6bad914317a3bd4af7eb7c99e66f01c7cd7ddc61354a8f1

data/lib/jekyll/attendease_plugin/event_data_generator.rb

@@ -34,7 +34,7 @@ module Jekyll
 
             FileUtils.mkdir_p(@attendease_data_path)
 
-            data_files = %w{ site templates event sessions presenters rooms filters venues sponsors }.map { |m| "#{m}.json"} << 'lingo.yml'
+            data_files = %w{ site event sessions presenters rooms filters venues sponsors }.map { |m| "#{m}.json"} << 'lingo.yml'
 
             data_files.each do |file_name|
               update_data = true

data/lib/jekyll/attendease_plugin/event_template_generator.rb

@@ -24,11 +24,6 @@ module Jekyll
       def generate(site)
         Jekyll.logger.info "[Attendease] Generating theme templates..."
 
-        # Template data from the Attendease event for overriding specific templates
-        templates = JSON.parse(File.read(File.join(site.source, '_attendease', 'data', 'templates.json')))
-
-        site.config['attendease']['templates'] = templates
-
         # Generate the template files if they don't yet exist.
         %w{ schedule presenters venues sponsors}.each do |p|
           path = File.join(site.source, '_attendease', 'templates', p)
@@ -62,17 +57,9 @@ EOF
         }.each do |page|
           destination_file = File.join(site.source, '_attendease', 'templates', "#{page}.html")
 
-          if template_data = get_template(templates, page)
-            unless template_data.start_with?('---')
-              template_data = front_matter + template_data
-            end
-
+          unless File.exists?(destination_file)
+            template_data = front_matter + File.read(File.join(template_path, "#{page}.html"))
             File.open(destination_file, 'w+') { |f| f.write(template_data) }
-          else
-            unless File.exists?(destination_file)
-              template_data = front_matter + File.read(File.join(template_path, "#{page}.html"))
-              File.open(destination_file, 'w+') { |f| f.write(template_data) }
-            end
           end
         end
 
@@ -86,16 +73,8 @@ EOF
           File.open(destination_file, 'w+') { |f| f.write(template_data) }
         end
 
-
       end
 
-      def get_template(templates, page)
-        template = nil
-        if t = templates.detect{|t| t['page'] == page}
-          template = t['data']
-        end
-        template
-      end
     end
   end
-end
+end

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = "0.6.18"
+    VERSION = "0.6.19.pre"
   end
 end

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

@@ -37,4 +37,3 @@ RSpec.describe Jekyll::AttendeasePlugin::PreZeroPointSixLinkRedirectGenerator do
   end
 
 end
-

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

@@ -198,7 +198,7 @@ RSpec.describe Jekyll::AttendeasePlugin::ScheduleGenerator do
     @site = build_site
 
     expect(@site.config['attendease']['event']['id']).to eq('foobar')
-    %w{ site templates event sessions presenters rooms filters venues sponsors lingo }.each do |key|
+    %w{ site event sessions presenters rooms filters venues sponsors lingo }.each do |key|
       expect(@site.config['attendease'].include?(key)).to eq(true)
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'jekyll'
+require 'coveralls'
+Coveralls.wear!
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19.pre
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Bring your event data into Jekyll for amazing event websites.
 email: support@attendease.com
 executables: []
@@ -162,7 +176,6 @@ files:
 - spec/lib/jekyll/attendease_plugin/event_template_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/filters_spec.rb
 - spec/lib/jekyll/attendease_plugin/helpers_spec.rb
-- spec/lib/jekyll/attendease_plugin/home_page_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/schedule_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/sponsor_generator_spec.rb
@@ -197,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.3
@@ -212,7 +225,6 @@ test_files:
 - spec/lib/jekyll/attendease_plugin/event_template_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/filters_spec.rb
 - spec/lib/jekyll/attendease_plugin/helpers_spec.rb
-- spec/lib/jekyll/attendease_plugin/home_page_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/schedule_generator_spec.rb
 - spec/lib/jekyll/attendease_plugin/sponsor_generator_spec.rb

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

@@ -1,53 +0,0 @@
-# require 'spec_helper'
-#
-# RSpec.describe Jekyll::AttendeasePlugin::HomePageGenerator do
-#
-#   #context 'Using the default homepage template in the gem' do
-#   #  before do
-#   #    # Ensure no custom templates are being used.
-#   #    templates_json = File.join(@site.config['source'], '_attendease', 'data', 'templates.json')
-#   #    File.open(templates_json, 'w') { |file| file.write([].to_json) }
-#   #    #File.delete(@site.config['source'], '_attendease', 'templates', 'index.html')
-#   #    @site = build_site
-#   #  end
-#   #
-#   #  it 'creates the home page' do
-#   #    template_files = Dir.chdir(@template_root) { Dir.glob('*/**.html') }
-#   #
-#   #    expect(File.exists?(File.join(@site.config['destination'], 'index.html'))).to eq(true)
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<h2>WHO</h2>"
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<div class=\"info\">#{@site.config['attendease']['data']['event_host']}</div>"
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<h2>WHEN</h2>"
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<div class=\"info\">#{@site.config['attendease']['data']['event_dates']}</div>"
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<h2>WHERE</h2>"
-#   #    expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<div class=\"info\">#{@site.config['attendease']['data']['event_location']}</div>"
-#   #  end
-#   #end
-#
-#   context 'Using a custom homepage template from the Attendease API' do
-#     before do
-#       templates_json = File.join(@site.config['source'], '_attendease', 'data', 'templates.json')
-#
-#       templates = [
-#         {
-#           :data => "<h1>This is a custom homepage for Attendease</h1>",
-#           :id => "544e905b0bdb82e3ac000002",
-#           :page => 'index',
-#           :section => 'website'
-#         }
-#       ]
-#
-#       File.open(templates_json, 'w') { |file| file.write(templates.to_json) }
-#
-#       @site = build_site
-#     end
-#
-#     it 'creates the home page' do
-#       template_files = Dir.chdir(@template_root) { Dir.glob('*/**.html') }
-#
-#       expect(File.exists?(File.join(@site.config['destination'], 'index.html'))).to eq(true)
-#       expect(File.read(File.join(@site.config['destination'], 'index.html'))).to include "<h1>This is a custom homepage for #{@site.config['attendease']['data']['event_host']}</h1>"
-#     end
-#   end
-#
-# end