octopress-render-tag 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b7bc14072b5f104f39c3dd26be2e5d59278cd4c
-  data.tar.gz: bfc0cb50384db2d1d1a6fd694fe913ac7ee873f3
+  metadata.gz: c5ef7d0ef6809c3c9599cd1c8b6e1f0585c14951
+  data.tar.gz: acdee57684c595f41d094d9effeba9bfe0d73f81
 SHA512:
-  metadata.gz: a5b72cb799bdfc06984ac7e99d40a7b28d3ac1cc530252cc7d961ca78b22152aa694462b6c23d170f233b94cfacd56a0fcedb4fc9efca2ac68db80fd3ff808c5
-  data.tar.gz: aad1715ddd874322f113948c97f8539a7de1c527bdd2f711000ffeb5cb73286b441b098c4e17ff27dda1033e10593573977b8345095caa6f25897344a83ed381
+  metadata.gz: 1aa31ae5348cccbf9b48605143703628aacc6dc0e482db7313866a70cef8c5c07ca180472d28b8d664edf2da6894c0649265505ae8e99137cfa95f295b9e481a
+  data.tar.gz: 297acda1204b6a681d580f54e681d4e236332da64af38437a46c064cc5a11633bfa77fcc4ea9b9abe9d150cfbf6002619ff5acc618a10e2435cb6e9c8c926e22

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.7 - 2015-05-14
+- Support for Jekyll 2 & 3
+
 ### 1.0.6 - 2015-01-11
 
 - Minor docs updates

data/lib/octopress-render-tag.rb

@@ -9,54 +9,93 @@ module Octopress
       class Tag < Liquid::Tag
         SYNTAX = /(\S+)(.+)?/
 
+        attr_reader :tag_markup
+        attr_reader :tag_name
+        attr_reader :raw
+        attr_accessor :filters
+
         def initialize(tag_name, markup, tokens)
           super
-          @og_markup = @markup = markup
-          if markup =~ /^(\s*raw\s)?(.+?)(\sraw\s*)?$/
-            @markup = $2
+
+          @tag_markup = markup
+          @tag_name = tag_name
+
+          if matched = markup.strip.match(/^(\s*raw\s)?(.+?)(\sraw\s*)?$/)
+            @tag_markup = $2
             @raw = true unless $1.nil? and $3.nil?
           end
         end
 
         def render(context)
-          return unless markup = TagHelpers::Conditional.parse(@markup, context)
-          if markup =~ TagHelpers::Var::HAS_FILTERS
-            markup = $1
-            filters = $2
-          end
-          markup = TagHelpers::Var.evaluate_ternary(markup, context)
-          markup = TagHelpers::Path.parse(markup, context)
+          return unless @markup = parse_markup(context)
 
-          content = read(markup, context)
+          content = read(@markup, context)
 
-          if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
-            local_vars = SafeYAML.load($1.strip)
-            content = $2.strip
+          if matched = content.match(/\A-{3}(?<vars>.+[^\A])-{3}\n(?<content>.+)/m)
+            local_vars = SafeYAML.load(matched['vars'].strip)
+            content = matched['content'].strip
           end
 
-          return content if @raw
+          if raw
+            content
+          else
+
+            content = strip_raw(content)
 
-          content = strip_raw(content)
-          include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
+            partial = Liquid::Template.parse(content)
+            content = context.stack {
+              context['include'] = parse_params(context)
+              if local_vars
+                context['page'] = Jekyll::Utils.deep_merge_hashes(context['page'], local_vars)
+              end
+              partial.render!(context)
+            }.strip
 
-          partial = Liquid::Template.parse(content)
-          content = context.stack {
-            context['include'] = include_tag.parse_params(context)
-            if local_vars
-              context['page'] = Jekyll::Utils.deep_merge_hashes(context['page'], local_vars)
+            content = replace_raw(content)
+            content = parse_convertible(content, context).strip
+
+            unless content.nil? || filters.nil?
+              content = TagHelpers::Var.render_filters(content, filters, context)
             end
-            partial.render!(context)
-          }.strip
 
-          content = replace_raw(content)
+            content
+          end
+        end
 
-          content = parse_convertible(content, context).strip
+        def parse_params(context)
+          if Jekyll::Tags::IncludeTag.respond_to?(:parse)
+            include_tag = Jekyll::Tags::IncludeTag.parse('include', @markup, [], {})
+          else
+            include_tag = Jekyll::Tags::IncludeTag.new('include', @markup, [])
+          end
+          include_tag.parse_params(context)
+        end
 
-          unless content.nil? || filters.nil?
-            content = TagHelpers::Var.render_filters(content, filters, context)
+        # Parses special markup, handling vars, conditions, and filters
+        # Returns:
+        #  - render tag path or nil if markup conditionals evaluate false
+        #
+        def parse_markup(context)
+          # If conditional statements are present, only continue if they are true
+          #
+          return unless markup = TagHelpers::Conditional.parse(tag_markup, context)
+
+          # If there are filters, store them for use later and strip them out of markup
+          #
+          if matched = markup.match(TagHelpers::Var::HAS_FILTERS)
+            markup = matched['markup']
+            @filters = matched['filters']
           end
 
-          content
+          # If there is a ternary expression, replace it with the true result
+          #
+          markup = TagHelpers::Var.evaluate_ternary(markup, context)
+
+          # Paths may be variables, check context to retrieve proper path
+          #
+          markup = TagHelpers::Path.parse(markup, context)
+
+          markup
         end
 
         def strip_raw(content)
@@ -101,6 +140,7 @@ Liquid::Template.register_tag('render_partial', Octopress::Tags::Render::Tag)
 if defined? Octopress::Docs
   Octopress::Docs.add({
     name:        "Octopress Render Tag",
+    gem_name:    "octopress-render-tag",
     description: "Embed files directly from the file system. This tag also supports conditional rendering, in-line filters.",
     path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
     type:        "tag",

data/lib/octopress-render-tag/hooks.rb

@@ -19,29 +19,7 @@ module Octopress
     end
     
     def render(payload)
-      pre_render
       do_layout(payload, { no_layout: nil })
-      post_render
-    end
-
-    def hooks
-      if self.site.respond_to? :page_hooks
-        self.site.page_hooks
-      else
-        []
-      end
-    end
-
-    def pre_render
-      self.hooks.each do |hook|
-        hook.pre_render(self)
-      end
-    end
-
-    def post_render
-      self.hooks.each do |hook|
-        hook.post_render(self)
-      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module Render
-      VERSION = "1.0.6"
+      VERSION = "1.0.7"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-render-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers
@@ -28,14 +28,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
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Render files inline on any Jekyll page or post
+description: 
 email:
 - brandon@imathis.com
 executables: []
@@ -127,7 +127,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: Render files inline on any Jekyll page or post