jekyll-template 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e013575787d42d5bf3d04ad9ed76a2861acc6d81
-  data.tar.gz: dceaec276853cfb9746c19d305433e3bfd9b4943
+  metadata.gz: 3333a130fc89923bfcda857c074206183bb3572d
+  data.tar.gz: 0b84993342b9be3575b41b1d3f3b827a9497f085
 SHA512:
-  metadata.gz: 0eb97c37686edffa5abfa10a024d70fc7c51c12f68b260d13ee99e7df46ca691e9a18c71f4242b4fa376251160563be5d7406eb4967c9539b093cf615e25a323
-  data.tar.gz: c509c21c2bac6aafe952c193a8a0b668924486a1ef8e1013eea967edd7cfbd452cfef7ece2d7b46b0050bd9ec60ac907a3a44ccae6f3cca6060e0cf5b8799a1e
+  metadata.gz: b4912b379f3e22658e3ce6d8028e54e9308faa0af1e4d13e38ebbf84e4f6dc05ddb81d0efa3e6952cf9aa382d352e0f8a7bd8dd77e158357c64a25cd35e0371a
+  data.tar.gz: 99dc2e76321450898e0b68cc54f6a4ec08d8dbe418a94f7690c40bb7dde471ef673673cbdda55e66b6686d598e97cce4d439faa2a4f25703f9af716bbd4472b5

data/jekyll-template.gemspec

@@ -23,7 +23,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_runtime_dependency("yui-compressor", "0.12.0")
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/jekyll/template.rb

@@ -2,7 +2,6 @@ require "htmlcompressor"
 require "jekyll"
 require "jekyll/template/version"
 require "unindent"
-# require "yui-compressor"
 
 module Jekyll
   module Tags
@@ -57,10 +56,6 @@ module Jekyll
         # Remove leading whitespace
         # content = content.lstrip
         compressor = HtmlCompressor::Compressor.new({
-          :compress_javascript => true,
-          :javascript_compressor => :yui,
-          :compress_css => true,
-          :css_compressor => :yui,
           :remove_comments => true
         })
         site = context.registers[:site]
@@ -101,27 +96,15 @@ module Jekyll
           end
         end
 
-        content = parse_content(context, content)
-
-        # sanitize
-        # Determines whether to parse as HTML or markdown
-        unless @sanitize
-          converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
-          content = content.to_s.unindent
-          content = converter.convert(content)
-        else
-          content = content.to_s.unindent
-        end
-
-        # setting the template content
+        content = sanitize(site, parse_content(context, content))
         context["template"]["content"] = content
 
-        # rendering the template with the content
-        @output = template.render( context )
-        # normalizes whitespace and indentation
-        @output = compressor.compress(@output)
+        compressor.compress(template.render(context))
       end
 
+      # update_attributes(data)
+      # Description: Merges data with @attributes.
+      # @param    data    { hash }
       def update_attributes(data)
         if data
           @attributes = @attributes.merge(data)
@@ -172,8 +155,6 @@ module Jekyll
       def get_template_content(template)
         file_path = get_template_path(template)
         path = File.read(file_path.strip)
-        # returns template content
-        path
       end
 
       # load_template(context)
@@ -204,6 +185,22 @@ module Jekyll
         end
       end
 
+      # sanitize(site, 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)
+        unless @sanitize
+          converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
+          content = content.to_s.unindent
+          content = converter.convert(content)
+        else
+          content = content.to_s.unindent
+        end
+      end
+
       # unindent(content)
       # Description: Removes initial indentation.
       # Returns: Content (string).

data/lib/jekyll/template/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Template
-    VERSION = "0.13.0"
+    VERSION = "0.14.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-template
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - ItsJonQ
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: yui-compressor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement