octopress-ink 1.0.0.alpha.21 → 1.0.0.alpha.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45467e05d9e1d22c806b1ec34b7e54d7ce2c53e0
-  data.tar.gz: 7bdf2595993c6c2d7c11fb6bcb0f322e451ee060
+  metadata.gz: ddc8138d15559a1928f3bc9d7f4a4d8a6ab95fcd
+  data.tar.gz: 6dc4f36adadf0d70480f395e2d98077c2d025e94
 SHA512:
-  metadata.gz: d385f87e816bb30c2d86465ca9c0dc1c8454125c124e6160217591e7748946196dab58d51fe62156bacf77583c00c89ba02af5b9d5fa37ce8880933d8ce1467c
-  data.tar.gz: 5dd3fc7e0e753550a3aeb37074e179ba4da43c2ed9f8e3fdcae38900837d13d14bb5276cac49eafd8c63fe7689bae93e6b337017396d7c587b63d378ee94d0af
+  metadata.gz: fdbb1c6acc6f9188b803e22503f4d37c1e4982f1a0bc7965f9bc317586ed16fe848161532bf830a0fcdab177323efdbcbe8eeddac9a016927fb8118e2c42c774
+  data.tar.gz: 063ac8ad2903c3d679b9710c463fa148cc870825e32abefb4b3ab4fb1e0ebc5ca8bc3f3debc6cf032566bf042aab2e19dc8a86c6d98f0592248a717ba952b4c5

data/lib/octopress-ink/assets/asset.rb

@@ -25,7 +25,7 @@ module Octopress
           files << plugin_path unless @plugin.type == 'local_plugin'
           files = files.flatten.reject { |f| !exists? f }
 
-          unless files.size
+          if files.empty?
             raise IOError.new "Could not find #{File.basename(@file)} at #{@file}"
           end
           @found_file = Pathname.new files[0]

data/lib/octopress-ink/helpers/conditional.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Helpers
     module Conditional
-      SYNTAX = /(.+)(if|unless)\s*(.+)/
+      SYNTAX = /(.*)(if|unless)\s*(.+)/
 
       def self.parse(markup, context)
         if markup =~ SYNTAX
@@ -11,9 +11,9 @@ module Octopress
           when 'unless'
             tag = Liquid::Unless.new('unless', $3, ["true","{% endunless %}"])
           end
-          tag.render(context) != ''
+          tag.render(context) != '' ? $1 : false
         else
-          true
+          markup
         end
       end
 

data/lib/octopress-ink/helpers/var.rb

@@ -1,6 +1,7 @@
 module Octopress
   module Helpers
     module Var
+      TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+)?/
 
       def self.set_var(var, operator, value, context)
         case operator
@@ -19,6 +20,9 @@ module Octopress
       end
 
       def self.get_value(vars, context)
