yui-compressor 0.9.5 → 0.9.6

data/lib/yui/compressor.rb

@@ -1,17 +1,16 @@
-require "open3"
+require "popen4"
+require "shellwords"
 require "stringio"
 
 module YUI #:nodoc:
   class Compressor
-    VERSION = "0.9.4"
-
-    YUI_ERROR_MARKER = '[ERROR]'
+    VERSION = "0.9.6"
 
     class Error < StandardError; end
     class OptionError   < Error; end
     class RuntimeError  < Error; end
 
-    attr_reader :options, :command
+    attr_reader :options
 
     def self.default_options #:nodoc:
       { :charset => "utf-8", :line_break => nil }
@@ -26,6 +25,10 @@ module YUI #:nodoc:
       @command = [path_to_java, "-jar", path_to_jar_file, *(command_option_for_type + command_options)]
     end
 
+    def command #:nodoc:
+      @command.map { |word| Shellwords.escape(word) }.join(" ")
+    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.
@@ -61,23 +64,28 @@ module YUI #:nodoc:
     #
     def compress(stream_or_string)
       streamify(stream_or_string) do |stream|
-        Open3.popen3(*command) do |stdin, stdout, stderr|
+        output = true
+        status = POpen4.popen4(command, "b") do |stdout, stderr, stdin, pid|
           begin
             stdin.binmode
             transfer(stream, stdin)
 
-            raise if stderr.read.include?(YUI_ERROR_MARKER)
-
             if block_given?
               yield stdout
             else
-              stdout.read
+              output = stdout.read
             end
 
           rescue Exception => e
             raise RuntimeError, "compression failed"
           end
         end
+
+        if status.exitstatus.zero?
+          output
+        else
+          raise RuntimeError, "compression failed"
+        end
       end
     end
 
@@ -114,6 +122,7 @@ module YUI #:nodoc:
         while buffer = from_stream.read(4096)
           to_stream.write(buffer)
         end
+        from_stream.close
         to_stream.close
       end
 

data/test/compressor_test.rb

@@ -7,7 +7,7 @@ module YUI
       div.warning {
         display: none;
       }
-      
+
       div.error {
         background: red;
         color: white;
@@ -35,23 +35,30 @@ module YUI
     END_JS
 
     FIXTURE_ERROR_JS = "var x = {class: 'name'};"
-    
+
     def test_compressor_should_raise_when_instantiated
       assert_raises YUI::Compressor::Error do
         YUI::Compressor.new
       end
     end
-    
+
     def test_css_should_be_compressed
       @compressor = YUI::CssCompressor.new
       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
       @compressor = YUI::JavaScriptCompressor.new
       assert_equal "var Foo={a:1};Foo.bar=(function(baz){if(false){doSomething()}else{for(var index=0;index<baz.length;index++){doSomething(baz[index])}}})(\"hello\");", @compressor.compress(FIXTURE_JS)
     end
-        
+
+    def test_large_js_should_be_compressed
+      assert_nothing_raised do
+        @compressor = YUI::JavaScriptCompressor.new
+        @compressor.compress(FIXTURE_JS * 200)
+      end
+    end
+
     def test_compress_should_raise_when_an_unknown_option_is_specified
       assert_raises YUI::Compressor::OptionError do
         @compressor = YUI::CssCompressor.new(:foo => "bar")
@@ -63,7 +70,7 @@ module YUI
       @compressor = YUI::CssCompressor.new
       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|
@@ -71,23 +78,22 @@ module YUI
         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}\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
       @compressor = YUI::JavaScriptCompressor.new(:line_break => 0)
       assert_equal "var Foo={a:1};\nFoo.bar=(function(baz){if(false){doSomething()\n}else{for(var index=0;\nindex<baz.length;\nindex++){doSomething(baz[index])\n}}})(\"hello\");", @compressor.compress(FIXTURE_JS)
     end
-    
+
     def test_munge_option_should_munge_local_variable_names
       @compressor = YUI::JavaScriptCompressor.new(:munge => true)
       assert_equal "var Foo={a:1};Foo.bar=(function(b){if(false){doSomething()}else{for(var a=0;a<b.length;a++){doSomething(b[a])}}})(\"hello\");", @compressor.compress(FIXTURE_JS)
     end
-    
+
     def test_optimize_option_should_not_modify_property_accesses_or_object_literal_keys_when_false
       @compressor = YUI::JavaScriptCompressor.new(:optimize => false)
       assert_equal "var Foo={\"a\":1};Foo[\"bar\"]=(function(baz){if(false){doSomething()}else{for(var index=0;index<baz.length;index++){doSomething(baz[index])}}})(\"hello\");", @compressor.compress(FIXTURE_JS)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yui-compressor
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -05:00
+date: 2011-03-30 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: POpen4
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
+  type: :runtime
+  version_requirements: *id001
 description: A Ruby interface to YUI Compressor for minifying JavaScript and CSS assets.
 email: sstephenson@gmail.com
 executables: []