jekyll-attendease 0.6.25k → 0.6.26a

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

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::SitePage do
-  before(:all) do
-    @site_page = find_page(described_class, Proc.new { |p| p.data['site_page']['slug'] == 'test' })
-  end
+  let(:site) { build_site }
+  let(:site_page) { find_page(site, described_class, Proc.new { |p| p.data['site_page']['slug'] == 'test' }) }
 
   pending 'fills the page zones with the rendered html' do
-    expect(@site_page.data['dropzone1']).to eq('<h1>Hello world</h1>')
+    expect(site_page.data['dropzone1']).to eq('<h1>Hello world</h1>')
   end
 end

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

@@ -1,24 +1,21 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::SitePagesGenerator do
-  before(:all) do
-    @site_pages_generator = find_generator(described_class)
-    @index_file = 'index.html'
-  end
+  let (:site) { build_site }
+  let (:site_pages_generator) { find_generator(site, described_class) }
+  let(:index_file) {  'index.html' }
 
   it 'creates a page using the provided slug' do
-    #require 'pry'
-    #binding.pry
-    slug = @site.data['pages'].last['slug']
-    file = File.join(@site.config['destination'], slug, 'index.html')
+    slug = site.data['pages'].last['slug']
+    file = File.join(site.config['destination'], slug, 'index.html')
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
     expect(File.read(file)).to include '<title>Test Page</title>'
   end
 
   it 'creates a block instance json file using the provided slug' do
-    slug = @site.data['pages'].last['slug']
-    file = File.join(@site.config['destination'], slug, 'index.json')
+    slug = site.data['pages'].last['slug']
+    file = File.join(site.config['destination'], slug, 'index.json')
     expect(File.exists?(file)).to eq(true)
     expect(File.file?(file)).to eq(true)
   end

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

@@ -1,12 +1,21 @@
 require 'spec_helper'
 
 RSpec.describe Jekyll::AttendeasePlugin::SponsorGenerator do
+  context 'event site' do
+    let (:site) { build_site }
 
-  it 'creates the sponsor listing page' do
-    template_files = Dir.chdir(@template_root) { Dir.glob('*/**.html') }
+    it 'creates the sponsor listing page' do
+      expect(File.exists?(File.join(site.config['destination'], 'sponsors', 'index.html'))).to eq(true)
+      expect(File.read(File.join(site.config['destination'], 'sponsors', 'index.html'))).to include "<h1>Sponsors</h1>"
+    end
+  end
+
+  context 'organization site' do
+    let (:org_site) { build_org_site }
 
-    expect(File.exists?(File.join(@site.config['destination'], 'sponsors', 'index.html'))).to eq(true)
-    expect(File.read(File.join(@site.config['destination'], 'sponsors', 'index.html'))).to include "<h1>Sponsors</h1>"
+    it 'does not create the sponsor listing page' do
+      expect(File.exists?(File.join(org_site.config['destination'], 'sponsors', 'index.html'))).to eq(false)
+    end
   end
 
 end

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

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 RSpec.describe "Jekyll Attendease tags" do
-  let(:context) { { :registers => { :site => @site, :page => {} } } }
+  let(:site) { build_site }
+  let(:context) { { :registers => { :site => site, :page => {} } } }
 
   def render(content)
     ::Liquid::Template.parse(content).render({}, context)
@@ -20,7 +21,7 @@ RSpec.describe "Jekyll Attendease tags" do
   context "{% attendease_locales_script %}" do
     subject { render("{% attendease_locales_script %}") }
     it { is_expected.to include "/api/lingo.json" }
-    it { is_expected.to include @site.config['attendease']['api_host'] }
+    it { is_expected.to include site.config['attendease']['api_host'] }
   end
 
   context "{% attendease_t event.lingo.sponsors %}" do

data/spec/spec_helper.rb

@@ -21,11 +21,22 @@ RSpec.configure do |config|
     end
 
     @template_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'templates'))
-    @dest = fixtures_path.join('_site')
-
     FileUtils.touch Dir.glob(File.join(File.dirname(__FILE__), 'fixtures', '_attendease', 'data', '*.*'))
-    @site = build_site
-    @page = Jekyll::Page.new(@site, File.join(File.dirname(__FILE__), 'fixtures'), '', 'page.html')
+    #let!(:site) { build_site }
+    #let!(:org_site) { build_site({ attendease: { mode: 'organization' } }) }
+    #let!(:page) { Jekyll::Page.new(@site, File.join(File.dirname(__FILE__), 'fixtures'), '', 'page.html') }
+  end
+
+  def site
+    @site
+  end
+
+  def dest
+    @dest ||= fixtures_path.join('_site')
+  end
+
+  def page
+    Jekyll::Page.new(site, File.join(File.dirname(__FILE__), 'fixtures'), '', 'page.html')
   end
 
   def test_dir(*subdirs)
