jekyll-liquid-plus 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFkMjM5ZjE1MjA3YzI1ODQyNTk0NWViYmE3YzA1ODA0NjgzYjJiOA==
+    NGI3NmEwZTU2NGMxNzMyMTQ4ODljZWZhYjhkMDk5MDliOTIwNTEwYQ==
   data.tar.gz: !binary |-
-    ZDVkNzU2NDk2NjVlYWFmNGZmOGM1OTBjODFjMGYyN2I2ZTI0ODE2MA==
+    YzNlMDg3ZGIwNTQ0MDMzYTNhOTk3ZjA5NGJhOTEzZDgzYmI1MmIxZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWVmZDc5YzEyY2FmMDg2M2NiN2E5M2QyZGQ2N2ZiZWM0ZmJhODNmMTk5N2Rl
-    ZGE3ZGFkMGZkNmM5Y2UxZmQ2M2MyYjJkM2E0ZDU0MDNjZTliMTllYjdiYzU0
-    Y2VhNzQ5MGZlNGVkYjk5NDZhZmFiY2Q0ZWMyM2JhZDkyMzc5MTI=
+    OGZmZjM5NTQwZTFiN2UzYTEyMTJhMDM3YTMxNDM5YmJiYTE4OGM0NTQxMThk
+    ZTY3NWI4MTkxYjM4NTg0ZWRjODgzMjU5YzllMDhjZTAxNmEyNjAwNGI3YmEx
+    MTMzMjg4NDEzYzQ3ZDYyM2Y2ZjhmYTFhMWM5MWIwNDM0YzJhYzQ=
   data.tar.gz: !binary |-
-    NzZjM2Q5ZjMxMGEyNjE4M2UyMGY1NWY0OGIyYzFhZjcwOWRjMTE3NmMyZTU2
-    ZWRjNDgwZjFmNDJiN2ZhNGMzY2I2ZjQ0MzJkZTMyOGIxZTc0Zjc3MDU2Y2Q0
-    Zjk5MGM5OTI3OTVlYjIzYTJmOTU5ZDdiOWY0M2I4ZmE0YzNlOGM=
+    Y2NhNTMxMTdmYzEyMmRmM2MwZDU5ZGEzNTQ4MzkwOWEzMzhhOWMyMWQ4MDlm
+    ODZiMGE2Y2Q2MzhlOGM3NTQyODY3MGU0Mjc0NGI3NDYzZGQ5MTA3MzQ5ZWZk
+    ZjNmNGJjMjZlNTVmOWUxZjM1YzIzMWZhNjA4NzMwYzQyNmExNjg=

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm: 1.9.3
+script: cd test && ruby test.rb

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 1.0.1 (2013-10-22)
+- Fixed var access issues #2, #3
+
+## 1.0.0 (2013-08-26)
+- Initial release. :)

data/README.md

@@ -1,5 +1,7 @@
 # Jekyll Liquid Plus
 
