jekyll-contentblocks 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 12919f1fc09805b1f3e91fc6b07841d81ce0ee7a
+  data.tar.gz: 064630ea1d99604218612fb556e3d56e32d50c53
+SHA512:
+  metadata.gz: dfc73df1ae4ca609ea1dc322c0c8b0cd46ccff53df8422650117343b8ac8ae2c582403eaee02d67aaf6aac8bd006263e6a82f5f17f46714a85a43c005def225e
+  data.tar.gz: 9243aeba1dde031fc24879c4a602e2842c277c45125cf02255871e57ca829c452fb7e7aa0d9aead97373d3f84c7c437249427804a8e47be9a02f6a7419b12999

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test/_site/
+gemfiles/*.lock

data/Appraisals

@@ -0,0 +1,39 @@
+appraise "jekyll-1.0.4" do
+  gem "jekyll", "1.0.4"
+end
+
+appraise "jekyll-1.1.2" do
+  gem "jekyll", "1.1.2"
+end
+
+appraise "jekyll-1.2.1" do
+  gem "jekyll", "1.2.1"
+end
+
+appraise "jekyll-1.3.1" do
+  gem "jekyll", "1.3.1"
+end
+
+appraise "jekyll-1.4.3" do
+  gem "jekyll", "1.4.3"
+end
+
+appraise "jekyll-1.5.1" do
+  gem "jekyll", "1.5.1"
+end
+
+appraise "jekyll-2.0.3" do
+  gem "jekyll", "2.0.3"
+end
+
+appraise "jekyll-2.1.1" do
+  gem "jekyll", "2.1.1"
+end
+
+appraise "jekyll-2.2.0" do
+  gem "jekyll", "2.2.0"
+end
+
+appraise "jekyll-2.3.0" do
+  gem "jekyll", "2.3.0"
+end

data/Gemfile

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

data/README.md

@@ -74,6 +74,23 @@ Here is my post content.
 
 Note that we didn't add anything to the `scripts` block in the post. That's OK, content blocks without any content will be ignored.
 
+### Checking if contentblock exists
+
+We might want to check if the particular contentblock exists before using it in our template:
+
+* [Capture](http://docs.shopify.com/themes/liquid-basics/logic) contents of the `sidebar` contentblock to a variable `result`
+* If `result` is not empty, output its contents surrounded with desired markup
+
+```liquid
+{% capture result %}{% contentblock sidebar %}{% endcapture %}
+
+{% if result != '' %}
+...template markup...
+{{ result }}
+...template markup...
+{% endif %}
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1 +1,19 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+
+desc 'Run the test'
+task :test do
+  require 'jekyll'
+  system 'rm -rf test/_site'
+  version = `jekyll --version`.strip
+  system 'jekyll build -s test/ -d test/_site &> /dev/null'
+  unless system 'grep \'<h2 id=.sidebar.>SIDEBAR</h2>\' test/_site/index.html &> /dev/null'
+    fail "#{version} failed!"
+  end
+  unless system 'grep "<p>3</p>" test/_site/index.html &> /dev/null'
+    fail "#{version} failed!"
+  end
+  puts "#{version} pass!"
+end
+

data/gemfiles/jekyll_1.0.4.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.0.4"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_1.1.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.1.2"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_1.2.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.2.1"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_1.3.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.3.1"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_1.4.3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.4.3"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_1.5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "1.5.1"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_2.0.3.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "2.0.3"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_2.1.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "2.1.1"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_2.2.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "2.2.0"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/gemfiles/jekyll_2.3.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "jekyll", "2.3.0"
+gem "appraisal", "1.0.2"
+
+gemspec :path => "../"

data/lib/jekyll-contentblocks/common.rb

@@ -1,7 +1,6 @@
 module Jekyll
   module ContentBlocks
     module Common
-      # Extracts and verified the content block's name
       def get_content_block_name(tag_name, block_name)
         block_name = (block_name || '').strip
         if block_name == ''
@@ -10,7 +9,6 @@ module Jekyll
         block_name
       end
 
-      # Gets the storage space for the content block
       def content_for_block(context)
         context.environments.first['contentblocks'] ||= {}
         context.environments.first['contentblocks'][@block_name] ||= []

data/lib/jekyll-contentblocks/content_block.rb

@@ -9,8 +9,11 @@ module Jekyll
       end
 
       def render(context)
-        converter = context.environments.first['converter']
-        content_for_block(context).map { |c| converter.convert(c || '') }.join
+        block_content = content_for_block(context).join
+        converters = context.environments.first['converters']
+        converters.reduce(block_content) do |content, converter|
+          converter.convert(content)
+        end
       end
     end
   end

data/lib/jekyll-contentblocks/content_for.rb

@@ -11,7 +11,6 @@ module Jekyll
 
       def render(context)
         content_for_block(context) << render_block(context)
-        # Render nothing right now
         ''
       end
     end

data/lib/jekyll-contentblocks/convertible.rb

@@ -3,10 +3,25 @@ module Jekyll
     alias_method :do_layout_orig, :do_layout
 
     def do_layout(payload, layouts)
-      # The contentblock tags needs access to the converter to process it while rendering.
-      payload['converter'] = self.converter
+      payload['converters'] = converters_for_content_block
       payload['contentblocks'] = {}
       do_layout_orig(payload, layouts)
     end
+
+    private
+
+    def converters_for_content_block
+      if jekyll_version_less_than?('2.3.0')
+        [converter]
+      else
+        converters.reject do |converter|
+          converter.class == Jekyll::Converters::Identity
+        end
+      end
+    end
+
+    def jekyll_version_less_than?(version)
+      Gem::Version.new(Jekyll::VERSION) < Gem::Version.new(version)
+    end
   end
 end

data/lib/jekyll-contentblocks/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module ContentBlocks
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/test/_layouts/default.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+  </head>
+  <body>
+    {{ content }}
+    <div>
+      {% contentblock sidebar %}
+    </div>
+  </body>
+</html>
+

data/test/_plugins/bundler.rb

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

data/test/index.md

@@ -0,0 +1,13 @@
+---
+title: Test Site
+layout: default
+---
+
+# CONTENT
+
+
+{% contentfor sidebar %}
+## SIDEBAR
+{{ 'foo bar baz' | number_of_words }}
+{% endcontentfor %}
+

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-contentblocks
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Rusty Geldmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides a mechanism for passing content up to the layout, like Rails'
@@ -36,10 +33,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/jekyll_1.0.4.gemfile
+- gemfiles/jekyll_1.1.2.gemfile
+- gemfiles/jekyll_1.2.1.gemfile
+- gemfiles/jekyll_1.3.1.gemfile
+- gemfiles/jekyll_1.4.3.gemfile
+- gemfiles/jekyll_1.5.1.gemfile
+- gemfiles/jekyll_2.0.3.gemfile
+- gemfiles/jekyll_2.1.1.gemfile
+- gemfiles/jekyll_2.2.0.gemfile
+- gemfiles/jekyll_2.3.0.gemfile
 - jekyll-contentblocks.gemspec
 - lib/jekyll-contentblocks.rb
 - lib/jekyll-contentblocks/common.rb
@@ -47,28 +55,33 @@ files:
 - lib/jekyll-contentblocks/content_for.rb
 - lib/jekyll-contentblocks/convertible.rb
 - lib/jekyll-contentblocks/version.rb
+- test/_layouts/default.html
+- test/_plugins/bundler.rb
+- test/index.md
 homepage: https://github.com/rustygeldmacher/jekyll-contentblocks
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Jekyll plugin kind of like Rails' content_for
-test_files: []
+test_files:
+- test/_layouts/default.html
+- test/_plugins/bundler.rb
+- test/index.md