jekyll-template 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d51afe697b5d9ee694a65e4bd7c2e2984a90e6
-  data.tar.gz: 51e6027143c6fb8d1ccca573cf371be640ee2217
+  metadata.gz: c096e5fc9774d05776a63f7edcbe6b1dbd6befb8
+  data.tar.gz: 537f48aa6647e7094cde578fe87ae9382ae35565
 SHA512:
-  metadata.gz: af69ac4cec5a3ffb31ecfb5cd94328dc80868bdce60be562576ad5390a658039da2f0d828b763dd2cd9b8ea112518a083b8dda1377a3b3201def3bcd680f0617
-  data.tar.gz: 750e144ba45c4ed90ad641228734db84af2a9ea037d2b0df7aca9585f3387993b8d3b6d25aa691740a6167c777a01e5c36d259d18071fd056e7383a109a09037
+  metadata.gz: cc13346f93678b97352ce2b0ed1569da576faeef3e991762f616a7a144685312b02c6fc5248f9a5aa6e07ff22b0853f2eae5f4cc497312a6a91277e0a7897860
+  data.tar.gz: 311648fa21b511ea2faf014479944f4a7262079fa0dcddd4d0f7b1f087748648d7f3cbef7c3c40707740f2100c8dea437d85a26ef79b669e4d1517fdf8bb7d01

data/jekyll-template.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("jekyll", ">= 3.1.2")
   spec.add_runtime_dependency("htmlcompressor", "~> 0.3.1")
-  spec.add_runtime_dependency("unindent", "~> 1.0")
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/jekyll/template.rb

@@ -1,7 +1,6 @@
 require "htmlcompressor"
 require "jekyll"
 require "jekyll/template/version"
-require "unindent"
 
 module Jekyll
   module Tags
@@ -17,12 +16,12 @@ module Jekyll
       # Description: Extends Liquid's default initialize method.
       def initialize(tag_name, markup, tokens)
         super
-        @root_path = false
+        @site = false
 
         # @template_name = markup
         if markup =~ Syntax
 
-          @template_name = $1
+          @template_name = $1.freeze
           @attributes = {}
           @sanitize = false
 
@@ -36,12 +35,6 @@ module Jekyll
         end
       end
 
-      # parse_content
-      # Description: Extends Liquid's default parse_content method.
-      def parse_content(context, content)
-        content
-      end
-
       # render
       # Description: Extends Liquid's default render method. This method also
       # adds additional features:
@@ -51,53 +44,39 @@ module Jekyll
       # - supports custom attributes to be used in template
       def render(context)
         content = super
-        # Set the root_path
-        @root_path = context.registers[:site].source
+        @site = context.registers[:site]
         # Remove leading whitespace
         # content = content.lstrip
         compressor = HtmlCompressor::Compressor.new({
           :remove_comments => true
         })
-        site = context.registers[:site]
 
-        add_template_to_dependency(site, @template_name, context)
+        add_template_to_dependency(@template_name, context)
+
         template_obj = load_cached_template(@template_name, context)
-        template_data = template_obj["data"]
-        update_attributes(template_data)
+        update_attributes(template_obj["data"])
 
         template = template_obj["template"]
 
         # Define the default template attributes
         # Source:
         # https://github.com/Shopify/liquid/blob/9a7778e52c37965f7b47673da09cfb82856a6791/lib/liquid/tags/include.rb
-        context["template_name"] = context.evaluate(@template_name)
+        context["template_name"] = @template_name
         context["partial"] = true
         context["template"] = Hash.new
 
         # Parse and extend template's front-matter with content front-matter
-        content_data = get_front_matter(content)
-        update_attributes(content_data)
+        update_attributes(get_front_matter(content))
         
-        # Remove front matter
-        content = strip_front_matter(content)
-
         # Setting template attributes from @attributes
         # This allows for @attributes to be used within the template as
         # {{ template.atttribute_name }}
         if @attributes
-          @attributes.each do |key, value|
-            val = context.evaluate(value)
-            context["template"][key] = val
-
-            # Adjust sanitize if parse: html
-            if (key == "parse") && (val == "html")
-              @sanitize = true
-            end
-          end
+          @sanitize = @attributes["parse"] && @attributes["parse"] == "html"
+          context["template"].merge!(@attributes)
         end
 
-        content = sanitize(site, parse_content(context, content))
-        context["template"]["content"] = content
+        context["template"]["content"] = sanitize(strip_front_matter(content))
 
         compressor.compress(template.render(context))
       end
