jekyll-minifier 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05c4b7e33729ca1d8212edf77880beea2ba46396d7484696715206be29444d7d
-  data.tar.gz: f7ecd9dbb911ba8fb5c93b3199c10c1c10e8c51d567a31a1d0a3bd055cf38d67
+  metadata.gz: 117cf6a5e022dd3c282ac194330042d5929e3ef4653e7c5da400b2feb6c34b7f
+  data.tar.gz: 36d20a781a57b322bfedbef53b22e8051515099e0555482a899513c0ff7ec593
 SHA512:
-  metadata.gz: 21b4e5d1e805a02f9aa1825714d23d25d18a01f7cf520ac09a6465732cf145c849924627624700470825d771f059cb4173a618f1ba565e9238efb82397d8f43d
-  data.tar.gz: 24dd387c6ca9308360c05a0cd184407fb4db7d5dae737d31a480fc27b5f5472938a2840773ab0ccea955872a31630728ea51339fb3c277cf56a71fdade493c73
+  metadata.gz: 22d694decf4e5c470fe9c65723b29d45837cb1061261feabe6bbff3ce30bfc512e0c414d63c43a5b5d21cd7636a0f693d40e6b64eee6dd568fbbf2ef2783b097
+  data.tar.gz: b6fe3b3590df38637c5a7f4dc806c04f445a4b413d9c5fd2ccde4cc76423f78dbaa91000a94f38f843a8dd0c59b206835a65c850302a67895ec45e3ee95006e2

data/.travis.yml

@@ -9,5 +9,5 @@ deploy:
     repo: digitalsparky/jekyll-minifier
 language: ruby
 rvm:
-- 2.3.1
-script: bundle exec rspec spec
+  - 2.3.1
+script: JEKYLL_ENV="production" bundle exec rspec spec

data/README.md

@@ -8,21 +8,26 @@ This was created due to the previous minifier (jekyll-press) not being CSS3 comp
 
 Note: this is my first ever gem, I'm learning, so feedback is much appreciated.
 
+** This minifier now only runs when JEKYLL_ENV="production" is set in the enviornment **
+
 Easy to use, just install the jekyll-minifier gem:
 
 <pre><code>gem install jekyll-minifier</code></pre>
 
-Then add this to your _config.yml:
+Then add this to your \_config.yml:
 
-<pre><code>gems:
+<pre><code>plugins:
     - jekyll-minifier
 </code></pre>
 
 Optionally, you can also add exclusions using:
+
 <pre><code>jekyll-minifier:
   exclude: 'atom.xml' # Exclude files from processing - file name, glob pattern or array of file names and glob patterns
 </code></pre>
-and toggle htmlcompressor features using:
+
+and toggle features and settings using:
+
 <pre><code>jekyll-minifier:
   preserve_php: true                # Default: false
   remove_spaces_inside_tags: true   # Default: true
@@ -44,5 +49,20 @@ and toggle htmlcompressor features using:
   preserve_line_breaks: false       # Default: false
   simple_boolean_attributes: false  # Default: false
   compress_js_templates: false      # Default: false
+  preserve_patterns:                # Default: (empty)
+  uglifier_args:                    # Default: (empty)
 </code></pre>
 
+js_args can be found in the the uglifier documentation at listed below
+
+Note: es6 has been implemented as experimental only via the upstream uglifier package.
+See https://github.com/lautis/uglifier for more information.
+
+To enable es6 syntax use:
+
+<pre><code>
+jekyll-minifier:
+  uglifier_args:
+    harmony: true
+
+</code></pre>

data/jekyll-minifier.gemspec

@@ -26,13 +26,13 @@ Gem::Specification.new do |gem|
     gem.version     = Jekyll::Minifier::VERSION
   end
 
-  gem.add_dependency "jekyll", "~> 3.5"
-  gem.add_dependency "uglifier", "~> 3.2"
-  gem.add_dependency "htmlcompressor", "~> 0.3"
+  gem.add_dependency "jekyll", ">= 3.5"
+  gem.add_dependency "uglifier", "~> 4.1"
+  gem.add_dependency "htmlcompressor", "~> 0.4"
   gem.add_dependency "cssminify2", "~> 2.0"
 
-  gem.add_development_dependency "rake", "~> 10.4"
-  gem.add_development_dependency "rspec", "~> 2.7"
-  gem.add_development_dependency "jekyll-paginate"
-  gem.add_development_dependency "redcarpet"
+  gem.add_development_dependency "rake", "~> 12.3"
+  gem.add_development_dependency "rspec", "~> 3.8"
+  gem.add_development_dependency "jekyll-paginate", "~> 1.1"
+  gem.add_development_dependency "redcarpet", "~> 3.4"
 end

data/lib/jekyll-minifier.rb

