octopress-ink 1.0.0.alpha.25 → 1.0.0.alpha.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4dedafd926d2d6222ffd41be255ff2c003e0eb
-  data.tar.gz: c9fa39b81fd8226df9d1184596760e1c232f719b
+  metadata.gz: 4041475a8dfd1d7a88ed97361bcff4f2afa13a70
+  data.tar.gz: 8b31fd6fdfc677127555bbec33d09474cb61699d
 SHA512:
-  metadata.gz: cce34cf01f0ba29e84a53839d8e4ad8d44d44b3ca2528c942f5c06dfa58405e0207c9f9f8d068d50f3fc168255d07bb225ffa3e9168ff0ca51592e3f1f5018b3
-  data.tar.gz: 2e46aed362277f732cc98ef8bded455359cda4527a6a9c6312c80cd83aa3e302d5e9d89b04bcafe8378f28eff7cc4c25502e19ff76c2a336f3a234d84d14f965
+  metadata.gz: e596f3368053dd56fc975e28f9956c488f6d4f58a681843cfbe266812031cf50c9aaf1dea6efeb18310411d546c49abe87942b7070ba4afc9ddba92c764bfe72
+  data.tar.gz: f05b1701b00b5737e7dc9003bd2c78f56ffca5916ed0f14d94444f1f6bb3a5f9d64a0117ac587770dac098b97ce837847c2b878fc9ec5cd3aecd78f59ae88a7c

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

@@ -3,7 +3,7 @@
 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
@@ -11,6 +11,7 @@ module Octopress
       end
 
       def render(context)
+        require 'pry-debugger'
         markup = Helpers::Conditional.parse(@markup, context)
         return unless markup
 
@@ -31,13 +32,8 @@ module Octopress
           end
         end
 
-        wrap = super.strip
-
-        if wrap =~ HAS_YIELD && content != ''
-          $1 + content + $3
-        else
-          ''
-        end
+        context.scopes.first['yield'] = content
+        super.strip
       end
 
       def error_msg(error)

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

@@ -5,6 +5,10 @@ module Octopress
     class YieldTag < Liquid::Tag
 
       def initialize(tag_name, markup, tokens)
+        if markup.strip == ''
+          raise IOError.new "Yield failed: {% #{tag_name} #{markup}%}. Please provide a block name to yield. - Syntax: {% yield block_name %}"
+        end
+
         super
         @markup = markup
         if markup =~ Helpers::Var::HAS_FILTERS

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.25"
+    VERSION = "1.0.0.alpha.26"
   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 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 foo.html some_var="var_test" %}[- {{ yield }} -]{% endwrap %}
 
 ## Filter testing
-[- TESTING INCLUDE -] → {% wrap foo.html | upcase %}[- {=yield} -]{% endwrap %}
-[- TESTING FILTERS -] → {% wrap foo.html | replace:"Include","Filters" | upcase | %}[- {=yield} -]{% endwrap %}
+[- TESTING INCLUDE -] → {% wrap foo.html | upcase %}[- {% assign foo = 'bar' %}{{ yield }} -]{% endwrap %}
+[- TESTING FILTERS -] → {% wrap foo.html | replace:"Include","Filters" | upcase | %}[- {{ 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 %}
+'' → '{% 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 %}
+[- 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 %}
+[- Testing Render -] → {% wrap_render test_render/_f.html %}[- {{ yield }} -]{% endwrap_render %}
 
 ## 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_yield %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.25
+  version: 1.0.0.alpha.26
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll