yui-compressor 0.9.6 → 0.12.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d9b97c893c00c609838029f8a8611fd04f7177cf
+  data.tar.gz: 4aa379e225be91d06684d374baaf9d565b27db1c
+SHA512:
+  metadata.gz: c9bc26358a6156d278dfba4d515e55aa308f02651d37af2787260f440e136fb1b9f0abe7f18e268a0ae7ffae1bd91289982fe27ccba8095366b6f64a85b8fc8b
+  data.tar.gz: 860bdf77773af18d195c945f429fbdbc22ce26efdc1890c4e7bb4d976938823d2d54eac3fda6622f7ca958d264cdc74155e058f8809a72b0562e5aefd0e7ece4

data/README.rdoc

@@ -0,0 +1,147 @@
+= Ruby-YUI Compressor
+
+Ruby-YUI Compressor provides a Ruby interface to the {YUI Compressor Java library}[http://developer.yahoo.com/yui/compressor/] for minifying JavaScript and CSS assets.
+
+<b>Latest version:</b> 0.12.0 (includes YUI Compressor 2.4.8)
+
+* {API documentation}[http://yui.rubyforge.org/]
+* {Source code}[http://github.com/sstephenson/ruby-yui-compressor/]
+* {Bug tracker}[http://github.com/sstephenson/ruby-yui-compressor/issues]
+
+Tested on Mac OS X Ruby 1.8.7 and Ruby 1.9.2.
+
+=== Installing and loading Ruby-YUI Compressor
+
+Ruby-YUI Compressor is distributed as a Ruby Gem (<tt>yui-compressor</tt>). Because YUI Compressor's .jar file is included in the box, Java >= 1.4 is its only dependency.
+
+  $ sudo gem install -r yui-compressor
+  $ irb -rubygems
+  >> require "yui/compressor"
+  => true
+
+You can also install Ruby-YUI Compressor with the {Rip package manager}[http://hellorip.com/]:
+
+  $ rip install git://github.com/sstephenson/ruby-yui-compressor.git 0.12.0
+  $ irb -rrip
+  >> require "yui/compressor"
+  => true
+
+=== Using Ruby-YUI Compressor
+
+Create either a YUI::CssCompressor or a YUI::JavaScriptCompressor. Then pass an IO or string to the YUI::Compressor#compress method and get the compressed contents back as a string or have them yielded to a block.
+
+==== Example: Compress JavaScript
+  compressor = YUI::JavaScriptCompressor.new
+  compressor.compress('(function () { var foo = {}; foo["bar"] = "baz"; })()')
+  # => "(function(){var foo={};foo.bar=\"baz\"})();"
+
+==== Example: Compress JavaScript and shorten local variable names
+  compressor = YUI::JavaScriptCompressor.new(:munge => true)
+  compressor.compress('(function () { var foo = {}; foo["bar"] = "baz"; })()')
+  # => "(function(){var a={};a.bar=\"baz\"})();"
+
+==== Example: Compress CSS
+  compressor = YUI::CssCompressor.new
+  compressor.compress(<<-END_CSS)
+    div.error {
+      color: red;
+    }
+    div.warning {
+      display: none;
+    }
+  END_CSS
+  # => "div.error{color:red;}div.warning{display:none;}"
+
+==== Overriding the path to Java or the YUI Compressor .jar file
+
+By default, YUI::Compressor looks for Java as the +java+ command in your path, and uses the YUI Compressor .jar file in YUI::Compressor's vendor directory. You can override both with the :java and :jar_file options:
+
+  YUI::JavaScriptCompressor.new(
+    :java     => "/usr/bin/java",
+    :jar_file => "/path/to/my/yuicompressor-2.4.8.jar"
+  )
+
+==== Additional compression options
+
+See the YUI::CssCompressor and YUI::JavaScriptCompressor documentation for more information on format-specific compression options.
+
+
+== Licenses
+
+==== Ruby-YUI Compressor code and documentation (MIT license)
+
+  Copyright (c) 2011 Sam Stephenson
+
+  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 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.
+
+==== YUI Compressor (BSD license)
+
+  Copyright (c) 2009, Yahoo! Inc.
+  All rights reserved.
+
+  Redistribution and use of this software 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 Yahoo! Inc. nor the names of its
+    contributors may be used to endorse or promote products
+    derived from this software without specific prior
+    written permission of Yahoo! Inc.
+
+  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.
+
+  This software also requires access to software from the following sources:
+
+  The Jarg Library v 1.0 ( http://jargs.sourceforge.net/ ) is available
+  under a BSD License. Copyright (c) 2001-2003 Steve Purcell,
+  Copyright (c) 2002 Vidar Holen, Copyright (c) 2002 Michal Ceresna and
+  Copyright (c) 2005 Ewan Mellor.
+
+  The Rhino Library ( http://www.mozilla.org/rhino/ ) is dually available
+  under an MPL 1.1/GPL 2.0 license, with portions subject to a BSD license.
+
+  Additionally, this software contains modified versions of the following
+  component files from the Rhino Library:
+
+  [org/mozilla/javascript/Decompiler.java]
+  [org/mozilla/javascript/Parser.java]
+  [org/mozilla/javascript/Token.java]
+  [org/mozilla/javascript/TokenStream.java]
+
+  The modified versions of these files are distributed under the MPL v 1.1
+  ( http://www.mozilla.org/MPL/MPL-1.1.html )

data/Rakefile

@@ -1,6 +1,6 @@
 require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
+require "rubygems/package_task"
+require "rdoc/task"
 require "rake/testtask"
 
 task :default => :test
@@ -11,11 +11,11 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-Rake::RDocTask.new do |t|
+RDoc::Task.new do |t|
   t.rdoc_files.include("README.rdoc", "lib/**/*.rb")
 end
 
-Rake::GemPackageTask.new(eval(IO.read(File.join(File.dirname(__FILE__), "yui-compressor.gemspec")))) do |pkg|
+Gem::PackageTask.new(eval(IO.read(File.join(File.dirname(__FILE__), "yui-compressor.gemspec")))) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end

data/lib/yui/compressor.rb

@@ -1,10 +1,11 @@
-require "popen4"
 require "shellwords"
 require "stringio"
+require "tempfile"
+require "rbconfig"
 
 module YUI #:nodoc:
   class Compressor
-    VERSION = "0.9.6"
+    VERSION = "0.12.0"
 
     class Error < StandardError; end
     class OptionError   < Error; end
@@ -22,11 +23,30 @@ module YUI #:nodoc:
 
     def initialize(options = {}) #:nodoc:
       @options = self.class.default_options.merge(options)
-      @command = [path_to_java, "-jar", path_to_jar_file, *(command_option_for_type + command_options)]
+      @command = [path_to_java]
+      @command.push(*java_opts)
+      @command.push("-jar")
+      @command.push(path_to_jar_file)
+      @command.push(*(command_option_for_type + command_options))
+      @command.compact!
     end
 
     def command #:nodoc:
-      @command.map { |word| Shellwords.escape(word) }.join(" ")
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+        # Shellwords is only for bourne shells, so windows shells get this
+        # extremely remedial escaping
+        escaped_cmd = @command.map do |word|
+          if word =~ / /
+            word = "\"%s\"" % word
+          end
+
+          word
+        end
+      else
+        escaped_cmd = @command.map { |word| Shellwords.escape(word) }
+      end
+
+      escaped_cmd.join(" ")
     end
 
     # Compress a stream or string of code with YUI Compressor. (A stream is
@@ -64,27 +84,27 @@ module YUI #:nodoc:
     #
     def compress(stream_or_string)
       streamify(stream_or_string) do |stream|
-        output = true
-        status = POpen4.popen4(command, "b") do |stdout, stderr, stdin, pid|
-          begin
-            stdin.binmode
-            transfer(stream, stdin)
-
-            if block_given?
-              yield stdout
-            else
-              output = stdout.read
-            end
-
-          rescue Exception => e
-            raise RuntimeError, "compression failed"
-          end
+        tempfile = Tempfile.new('yui_compress')
+        tempfile.write stream.read
+        tempfile.flush
+        full_command = "%s %s" % [command, tempfile.path]
+
+        begin
+          output = `#{full_command}`
+        rescue Exception => e
+          # windows shells tend to blow up here when the command fails
+          raise RuntimeError, "compression failed: %s" % e.message
+        ensure
+          tempfile.close!
         end
 
-        if status.exitstatus.zero?
+        if $?.exitstatus.zero?
           output
         else
-          raise RuntimeError, "compression failed"
+          # Bourne shells tend to blow up here when the command fails, usually
+          # because java is missing
+          raise RuntimeError, "Command '%s' returned non-zero exit status" %
+            full_command
         end
       end
     end
@@ -106,8 +126,12 @@ module YUI #:nodoc:
         options.delete(:java) || "java"
       end
 
+      def java_opts
+        options.delete(:java_opts).to_s.split(/\s+/)
+      end
+
       def path_to_jar_file
-        options.delete(:jar_file) || File.join(File.dirname(__FILE__), *%w".. yuicompressor-2.4.4.jar")
+        options.delete(:jar_file) || File.join(File.dirname(__FILE__), *%w".. yuicompressor-2.4.8.jar")
       end
 
       def streamify(stream_or_string)
@@ -118,14 +142,6 @@ module YUI #:nodoc:
         end
       end
 
-      def transfer(from_stream, to_stream)
-        while buffer = from_stream.read(4096)
-          to_stream.write(buffer)
-        end
-        from_stream.close
-        to_stream.close
-      end
-
       def command_option_for_type
         ["--type", self.class.compressor_type.to_s]
       end

data/test/compressor_test.rb

@@ -36,6 +36,21 @@ module YUI
 
     FIXTURE_ERROR_JS = "var x = {class: 'name'};"
 
+    def test_js_java_opts_one_opt
+      @compressor = YUI::JavaScriptCompressor.new(:java_opts => "-Xms64M")
+      assert_match(/^java -Xms64M/, @compressor.command)
+    end
+
+    def test_css_java_opts_two_opts
+      @compressor = YUI::CssCompressor.new(:java_opts => "-Xms64M -Xmx64M")
+      assert_match(/^java -Xms64M -Xmx64M/, @compressor.command)
+    end
+
+    def test_js_java_opts_no_opts
+      @compressor = YUI::JavaScriptCompressor.new()
+      assert_match(/^java -jar/, @compressor.command)
+    end
+
     def test_compressor_should_raise_when_instantiated
       assert_raises YUI::Compressor::Error do
         YUI::Compressor.new

metadata

@@ -1,85 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yui-compressor
-version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
+version: !ruby/object:Gem::Version
+  version: 0.12.0
 platform: ruby
-authors: 
+authors:
 - Sam Stephenson
+- Stephen Crosby
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-30 00:00:00 -05:00
-default_executable: 
-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
+date: 2013-09-29 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby interface to YUI Compressor for minifying JavaScript and CSS assets.
-email: sstephenson@gmail.com
+email: stevecrozz@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- README.rdoc
 - Rakefile
+- lib/yuicompressor-2.4.8.jar
 - lib/yui/compressor.rb
-- lib/yuicompressor-2.4.4.jar
 - test/compressor_test.rb
-has_rdoc: true
 homepage: http://github.com/sstephenson/ruby-yui-compressor/
-licenses: []
-
+licenses:
+- MIT
+- BSD-3-clause
+- MPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: yui
-rubygems_version: 1.5.0
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JavaScript and CSS minification library
-test_files: 
+test_files:
 - test/compressor_test.rb