@@ -31,50 +31,96 @@ module Jekyll
     end
 
     def output_html(path, content)
-      args = { remove_comments: true, compress_css: true, compress_javascript: true, preserve_patterns: [] }
-      args[:css_compressor] = CSSminify2.new
-      args[:javascript_compressor] = Uglifier.new
-
-      opts = @site.config['jekyll-minifier']
-
-      if ( !opts.nil? )
-        args[:remove_spaces_inside_tags]   = opts['remove_spaces_inside_tags']  if opts.has_key?('remove_spaces_inside_tags')
-        args[:remove_multi_spaces]         = opts['remove_multi_spaces']        if opts.has_key?('remove_multi_spaces')
-        args[:remove_comments]             = opts['remove_comments']            if opts.has_key?('remove_comments')
-        args[:remove_intertag_spaces]      = opts['remove_intertag_spaces']     if opts.has_key?('remove_intertag_spaces')
-        args[:remove_quotes]               = opts['remove_quotes']              if opts.has_key?('remove_quotes')
-        args[:compress_css]                = opts['compress_css']               if opts.has_key?('compress_css')
-        args[:compress_javascript]         = opts['compress_javascript']        if opts.has_key?('compress_javascript')
-        args[:simple_doctype]              = opts['simple_doctype']             if opts.has_key?('simple_doctype')
-        args[:remove_script_attributes]    = opts['remove_script_attributes']   if opts.has_key?('remove_script_attributes')
-        args[:remove_style_attributes]     = opts['remove_style_attributes']    if opts.has_key?('remove_style_attributes')
-        args[:remove_link_attributes]      = opts['remove_link_attributes']     if opts.has_key?('remove_link_attributes')
-        args[:remove_form_attributes]      = opts['remove_form_attributes']     if opts.has_key?('remove_form_attributes')
-        args[:remove_input_attributes]     = opts['remove_input_attributes']    if opts.has_key?('remove_input_attributes')
-        args[:remove_javascript_protocol]  = opts['remove_javascript_protocol'] if opts.has_key?('remove_javascript_protocol')
-        args[:remove_http_protocol]        = opts['remove_http_protocol']       if opts.has_key?('remove_http_protocol')
-        args[:remove_https_protocol]       = opts['remove_https_protocol']      if opts.has_key?('remove_https_protocol')
-        args[:preserve_line_breaks]        = opts['preserve_line_breaks']       if opts.has_key?('preserve_line_breaks')
-        args[:simple_boolean_attributes]   = opts['simple_boolean_attributes']  if opts.has_key?('simple_boolean_attributes')
-        args[:compress_js_templates]       = opts['compress_js_templates']      if opts.has_key?('compress_js_templates')
-        args[:preserve_patterns]          += [/<\?php.*?\?>/im]                if opts['preserve_php'] == true
-
-        # Potential to add patterns from YAML
-        #args[:preserve_patterns]          += opts[:preserve_patterns].map { |pattern| Regexp.new(pattern)} if opts.has_key?(:preserve_patterns)
-      end
+      if ( ENV['JEKYLL_ENV'] == "production" )
+        html_args = { remove_comments: true, compress_css: true, compress_javascript: true, preserve_patterns: [] }
+        js_args = {}
+
+        opts = @site.config['jekyll-minifier']
+        if ( !opts.nil? )
+          # Javascript Arguments
+          js_args                                += opts[:uglifier_args]               if opts.has_key?(:uglifier_args)
+          
+          # HTML Arguments
+          html_args[:remove_spaces_inside_tags]   = opts['remove_spaces_inside_tags']  if opts.has_key?('remove_spaces_inside_tags')
+          html_args[:remove_multi_spaces]         = opts['remove_multi_spaces']        if opts.has_key?('remove_multi_spaces')
+          html_args[:remove_comments]             = opts['remove_comments']            if opts.has_key?('remove_comments')
+          html_args[:remove_intertag_spaces]      = opts['remove_intertag_spaces']     if opts.has_key?('remove_intertag_spaces')
+          html_args[:remove_quotes]               = opts['remove_quotes']              if opts.has_key?('remove_quotes')
+          html_args[:compress_css]                = opts['compress_css']               if opts.has_key?('compress_css')
+          html_args[:compress_javascript]         = opts['compress_javascript']        if opts.has_key?('compress_javascript')
+          html_args[:simple_doctype]              = opts['simple_doctype']             if opts.has_key?('simple_doctype')
+          html_args[:remove_script_attributes]    = opts['remove_script_attributes']   if opts.has_key?('remove_script_attributes')
+          html_args[:remove_style_attributes]     = opts['remove_style_attributes']    if opts.has_key?('remove_style_attributes')
+          html_args[:remove_link_attributes]      = opts['remove_link_attributes']     if opts.has_key?('remove_link_attributes')
+          html_args[:remove_form_attributes]      = opts['remove_form_attributes']     if opts.has_key?('remove_form_attributes')
+          html_args[:remove_input_attributes]     = opts['remove_input_attributes']    if opts.has_key?('remove_input_attributes')
+          html_args[:remove_javascript_protocol]  = opts['remove_javascript_protocol'] if opts.has_key?('remove_javascript_protocol')
+          html_args[:remove_http_protocol]        = opts['remove_http_protocol']       if opts.has_key?('remove_http_protocol')
+          html_args[:remove_https_protocol]       = opts['remove_https_protocol']      if opts.has_key?('remove_https_protocol')
+          html_args[:preserve_line_breaks]        = opts['preserve_line_breaks']       if opts.has_key?('preserve_line_breaks')
+          html_args[:simple_boolean_attributes]   = opts['simple_boolean_attributes']  if opts.has_key?('simple_boolean_attributes')
+          html_args[:compress_js_templates]       = opts['compress_js_templates']      if opts.has_key?('compress_js_templates')
+          html_args[:preserve_patterns]          += [/<\?php.*?\?>/im]                 if opts['preserve_php'] == true
+          html_args[:preserve_patterns]          += opts[:preserve_patterns].map { |pattern| Regexp.new(pattern)} if opts.has_key?(:preserve_patterns)
+        end
+        
+        html_args[:css_compressor]              = CSSminify2.new()
+
+        if ( !js_args.nil? )
+          html_args[:javascript_compressor]       = Uglifier.new(js_args)
+        else
+          html_args[:javascript_compressor]       = Uglifier.new()
+        end
 