@@ -107,18 +86,17 @@ module Jekyll
       # @param    data    { hash }
       def update_attributes(data)
         if data
-          @attributes = @attributes.merge(data)
+          @attributes.merge!(data)
         end
       end
 
-      # add_template_to_dependency(site, path, context)
+      # add_template_to_dependency(path, context)
       # source: https://github.com/jekyll/jekyll/blob/e509cf2139d1a7ee11090b09721344608ecf48f6/lib/jekyll/tags/include.rb
-      def add_template_to_dependency(site, path, context)
+      def add_template_to_dependency(path, context)
         if context.registers[:page] && context.registers[:page].key?("path")
-          path = get_template_path(path)
-          site.regenerator.add_dependency(
-            site.in_source_dir(context.registers[:page]["path"]),
-            path
+          @site.regenerator.add_dependency(
+            @site.in_source_dir(context.registers[:page]["path"]),
+            get_template_path(path)
           )
         end
       end
@@ -132,10 +110,7 @@ module Jekyll
         if cached_templates.key?(path)
           cached_templates[path]
         else
-          begin
-            template = load_template(context)
-            cached_templates[path] = template
-          end
+          cached_templates[path] = load_template()
         end
       end
 
@@ -143,10 +118,7 @@ module Jekyll
       # Returns: A full file path of the template
       # @param    path    { string }
       def get_template_path(path)
-        # default template path
-        dir = @root_path.to_s
-        view = "_templates/" + path.to_s
-        File.join(dir, view).to_s
+        File.join(@site.source.to_s, "_templates", path.to_s)
       end
 
       # get_template_content(template)
@@ -154,22 +126,18 @@ module Jekyll
       # Returns: Template content
       # @param    template    { string }
       def get_template_content(template)
-        file_path = get_template_path(template)
-        path = File.read(file_path.strip)
+        path = File.read(get_template_path(template).strip)
       end
 
-      # load_template(context)
+      # load_template()
       # Description: Extends Liquid's default load_template method. Also provides
       # extra enhancements:
       # - parses and sets template front-matter content
       # Returns: Template class
-      def load_template(context)
-        # Set the root_path
-        @root_path = context.registers[:site].source
-        file_path = get_template_path(@template_name)
-        file = context.registers[:site]
+      def load_template()
+        file = @site
           .liquid_renderer
-          .file(file_path)
+          .file(get_template_path(@template_name))
         # Set the template_content
         template_content = get_template_content(@template_name)
 
@@ -186,19 +154,17 @@ module Jekyll
         end
       end
 
-      # sanitize(site, content)
+      # sanitize(content)
       # Description: Renders the content as markdown or HTML based on the
       # "parse" attribute.
       # Returns: Content (string).
-      # @param    site      { Jekyll site instance }
       # @param    content   { string }
-      def sanitize(site, content)
+      def sanitize(content)
         unless @sanitize
-          converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
-          content = content.to_s.unindent
-          content = converter.convert(content)
+          converter = @site.find_converter_instance(::Jekyll::Converters::Markdown)
+          content = converter.convert(unindent(content))
         else
-          content = content.to_s.unindent
+          content = unindent(content)
         end
       end
 
@@ -208,13 +174,13 @@ module Jekyll
       # @param    content    { string }
       def unindent(content)
         # Remove initial whitespace
-        content = content.gsub(/\A^\s*\n/, "")
+        content.gsub!(/\A^\s*\n/, "")
 
         # Remove indentations
         whitespace_regex = %r!^\s*!m
         if content =~ whitespace_regex
           indentation = Regexp.last_match(0).length
-          content = content.gsub(/^\ {#{indentation}}/, "")
+          content.gsub!(/^\ {#{indentation}}/, "")
         end
 
         content
@@ -232,9 +198,7 @@ module Jekyll
           # Push YAML data to the template's attributes
           values = SafeYAML.load(front_matter)
           # Set YAML data to @attributes
-          values.each do |key, value|
-            data[key] = value
-          end
+          data.merge!(values)
           # Returns data
           data
         end
@@ -251,7 +215,7 @@ module Jekyll
         if content =~ YAML_FRONT_MATTER_REGEXP
           front_matter = Regexp.last_match(0)
           # Returns content with stripped front-matter
-          content = content.gsub(front_matter, "")
+          content.gsub!(front_matter, "")
         end
 
         content

data/lib/jekyll/template/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Template
-    VERSION = "0.15.0"
+    VERSION = "0.16.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-template
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - ItsJonQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: unindent
-  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: bundler
   requirement: !ruby/object:Gem::Requirement