+[![Gem Version](https://badge.fury.io/rb/jekyll-liquid-plus.png)](http://badge.fury.io/rb/jekyll-liquid-plus) [![Build Status](https://travis-ci.org/imathis/jekyll-liquid-plus.png)](https://travis-ci.org/imathis/jekyll-liquid-plus)
+
 Super powered Liquid tags for smarter Jekyll templating.
 
 Redesigned, but backwards compatible: include, assign, capture.

data/lib/jekyll-liquid-plus.rb

@@ -1,4 +1,8 @@
-require "liquid"
+require 'liquid'
+
+$:.unshift File.dirname(__FILE__)
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 
 module LiquidPlus
   autoload :IncludeTag,    'jekyll-liquid-plus/tags/include'

data/lib/jekyll-liquid-plus/tags/render.rb

@@ -95,10 +95,10 @@ module LiquidPlus
           else
             content = parse_params(content, context) if @params or @local_vars
 
-            p = Jekyll::ConvertiblePage.new(context.registers[:site], path, content)
-            payload = { 'page' => context.registers[:page], 'site' => context.registers[:site] }
-            p.render(payload, { registers: context.registers })
-            p.output.strip
+            page = Jekyll::ConvertiblePage.new(context.registers[:site], path, content)
+            payload = { 'page' => context.registers[:page] }.merge(context.registers[:site].site_payload)
+            page.render(payload, { registers: context.registers })
+            page.output.strip
           end
         end
       elsif path

data/lib/jekyll-liquid-plus/tags/return.rb

@@ -9,8 +9,8 @@ module LiquidPlus
     end
 
     def render(context)
-      if @markup = Conditional.parse(@markup, context)
-        Var.get_value(@markup, context)
+      if parsed_markup = Conditional.parse(@markup, context)
+        Var.get_value(parsed_markup, context)
       else
         ''
       end

data/lib/jekyll-liquid-plus/version.rb

@@ -1,3 +1,3 @@
 module LiquidPlus
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/_config.yml

@@ -2,3 +2,4 @@ name: Your New Jekyll Site
 markdown: redcarpet
 pygments: true
 source: source
+some_var: 'foo'

data/test/source/_plugins/liquid-plus.rb

@@ -1,2 +1 @@
-require 'jekyll-liquid-plus'
-
+require File.expand_path('../../../lib/jekyll-liquid-plus.rb', File.dirname(__FILE__))

data/test/source/f/file4.html

@@ -0,0 +1 @@
+{% assign bar = 'foo' %}{{ bar }}

data/test/source/f/file5.html

@@ -0,0 +1 @@
+{{ site.some_var }}

data/test/source/render.html

@@ -15,6 +15,10 @@ file.html → {% render file %}
 '' → '{% render f/file.html unless true %}'
 file.html → {% render f/file.html if some_bool %}
 
+## Test variables
+foo → {% render f/file4.html %}
+foo → {% render f/file5.html %}
+
 ## Ternary include
 file2.html → {% render (false ? f/file.html : f/file2.html) %}
 file.html → {% render (some_bool ? f/file.html : f/file2.html) %}

data/test/source/return.html

@@ -1,6 +1,9 @@
 ---
 layout: nil
 date: 2013-07-21 18:59
+people:
+  - { name: Bill }
+  - { name: Bob }
 ---
 {% assign foo = 'bar' %}
 
@@ -18,6 +21,9 @@ nope → {% return (foo == 'baz' ? foo : 'nope') %}
 nope → {% return bingo || fez || 'nope' %}
 bar → {% return bingo || fez || foo %}
 
+## Test local variables
+yep → {% for person in page.people %}{% return 'yep' if person.name == 'Bill' %}{% endfor %}
+
 ## Returns with filters
 2013-07-21T18:59:00-05:00 → {% return post.date or page.date | datetime | date_to_xmlschema %}
 2013-07-21T18:59:00-05:00 → {% return (post ? post.date : page.date) | datetime | date_to_xmlschema %}

data/test/test.rb

@@ -2,6 +2,8 @@
 require 'pathname'
 require 'colorator'
 
+has_failed = false
+
 def test(path)
   path = Pathname.new path + '.html'
   failure = []
@@ -27,6 +29,7 @@ def test(path)
   if failure.size > 0
     puts "failed".red + ": #{path}"
     puts failure.join "\n"
+    has_failed = true
   else
     puts "passed".green + ": #{path}" 
   end
@@ -42,3 +45,5 @@ test 'wrap'
 test 'assign'
 test 'capture'
 test 'return'
+
+abort if has_failed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-liquid-plus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -74,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -102,6 +104,8 @@ files:
 - test/source/f/file.html
 - test/source/f/file2.html
 - test/source/f/file3.md
+- test/source/f/file4.html
+- test/source/f/file5.html
 - test/source/include.html
 - test/source/render.html
 - test/source/return.html