-      compressor = HtmlCompressor::Compressor.new(args)
-      output_file(path, compressor.compress(content))
+        compressor = HtmlCompressor::Compressor.new(html_args)
+        output_file(path, compressor.compress(content))
+      else
+        output_file(path, content)
+      end
     end
 
     def output_js(path, content)
-      compressed = Uglifier.new
-      output_file(path, compressed.compile(content))
+      if ( ENV['JEKYLL_ENV'] == "production" )
+        opts       = @site.config['jekyll-minifier']
+        compress = true
+        if ( !opts.nil? )
+          compress    = opts['compress_javascript']               if opts.has_key?('compress_javascript')
+          js_args   += opts[:js_args] if opts.has_key?(:js_args)
+        end
+
+        if ( compress )
+          if ( !js_args.nil? )
+            compressor = Uglifier.new(js_args)
+          else
+            compressor = Uglifier.new()
+          end
+
+          output_file(path, compressed.compile(content))
+        else
+          output_file(path, content)
+        end
+      else
+        output_file(path, content)
+      end
     end
 
     def output_css(path, content)
-      compressor = CSSminify2.new
-      output_file(path, compressor.compress(content))
+      if ( ENV['JEKYLL_ENV'] == "production" )
+        opts       = @site.config['jekyll-minifier']
+        compress = true
+        if ( !opts.nil? )
+          compress    = opts['compress_css']               if opts.has_key?('compress_css')
+        end
+        if ( compress )
+          compressor = CSSminify2.new()
+          output_file(path, compressor.compress(content))
+        else
+          output_file(path, content)
+        end
+      else
+        output_file(path, content)
+      end
+
     end
 
     private

data/lib/jekyll-minifier/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minifier
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/spec/fixtures/_config.yml

@@ -1,19 +1,24 @@
-markdown:               redcarpet
-highlighter:            pygments
-title:                  Example.com
-tagline:                'Example!'
-description:            ''
-url:                    https://example.com
-paginate:               10
-category_dir:           /
-category_title_prefix:  ''
-permalink:              :categories/:title.html
-timezone:               Australia/Perth
+markdown: redcarpet
+highlighter: pygments
+title: Example.com
+tagline: "Example!"
+description: ""
+url: https://example.com
+paginate: 10
+category_dir: /
+category_title_prefix: ""
+permalink: :categories/:title.html
+timezone: Australia/Perth
 author:
-    name:       'Example'
-    email:      'example@example.com'
+  name: "Example"
+  email: "example@example.com"
 menu:
-    - { url: 'https://www.github.com/example/', name: 'GitHub', nofollow: true, newwindow: true }
+  - {
+      url: "https://www.github.com/example/",
+      name: "GitHub",
+      nofollow: true,
+      newwindow: true,
+    }
 plugins:
-    - jekyll-minifier
-    - jekyll-paginate
+  - jekyll-minifier
+  - jekyll-paginate

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minifier
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - DigitalSparky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: htmlcompressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: cssminify2
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: jekyll-paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Jekyll Minifier using htmlcompressor for html, uglifier for js and css
 email:
 - matthew@spurrier.com.au
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 2
 summary: Jekyll Minifier for html, css, and javascript