+        if vars =~ TERNARY
+          vars = $1 + evaluate_ternary($2, $3, $4, context) + $5
+        end
         vars = vars.strip.gsub(/ or /, ' || ')
         vars = vars.split(/ \|\| /).map { |v|
           Liquid::Variable.new(v.strip).render(context)
@@ -26,6 +30,11 @@ module Octopress
 
         vars.empty? ? nil : vars.first
       end
+
+      def self.evaluate_ternary(expression, if_true, if_false, context)
+        Conditional.parse("if #{expression}", context) ? if_true : if_false
+      end
+
     end
   end
 end

data/lib/octopress-ink/tags/assign.rb

@@ -9,12 +9,10 @@ module Octopress
       end
 
       def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = $1
-        end
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
 
-        if @markup =~ SYNTAX
+        if markup =~ SYNTAX
           var      = $1
           operator = $2
           value    = $3

data/lib/octopress-ink/tags/capture.rb

@@ -9,12 +9,10 @@ module Octopress
       end
 
       def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = $1
-        end
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
 
-        if @markup =~ SYNTAX
+        if markup =~ SYNTAX
           var      = $1
           operator = $2
           value = super.lstrip

data/lib/octopress-ink/tags/content_for.rb

@@ -10,12 +10,10 @@ module Octopress
       end
 
       def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = $1
-        end
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
 
-        @block_name ||= Helpers::ContentFor.get_block_name(@tag_name, @markup)
+        @block_name ||= Helpers::ContentFor.get_block_name(@tag_name, markup)
         Helpers::ContentFor.append_to_block(context, @block_name, super)
         ''
       end

data/lib/octopress-ink/tags/footer.rb

@@ -3,6 +3,7 @@ module Octopress
     class FooterBlock < ContentForBlock
       def initialize(tag_name, markup, tokens)
         @block_name = 'footer'
+        @markup = markup
         super
       end
     end

data/lib/octopress-ink/tags/head.rb

@@ -3,6 +3,7 @@ module Octopress
     class HeadBlock < ContentForBlock
       def initialize(tag_name, markup, tokens)
         @block_name = 'head'
+        @markup = markup
         super
       end
     end

data/lib/octopress-ink/tags/include.rb

@@ -5,22 +5,25 @@ module Octopress
 
       def initialize(tag_name, markup, tokens)
         super
-        @markup = markup
+        @og_markup = @markup = markup
       end
 
       def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = Helpers::Path.parse($1, context)
-        end
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
+        markup = Helpers::Path.parse(markup, context)
 
-        include_tag = Jekyll::Tags::IncludeTag.new('include', @markup, [])
+        include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
 
         # If markup references a plugin e.g. plugin-name:include-file.html
-        if @markup.strip =~ PLUGIN_SYNTAX
+        if markup.strip =~ PLUGIN_SYNTAX
           plugin = $1
           path = $2
-          content = Plugins.include(plugin, path, context.registers[:site]).read
+          begin
+            content = Plugins.include(plugin, path, context.registers[:site]).read
+          rescue => error
+            raise IOError.new "Include failed: {% #{@tag_name} #{@og_markup}%}. The plugin '#{plugin}' does not have an include named '#{path}'."
+          end
           partial = Liquid::Template.parse(content)
           context.stack {
             context['include'] = include_tag.parse_params(context)
@@ -28,7 +31,7 @@ module Octopress
           }.strip
         # Otherwise, use Jekyll's default include tag
         else
-          include_tag.render(context)
+          include_tag.render(context).strip
         end
       end
     end

data/lib/octopress-ink/tags/return.rb

@@ -0,0 +1,17 @@
+module Octopress
+  module Tags
+    class ReturnTag < Liquid::Tag
+      def initialize(tag_name, markup, tokens)
+        @markup = markup.strip
+        super
+      end
+
+      def render(context)
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
+
+        Helpers::Var.get_value(@markup, context)
+      end
+    end
+  end
+end

data/lib/octopress-ink/tags/scripts.rb

@@ -3,6 +3,7 @@ module Octopress
     class ScriptsBlock < ContentForBlock
       def initialize(tag_name, markup, tokens)
         @block_name = 'scripts'
+        @markup = markup
         super
       end
     end

data/lib/octopress-ink/tags/wrap.rb

@@ -0,0 +1,47 @@
+# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
+#
+module Octopress
+  module Tags
+    class WrapTag < Liquid::Block
+      HAS_YIELD = /(.*?)({=\s*yield\s*})(.*)/im
+      def initialize(tag_name, markup, tokens)
+        super
+        @og_markup = @markup = markup
+        @tag_name = tag_name
+      end
+
+      def render(context)
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
+
+        case @tag_name
+        when 'wrap_yield'
+          content = content_for(markup, context)
+        when 'wrap'
+          begin
+            content = include_tag = Octopress::Tags::IncludeTag.new('include', markup, []).render(context)
+          rescue => error
+            error.message
+            message = "Wrap failed: {% #{@tag_name} #{@og_markup}%}."
+            message << $1 if error.message =~ /%}\.(.+)/
+            raise IOError.new message
+          end
+        end
+
+        wrap = super.strip
+
+        if wrap =~ HAS_YIELD && content != ''
+          $1 + content + $3
+        else
+          ''
+        end
+      end
+
+      def content_for(markup, context)
+        @block_name = Helpers::ContentFor.get_block_name(@tag_name, markup)
+        Helpers::ContentFor.render(context, @block_name).strip
+      end
+    end
+  end
+end
+

data/lib/octopress-ink/tags/yield.rb

@@ -9,10 +9,8 @@ module Octopress
       end
 
       def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = $1
-        end
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
 
         content = Helpers::ContentFor.render(context, @block_name)
         if @block_name == 'head'

data/lib/octopress-ink/tags.rb

