yuicompressor 1.3.2 → 1.3.3

data/lib/yuicompressor.rb

@@ -64,6 +64,14 @@ module YUICompressor
     end
   end
 
+  def stringify(stream_or_string) #:nodoc:
+    case stream_or_string
+      when IO then stream_or_string.read
+      when String then stream_or_string
+      else raise ArgumentError, 'Stream or string required'
+    end
+  end
+
   # If we're on JRuby we can use the YUI Compressor Java classes directly. This
   # gives a huge speed boost. Otherwise we need to make a system call to the
   # Java interpreter and stream IO to/from the shell.

data/lib/yuicompressor/shell.rb

@@ -38,7 +38,7 @@ module YUICompressor
   def compress(stream_or_string, options={})
     raise ArgumentError, 'Option :type required' unless options.key?(:type)
 
-    stream = streamify(stream_or_string)
+    string = stringify(stream_or_string)
 
     case options[:type].to_s
     when 'js'
@@ -52,15 +52,10 @@ module YUICompressor
     command = [ options.delete(:java) || 'java', '-jar', JAR_FILE ]
     command.concat(command_arguments(options))
 
-    Open3.popen3(command.join(' ')) do |input, output, stderr|
-      begin
-        input.write(stream.read)
-        input.close_write
-
-        output.read
-      rescue Exception => e
-        raise 'Compression failed: %s' % e
-      end
+    stdout_str, stderr_str, status = Open3.capture3(command.join(' '), stdin_data: string, binmode: true)
+    unless status.success?
+     raise "Compression failed: #{stderr_str}"
     end
+    stdout_str
   end
 end

data/test/js_test.rb

@@ -86,4 +86,10 @@ CODE
   def test_large_stream
     assert compress_js(File.new(File.expand_path('../_files/jquery-1.4.2.js', __FILE__), 'r'))
   end
+
+  def test_error_reporting
+    assert_raises RuntimeError do
+      compress_js('function() {;')  # syntax error
+    end
+  end
 end

data/yuicompressor.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'yuicompressor'
-  s.version = '1.3.2'
-  s.date = '2014-01-29'
+  s.version = '1.3.3'
+  s.date = '2014-03-01'
 
   s.summary = 'A YUI JavaScript and CSS compressor for Ruby and JRuby'
   s.description = 'A YUI JavaScript and CSS compressor for Ruby and JRuby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yuicompressor
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake