jekyll-contentblocks 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddeace684edb5376fdab5c280c88ced16731264b
-  data.tar.gz: d770dffb2fb6b82e75888a2d502e02177a713864
+  metadata.gz: d4fb4909712a67d92748bbfbc282d1b3f89b991c
+  data.tar.gz: dfd1945707d8649f2e43f3672f224ae78927b303
 SHA512:
-  metadata.gz: 06022becaeac04a221c70de8c345612cabbd96c61832faefb965085514a56265bfe916aa2476c54c7e8613de3a97db53d4032bc71b5a14e8e8441ab64bb07d1b
-  data.tar.gz: 0e8281ad795ef26b00cd522c73603a7b5adb37a2f6d1a0aaa54b5c4308ecf17975db901f2ed8b8c54e450c702d47016656ed6f78791ee00759314a978cf9e9af
+  metadata.gz: 97972d1f3a4f9f3d9f0eaddec302ec71d5f9e5bd2d8b92f4e3f6b84ecc59592001bf86fc4a434fc8558d30fb75ad44bc1bc42a2a6de81d5b9c92125cc5724300
+  data.tar.gz: 24c856f8e881109a48024c7eb2818750b9d3956a1a46653d99779b0a7b42336a4136417af0f4737e2fc365e80bf42427c3a6a615f8c392047b39a628f93f7076

data/Gemfile

@@ -4,6 +4,7 @@ gem 'jekyll', '> 1.0.0'
 gem 'appraisal', '1.0.2'
 
 gem 'pry'
+gem 'pry-byebug'
 gem 'rspec', '~> 3.3.0'
 gem 'nokogiri', '~> 1.6.6.0'
 

data/gemfiles/jekyll_1.0.4.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.0.4"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_1.1.2.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.1.2"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_1.2.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.2.1"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_1.3.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.3.1"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_1.4.3.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.4.3"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_1.5.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "1.5.1"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.0.3.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.0.3"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.1.1.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.1.1"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.2.0.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.2.0"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.3.0.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.3.0"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.4.0.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.4.0"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/gemfiles/jekyll_2.5.3.gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gem "jekyll", "2.5.3"
 gem "appraisal", "1.0.2"
 gem "pry"
+gem "pry-byebug"
 gem "rspec", "~> 3.3.0"
 gem "nokogiri", "~> 1.6.6.0"
 

data/jekyll-contentblocks.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll/contentblocks/version'
+require 'jekyll/content_blocks/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "jekyll-contentblocks"

data/lib/jekyll/content_blocks/content_block_tag.rb

@@ -0,0 +1,30 @@
+module Jekyll
+  module ContentBlocks
+    module ContentBlockTag
+      def initialize(tag_name, block_name, tokens)
+        super
+        @block_name = get_content_block_name(tag_name, block_name)
+      end
+
+      private
+
+      def get_content_block_name(tag_name, block_name)
+        block_name = (block_name || '').strip
+        if block_name == ''
+          raise SyntaxError.new("No block name given in #{tag_name} tag")
+        end
+        block_name
+      end
+
+      def block_has_content?(context)
+        block_content = content_for_block(context).join
+        !(block_content.nil? || block_content.empty?)
+      end
+
+      def content_for_block(context)
+        context.environments.first['contentblocks'] ||= {}
+        context.environments.first['contentblocks'][@block_name] ||= []
+      end
+    end
+  end
+end

data/lib/jekyll/content_blocks/renderer.rb

@@ -0,0 +1,11 @@
+module Jekyll
+  class Renderer
+    alias_method :render_liquid_orig, :render_liquid
+
+    def render_liquid(content, payload, info, path = nil)
+      payload['converters'] ||= converters
+      payload['contentblocks'] ||= {}
+      render_liquid_orig(content, payload, info, path)
+    end
+  end
+end

data/lib/jekyll/{contentblocks → content_blocks}/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module ContentBlocks
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end
 

data/lib/jekyll/tags/content_block.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Tags
     class ContentBlock < Liquid::Tag
-      include ::Jekyll::ContentBlockTag
+      include ::Jekyll::ContentBlocks::ContentBlockTag
 
       def render(context)
         block_content = content_for_block(context).join

data/lib/jekyll/tags/content_for.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Tags
     class ContentFor < Liquid::Block
-      include ::Jekyll::ContentBlockTag
+      include ::Jekyll::ContentBlocks::ContentBlockTag
       alias_method :render_block, :render
 
       def render(context)

data/lib/jekyll/tags/if_has_content.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Tags
     class IfHasContent < Liquid::Block
-      include ::Jekyll::ContentBlockTag
+      include ::Jekyll::ContentBlocks::ContentBlockTag
       alias_method :render_block, :render
 
       def render(context)

data/lib/jekyll/tags/if_not_has_content.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Tags
     class IfNotHasContent < Liquid::Block
-      include ::Jekyll::ContentBlockTag
+      include ::Jekyll::ContentBlocks::ContentBlockTag
       alias_method :render_block, :render
 
       def render(context)

data/lib/jekyll-contentblocks.rb

@@ -1,9 +1,22 @@
 require 'jekyll'
