octopress-ink 1.0.0.alpha.27 → 1.0.0.alpha.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb2eeb2e446b336fd58c729e0e6a7502f9d6bb3
-  data.tar.gz: fe1e77611c7f66c7691b09fb6eff276d14840ba3
+  metadata.gz: fc46c805b9c9408a12e59be45bce38d1e60a9b98
+  data.tar.gz: f3235034540210c39d801bfc0afb6cd2d7b7d3a2
 SHA512:
-  metadata.gz: 7c5f038dd274c159d5a5b41ea8defc59ea1d09a0e0db615f1de090112674560130520bddc3c5a648234e697e4a0736f5a91a2ee6c87ce2af897fa041c7b17de3
-  data.tar.gz: 176556c8a98b88c6de0598f9e5d63207563aca913d4ce96732467e1bba711f05eb62dea30caaf221b46a7e747f4f584bc9f0f9835b40eb84149a523824331dfc
+  metadata.gz: 5448ac1ba45a66b2a692f1ffb1acc3e7955ac1639bb6df01d5f8c92c128edc7dedb8b7e00a47fefd0f6bc790bad94a57bf0c749b3af4ee62eb47ae44fdc991d0
+  data.tar.gz: 060ba433677737ad6fddc84b15b41016784c0c6a5c6138d10e987900b6590391729929c03eaae5d3dccd935b10b201067b45639d4de90fbab07a6ef6c5b0ca40

data/lib/octopress-ink.rb

@@ -40,8 +40,6 @@ 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::WrapTag)
-Liquid::Template.register_tag('wrap_render', Octopress::Tags::WrapTag)
 Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
 Liquid::Template.register_tag('_', Octopress::Tags::LineCommentTag)
 

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

@@ -15,16 +15,29 @@ module Octopress
         markup = Helpers::Conditional.parse(@markup, context)
         return unless markup
 
-        case @tag_name
-        when 'wrap_yield'
+        type = if markup =~ /^\s*yield\s(.+)/
+          markup = $1
+          'yield'
+        elsif markup =~ /^\s*render\s(.+)/
+          markup = $1
+          'render'
+        elsif markup =~ /^\s*include\s(.+)/
+          markup = $1
+          'include'
+        else
+          raise IOError.new "Wrap Failed: {% wrap #{@og_markup}%} - Which type of wrap: inlcude, yield, render? - Correct syntax: {% wrap type path or var [filters] [conditions] %}"
+        end
+
+        case type
+        when 'yield'
           content = Tags::YieldTag.new('yield', markup, []).render(context)
-        when 'wrap_render'
+        when 'render'
           begin
             content = Tags::RenderTag.new('render', markup, []).render(context)
           rescue => error
             error_msg error
           end
-        when 'wrap'
+        when 'include'
           begin
             content = Tags::IncludeTag.new('include', markup, []).render(context)
           rescue => error

data/lib/octopress-ink/version.rb

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

data/test/source/test_tags/wrap.html

@@ -4,28 +4,28 @@ layout: nil
 {% assign some_bool = true %}
 
 ## Testing a simple wrap
-[- Testing Include -] → {% wrap foo.html %}[- {{ yield }} -]{% endwrap %}
+[- Testing Include -] → {% wrap include foo.html %}[- {{ yield }} -]{% endwrap %}
 
 ## Local var passing
-[- Testing Include var_test -] → {% wrap foo.html some_var="var_test" %}[- {{ yield }} -]{% endwrap %}
+[- Testing Include var_test -] → {% wrap include foo.html some_var="var_test" %}[- {{ yield }} -]{% endwrap %}
 
 ## Filter testing
-[- TESTING INCLUDE -] → {% wrap foo.html | upcase %}[- {% assign foo = 'bar' %}{{ yield }} -]{% endwrap %}
-[- TESTING FILTERS -] → {% wrap foo.html | replace:"Include","Filters" | upcase | %}[- {{ yield }} -]{% endwrap %}
+[- TESTING INCLUDE -] → {% wrap include foo.html | upcase %}[- {% assign foo = 'bar' %}{{ yield }} -]{% endwrap %}
+[- TESTING FILTERS -] → {% wrap include foo.html | replace:"Include","Filters" %}[- {{ yield | upcase }} -]{% 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 %}
+'' → '{% wrap include foo.html unless true %}[- {{ yield }} -]{% endwrap %}'
+'' → '{% wrap include foo.html unless some_bool %}[- {{ yield }} -]{% endwrap %}'
+[- Testing Include -] → {% wrap include foo.html if true %}[- {{ yield }} -]{% endwrap %}
+[- Testing Include -] → {% wrap include 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 %}
+[- include from plugin -] → {% wrap include awesome-sauce:some-include.html %}[- {{ yield }} -]{% endwrap %}
+[- Yo Dawg, I heard you like includes. -] → {% wrap include theme:greet.html greeting="Yo Dawg" %}[- {{ yield }} -]{% endwrap %}
 
 ## Wrap render
-[- Testing Render -] → {% wrap_render test_render/_f.html %}[- {{ yield }} -]{% endwrap_render %}
+[- Testing Render -] → {% wrap render test_render/_f.html %}[- {{ yield }} -]{% endwrap %}
 
 ## Wrap yield
 {% content_for test %}Testing wrap yield{% endcontent_for %}
-[- Testing wrap yield -] → {% wrap_yield test %}[- {{ yield }} -]{% endwrap_yield %}
+[- Testing wrap yield -] → {% wrap yield test %}[- {{ yield }} -]{% endwrap %}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.27
+  version: 1.0.0.alpha.28
 platform: ruby
 authors:
 - Brandon Mathis