jekyll-jsminify 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98dfed0de1907a15cc5232d3e6b92d9d83da0654
-  data.tar.gz: 4261e080a9b372cc9307553be274e0abc910290d
+  metadata.gz: 72ff05f938eed9373c60a5e7dec47ee075aba844
+  data.tar.gz: a7772b058e5a05ce7623900941b9d5c7e6e320bb
 SHA512:
-  metadata.gz: 9ba8706ead25895619319765ee4e92645fa377486052ec754ae850b45ac2e2def55595b089af3346ad8df726cfe984539232687207a81994bc2a479e7daefaeb
-  data.tar.gz: 171a0959e1dbb90c32d57ccfe5c4d01619dd82719ad862f4cbf02a6a8a6d9c9ac4a085cda80ef2be9e98deb63083f1b5f5334d09c12b9a5cdc652c5c5844a3a6
+  metadata.gz: 2d29568cf80f176ff54b5f3ce866e386197bff2af9560c6592f3a501a72b2bda309be97c0034b694e20d3663bb3fe3368596fc31cf17a4570ffaa22bcdcda5e5
+  data.tar.gz: 764977576e972929902a350aa8d90be0c21658e9931667510fc2081c51a37e4cec88861a41f816d6fc83614a58fc34e04aefc6f8b4ed327c09863745201ee63f

data/lib/jekyll-jsminify.rb

@@ -4,8 +4,8 @@ module Jekyll
   module Converters
     module Minify
       def self.symbolize_keys(hash)
-        return { } if hash.nil?
-        hash.inject({}){|result, (key, value)|
+        return {} if hash.nil?
+        hash.inject({}) do |result, (key, value)|
           new_key = case key
                     when String then key.to_sym
                     else key
@@ -16,7 +16,7 @@ module Jekyll
                       end
           result[new_key] = new_value
           result
-        }
+        end
       end
     end
   end
@@ -24,30 +24,28 @@ end
 
 module Jekyll
   module Converters
-    module Minify
-      class JSMinify < Converter
-        safe true
-        priority :lowest
+    class JSMinify < Converter
+      safe true
+      priority :lowest
 
-        def initialize(config={})
-          config['jsminify'] = Minify::symbolize_keys(config['jsminify'])
-          @config = config.dup
-        end
+      def initialize(config={})
+        config['jsminify'] = Minify::symbolize_keys(config['jsminify'])
+        @config = config.dup
+      end
 
 
-        def matches(ext)
-          ext.downcase == ".js"
-        end
+      def matches(ext)
+        ext.downcase == '.js'
+      end
 
-        def output_ext(ext)
-          ".js"
-        end
+      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
+      def convert(content)
+        config = @config['jsminify'] || {}
+        return content if config[:do_not_compress] == true
+        Uglifier.new(config).compile content
       end
     end
   end
@@ -55,42 +53,27 @@ end
 
 module Jekyll
   module Converters
-    module Minify
-      class CSMinify < CoffeeScript
-        safe true
-        priority :lowest
-
-        def initialize(config={})
-          config['jsminify'] = Minify::symbolize_keys(config['jsminify'])
-          @config = config.dup
-        end
+    class CSMinify < CoffeeScript
+      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)
+        '.js'
+      end
 
-        def convert(content)
-          config = @config['jsminify'] || {}
+      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
+        js_content = super
+        return js_content if config[:do_not_compress] == true
 
-          begin
-            Uglifier.new(config).compile super
-          rescue
-            Uglifier.new(config).compile content
-          end
-        end
+        Uglifier.new(config).compile(js_content)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-jsminify
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Garen J. Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-coffeescript
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  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
@@ -108,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A JavaScript and CoffeeScript minifier for Jekyll.