octopress-wrap-tag 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7d225366ce2656cef612efaf6a3153338f3d202
-  data.tar.gz: 997d4da4c4cf383657a0d29dfa3d2363a8a8caa8
+  metadata.gz: e11bab0f5c7f69eec22e24bdb4312d1e1bbb76ac
+  data.tar.gz: 7f159b3cb9a124c3618c25987ecfd8cee2b489bf
 SHA512:
-  metadata.gz: 173a2e9a6779e361e9c48a81e2c763ee732c248ef8d600d7ed09805a1a757fa8330fc18901036288bf94d1b8c2384bed9626347fed696b07fc9fb8e8de910472
-  data.tar.gz: 5cc827b55d7953117cf460f2b52e009a5c2f8dc53b8e4abc85b16b12fd9a06eb3c4b6e1e80dd00ddeeb6ae8317bd124d0dcf87187e9d7021f5a9cca810cd12a3
+  metadata.gz: f69bb421f1a2060902fb0f95ce98ca60fed67252cbdf9e7f76605346d1a0d80a9409631cbae64f1dc1e3a9a6b98c38118ba4abea05fc871c2ab3dd88d3df909f
+  data.tar.gz: 7d5592352d6d14307a7c5b8624b2d7130eeeccb9314d65a443e9c30170e04f86aff08758ce2c6aab0517fd385e355dd792fb85461170cc114e0c8987cdc9e873

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 1.9.3
-script: bundle exec clash test
+script: clash test

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.1.1 - 2015-05-14
+- Support for Jekyll 2 & 3
+
 ### 1.1.0 - 2015-04-01
 
 - New: `wrap return` wraps return tag output.

data/lib/octopress-wrap-tag.rb

@@ -44,24 +44,39 @@ module Octopress
             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
 
+          # Liquid 3 requires Tag.parse insated of Tag.new
+          parse = Liquid::Tag.respond_to?(:parse)
+
           case type
           when 'yield'
-            content = Octopress::Tags::Yield::Tag.new('yield', markup, []).render(context)
+            if parse
+              content = Octopress::Tags::Yield::Tag.parse('yield', markup, [], {}).render(context)
+            else
+              content = Octopress::Tags::Yield::Tag.new('yield', markup, []).render(context)
+            end
             return '' if content.nil?
           when 'return'
-            content = Octopress::Tags::ReturnTag::Tag.new('return', markup, []).render(context)
+            if parse
+              content = Octopress::Tags::ReturnTag::Tag.parse('return', markup, [], {}).render(context)
+            else
+              content = Octopress::Tags::ReturnTag::Tag.new('return', markup, []).render(context)
+            end
             return '' if content.nil?
           when 'render'
             begin
-              content = Octopress::Tags::Render::Tag.new('render', markup, []).render(context)
+              if parse
+                content = Octopress::Tags::Render::Tag.parse('render', markup, [], {}).render(context)
+              else
+                content = Octopress::Tags::Render::Tag.new('render', markup, []).render(context)
+              end
             rescue => error
               error_msg error
             end
           when 'include'
-            begin
+            if parse
+              content = Octopress::Tags::Include::Tag.parse('include', markup, [], {}).render(context)
+            else
               content = Octopress::Tags::Include::Tag.new('include', markup, []).render(context)
-            rescue => error
-              error_msg error
             end
           end
 

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

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

data/octopress-wrap-tag.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Brandon Mathis"]
   spec.email         = ["brandon@imathis.com"]
   spec.summary       = %q{A Liquid block tag which makes it easy to wrap an include, render or yield tag with html}
-  spec.description   = %q{A Liquid block tag which makes it easy to wrap an include, render or yield tag with html}
   spec.homepage      = "https://github.com/octopress/wrap-tag"
   spec.license       = "MIT"
 
@@ -23,7 +22,7 @@ Gem::Specification.new do |spec|
   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_runtime_dependency "jekyll", ">= 2.0"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
@@ -31,7 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "octopress"
 
-  if RUBY_VERSION >= "2"
-    spec.add_development_dependency "octopress-debugger"
-  end
+  spec.add_development_dependency "octopress-debugger"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-wrap-tag
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers
@@ -84,14 +84,14 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -178,8 +178,7 @@ dependencies:
     - - ">="
       - !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
+description: 
 email:
 - brandon@imathis.com
 executables: []
@@ -232,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Liquid block tag which makes it easy to wrap an include, render or yield