jekyll-contentblocks 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fa5ab18f418d6455911cf33dbb9ad6d8e08c52
-  data.tar.gz: 8da924d203b87c0afb2767872386287b7ad9e4a8
+  metadata.gz: 40a997daa68a6ef8db0f0df0125d379c4a8fe962
+  data.tar.gz: ebafec9066fba596044477ede027e556c92de9b6
 SHA512:
-  metadata.gz: 7247b7a4107c6d88be63576b06ea8dcd320c19e5b8a54509ebd3b2b1aef62bc3e5e756d1eb5269554e1e0c65d71d02bd4ff2238ad74b21a28256883808592112
-  data.tar.gz: 977e960485aabbc1f811a34561e805ea8fb4cabccab90d70258967b3d73d17e66268a595846c9f1012e1bd8b40ec5418da7bc639365b96fff43d3fb8c8e4374a
+  metadata.gz: fb02de9135f264125157e2b0412ac3ab5b10234144f6c16e5300ee3e23adba036e9ca1ce20f90fb9ff37d966c044b6567317275757c16880aafa757a16ea2955
+  data.tar.gz: 39869c8dc1f4c427b17ce2fd1f4a128571ed8b00200d7c84ddeb6d32dd3f99e2aa070795e16ba9ff463f427295e78a37540ba2f947fbbc5c2651c8ff4a5e2a6a

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/Appraisals

@@ -45,3 +45,11 @@ end
 appraise "jekyll-2.5.3" do
   gem "jekyll", "2.5.3"
 end
+
+appraise "jekyll-3.0.3" do
+  gem "jekyll", "3.0.3"
+end
+
+appraise "jekyll-3.1.2" do
+  gem "jekyll", "3.1.2"
+end

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'jekyll', '> 1.0.0'
+gem 'jekyll', '3.1.2'
 gem 'appraisal', '1.0.2'
 
 gem 'pry'

data/README.md

@@ -9,7 +9,9 @@ layouts. It's kind of like having Rails' content_for available for Jekyll.
 
 Add this line to your Jekyll project's `Gemfile`:
 ```ruby
-gem 'jekyll-contentblocks'
+ group :jekyll_plugins do
+   gem 'jekyll-contentblocks'
+ end
 ```
 
 Then execute:
@@ -17,15 +19,8 @@ Then execute:
 $ bundle install
 ```
 
-Make sure your have a plugin that initializes Bundler:
-```ruby
-# _plugins/bundler.rb
-require "rubygems"
-require "bundler/setup"
-Bundler.require(:default)
-```
-
 ### Standalone
+
 Execute:
 ```bash
 $ gem install jekyll-contentblocks
@@ -101,7 +96,7 @@ it in our template. To do this, use the `ifhascontent` tag:
 ```liquid
 {% ifhascontent javascripts %}
   <script type="text/javascript>
-    {% contentfor javascripts %}
+    {% contentblock javascripts %}
   </script>
 {% endifhascontent %}
 ```

data/gemfiles/jekyll_3.0.3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "3.0.3"
+gem "appraisal", "1.0.2"
+gem "pry"
+gem "pry-byebug"
+gem "rspec", "~> 3.3.0"
+gem "nokogiri", "~> 1.6.6.0"
+
+gemspec :path => "../"

data/gemfiles/jekyll_3.1.2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "3.1.2"
+gem "appraisal", "1.0.2"
+gem "pry"
+gem "pry-byebug"
+gem "rspec", "~> 3.3.0"
+gem "nokogiri", "~> 1.6.6.0"
+
+gemspec :path => "../"

data/lib/jekyll-contentblocks.rb

@@ -10,9 +10,18 @@ module Jekyll
   end
 end
 
-require 'jekyll/content_blocks/convertible'
-unless Jekyll.version_less_than?('2.0.0')
-  require 'jekyll/content_blocks/renderer'
+if Jekyll.version_less_than?('3.0.0')
+  require 'jekyll/content_blocks/convertible'
+  unless Jekyll.version_less_than?('2.0.0')
+    require 'jekyll/content_blocks/renderer'
+  end
+else
+  require 'jekyll/content_blocks/pre_render_hook'
+  [:documents, :pages, :posts].each do |content_type|
+    Jekyll::Hooks.register content_type, :pre_render do |doc, payload|
+      Jekyll::ContentBlocks::PreRenderHook.call(doc, payload)
+    end
+  end
 end
 
 require 'jekyll/content_blocks/version'

data/lib/jekyll/content_blocks/pre_render_hook.rb

@@ -0,0 +1,13 @@
+module Jekyll
+  module ContentBlocks
+    class PreRenderHook
+      def self.call(document, payload)
+        payload['converters'] = document.site.converters.select do |converter|
+          file_extension = File.extname(document.path)
+          converter.matches(file_extension)
+        end
+        payload['contentblocks'] = {}
+      end
+    end
+  end
+end

data/lib/jekyll/content_blocks/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
   module ContentBlocks
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end
 

data/spec/jekyll_content_blocks_spec.rb

@@ -40,7 +40,6 @@ describe Jekyll::ContentBlocks do
 
     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
@@ -62,6 +61,16 @@ describe Jekyll::ContentBlocks do
       end
     end
 
+    describe 'page2.html' do
+      let(:page) { load_html('page2.html') }
+
+      it 'renders only the page2 sidebar' do
+        sidebar = page.css('div.custom-sidebar')
+        expect(sidebar).not_to be_empty
+        expect(sidebar.text.strip).to eq 'A pretty simple sidebar.'
+      end
+    end
+
     describe 'ifnothascontent' do
       it 'renders defaults when content is not supplied' do
         expect(index.css('div#footer')).not_to be_empty

data/test/_plugins/require.rb

@@ -0,0 +1,2 @@
+require 'jekyll-contentblocks'
+

data/test/page2.md

@@ -0,0 +1,12 @@
+---
+title: Page Two
+layout: default
+---
+
+# CONTENT
+
+This page also has a sidebar.
+
+{% contentfor sidebar %}
+A pretty simple sidebar.
+{% endcontentfor %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentblocks
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rusty Geldmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -50,10 +51,13 @@ files:
 - gemfiles/jekyll_2.3.0.gemfile
 - gemfiles/jekyll_2.4.0.gemfile
 - gemfiles/jekyll_2.5.3.gemfile
+- gemfiles/jekyll_3.0.3.gemfile
+- gemfiles/jekyll_3.1.2.gemfile
 - jekyll-contentblocks.gemspec
 - lib/jekyll-contentblocks.rb
 - lib/jekyll/content_blocks/content_block_tag.rb
 - lib/jekyll/content_blocks/convertible.rb
+- lib/jekyll/content_blocks/pre_render_hook.rb
 - lib/jekyll/content_blocks/renderer.rb
 - lib/jekyll/content_blocks/version.rb
 - lib/jekyll/tags/content_block.rb
@@ -66,9 +70,10 @@ files:
 - test/_items/one.md
 - test/_items/two.md
 - test/_layouts/default.html
-- test/_plugins/bundler.rb
+- test/_plugins/require.rb
 - test/index.md
 - test/page.md
+- test/page2.md
 homepage: https://github.com/rustygeldmacher/jekyll-contentblocks
 licenses: []
 metadata: {}
@@ -99,6 +104,7 @@ test_files:
 - test/_items/one.md
 - test/_items/two.md
 - test/_layouts/default.html
-- test/_plugins/bundler.rb
+- test/_plugins/require.rb
 - test/index.md
 - test/page.md
+- test/page2.md

data/test/_plugins/bundler.rb

@@ -1,4 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-Bundler.require(:default)
-