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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddc8138d15559a1928f3bc9d7f4a4d8a6ab95fcd
-  data.tar.gz: 6dc4f36adadf0d70480f395e2d98077c2d025e94
+  metadata.gz: 37ae1d79d24dfabbbe224a384bc2867a41911996
+  data.tar.gz: 1b2b6d06f7877c7387482c6516ed2947f67144e9
 SHA512:
-  metadata.gz: fdbb1c6acc6f9188b803e22503f4d37c1e4982f1a0bc7965f9bc317586ed16fe848161532bf830a0fcdab177323efdbcbe8eeddac9a016927fb8118e2c42c774
-  data.tar.gz: 063ac8ad2903c3d679b9710c463fa148cc870825e32abefb4b3ab4fb1e0ebc5ca8bc3f3debc6cf032566bf042aab2e19dc8a86c6d98f0592248a717ba952b4c5
+  metadata.gz: b5c703a3ce89c9e3f2551b09d3baec20c96945200ae6a9b94e330183cfaac09f33b520a41b34a69097ed3d5621e98a62c8c63f79ace419896125a5450ebad63f
+  data.tar.gz: fe8902c99f7f4bba176594b9aa6da57cd1d1969b70706033f9e94e4f3e03643b6d4c1d1f407a36d98741e23d86dd2bda596974bbcfeb0addb3265d58667c1143

data/lib/octopress-ink.rb

@@ -28,6 +28,7 @@ Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
 Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
 Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
 Liquid::Template.register_tag('return', Octopress::Tags::ReturnTag)
+Liquid::Template.register_tag('render', Octopress::Tags::RenderTag)
 Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
 Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
 Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForBlock)

data/lib/octopress-ink/assets/config.rb

@@ -24,12 +24,12 @@ module Octopress
         if @plugin.type != 'local_plugin'
           default = plugin_path
           if exists? default
-            config = YAML::load(File.open(default))
+            config = YAML.safe_load(File.open(default))
           end
         end
         override = user_path(site)
         if exists? override
-          config = config.deep_merge YAML::load(File.open(override))
+          config = config.deep_merge YAML.safe_load(File.open(override))
         end
         config
       end

data/lib/octopress-ink/helpers/path.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Helpers
     module Path
-      FILE = /(\S+)(\s.+)/
+      FILE = /(\S+)(\s.*)/
       def self.parse(markup, context)
         if markup =~ FILE
           (context[$1].nil? ? $1 : context[$1]) + $2
@@ -9,6 +9,34 @@ module Octopress
           markup
         end
       end
+
+      # Allow paths to begin from the directory of the context page or
+      # have absolute paths
+      #
+      # Input: 
+      #  - file: "file.html"
+      #  - context: A Jekyll context object
+      #
+      #  Returns the full path to a file
+      #
+      def self.expand(file, context)
+        root = context.registers[:site].source
+
+        # If local file, e.g. ./somefile
+        if file =~ /^\.\/(.+)/
+          local_dir = File.dirname context.registers[:page]['path']
+          File.join root, local_dir, $1
+
+        # If absolute or relative to a user directory, e.g. /Users/Bob/somefile or ~/somefile
+        elsif file =~ /^[\/~]/
+          Pathname.new(file).expand_path
+
+        # Otherwise, assume relative to site root
+        else
+          File.join root, file
+        end
+      end
+      
     end
   end
 end

data/lib/octopress-ink/helpers/var.rb

@@ -20,9 +20,7 @@ module Octopress
       end
 
       def self.get_value(vars, context)
