jekyll-jsminify 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd4d245b467844fc511539a60558a28b2214690
-  data.tar.gz: 5273c738d274fd6c46089ae4449528e0bff05f3d
+  metadata.gz: 598be9e77cedac448142d21375d5cdf0b1d76749
+  data.tar.gz: ade14f98043a18087c1635997d34039b9dbd6562
 SHA512:
-  metadata.gz: 81433bad7c8105615a4a5c8daa96521f9f76150bcf64a6a4ccbe59b99f5ac40e4414e4d2b0bb35ed832fd35fbef24c0daefdbe6d0d29236c7a4941c903ec0e89
-  data.tar.gz: 69ef2b73f36bd270da88f7011ffb6234da719f2ce80f6af0dcadc5cee1a85c5d9e442f81cca69eb7e6590d1a8131f4338507b0a0ea00efdc90c15c1f1b7294d2
+  metadata.gz: 2e654bfb3052c6e460fef1a454b5611c5da17c56709475b6df4e048316562c05eaa838fca6386dbeea8ee6789486e97c919d68c7eb58dbccfc103034c2798bd7
+  data.tar.gz: 137cfbf2897ed8533a6c8e523a3f2a277aba6572b772e3356c8d610299c4f80cb3f4668429f3b9a01c3c2c680c195321d901dab75389275f27c064727898ab8b

data/lib/jekyll-jsminify.rb

@@ -1,31 +1,53 @@
 require 'uglifier'
 
-DEFAULT_UGLIFY_OPTS = {
-  "jsminify" => {
-    :comments => :none
-  }
-}
+module Jekyll
+  module Converters
+    module Minify
+      def self.symbolize_keys(hash)
+        return { } if hash.nil?
+        hash.inject({}){|result, (key, value)|
+          new_key = case key
+                    when String then key.to_sym
+                    else key
+                    end
+          new_value = case value
+                      when Hash then symbolize_keys(value)
+                      else value
+                      end
+          result[new_key] = new_value
+          result
+        }
+      end
+    end
+  end
+end
 
 module Jekyll
   module Converters
-    class JSMinify < Converter
-      safe true
-      priority :lowest
+    module Minify
+      class JSMinify < Converter
+        safe true
+        priority :lowest
 
-      def initialize(config={})
-        @config = DEFAULT_UGLIFY_OPTS.merge config
-      end
+        def initialize(config={})
+          config['jsminify'] = Minify::symbolize_keys(config['jsminify'])
+          @config = config.dup
+        end
 
-      def matches(ext)
-        ext.downcase == ".js"
-      end
 
-      def output_ext(ext)
-        ".js"
-      end
+        def matches(ext)
+          ext.downcase == ".js"
+        end
 
-      def convert(content)
-        Uglifier.new(@config['jsminify']).compile content
+        def output_ext(ext)
+          ".js"
+        end
+
+        def convert(content)
+          config = @config['jsminify'] || {}
+          return content if config[:do_not_compress] == true
+          Uglifier.new(config).compile content
+        end
       end
     end
   end
@@ -33,29 +55,41 @@ end
 
 module Jekyll
   module Converters
-    class CSMinify < CoffeeScript
-      safe true
-      priority :lowest
+    module Minify
+      class CSMinify < CoffeeScript
+        safe true
+        priority :lowest
 
-      def initialize(config={})
-        @config = DEFAULT_UGLIFY_OPTS.merge config
-      end
+        def initialize(config={})
+          config['jsminify'] = Minify::symbolize_keys(config['jsminify'])
+          @config = config.dup
+        end
 
-      def matches(ext)
-        ext.downcase == ".coffee"
-      end
+        def matches(ext)
+          ext.downcase == ".coffee"
+        end
 
-      def output_ext(ext)
-        super
-      end
+        def output_ext(ext)
+          super
+        end
+
+        def convert(content)
+          config = @config['jsminify'] || {}
+
+          # can't figure out why sometimes, CS comes down here, and sometimes,
+          # proper JS. Also can't figure out how to scope to just SyntaxError.
+          # some timing issue?
+          begin
+            return super if config[:do_not_compress] == true
+          rescue
+            return content if config[:do_not_compress] == true
+          end
 
-      def convert(content)
-        # can't figure out why sometimes, CS comes down here, and sometimes,
-        # proper JS. Also can't figure out how to scope to just SyntaxError.
-        begin
-          Uglifier.new(@config['jsminify']).compile super
-        rescue
-          Uglifier.new(@config['jsminify']).compile content
+          begin
+            Uglifier.new(config).compile super
+          rescue
+            Uglifier.new(config).compile content
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-jsminify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier