Permalink
Browse files

cssmin and jsmin is the new minimum requirements of jammit. YUI is no…

…w optional.

Also, cssmin and jsmin are no longer vendored. They are now part of jammit.gemspec dependencies.
  • Loading branch information...
1 parent bfaad0f commit 28ddf14bc7a33d25734f55759429657997fa6ec5 @didip committed Mar 29, 2012
Showing with 3 additions and 396 deletions.
  1. +2 −1 jammit.gemspec
  2. +0 −112 lib/jammit/cssmin_compressor.rb
  3. +1 −283 lib/jammit/jsmin_compressor.rb
View
3 jammit.gemspec
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
'--main' << 'README' <<
'--all'
- s.add_dependency 'yui-compressor', ['>= 0.9.3']
+ s.add_dependency 'cssmin', ['>= 1.0.2']
+ s.add_dependency 'jsmin', ['>= 1.0.1']
s.files = Dir['lib/**/*', 'bin/*', 'rails/*', 'jammit.gemspec', 'LICENSE', 'README']
end
View
112 lib/jammit/cssmin_compressor.rb
@@ -1,115 +1,3 @@
-#--
-# Copyright (c) 2008 Ryan Grove <ryan@wonko.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-# * Neither the name of this project nor the names of its contributors may be
-# used to endorse or promote products derived from this software without
-# specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#++
-
-# = CSSMin
-#
-# Minifies CSS using a fast, safe routine adapted from Julien Lecomte's YUI
-# Compressor, which was in turn adapted from Isaac Schlueter's cssmin PHP
-# script.
-#
-# Author:: Ryan Grove (mailto:ryan@wonko.com)
-# Version:: 1.0.2 (2008-08-23)
-# Copyright:: Copyright (c) 2008 Ryan Grove. All rights reserved.
-# License:: New BSD License (http://opensource.org/licenses/bsd-license.php)
-# Website:: http://github.com/rgrove/cssmin/
-#
-# == Example
-#
-# require 'rubygems'
-# require 'cssmin'
-#
-# File.open('example.css', 'r') {|file| puts CSSMin.minify(file) }
-#
-module CSSMin
-
- # Reads CSS from +input+ (which can be a String or an IO object) and
- # returns a String containing minified CSS.
- def self.minify(input)
- css = input.is_a?(IO) ? input.read : input.dup.to_s
-
- # Remove comments.
- css.gsub!(/\/\*[\s\S]*?\*\//, '')
-
- # Compress all runs of whitespace to a single space to make things easier
- # to work with.
- css.gsub!(/\s+/, ' ')
-
- # Replace box model hacks with placeholders.
- css.gsub!(/"\\"\}\\""/, '___BMH___')
-
- # Remove unnecessary spaces, but be careful not to turn "p :link {...}"
- # into "p:link{...}".
- css.gsub!(/(?:^|\})[^\{:]+\s+:+[^\{]*\{/) do |match|
- match.gsub(':', '___PSEUDOCLASSCOLON___')
- end
- css.gsub!(/\s+([!\{\};:>+\(\)\],])/, '\1')
- css.gsub!('___PSEUDOCLASSCOLON___', ':')
- css.gsub!(/([!\{\}:;>+\(\[,])\s+/, '\1')
-
- # Add missing semicolons.
- css.gsub!(/([^;\}])\}/, '\1;}')
-
- # Replace 0(%, em, ex, px, in, cm, mm, pt, pc) with just 0.
- css.gsub!(/([\s:])([+-]?0)(?:%|em|ex|px|in|cm|mm|pt|pc)/i, '\1\2')
-
- # Replace 0 0 0 0; with 0.
- css.gsub!(/:(?:0 )+0;/, ':0;')
-
- # Replace background-position:0; with background-position:0 0;
- css.gsub!('background-position:0;', 'background-position:0 0;')
-
- # Replace 0.6 with .6, but only when preceded by : or a space.
- css.gsub!(/(:|\s)0+\.(\d+)/, '\1.\2')
-
- # Convert rgb color values to hex values.
- css.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
- '#' << $1.scan(/\d+/).map{|n| n.to_i.to_s(16).rjust(2, '0') }.join
- end
-
- # Compress color hex values, making sure not to touch values used in IE
- # filters, since they would break.
- css.gsub!(/([^"'=\s])(\s?)\s*#([0-9a-f])\3([0-9a-f])\4([0-9a-f])\5/i, '\1\2#\3\4\5')
-
- # Remove empty rules.
- css.gsub!(/[^\}]+\{;\}\n/, '')
-
- # Re-insert box model hacks.
- css.gsub!('___BMH___', '"\"}\""')
-
- # Prevent redundant semicolons.
- css.gsub!(/;;+/, ';')
-
- css.strip
- end
-
-end
-
-
# Wraps CSSMin compressor to use the same API as the rest of
# Jammit's compressors.
class Jammit::CssminCompressor
View
284 lib/jammit/jsmin_compressor.rb
@@ -1,286 +1,4 @@
-#--
-# jsmin.rb - Ruby implementation of Douglas Crockford's JSMin.
-#
-# This is a port of jsmin.c, and is distributed under the same terms, which are
-# as follows:
-#
-# Copyright (c) 2002 Douglas Crockford (www.crockford.com)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# The Software shall be used for Good, not Evil.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#++
-
-require 'strscan'
-
-# = JSMin
-#
-# Ruby implementation of Douglas Crockford's JavaScript minifier, JSMin.
-#
-# *Author*:: Ryan Grove (mailto:ryan@wonko.com)
-# *Version*:: 1.0.1 (2008-11-10)
-# *Copyright*:: Copyright (c) 2008 Ryan Grove. All rights reserved.
-# *Website*:: http://github.com/rgrove/jsmin
-#
-# == Example
-#
-# require 'rubygems'
-# require 'jsmin'
-#
-# File.open('example.js', 'r') {|file| puts JSMin.minify(file) }
-#
-module JSMin
- CHR_APOS = "'".freeze
- CHR_ASTERISK = '*'.freeze
- CHR_BACKSLASH = '\\'.freeze
- CHR_CR = "\r".freeze
- CHR_FRONTSLASH = '/'.freeze
- CHR_LF = "\n".freeze
- CHR_QUOTE = '"'.freeze
- CHR_SPACE = ' '.freeze
-
- ORD_LF = ?\n
- ORD_SPACE = ?\
- ORD_TILDE = ?~
-
- class ParseError < RuntimeError
- attr_accessor :source, :line
- def initialize(err, source, line)
- @source = source,
- @line = line
- super "JSMin Parse Error: #{err} at line #{line} of #{source}"
- end
- end
-
- class << self
- def raise(err)
- super ParseError.new(err, @source, @line)
- end
-
- # Reads JavaScript from _input_ (which can be a String or an IO object) and
- # returns a String containing minified JS.
- def minify(input)
- @js = StringScanner.new(input.is_a?(IO) ? input.read : input.to_s)
- @source = input.is_a?(IO) ? input.inspect : input.to_s[0..100]
- @line = 1
-
- @a = "\n"
- @b = nil
- @lookahead = nil
- @output = ''
-
- action_get
-
- while !@a.nil? do
- case @a
- when CHR_SPACE
- if alphanum?(@b)
- action_output
- else
- action_copy
- end
-
- when CHR_LF
- if @b == CHR_SPACE
- action_get
- elsif @b =~ /[{\[\(+-]/
- action_output
- else
- if alphanum?(@b)
- action_output
- else
- action_copy
- end
- end
-
- else
- if @b == CHR_SPACE
- if alphanum?(@a)
- action_output
- else
- action_get
- end
- elsif @b == CHR_LF
- if @a =~ /[}\]\)\\"+-]/
- action_output
- else
- if alphanum?(@a)
- action_output
- else
- action_get
- end
- end
- else
- action_output
- end
- end
- end
-
- @output
- end
-
- private
-
- # Corresponds to action(1) in jsmin.c.
- def action_output
- @output << @a
- action_copy
- end
-
- # Corresponds to action(2) in jsmin.c.
- def action_copy
- @a = @b
-
- if @a == CHR_APOS || @a == CHR_QUOTE
- loop do
- @output << @a
- @a = get
-
- break if @a == @b
-
- if @a[0] <= ORD_LF
- raise "unterminated string literal: #{@a.inspect}"
- end
-
- if @a == CHR_BACKSLASH
- @output << @a
- @a = get
-
- if @a[0] <= ORD_LF
- raise "unterminated string literal: #{@a.inspect}"
- end
- end
- end
- end
-
- action_get
- end
-
- # Corresponds to action(3) in jsmin.c.
- def action_get
- @b = nextchar
-
- if @b == CHR_FRONTSLASH && (@a == CHR_LF || @a =~ /[\(,=:\[!&|?{};]/)
- @output << @a
- @output << @b
-
- loop do
- @a = get
-
- # Inside a regex [...] set, which MAY contain a '/' itself.
- # Example:
- # mootools Form.Validator near line 460:
- # return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
- if @a == '['
- loop do
- @output << @a
- @a = get
- case @a
- when ']' then break
- when CHR_BACKSLASH then
- @output << @a
- @a = get
- when @a[0] <= ORD_LF
- raise "JSMin parse error: unterminated regular expression " +
- "literal: #{@a}"
- end
- end
- elsif @a == CHR_FRONTSLASH
- break
- elsif @a == CHR_BACKSLASH
- @output << @a
- @a = get
- elsif @a[0] <= ORD_LF
- raise "unterminated regular expression : #{@a.inspect}"
- end
-
- @output << @a
- end
-
- @b = nextchar
- end
- end
-
- # Returns true if +c+ is a letter, digit, underscore, dollar sign,
- # backslash, or non-ASCII character.
- def alphanum?(c)
- c.is_a?(String) && !c.empty? && (c[0] > ORD_TILDE || c =~ /[0-9a-z_$\\]/i)
- end
-
- # Returns the next character from the input. If the character is a control
- # character, it will be translated to a space or linefeed.
- def get
- if @lookahead
- c = @lookahead
- @lookahead = nil
- else
- c = @js.getch
- if c == CHR_LF || c == CHR_CR
- @line += 1
- return CHR_LF
- end
- return ' ' unless c.nil? || c[0] >= ORD_SPACE
- end
- c
- end
-
- # Gets the next character, excluding comments.
- def nextchar
- c = get
- return c unless c == CHR_FRONTSLASH
-
- case peek
- when CHR_FRONTSLASH
- loop do
- c = get
- return c if c[0] <= ORD_LF
- end
-
- when CHR_ASTERISK
- get
- loop do
- case get
- when CHR_ASTERISK
- if peek == CHR_FRONTSLASH
- get
- return ' '
- end
-
- when nil
- raise 'unterminated comment'
- end
- end
-
- else
- return c
- end
- end
-
- # Gets the next character without getting it.
- def peek
- @lookahead = get
- end
- end
-end
-
-
-# Wraps CSSMin compressor to use the same API as the rest of
+# Wraps JSMin compressor to use the same API as the rest of
# Jammit's compressors.
class Jammit::JsminCompressor
def initialize(options = {})

0 comments on commit 28ddf14

Please sign in to comment.