-        if vars =~ TERNARY
-          vars = $1 + evaluate_ternary($2, $3, $4, context) + $5
-        end
+        vars = evaluate_ternary(vars, context)
         vars = vars.strip.gsub(/ or /, ' || ')
         vars = vars.split(/ \|\| /).map { |v|
           Liquid::Variable.new(v.strip).render(context)
@@ -31,8 +29,12 @@ module Octopress
         vars.empty? ? nil : vars.first
       end
 
-      def self.evaluate_ternary(expression, if_true, if_false, context)
-        Conditional.parse("if #{expression}", context) ? if_true : if_false
+      def self.evaluate_ternary(markup, context)
+        if markup =~ TERNARY
+          $1 + (Conditional.parse("if #{$2}", context) ? $3 : $4) + $5
+        else
+          markup
+        end
       end
 
     end

data/lib/octopress-ink/jekyll/hooks.rb

@@ -11,4 +11,24 @@ module Jekyll
       do_layout_orig(payload, layouts)
     end
   end
+
+  # Create a new page class to allow partials to trigger Jekyll Page Hooks.
+  class ConvertiblePage
+    include Convertible
+    
+    attr_accessor :name, :content, :site, :ext, :output, :data
+    
+    def initialize(site, name, content)
+      @site     = site
+      @name     = name
+      @ext      = File.extname(name)
+      @content  = content
+      @data     = { layout: "no_layout" } # hack
+      
+    end
+    
+    def render(payload)
+      do_layout(payload, { no_layout: nil })
+    end
+  end
 end

data/lib/octopress-ink/tags.rb

@@ -3,6 +3,7 @@ module Octopress
     autoload :IncludeTag,           'octopress-ink/tags/include'
     autoload :AssignTag,            'octopress-ink/tags/assign'
     autoload :ReturnTag,            'octopress-ink/tags/return'
+    autoload :RenderTag,            'octopress-ink/tags/render'
     autoload :CaptureTag,           'octopress-ink/tags/capture'
     autoload :JavascriptTag,        'octopress-ink/tags/javascript'
     autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'

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

@@ -11,6 +11,7 @@ module Octopress
       def render(context)
         markup = Helpers::Conditional.parse(@markup, context)
         return unless markup
+        markup = Helpers::Var.evaluate_ternary(markup, context)
         markup = Helpers::Path.parse(markup, context)
 
         include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
@@ -29,6 +30,7 @@ module Octopress
             context['include'] = include_tag.parse_params(context)
             partial.render!(context)
           }.strip
+          
         # Otherwise, use Jekyll's default include tag
         else
           include_tag.render(context).strip

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

@@ -0,0 +1,62 @@
+module Octopress
+  module Tags
+    class RenderTag < Liquid::Tag
+      SYNTAX = /(\S+)(.+)/
+
+      def initialize(tag_name, markup, tokens)
+        super
+        @og_markup = @markup = markup
+        if markup =~ /^(\s*raw\s)?(.+?)(\sraw\s*)?$/
+          @markup = $2
+          @raw = true unless $1.nil? and $3.nil?
+        end
+      end
+
+      def render(context)
+        markup = Helpers::Conditional.parse(@markup, context)
+        return unless markup
+        markup = Helpers::Var.evaluate_ternary(markup, context)
+        markup = Helpers::Path.parse(markup, context)
+
+        content = read(markup, context)
+
+        if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
+          local_vars = YAML.safe_load($1.strip)
+          content = $2.strip
+        end
+
+        return content if @raw
+
+        include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
+
+        partial = Liquid::Template.parse(content)
+        content = context.stack {
+          context['include'] = include_tag.parse_params(context)
+          context['page'] = context['page'].deep_merge(local_vars) if local_vars
+          partial.render!(context)
+        }.strip
+
+        parse_convertible(content, context)
+        
+      end
+
+      def read(markup, context)
+        path = markup.match(SYNTAX)[1]
+        @path = Helpers::Path.expand(path, context)
+        begin
+          Pathname.new(@path).read
+        rescue
+          raise IOError.new "Render failed: {% #{@tag_name} #{@og_markup}%}. The file '#{path}' could not be found at #{@path}."
+        end
+      end
+      
+      def parse_convertible(content, context)
+        page = Jekyll::ConvertiblePage.new(context.registers[:site], @path, content)
+        page.render({})
+        page.output.strip
+      end
+      
+    end
+  end
+end
+

