Rename project to ruby-css-toolkit

Author: Richard Hulse

bin/css-compressor renamed to bin/css-toolkit

@@ -3,7 +3,7 @@
 
 require 'getoptlong'
 
-require File.join(File.dirname(__FILE__), *%w[.. lib css_compressor])
+require File.join(File.dirname(__FILE__), *%w[.. lib css_toolkit])
 
 # options
 
@@ -18,7 +18,7 @@ $outfile = nil
 # Explain to the user how to use css compressor
 
 def usage
-  puts ' CSS compressor             |'
+  puts ' CSS Optimizer              |'
   puts '----------------------------|'
   puts ''
   puts '--help, -h                  Display this help'

lib/css_toolkit.rb

@@ -0,0 +1,11 @@
+require 'modules/yui_compressor'
+
+module CssToolkit
+	include YuiCompressor
+
+	def yui_compressor(css, line_length)
+		yui = Yui.new()
+		yui.compress(css, line_length)
+	end
+
+end

lib/modules/yui_compressor.rb

@@ -1,23 +1,19 @@
 # This is a Ruby port of the YUI CSS compressor
 # See LICENSE for license information
 
-module CssCompressor
+module YuiCompressor
   # Compress CSS rules using a variety of techniques
 
-  class CSS
+  class Yui
 		attr_reader :input_size, :output_size
-    def initialize(options = {})
-			@options = {
-				:use_tidy => true,   # use the extra CSS optimisations
-				:tidy_test => false, # used during unit tests only
-			}.merge(options)
+    def initialize()
       @preservedTokens = []
       @comments = []
 			@input_size = 0
 			@output_size = 0
     end
 
-    def compress(css)
+    def compress(css, line_length=0)
 			@input_size = css.length
 
       css = process_comments_and_strings(css)
@@ -88,11 +84,8 @@ def compress(css)
 	    # See SF bug #1980989
 	    css.gsub!(/[;]+/, ';');
 
-			# this does some extra smart cleaning of rules to remove redundancy
-			css = tidy_css(css) if @options[:use_tidy]
-
       #restore preserved comments and strings
-			css = restore_preserved_comments_and_strings(css) unless @options[:tidy_test]
+			css = restore_preserved_comments_and_strings(css)
 
       # top and tail whitespace
       css.strip!
@@ -210,73 +203,6 @@ def restore_preserved_comments_and_strings(clean_css)
 
 			css
 		end
-
-		def tidy_css(clean_css)
-			css = clean_css.clone
-
-			# color swaps
-			swaps = {
-				'white' 	=> '#fff',
-				'black' 	=> '#000',
-	      'fuchsia'	=> '#f0f',
-	      'yellow'	=> '#ff0',
-	      '#f00'		=> 'red',
-				'#800000'	=> 'maroon',
-				'#ffa500' => 'orange',
-				'#808000'	=> 'olive',
-				'#800080'	=> 'purple',
-				'#008000' => 'green',
-				'#000080'	=> 'navy',
-				'#008080' => 'teal',
-				'#c0c0c0' => 'silver',
-				'#808080' => 'gray',
-			}
-
-			swaps.each do |from, to|
-				css.gsub!(/:#{from}(;|\})/, ":#{to}\\1")
-			end
-
-			css = split_lines(css)
-			css = restore_lines(css)
-
-			css
-		end
-
-		def split_lines(clean_css)
-			css = clean_css.clone
-
-      startIndex = 0
-      endIndex = 0
-			totallen = css.length
-
-			css.gsub!("@", "\n@")
-
-			# split @ declarations like @import onto their own lines
-      while (startIndex = css.index("@", startIndex))
-        endIndex = css.index(/;|\{/, startIndex)
-
-        unless endIndex
-          endIndex = totallen
-        end
-        css = css.slice(0..endIndex).to_s + "\n" + css.slice(endIndex+1, totallen).to_s
-				startIndex = endIndex
-				totallen += 1 # to allow for the extra \n
-      end
-			css.gsub!("}", "}\n")
-			css.gsub!("{", "\n{")
-			css.gsub!(/\n+/, "\n")
-			css.gsub!("*/", "*/\n")
-			css.strip!
-
-			css
-		end
-
-		def restore_lines(clean_css)
-			css = clean_css.clone
-			css.gsub!("\n", '')
-
-			css
-		end
  end
 
 end

test/css_compressor_test.rb

@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
 require 'rubygems'
 require 'test/unit'
-require 'css_compressor'
+require 'css_toolkit'

test/test_helper.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+# Test cases for preping a file for parsing
+class YuiCompressorTest < Test::Unit::TestCase
+  include CssToolkit
+
+  def setup
+    @yui = Yui.new()
+
+		# build our tests based on the available files
+		# test_files = Dir.glob(File.join(File.dirname(__FILE__), 'yuicss/*.css'))
+		# test_files.each do |file|
+		# 	base_name = File.basename(file, ".css")
+		# 	class self <<
+		# 		def test_yui_#{basename}
+		# 			test_css 			= File.read(file)
+		# 			expected_css 	= File.read(file + '.min')
+		# 			assert_equal(expected_css, @yui.compress(test_css))
+		# 		end
+		# 	
+		# end
+
+  end
+
+  # basic test
+  def test_pass_through
+    assert_equal('body{margin:5px}', @yui.compress('body{margin:5px}'))
+  end
+
+  def test_whitespace_reduction
+    assert_equal('a b', @yui.compress('  a   b  '))
+  end
+
+  def test_whitespace_reduction_with_tab
+    assert_equal('a b', @yui.compress("  a  \t  b  "))
+  end
+
+  def test_whitespace_and_unix_newline
+    assert_equal('a b', @yui.compress(" a\n b"))
+  end
+
+  def test_whitespace_and_windows_newline
+    assert_equal('a b', @yui.compress("   a  \r\nb "))
+  end
+
+	# test all the files in the yui directory
+	def test_yui_css
+		test_files = Dir.glob(File.join(File.dirname(__FILE__), 'yuicss/*.css'))
+		test_files.each do |file|
+	    test_css 			= File.read(file)
+	    expected_css 	= File.read(file + '.min')
+
+			test_name = File.basename(file, ".css")
+			assert_block "Couldn't do the thing - #{test_name}" do
+				expected_css == @yui.compress(test_css) #    do_the_thing
+			end
+#			assert_equal(), "'yui-#{test_name}' failed" )
+		end
+	end
+
+end