@@ -44,12 +55,12 @@ RSpec.configure do |config|
     Jekyll::Utils.deep_merge_hashes(base_hash, overrides)
   end
 
-  def find_generator(generator_class)
-    @site.generators.select { |m| m.class == generator_class }.first
+  def find_generator(site, generator_class)
+    site.generators.select { |m| m.class == generator_class }.first
   end
 
-  def find_page(page_class, lambda_matcher = false)
-    @site.pages.select do |m|
+  def find_page(site, page_class, lambda_matcher = false)
+    site.pages.select do |m|
       if m.class == page_class
         match = true
         if lambda_matcher
@@ -63,19 +74,9 @@ RSpec.configure do |config|
   def site_configuration(overrides = {})
     Jekyll::Utils.deep_merge_hashes(build_configs({
       'source'               => fixtures_path.to_s,
-      'destination'          => @dest.to_s,
+      'destination'          => dest.to_s,
       'attendease'           => {
-        'api_host'                => 'http://foobar/',
-        'test_mode'               => false,
-        'locale'                  => 'en',
-        'schedule_path_name'      => 'schedule',
-        'presenters_path_name'    => 'presenters',
-        'sponsors_path_name'      => 'sponsors',
-        'venue_path_name'         => 'venue',
-        'venues_path_name'        => 'venues',
-        'base_layout'             => 'layout',
-        'generate_schedule_pages' => true,
-        'generate_sponsor_pages'  => true,
+        'api_host'                => 'https://foobar/',
         'has_sessions'            => true,
         'has_presenters'          => true,
         'has_sponsors'            => true,
@@ -87,19 +88,26 @@ RSpec.configure do |config|
   end
 
   def build_site(config = {})
-    site = Jekyll::Site.new(site_configuration(config))
-    site.process
-    site
+    #dest.rmtree if dest.exist?
+    @site = Jekyll::Site.new(site_configuration(config))
+    @site.process
+    @site
   end
 
-  config.after(:all) do
-    @dest.rmtree if @dest.exist?
+  def build_org_site
+    build_site({ 'attendease' => { 'mode' => 'organization', 'jekyll33' => true } })
+  end
+
+  config.after(:each) do
+    dest.rmtree if dest.exist?
     fixtures_path.join('_attendease', 'templates').rmtree if File.exists?(fixtures_path.join('_attendease', 'templates'))
     fixtures_path.join('attendease_layouts').rmtree if File.exists?(fixtures_path.join('attendease_layouts'))
-    Dir.glob(File.join(@site.source, '**', 'index.json')).map do |i|
-      puts "Removing #{Pathname.new(i).parent}"
+    unless @site.nil?
+      Dir.glob(File.join(@site.source, '**', 'index.json')).map do |i|
+        puts "Removing #{Pathname.new(i).parent}"
 
-      FileUtils.rm_r Pathname.new(i).parent
+        FileUtils.rm_r Pathname.new(i).parent
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.25k
+  version: 0.6.26a
 platform: ruby
 authors:
 - Michael Wood
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -161,6 +161,7 @@ extra_rdoc_files: []
 files:
 - lib/jekyll-attendease.rb
 - lib/jekyll/attendease_plugin.rb
+- lib/jekyll/attendease_plugin/config_mixin.rb
 - lib/jekyll/attendease_plugin/event_data_generator.rb
 - lib/jekyll/attendease_plugin/event_layout_generator.rb
 - lib/jekyll/attendease_plugin/event_layout_page.rb
@@ -169,6 +170,7 @@ files:
 - lib/jekyll/attendease_plugin/helpers.rb
 - lib/jekyll/attendease_plugin/home_page.rb
 - lib/jekyll/attendease_plugin/home_page_generator.rb
+- lib/jekyll/attendease_plugin/organization_data_generator.rb
 - lib/jekyll/attendease_plugin/pre_zero_point_six_link_redirect_generator.rb
 - lib/jekyll/attendease_plugin/presenter_page.rb
 - lib/jekyll/attendease_plugin/presenters_index_page.rb
@@ -180,6 +182,7 @@ files:
 - lib/jekyll/attendease_plugin/schedule_session_page.rb
 - lib/jekyll/attendease_plugin/schedule_sessions_page.rb
 - lib/jekyll/attendease_plugin/site_page.rb
+- lib/jekyll/attendease_plugin/site_page_blocks_json.rb
 - lib/jekyll/attendease_plugin/site_pages_generator.rb
 - lib/jekyll/attendease_plugin/sponsor_generator.rb
 - lib/jekyll/attendease_plugin/sponsors_index_page.rb
@@ -192,6 +195,7 @@ 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/organization_data_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/site_page_spec.rb
@@ -244,6 +248,7 @@ 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/organization_data_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/site_page_spec.rb