octopress-wrap-tag 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e469df46d5b7be7e0ae98a34c26a4e2fee1c83
-  data.tar.gz: 71ac2161026cce8a610c20f7b493dfcc52e5d918
+  metadata.gz: b7d225366ce2656cef612efaf6a3153338f3d202
+  data.tar.gz: 997d4da4c4cf383657a0d29dfa3d2363a8a8caa8
 SHA512:
-  metadata.gz: da4ef0afe18da337821b8787ed2fb900d54adf967f92f3b0f1b807a6d97be87265555c4743794ab35d06902b759cd3ae79de8f2053c12417d390d19be0e5f44f
-  data.tar.gz: aefc65f66d34746e53e6af5740e8be1b7ba89183996f9b1ef854c8892be8164bb21005eecd5ad9ea5650274e476c6b0d43cc01bd1aa3baf59c81e52540779796
+  metadata.gz: 173a2e9a6779e361e9c48a81e2c763ee732c248ef8d600d7ed09805a1a757fa8330fc18901036288bf94d1b8c2384bed9626347fed696b07fc9fb8e8de910472
+  data.tar.gz: 5cc827b55d7953117cf460f2b52e009a5c2f8dc53b8e4abc85b16b12fd9a06eb3c4b6e1e80dd00ddeeb6ae8317bd124d0dcf87187e9d7021f5a9cca810cd12a3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.0 - 2015-04-01
+
+- New: `wrap return` wraps return tag output.
+
 ### 1.0.3 - 2015-01-11
 
 - Readme fix

data/README.md

@@ -30,12 +30,10 @@ Next add it to your gems list in Jekyll's `_config.yml`
 
 ### Basic usage
 
-the wrap tag is basically just wrapping Octopress's [include](https://github.com/octopress/include-tag), 
+The wrap tag is basically just wrapping Octopress's [include](https://github.com/octopress/include-tag), 
+[return](https://github.com/octopress/return-tag),
 [render](https://github.com/octopress/render-tag) and [yield](https://github.com/octopress/content-for)
-tags with HTML in a liquid block tag. So all the features are the same. 
-
-The wrap tag supports all the same features that Octopress's [include](https://github.com/octopress/include-tag), 
-[render](https://github.com/octopress/render-tag) and [yield](https://github.com/octopress/content-for) tags support. This also means that `wrap yield` won't output anything if there isn't any content.
+tags with HTML in a liquid block tag. This means that the wrap tag,supports conditional output, filters and all the other features these tags offer. This also means that `wrap yield` and `wrap return` won't output anything if there isn't any content.
 
 ```html
 {% wrap include post.html %}
@@ -46,12 +44,16 @@ The wrap tag supports all the same features that Octopress's [include](https://g
   <div class="licence-text">{{ yield }}</div>
 {% endwrap %}
 
-{% wrap yeild post_footer %}
+{% wrap yield post_footer %}
   <div class="post-footer">{{ yield }}</div>
 {% endwrap %}
+
+{% wrap return site.author %}
+  Post by {{ yield }}
+{% endrwap %}
 ```
 
-### Yield example
+### Wrap Yield
 
 A great use case for `wrap yield` is to add content sections to a
 template which can be easily and optionally filled from a post or page by using the
@@ -90,9 +92,11 @@ rendered since it wasn't set in this post.
 ### Advanced features
 
 The examples below only demonstrate wrapping the include tag for brevity, but as stated earlier, the wrap tag 
-is basically just wrapping Octopress's [include](https://github.com/octopress/include-tag), 
-[render](https://github.com/octopress/render-tag) and [yield](https://github.com/octopress/content-for)
-tags with HTML in a liquid block tag. So all the features are the same. 
+supports all the features of the [include](https://github.com/octopress/include-tag), 
+[render](https://github.com/octopress/render-tag), 
+[return](https://github.com/octopress/return-tag) and
+[yield](https://github.com/octopress/content-for)
+tags.
 
 <!-- title:"If a page has this yaml front-matter" -->
 ```html

data/lib/octopress-wrap-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module Wrap
-      VERSION = "1.0.3"
+      VERSION = "1.1.0"
     end
   end
 end

data/lib/octopress-wrap-tag.rb

@@ -4,6 +4,7 @@ require "octopress-tag-helpers"
 require "octopress-include-tag"
 require "octopress-render-tag"
 require "octopress-content-for"
+require "octopress-return-tag"
 require "jekyll"
 
 # Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
@@ -36,6 +37,9 @@ module Octopress
           elsif markup =~ /^\s*include\s(.+)/
             markup = $1
             'include'
+          elsif markup =~ /^\s*return\s(.+)/
+            markup = $1
+            'return'
           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
@@ -43,6 +47,10 @@ module Octopress
           case type
           when 'yield'
             content = Octopress::Tags::Yield::Tag.new('yield', markup, []).render(context)
+            return '' if content.nil?
+          when 'return'
+            content = Octopress::Tags::ReturnTag::Tag.new('return', markup, []).render(context)
+            return '' if content.nil?
           when 'render'
             begin
               content = Octopress::Tags::Render::Tag.new('render', markup, []).render(context)

data/octopress-wrap-tag.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "octopress-include-tag", "~> 1.0"
   spec.add_runtime_dependency "octopress-render-tag", "~> 1.0"
   spec.add_runtime_dependency "octopress-content-for", "~> 1.0"
+  spec.add_runtime_dependency "octopress-return-tag", "~> 1.0"
   spec.add_runtime_dependency "jekyll", "~> 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
@@ -29,4 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "clash"
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "octopress"
+
+  if RUBY_VERSION >= "2"
+    spec.add_development_dependency "octopress-debugger"
+  end
 end

data/test/_expected/wrap.html

@@ -28,3 +28,6 @@
 
 [- Testing wrap yield -] → [- Testing wrap yield -]
 
+## Wrap return
+partial: foo.html
+''

data/test/wrap.html

@@ -31,3 +31,6 @@ partial: foo.html
 {% content_for test %}Testing wrap yield{% endcontent_for %}
 [- Testing wrap yield -] → {% wrap yield test %}[- {{ yield }} -]{% endwrap %}
 
+## Wrap return
+{% wrap return page.partial %}partial: {{ yield }}{% endwrap %}
+'{% wrap return nuthin %}should be blank: {{ yield }}{% endwrap %}'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-wrap-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: octopress-return-tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Liquid block tag which makes it easy to wrap an include, render or
   yield tag with html
 email:
@@ -158,7 +186,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".clash.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -170,7 +197,7 @@ files:
 - lib/octopress-wrap-tag/version.rb
 - octopress-wrap-tag.gemspec
 - test/.gitignore
-- test/Gemfile
+- test/_clash.yml
 - test/_config.yml
 - test/_expected/ink-wrap.html
 - test/_expected/wrap.html
@@ -212,7 +239,7 @@ summary: A Liquid block tag which makes it easy to wrap an include, render or yi
   tag with html
 test_files:
 - test/.gitignore
-- test/Gemfile
+- test/_clash.yml
 - test/_config.yml
 - test/_expected/ink-wrap.html
 - test/_expected/wrap.html

data/test/Gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'octopress-wrap-tag', path: '../'
-gem 'octopress'
-gem 'octopress-ink'
-gem 'pry-debugger'
-gem 'clash'