yui-compressor 0.9.1 → 0.9.3

data/lib/yui/compressor.rb

@@ -3,12 +3,14 @@ require "stringio"
 
 module YUI #:nodoc:
   class Compressor
+    VERSION = "0.9.3"
+
     class Error < StandardError; end
     class OptionError   < Error; end
     class RuntimeError  < Error; end
-    
+
     attr_reader :options, :command
-    
+
     def self.default_options #:nodoc:
       { :charset => "utf-8", :line_break => nil }
     end
@@ -21,7 +23,7 @@ module YUI #:nodoc:
       @options = self.class.default_options.merge(options)
       @command = [path_to_java, "-jar", path_to_jar_file, *(command_option_for_type + command_options)]
     end
-    
+
     # Compress a stream or string of code with YUI Compressor. (A stream is
     # any object that responds to +read+ and +close+ like an IO.) If a block
     # is given, you can read the compressed code from the block's argument.
@@ -60,20 +62,20 @@ module YUI #:nodoc:
         Open3.popen3(*command) do |stdin, stdout, stderr|
           begin
             transfer(stream, stdin)
-            
+
             if block_given?
               yield stdout
             else
               stdout.read
             end
-            
+
           rescue Exception => e
             raise RuntimeError, "compression failed"
           end
         end
       end
     end
-    
+
     private
       def command_options
         options.inject([]) do |command_options, (name, argument)|
@@ -92,7 +94,7 @@ module YUI #:nodoc:
       end
 
       def path_to_jar_file
-        options.delete(:jar_file) || File.join(File.dirname(__FILE__), *%w".. .. vendor yuicompressor-2.4.2.jar")
+        options.delete(:jar_file) || File.join(File.dirname(__FILE__), *%w".. yuicompressor-2.4.4.jar")
       end
 
       def streamify(stream_or_string)
@@ -102,14 +104,14 @@ module YUI #:nodoc:
           yield StringIO.new(stream_or_string.to_s)
         end
       end
-      
+
       def transfer(from_stream, to_stream)
         while buffer = from_stream.read(4096)
           to_stream.write(buffer)
         end
         to_stream.close
       end
-      
+
       def command_option_for_type
         ["--type", self.class.compressor_type.to_s]
       end
@@ -117,25 +119,25 @@ module YUI #:nodoc:
       def command_option_for_charset(charset)
         ["--charset", charset.to_s]
       end
-      
+
       def command_option_for_line_break(line_break)
         line_break ? ["--line-break", line_break.to_s] : []
       end
   end
-  
+
   class CssCompressor < Compressor
     def self.compressor_type #:nodoc:
       "css"
     end
-    
+
     # Creates a new YUI::CssCompressor for minifying CSS code.
     #
     # Options are:
     #
-    # <tt>:charset</tt>::    Specifies the character encoding to use. Defaults to 
+    # <tt>:charset</tt>::    Specifies the character encoding to use. Defaults to
     #                        <tt>"utf-8"</tt>.
     # <tt>:line_break</tt>:: By default, CSS will be compressed onto a single
-    #                        line. Use this option to specify the maximum 
+    #                        line. Use this option to specify the maximum
     #                        number of characters in each line before a newline
     #                        is added. If <tt>:line_break</tt> is 0, a newline
     #                        is added after each CSS rule.
@@ -144,12 +146,12 @@ module YUI #:nodoc:
       super
     end
   end
-  
+
   class JavaScriptCompressor < Compressor
     def self.compressor_type #:nodoc:
       "js"
     end
-    
+
     def self.default_options #:nodoc:
       super.merge(
         :munge    => false,
@@ -157,17 +159,17 @@ module YUI #:nodoc:
         :preserve_semicolons => false
       )
     end
-    
+
     # Creates a new YUI::JavaScriptCompressor for minifying JavaScript code.
     #
     # Options are:
     #
-    # <tt>:charset</tt>::    Specifies the character encoding to use. Defaults to 
+    # <tt>:charset</tt>::    Specifies the character encoding to use. Defaults to
     #                        <tt>"utf-8"</tt>.
-    # <tt>:line_break</tt>:: By default, JavaScript will be compressed onto a 
+    # <tt>:line_break</tt>:: By default, JavaScript will be compressed onto a
     #                        single line. Use this option to specify the
     #                        maximum number of characters in each line before a