@@ -2,6 +2,7 @@ module Octopress
   module Tags
     autoload :IncludeTag,           'octopress-ink/tags/include'
     autoload :AssignTag,            'octopress-ink/tags/assign'
+    autoload :ReturnTag,            'octopress-ink/tags/return'
     autoload :CaptureTag,           'octopress-ink/tags/capture'
     autoload :JavascriptTag,        'octopress-ink/tags/javascript'
     autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'
@@ -10,7 +11,7 @@ module Octopress
     autoload :FooterBlock,          'octopress-ink/tags/footer'
     autoload :YieldTag,             'octopress-ink/tags/yield'
     autoload :ScriptsBlock,         'octopress-ink/tags/scripts'
-    autoload :WrapYieldBlock,       'octopress-ink/tags/wrap_yield'
+    autoload :WrapTag,              'octopress-ink/tags/wrap'
   end
 end
 

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.21"
+    VERSION = "1.0.0.alpha.22"
   end
 end

data/lib/octopress-ink.rb

@@ -27,6 +27,7 @@ end
 Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
 Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
 Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
+Liquid::Template.register_tag('return', Octopress::Tags::ReturnTag)
 Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
 Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
 Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForBlock)
@@ -34,7 +35,8 @@ Liquid::Template.register_tag('head', Octopress::Tags::HeadBlock)
 Liquid::Template.register_tag('footer', Octopress::Tags::FooterBlock)
 Liquid::Template.register_tag('scripts', Octopress::Tags::ScriptsBlock)
 Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
-Liquid::Template.register_tag('wrap_yield', Octopress::Tags::WrapYieldBlock)
+Liquid::Template.register_tag('wrap_yield', Octopress::Tags::WrapTag)
+Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
 
 Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')
 

data/test/_config.yml

@@ -4,3 +4,4 @@ pygments: true
 source: source
 destination: site
 include_test: foo.html
+timezone: America/Chicago

data/test/_sass_compact.yml

@@ -2,5 +2,4 @@
 octopress:
   sass: 
     output_style: compact
-    line_numbers: true
 

data/test/expected/test_tags/head.html

@@ -1,4 +1,4 @@
-<meta name='generator' content='Octopress 1.0.0.alpha.21'>
+<meta name='generator' content='Octopress 1.0.0.alpha.22'>
 Testing head tag
 Testing that content_for is additive
 

data/test/expected/test_tags/include.html

@@ -1,2 +1,25 @@
-Testing Include var_test
+
+
+## Testing a simple include
+Testing Include → Testing Include
+
+## Local var passing
+Testing Include var_test → Testing Include var_test
+
+## Conditional Include
+'' → ''
+'' → ''
+'' → ''
+Testing Include → Testing Include
+Testing Include → Testing Include
+Testing Include var_test → Testing Include var_test
+
+## Plugin wraps
+include from plugin → include from plugin
+Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
+'' → ''
+Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
+
+## Theme Include override
+include from theme override → include from theme override
 

data/test/expected/test_tags/wrap.html

@@ -0,0 +1,18 @@
+
+
+## Testing a simple wrap
+[- Testing Include -] → [- Testing Include -]
+
+## Local var passing
+[- Testing Include var_test -] → [- Testing Include var_test -]
+
+## Conditional wrap
+'' → ''
+'' → ''
+[- Testing Include -] → [- Testing Include -]
+[- Testing Include -] → [- Testing Include -]
+
+## Plugin wraps
+[- include from plugin -] → [- include from plugin -]
+[- Yo Dawg, I heard you like includes. -] → [- Yo Dawg, I heard you like includes. -]
+

data/test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css