data/lib/octopress-ink/version.rb

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

data/test/_config.yml

@@ -4,4 +4,5 @@ pygments: true
 source: source
 destination: site
 include_test: foo.html
+render_test: kittens
 timezone: America/Chicago

data/test/expected/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/expected/test_tags/include.html

@@ -20,6 +20,10 @@ Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
 '' → ''
 Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
 
+## Ternary include
+, I heard you like includes. → , I heard you like includes.
+Testing Include → Testing Include
+
 ## Theme Include override
 include from theme override → include from theme override
 

data/test/expected/test_tags/render.html

@@ -0,0 +1,30 @@
+
+
+
+
+
+
+## Simple render
+Testing Render → Testing Render
+Testing Render whatever → Testing Render whatever
+
+## File name stored in variable
+Testing Render → Testing Render
+
+## Post conditional render
+'' → ''
+Testing Render → Testing Render
+
+## Test Variables
+kittens → kittens
+
+## Ternary include
+kittens → kittens
+Testing Render → Testing Render
+
+## Render markdown with local vars
+<p><strong>page vars</strong></p> → <p><strong>page vars</strong></p>
+
+## Render raw
+Testing Render {{ include.var }} → Testing Render {{ include.var }}
+

data/test/site/test_tags/include.html

@@ -20,6 +20,10 @@ Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
 '' → ''
 Yo Dawg, I heard you like includes. → Yo Dawg, I heard you like includes.
 
+## Ternary include
+, I heard you like includes. → , I heard you like includes.
+Testing Include → Testing Include
+
 ## Theme Include override
 include from theme override → include from theme override
 

data/test/site/test_tags/render.html

@@ -0,0 +1,30 @@
+
+
+
+
+
+
+## Simple render
+Testing Render → Testing Render
+Testing Render whatever → Testing Render whatever
+
+## File name stored in variable
+Testing Render → Testing Render
+
+## Post conditional render
+'' → ''
+Testing Render → Testing Render
+
+## Test Variables
+kittens → kittens
+
+## Ternary include
+kittens → kittens
+Testing Render → Testing Render
+
+## Render markdown with local vars
+<p><strong>page vars</strong></p> → <p><strong>page vars</strong></p>
+
+## Render raw
+Testing Render {{ include.var }} → Testing Render {{ include.var }}
+

data/test/source/test_render/_f.html

@@ -0,0 +1 @@
+Testing Render {{ include.var }}

data/test/source/test_render/_var.html

@@ -0,0 +1 @@
+{% assign bar = site.render_test %}{{ bar }}

data/test/source/test_tags/_test_render.md

@@ -0,0 +1,4 @@
+---
+foo: page vars
+---
+**{{page.foo}}**

data/test/source/test_tags/include.html