-    #                        newline is added. If <tt>:line_break</tt> is 0, a 
+    #                        newline is added. If <tt>:line_break</tt> is 0, a
     #                        newline is added after each JavaScript statement.
     # <tt>:munge</tt>::      Specifies whether YUI Compressor should shorten local
     #                        variable names when possible. Defaults to +false+.
@@ -175,9 +177,9 @@ module YUI #:nodoc:
     #                        JavaScript object property access and object literal
     #                        declarations to use as few characters as possible.
     #                        Defaults to +true+.
-    # <tt>:preserve_semicolons</tt>:: Defaults to +false+. If +true+, YUI 
-    #                                 Compressor will ensure semicolons exist 
-    #                                 after each statement to appease tools like 
+    # <tt>:preserve_semicolons</tt>:: Defaults to +false+. If +true+, YUI
+    #                                 Compressor will ensure semicolons exist
+    #                                 after each statement to appease tools like
     #                                 JSLint.
     #
     def initialize(options = {})
@@ -188,11 +190,11 @@ module YUI #:nodoc:
       def command_option_for_munge(munge)
         munge ? [] : ["--nomunge"]
       end
-    
+
       def command_option_for_optimize(optimize)
         optimize ? [] : ["--disable-optimizations"]
       end
-    
+
       def command_option_for_preserve_semicolons(preserve_semicolons)
         preserve_semicolons ? ["--preserve-semi"] : []
       end

data/test/compressor_test.rb

@@ -12,6 +12,10 @@ module YUI
         background: red;
         color: white;
       }
+
+      @media screen and (max-device-width: 640px) {
+        body { font-size: 90%; }
+      }
     END_CSS
 
     FIXTURE_JS = <<-END_JS
@@ -38,7 +42,7 @@ module YUI
     
     def test_css_should_be_compressed
       @compressor = YUI::CssCompressor.new
-      assert_equal "div.warning{display:none;}div.error{background:red;color:white;}", @compressor.compress(FIXTURE_CSS)
+      assert_equal "div.warning{display:none}div.error{background:red;color:white}@media screen and (max-device-width:640px){body{font-size:90%}}", @compressor.compress(FIXTURE_CSS)
     end
     
     def test_js_should_be_compressed
@@ -55,20 +59,21 @@ module YUI
 
     def test_compress_should_accept_an_io_argument
       @compressor = YUI::CssCompressor.new
-      assert_equal "div.warning{display:none;}div.error{background:red;color:white;}", @compressor.compress(StringIO.new(FIXTURE_CSS))
+      assert_equal "div.warning{display:none}div.error{background:red;color:white}@media screen and (max-device-width:640px){body{font-size:90%}}", @compressor.compress(StringIO.new(FIXTURE_CSS))
     end
     
     def test_compress_should_accept_a_block_and_yield_an_io
       @compressor = YUI::CssCompressor.new
       @compressor.compress(FIXTURE_CSS) do |stream|
         assert_kind_of IO, stream
-        assert_equal "div.warning{display:none;}div.error{background:red;color:white;}", stream.read
+        assert_equal "div.warning{display:none}div.error{background:red;color:white}@media screen and (max-device-width:640px){body{font-size:90%}}", stream.read
       end
     end
     
     def test_line_break_option_should_insert_line_breaks_in_css
       @compressor = YUI::CssCompressor.new(:line_break => 0)
-      assert_equal "div.warning{display:none;}\ndiv.error{background:red;color:white;}", @compressor.compress(FIXTURE_CSS)
+      assert_equal "div.warning{display:none}\ndiv.error{background:red;color:white}\n@media screen and (max-device-width:640px){body{font-size:90%}\n}", @compressor.compress(FIXTURE_CSS)
+    
     end
     
     def test_line_break_option_should_insert_line_breaks_in_js

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yui-compressor
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  hash: 61
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -05:00
+date: 2011-01-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -24,8 +30,9 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - lib/yui/compressor.rb
+- lib/yuicompressor-2.4.2.jar
+- lib/yuicompressor-2.4.4.jar
 - test/compressor_test.rb
-- vendor/yuicompressor-2.4.2.jar
 has_rdoc: true
 homepage: http://github.com/sstephenson/ruby-yui-compressor/
 licenses: []
@@ -36,21 +43,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: yui
-rubygems_version: 1.3.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JavaScript and CSS minification library