-require 'jekyll/convertible'
-require File.expand_path('../jekyll/convertible', __FILE__)
 
-require 'jekyll/contentblocks/version'
-require 'jekyll/content_block_tag'
+module Jekyll
+  def self.version_less_than?(version)
+    Gem::Version.new(VERSION) < Gem::Version.new(version)
+  end
+
+  def self.supports_collections?
+    !version_less_than?('2.0.0')
+  end
+end
+
+require 'jekyll/content_blocks/convertible'
+unless Jekyll.version_less_than?('2.0.0')
+  require 'jekyll/content_blocks/renderer'
+end
+
+require 'jekyll/content_blocks/version'
+require 'jekyll/content_blocks/content_block_tag'
 require 'jekyll/tags/content_for'
 require 'jekyll/tags/if_has_content'
 require 'jekyll/tags/if_not_has_content'

data/spec/jekyll_content_blocks_spec.rb

@@ -1,39 +1,94 @@
 require 'spec_helper'
 
 describe Jekyll::ContentBlocks do
-  jekyll_version = `jekyll --version`.strip
-  puts jekyll_version
+  puts "jekyll #{jekyll_version}"
 
-  context "against #{jekyll_version}" do
+  context "against jekyll #{jekyll_version}" do
     before(:all) do
       expect(generate_test_site).to be true
     end
 
-    let(:page) { load_index_html.html }
-    let(:sidebar) { page.css('body > div > h2#sidebar').first }
+    let(:index) { load_html('index.html') }
 
-    it 'renders the sidebar content block' do
-      expect(sidebar).not_to be_nil
-      expect(sidebar.text).to eq 'SIDEBAR'
-    end
+    describe 'index.html' do
+      let(:sidebar) { index.css('body > div > h2#sidebar').first }
+
+      it 'does not render the css block' do
+        expect(index.css('style')).to be_empty
+      end
+
+      it 'renders the custom sidebar' do
+        expect(index.css('div.custom-sidebar')).not_to be_empty
+        expect(index.css('div.sidebar-default')).to be_empty
+      end
+
+      it 'renders the sidebar content block' do
+        expect(sidebar).not_to be_nil
+        expect(sidebar.text).to eq 'SIDEBAR'
+      end
+
+      it 'renders Liquid within a content block' do
+        rendered_liquid = sidebar.css('+ p')
+        expect(rendered_liquid).not_to be_nil
+        expect(rendered_liquid.text).to eq '3'
+      end
 
-    it 'renders Liquid within a content block' do
-      rendered_liquid = sidebar.css('+ p')
-      expect(rendered_liquid).not_to be_nil
-      expect(rendered_liquid.text).to eq '3'
+      it 'does not render a block without content' do
+        expect(index.css('head > style')).to be_empty
+      end
     end
 
-    it 'does not render a block without content' do
-      expect(page.css('head > style')).to be_empty
+    describe 'page.html' do
+      let(:page) { load_html('page.html') }
+      let(:sidebar) { index.css('body > div > h2#sidebar').first }
+
+      it 'renders the css block' do
+        expect(page.css('style')).not_to be_empty
+      end
+
+      it 'does not process Markdown in the CSS block' do
+        expect(page.css('style p')).to be_empty
+      end
+
+      it 'renders the custom footer' do
+        expect(page.css('div#footer')).to be_empty
+        expect(page.css('div#custom-footer')).not_to be_empty
+      end
+
+      it 'renders the default sidebar' do
+        expect(page.css('div.sidebar-default')).not_to be_empty
+        expect(page.css('div.custom-sidebar')).to be_empty
+      end
     end
 
     describe 'ifnothascontent' do
       it 'renders defaults when content is not supplied' do
-        expect(page.css('div#footer')).not_to be_empty
+        expect(index.css('div#footer')).not_to be_empty
       end
 
       it 'does not render when there is content' do
-        expect(page.css('div[class=sidebar-default]')).to be_empty
+        expect(index.css('div[class=sidebar-default]')).to be_empty
+      end
+    end
+
+    if Jekyll.supports_collections?
+      describe 'content blocks in a collection' do
+        let(:item_one) { load_item_html('one') }
+        let(:item_two) { load_item_html('two') }
+
+        it 'should render the content block' do
+          expect(item_one.css('div[class=sidebar-default]')).to be_empty
+          expect(item_one.css('div[class=custom-sidebar]')).not_to be_empty
+        end
+
+        it 'should skip a content block that was not defined' do
+          expect(item_two.css('div[class=sidebar-default]')).not_to be_empty
+          expect(item_two.css('div[class=custom-sidebar]')).to be_empty
+        end
+
+        it 'should process Markdown inside the content block' do
+          expect(item_one.css('div[class=custom-sidebar] ul li')).not_to be_empty
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,17 +1,34 @@
 require 'nokogiri'
+require 'jekyll-contentblocks'
 
 module SpecHelpers
+  def jekyll_version
+    @jekyll_version ||= `jekyll --version`.strip.gsub('jekyll ', '')
+  end
+
   def generate_test_site
     system 'rm -rf test/_site'
     system 'jekyll build -s test/ -d test/_site &> /dev/null'
   end
 