@@ -23,6 +23,10 @@ Yo Dawg, I heard you like includes. → {% include theme:greet.html greeting="Yo
 '' → '{% include theme:greet.html greeting="Yo Dawg" unless some_bool %}'
 Yo Dawg, I heard you like includes. → {% include theme:greet.html greeting="Yo Dawg" if some_bool %}
 
+## Ternary include
+, I heard you like includes. → {% include (false ? foo.html : theme:greet.html) %}
+Testing Include → {% include (some_bool ? foo.html : theme:greet.html) %}
+
 ## Theme Include override
 include from theme override → {% include theme:bar.html %}
 

data/test/source/test_tags/render.html

@@ -0,0 +1,32 @@
+---
+layout: nil
+---
+{% assign file = 'test_render/_f.html' %}
+{% assign file2 = 'test_render/_var.html' %}
+{% assign relative = './_test_render.md' %}
+{% assign some_bool = true %}
+{% assign test_var = 'variable' %}
+
+## Simple render
+Testing Render → {% render test_render/_f.html %}
+Testing Render whatever → {% render test_render/_f.html var="whatever" %}
+
+## File name stored in variable
+Testing Render → {% render file %}
+
+## Post conditional render
+'' → '{% render file unless true %}'
+Testing Render → {% render file if some_bool %}
+
+## Test Variables
+kittens → {% render test_render/_var.html %}
+
+## Ternary include
+kittens → {% render (false ? file : file2) %}
+Testing Render → {% render (some_bool ? file : file2) %}
+
+## Render markdown with local vars
+<p><strong>page vars</strong></p> → {% render relative %}
+
+## Render raw
+{% raw %}Testing Render {{ include.var }}{% endraw %} → {% render raw file %}

data/test/test.rb

@@ -39,7 +39,7 @@ end
 build
 
 def test_tags(dir)
-  tags = %w{content_for footer head include scripts assign capture wrap}
+  tags = %w{content_for footer head include scripts assign capture wrap render}
   tags.each { |file| test("test_tags/#{file}.html", dir) }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.22
+  version: 1.0.0.alpha.23
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -124,6 +124,7 @@ files:
 - lib/octopress-ink/tags/head.rb
 - lib/octopress-ink/tags/include.rb
 - lib/octopress-ink/tags/javascript.rb
+- lib/octopress-ink/tags/render.rb
 - lib/octopress-ink/tags/return.rb
 - lib/octopress-ink/tags/scripts.rb
 - lib/octopress-ink/tags/stylesheet.rb
@@ -161,6 +162,7 @@ files:
 - test/expected/test_tags/footer.html
 - test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
+- test/expected/test_tags/render.html
 - test/expected/test_tags/scripts.html
 - test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -185,6 +187,7 @@ files:
 - test/site/test_tags/footer.html
 - test/site/test_tags/head.html
 - test/site/test_tags/include.html
+- test/site/test_tags/render.html
 - test/site/test_tags/return.html
 - test/site/test_tags/scripts.html
 - test/site/test_tags/wrap.html
@@ -232,12 +235,16 @@ files:
 - test/source/test_layouts/plugin_layout.html
 - test/source/test_layouts/theme.html
 - test/source/test_layouts/theme_override.html
+- test/source/test_render/_f.html
+- test/source/test_render/_var.html
+- test/source/test_tags/_test_render.md
 - test/source/test_tags/assign.html
 - test/source/test_tags/capture.html
 - test/source/test_tags/content_for.html
 - test/source/test_tags/footer.html
 - test/source/test_tags/head.html
 - test/source/test_tags/include.html
+- test/source/test_tags/render.html
 - test/source/test_tags/return.html
 - test/source/test_tags/scripts.html
 - test/source/test_tags/wrap.html
@@ -297,6 +304,7 @@ test_files:
 - test/expected/test_tags/footer.html
 - test/expected/test_tags/head.html
 - test/expected/test_tags/include.html
+- test/expected/test_tags/render.html
 - test/expected/test_tags/scripts.html
 - test/expected/test_tags/wrap.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -321,6 +329,7 @@ test_files:
 - test/site/test_tags/footer.html
 - test/site/test_tags/head.html
 - test/site/test_tags/include.html
+- test/site/test_tags/render.html
 - test/site/test_tags/return.html
 - test/site/test_tags/scripts.html
 - test/site/test_tags/wrap.html
@@ -368,12 +377,16 @@ test_files:
 - test/source/test_layouts/plugin_layout.html
 - test/source/test_layouts/theme.html
 - test/source/test_layouts/theme_override.html
+- test/source/test_render/_f.html
+- test/source/test_render/_var.html
+- test/source/test_tags/_test_render.md
 - test/source/test_tags/assign.html
 - test/source/test_tags/capture.html
 - test/source/test_tags/content_for.html
 - test/source/test_tags/footer.html
 - test/source/test_tags/head.html
 - test/source/test_tags/include.html
+- test/source/test_tags/render.html
 - test/source/test_tags/return.html
 - test/source/test_tags/scripts.html
 - test/source/test_tags/wrap.html