octopress-ink 1.0.0.alpha.23 → 1.0.0.alpha.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ae1d79d24dfabbbe224a384bc2867a41911996
-  data.tar.gz: 1b2b6d06f7877c7387482c6516ed2947f67144e9
+  metadata.gz: 1792939440a17c3b7b73592e7f18f14de673923c
+  data.tar.gz: 6a03bc173a8b9ea4f5fbc0c0048a9d1dc07a4da3
 SHA512:
-  metadata.gz: b5c703a3ce89c9e3f2551b09d3baec20c96945200ae6a9b94e330183cfaac09f33b520a41b34a69097ed3d5621e98a62c8c63f79ace419896125a5450ebad63f
-  data.tar.gz: fe8902c99f7f4bba176594b9aa6da57cd1d1969b70706033f9e94e4f3e03643b6d4c1d1f407a36d98741e23d86dd2bda596974bbcfeb0addb3265d58667c1143
+  metadata.gz: 5bce98043f48a2242540a61b76b5cc8bd5ab8e4527dd451841935887a6153a8513f2ee008e8c79a26eb7dba784eae9a8eecc163b86674b92332fd3b59c4e5af0
+  data.tar.gz: b1fadbfd01da61504f1d29b37e9461b95a631ce27c576146ce0f342b88aec98b21bb02ea4eb57c4cbed5a62edd0d47413228e1591e1d8f45c1726b0e74b0a7fc

data/lib/octopress-ink.rb

@@ -37,6 +37,7 @@ 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)
 
 Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')

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

@@ -17,14 +17,17 @@ module Octopress
         case @tag_name
         when 'wrap_yield'
           content = content_for(markup, context)
+        when 'wrap_render'
+          begin
+            content = include_tag = Octopress::Tags::RenderTag.new('render', markup, []).render(context)
+          rescue => error
+            error_msg error
+          end
         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
+            error_msg error
           end
         end
 
@@ -37,6 +40,13 @@ module Octopress
         end
       end
 
+      def error_msg(error)
+        error.message
+        message = "Wrap failed: {% #{@tag_name} #{@og_markup}%}."
+        message << $1 if error.message =~ /%}\.(.+)/
+        raise IOError.new message
+      end
+
       def content_for(markup, context)
         @block_name = Helpers::ContentFor.get_block_name(@tag_name, markup)
         Helpers::ContentFor.render(context, @block_name).strip

data/lib/octopress-ink/version.rb

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

data/test/expected/test_tags/head.html

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

data/test/expected/test_tags/wrap.html

@@ -16,3 +16,6 @@
 [- include from plugin -] → [- include from plugin -]
 [- Yo Dawg, I heard you like includes. -] → [- Yo Dawg, I heard you like includes. -]
 
+## Wrap render
+[- Testing Render -] → [- Testing Render -]
+

data/test/site/test_tags/head.html

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

data/test/site/test_tags/wrap.html

@@ -16,3 +16,6 @@
 [- include from plugin -] → [- include from plugin -]
 [- Yo Dawg, I heard you like includes. -] → [- Yo Dawg, I heard you like includes. -]
 
+## Wrap render
+[- Testing Render -] → [- Testing Render -]
+

data/test/source/test_tags/wrap.html

@@ -19,3 +19,6 @@ layout: nil
 [- 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 %}
 
+## Wrap render
+[- Testing Render -] → {% wrap_render test_render/_f.html %}[- {=yield} -]{% endwrap_render %}
+

metadata

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