-  def load_index_html
-    index_html = File.read('test/_site/index.html')
-    Nokogiri::Slop(index_html)
+  def load_html(file)
+    path = "test/_site/#{file}"
+    if File.exists?(path)
+      index_html = File.read(path)
+      Nokogiri::Slop(index_html).html
+    end
+  end
+
+  def load_item_html(item)
+    if Jekyll.version_less_than?('2.1.0')
+      load_html("items/#{item}.html")
+    else
+      load_html("items/#{item}/index.html")
+    end
   end
 end
 
 RSpec.configure do |config|
+  config.extend(SpecHelpers)
   config.include(SpecHelpers)
 end

data/test/_config.yml

@@ -0,0 +1,5 @@
+collections:
+  items:
+    output: true
+    permalink: /items/:path/
+

data/test/_items/one.md

@@ -0,0 +1,14 @@
+---
+layout: default
+title: One
+---
+
+## From a collection.
+
+{% contentfor sidebar %}
+
+* Some content
+* in a markdown list
+* with some {{ 'liquid' }} tags too!
+
+{% endcontentfor %}

data/test/_items/two.md

@@ -0,0 +1,9 @@
+---
+layout: default
+title: Two
+---
+
+## From a collection.
+
+I have no custom sidebar.
+

data/test/_layouts/default.html

@@ -9,10 +9,12 @@
   </head>
 
   <body>
+    <h1>{{ page.title }}</h1>
+
     {{ content }}
 
     {% ifhascontent sidebar %}
-      <div>
+      <div class="custom-sidebar">
         {% contentblock sidebar %}
       </div>
     {% endifhascontent %}
@@ -23,6 +25,10 @@
       </div>
     {% endifnothascontent %}
 
+    {% ifhascontent footer %}
+      {% contentblock footer %}
+    {% endifhascontent %}
+
     {% ifnothascontent footer %}
     <div id="footer">
       This is the default footer.

data/test/index.md

@@ -5,7 +5,6 @@ layout: default
 
 # CONTENT
 
-
 {% contentfor sidebar %}
 ## SIDEBAR
 {{ 'foo bar baz' | number_of_words }}

data/test/page.md

@@ -0,0 +1,18 @@
+---
+title: A test page
+layout: default
+---
+
+{% contentfor css %}
+  div {
+    font-weight: bold;
+  }
+{% endcontentfor %}
+
+This page is here to test the opposite of index.md
+
+{% contentfor footer %}
+  <div id="custom-footer">
+  This is the custom footer for hte page.
+  </div>
+{% endcontentfor %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentblocks
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Rusty Geldmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -52,18 +52,23 @@ files:
 - gemfiles/jekyll_2.5.3.gemfile
 - jekyll-contentblocks.gemspec
 - lib/jekyll-contentblocks.rb
-- lib/jekyll/content_block_tag.rb
-- lib/jekyll/contentblocks/version.rb
-- lib/jekyll/convertible.rb
+- lib/jekyll/content_blocks/content_block_tag.rb
+- lib/jekyll/content_blocks/convertible.rb
+- lib/jekyll/content_blocks/renderer.rb
+- lib/jekyll/content_blocks/version.rb
 - lib/jekyll/tags/content_block.rb
 - lib/jekyll/tags/content_for.rb
 - lib/jekyll/tags/if_has_content.rb
 - lib/jekyll/tags/if_not_has_content.rb
 - spec/jekyll_content_blocks_spec.rb
 - spec/spec_helper.rb
+- test/_config.yml
+- test/_items/one.md
+- test/_items/two.md
 - test/_layouts/default.html
 - test/_plugins/bundler.rb
 - test/index.md
+- test/page.md
 homepage: https://github.com/rustygeldmacher/jekyll-contentblocks
 licenses: []
 metadata: {}
@@ -90,6 +95,10 @@ summary: A Jekyll plugin kind of like Rails' content_for
 test_files:
 - spec/jekyll_content_blocks_spec.rb
 - spec/spec_helper.rb
+- test/_config.yml
+- test/_items/one.md
+- test/_items/two.md
 - test/_layouts/default.html
 - test/_plugins/bundler.rb
 - test/index.md
+- test/page.md

data/lib/jekyll/content_block_tag.rb

@@ -1,28 +0,0 @@
-module Jekyll
-  module ContentBlockTag
-    def initialize(tag_name, block_name, tokens)
-      super
-      @block_name = get_content_block_name(tag_name, block_name)
-    end
-
-    private
-
-    def get_content_block_name(tag_name, block_name)
-      block_name = (block_name || '').strip
-      if block_name == ''
-        raise SyntaxError.new("No block name given in #{tag_name} tag")
-      end
-      block_name
-    end
-
-    def block_has_content?(context)
-      block_content = content_for_block(context).join
-      !(block_content.nil? || block_content.empty?)
-    end
-
-    def content_for_block(context)
-      context.environments.first['contentblocks'] ||= {}
-      context.environments.first['contentblocks'][@block_name] ||= []
-    end
-  end
-end