@@ -3,7 +3,6 @@ body { margin: 2px; padding: 2px; }
 
 .main { color: #444; }
 
-/* line 2 */
 body { background: black; }
 
 /* Plugin: awesome-sauce */
@@ -12,11 +11,8 @@ body { background: black; }
 /* Plugin: user stylesheets */
 .css-plugin { background: #fed; }
 
-/* line 1, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/_foo.scss */
 body { display: table; }
 
-/* line 4, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/site.sass */
 body { background: #aaa111; }
 
-/* line 6, /Users/imathis/workspace/octodev/ink/test/source/stylesheets/site.sass */
 div { display: table; }

data/test/site/test_tags/head.html

@@ -1,4 +1,4 @@
-<meta name='generator' content='Octopress 1.0.0.alpha.21'>
+<meta name='generator' content='Octopress 1.0.0.alpha.22'>
 Testing head tag
 Testing that content_for is additive
 

data/test/site/test_tags/include.html

@@ -1,2 +1,25 @@
-Testing Include var_test
+
+
+## Testing a simple include
+Testing Include → Testing Include
+
+## Local var passing
+Testing Include var_test → Testing Include var_test
+
+## Conditional Include
+'' → ''
+'' → ''
+'' → ''
+Testing Include → Testing Include
+Testing Include → Testing Include
+Testing Include var_test → Testing Include var_test
+
+## Plugin wraps
+include from plugin → include from plugin
+Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
+'' → ''
+Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
+
+## Theme Include override
+include from theme override → include from theme override
 

data/test/site/test_tags/return.html

@@ -0,0 +1,23 @@
+
+
+## Simple return
+bar → bar
+
+## Conditional return
+bar → bar
+'' → ''
+
+## Ternary return
+nope → nope
+
+## Cascading return
+nope → nope
+bar → bar
+
+## Test local variables
+yep → yep
+
+## Returns with filters
+2013-07-21T18:59:00-05:00 → 2013-07-21T18:59:00-05:00
+2013-07-21T18:59:00-05:00 → 2013-07-21T18:59:00-05:00
+

data/test/site/test_tags/wrap.html

@@ -0,0 +1,18 @@
+
+
+## Testing a simple wrap
+[- Testing Include -] → [- Testing Include -]
+
+## Local var passing
+[- Testing Include var_test -] → [- Testing Include var_test -]
+
+## Conditional wrap
+'' → ''
+'' → ''
+[- Testing Include -] → [- Testing Include -]
+[- Testing Include -] → [- Testing Include -]
+
+## Plugin wraps
+[- include from plugin -] → [- include from plugin -]
+[- Yo Dawg, I heard you like includes. -] → [- Yo Dawg, I heard you like includes. -]
+

data/test/source/test_tags/assign.html

@@ -20,6 +20,6 @@ foo → {% assign var7 = baz || 'foo' %}{{ var7 }}
 yepyep → {% assign var1 += 'yep' %}{{ var1 }}
 
 ## Complex assignment
-awesome → {% assign var9 = 'awesome' %}{{ var9 }}
+awesome → {% assign var9 = (page.layout == 'nil' ? 'awesome' : 'lame' ) %}{{ var9 }}
 AWESOME → {% assign var10 = var9 | upcase %}{{ var10 }}
 

data/test/source/test_tags/include.html

@@ -1,3 +1,28 @@
 ---
+layout: nil
 ---
-{% include foo.html some_var="var_test" %}
+{% assign some_bool = true %}
+
+## Testing a simple include
+Testing Include → {% include foo.html %}
+
+## Local var passing
+Testing Include var_test → {% include foo.html some_var="var_test" %}
+
+## Conditional Include
+'' → '{% include foo.html unless true %}'
+'' → '{% include foo.html unless some_bool %}'
+'' → '{% include foo.html unless site.name == 'Your New Jekyll Site' %}'
+Testing Include → {% include foo.html if true %}
+Testing Include → {% include foo.html if site.name == 'Your New Jekyll Site' %}
+Testing Include var_test → {% include foo.html some_var="var_test" if some_bool %}
+
+## Plugin wraps
+include from plugin → {% include awesome-sauce:some-include.html %}
+Yo Dawg, I heard you like includes. → {% include theme:greet.html greeting="Yo Dawg" %}
+'' → '{% include theme:greet.html greeting="Yo Dawg" unless some_bool %}'
+Yo Dawg, I heard you like includes. → {% include theme:greet.html greeting="Yo Dawg" if some_bool %}
+
+## Theme Include override
+include from theme override → {% include theme:bar.html %}
+

data/test/source/test_tags/return.html

@@ -0,0 +1,30 @@
+---
+layout: nil
+date: 2013-07-21 18:59
+people:
+  - { name: Bill }
+  - { name: Bob }
+---
+{% assign foo = 'bar' %}
+
+## Simple return
+bar → {% return foo %}
+
+## Conditional return
+bar → {% return foo if foo %}
+'' → '{% return foo unless foo == 'bar' %}'
+
+## Ternary return
+nope → {% return (foo == 'baz' ? foo : 'nope') %}
+
+## Cascading return
+nope → {% return bingo || fez || 'nope' %}
+bar → {% return bingo || fez || foo %}
+
+## Test local variables
+yep → {% for person in page.people %}{% return 'yep' if person.name == 'Bill' %}{% endfor %}
+
+## Returns with filters
+2013-07-21T18:59:00-05:00 → {% return post.date or page.date | datetime | date_to_xmlschema %}
+2013-07-21T18:59:00-05:00 → {% return (post ? post.date : page.date) | datetime | date_to_xmlschema %}
+

data/test/source/test_tags/wrap.html

@@ -0,0 +1,21 @@
+---
+layout: nil
+---
+{% assign some_bool = true %}
+
+## Testing a simple wrap
+[- Testing Include -] → {% wrap foo.html %}[- {=yield} -]{% endwrap %}
+
+## Local var passing
+[- Testing Include var_test -] → {% wrap foo.html some_var="var_test" %}[- {=yield} -]{% endwrap %}
+
+## Conditional wrap
+'' → '{% wrap foo.html unless true %}[- {=yield} -]{% endwrap %}'
+'' → '{% wrap foo.html unless some_bool %}[- {=yield} -]{% endwrap %}'
+[- Testing Include -] → {% wrap foo.html if true %}[- {=yield} -]{% endwrap %}
+[- Testing Include -] → {% wrap foo.html if some_bool %}[- {=yield} -]{% endwrap %}
+
+## Plugin wraps
+[- include from plugin -] → {% wrap awesome-sauce:some-include.html %}[- {=yield} -]{% endwrap %}
+[- Yo Dawg, I heard you like includes. -] → {% wrap theme:greet.html greeting="Yo Dawg" %}[- {=yield} -]{% endwrap %}
+

data/test/test.rb

@@ -39,7 +39,7 @@ end
 build
 
 def test_tags(dir)
-  tags = %w{content_for footer head include include_plugin include_theme include_theme_override scripts include_if assign capture}
+  tags = %w{content_for footer head include scripts assign capture wrap}
   tags.each { |file| test("test_tags/#{file}.html", dir) }
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.21
+  version: 1.0.0.alpha.22
 platform: ruby
 authors:
 - Brandon Mathis
@@ -124,9 +124,10 @@ files:
 - lib/octopress-ink/tags/head.rb
 - lib/octopress-ink/tags/include.rb
 - lib/octopress-ink/tags/javascript.rb
+- lib/octopress-ink/tags/return.rb
 - lib/octopress-ink/tags/scripts.rb
 - lib/octopress-ink/tags/stylesheet.rb
-- lib/octopress-ink/tags/wrap_yield.rb
+- lib/octopress-ink/tags/wrap.rb
 - lib/octopress-ink/tags/yield.rb
 - lib/octopress-ink/version.rb
 - octopress-ink.gemspec
@@ -160,11 +161,8 @@ files:
 - test/expected/test_tags/footer.html
 - test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
-- test/expected/test_tags/include_if.html
-- test/expected/test_tags/include_plugin.html
-- test/expected/test_tags/include_theme.html
-- test/expected/test_tags/include_theme_override.html
 - test/expected/test_tags/scripts.html
+- test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -187,11 +185,9 @@ files:
 - test/site/test_tags/footer.html
 - test/site/test_tags/head.html
 - test/site/test_tags/include.html
-- test/site/test_tags/include_if.html
-- test/site/test_tags/include_plugin.html
-- test/site/test_tags/include_theme.html
-- test/site/test_tags/include_theme_override.html
+- test/site/test_tags/return.html
 - test/site/test_tags/scripts.html
+- test/site/test_tags/wrap.html
 - test/source/.gitignore
 - test/source/_custom/awesome-sauce/config.yml
 - test/source/_custom/theme/config.yml
@@ -242,11 +238,9 @@ files:
 - test/source/test_tags/footer.html
 - test/source/test_tags/head.html
 - test/source/test_tags/include.html
-- test/source/test_tags/include_if.html
-- test/source/test_tags/include_plugin.html
-- test/source/test_tags/include_theme.html
-- test/source/test_tags/include_theme_override.html
+- test/source/test_tags/return.html
 - test/source/test_tags/scripts.html
+- test/source/test_tags/wrap.html
 - test/test.rb
 homepage: https://github.com/octopress/ink
 licenses:
@@ -303,11 +297,8 @@ test_files:
 - test/expected/test_tags/footer.html
 - test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
-- test/expected/test_tags/include_if.html
-- test/expected/test_tags/include_plugin.html
-- test/expected/test_tags/include_theme.html
-- test/expected/test_tags/include_theme_override.html
 - test/expected/test_tags/scripts.html
+- test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -330,11 +321,9 @@ test_files:
 - test/site/test_tags/footer.html
 - test/site/test_tags/head.html
 - test/site/test_tags/include.html
-- test/site/test_tags/include_if.html
-- test/site/test_tags/include_plugin.html
-- test/site/test_tags/include_theme.html
-- test/site/test_tags/include_theme_override.html
+- test/site/test_tags/return.html
 - test/site/test_tags/scripts.html
+- test/site/test_tags/wrap.html
 - test/source/.gitignore
 - test/source/_custom/awesome-sauce/config.yml
 - test/source/_custom/theme/config.yml
@@ -385,9 +374,7 @@ test_files:
 - test/source/test_tags/footer.html
 - test/source/test_tags/head.html
 - test/source/test_tags/include.html
-- test/source/test_tags/include_if.html
-- test/source/test_tags/include_plugin.html
-- test/source/test_tags/include_theme.html
-- test/source/test_tags/include_theme_override.html
+- test/source/test_tags/return.html
 - test/source/test_tags/scripts.html
+- test/source/test_tags/wrap.html
 - test/test.rb

data/lib/octopress-ink/tags/wrap_yield.rb

@@ -1,33 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-#
-module Octopress
-  module Tags
-    class WrapYieldBlock < Liquid::Block
-      HAS_YIELD = /(.*?)({=\s*yield\s*})(.*)/im
-      def initialize(tag_name, markup, tokens)
-        super
-        @markup = markup
-        @tag_name = tag_name
-      end
-
-      def render(context)
-        if @markup =~ Helpers::Conditional::SYNTAX
-          return unless Helpers::Conditional.parse(@markup, context)
-          @markup = $1
-        end
-
-        @block_name = Helpers::ContentFor.get_block_name(@tag_name, @markup)
-
-        wrap = super.strip
-        content = Helpers::ContentFor.render(context, @block_name).strip
-
-        if wrap =~ HAS_YIELD && content != ''
-          $1 + content + $3
-        else
-          ''
-        end
-      end
-    end
-  end
-end
-

data/test/expected/test_tags/include_if.html

@@ -1,6 +0,0 @@
-Testing Include var_test
-
-
-
-Testing Include var_test
-

data/test/expected/test_tags/include_plugin.html

@@ -1 +0,0 @@
-include from plugin

data/test/expected/test_tags/include_theme.html

@@ -1,2 +0,0 @@
-Testing theme include
-Yo Dawg, I heard you like includes.

data/test/expected/test_tags/include_theme_override.html

@@ -1 +0,0 @@
-include from theme override

data/test/site/test_tags/include_if.html

@@ -1,6 +0,0 @@
-Testing Include var_test
-
-
-
-Testing Include var_test
-

data/test/site/test_tags/include_plugin.html

@@ -1 +0,0 @@
-include from plugin

data/test/site/test_tags/include_theme.html

@@ -1,2 +0,0 @@
-Testing theme include
-Yo Dawg, I heard you like includes.

data/test/site/test_tags/include_theme_override.html

@@ -1 +0,0 @@
-include from theme override

data/test/source/test_tags/include_if.html

@@ -1,6 +0,0 @@
----
----
-{% include foo.html some_var="var_test" if site.name == 'Your New Jekyll Site' %}
-{% include site.include_test some_var="var_test" if site.name != 'Your New Jekyll Site' %}
-{% include site.include_test some_var="var_test" unless site.name == 'Your New Jekyll Site' %}
-{% include site.include_test some_var="var_test" unless site.name == 'Your Stupid Website' %}

data/test/source/test_tags/include_plugin.html

@@ -1,3 +0,0 @@
----
----
-{% include awesome-sauce:some-include.html %}

data/test/source/test_tags/include_theme.html

@@ -1,4 +0,0 @@
----
----
-Testing theme include
-{% include theme:greet.html greeting="Yo Dawg" %}

data/test/source/test_tags/include_theme_override.html

@@ -1,3 +0,0 @@
----
----
-{% include theme:bar.html %}