yuicompressor 1.0.1 → 1.1.0

data/lib/yuicompressor.rb

@@ -1,13 +1,9 @@
 require 'stringio'
 
 module YUICompressor
-
   # The path to the YUI Compressor jar file.
   JAR_FILE = File.expand_path('../yuicompressor-2.4.2.jar', __FILE__)
 
-  autoload :JRuby, 'yuicompressor/jruby'
-  autoload :Shell, 'yuicompressor/shell'
-
   module_function
 
   # Returns +true+ if the Ruby platform is JRuby.
@@ -68,12 +64,9 @@ module YUICompressor
   # 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.
-  mod = jruby? ? JRuby : Shell
-
-  include mod
-
-  mod.instance_methods.each do |name|
-    module_function name
+  if jruby?
+    require 'yuicompressor/jruby'
+  else
+    require 'yuicompressor/shell'
   end
-
 end

data/lib/yuicompressor/jruby.rb

@@ -2,85 +2,83 @@ require 'java'
 require 'stringio'
 
 module YUICompressor
-  # This module contains methods specific to the JRuby platform and is
-  # automatically used when JRuby is detected. It provides a significant
-  # increase in performance over the Shell module.
-  module JRuby
+  # This file contains methods specific to the JRuby platform and is
+  # automatically used when JRuby is detected.
 
-    require JAR_FILE
+  require JAR_FILE
 
-    import java.io.InputStreamReader
-    import java.io.OutputStreamWriter
-    import com.yahoo.platform.yui.compressor.JavaScriptCompressor
-    import com.yahoo.platform.yui.compressor.CssCompressor
+  import java.io.InputStreamReader
+  import java.io.OutputStreamWriter
+  import com.yahoo.platform.yui.compressor.JavaScriptCompressor
+  import com.yahoo.platform.yui.compressor.CssCompressor
 
-    class ErrorReporter #:nodoc:
-      def error(message, source_name, line, line_source, line_offset)
-        if line < 0
-          "\n[ERROR] %s" % message
-        else
-          "\n[ERROR] %s:%s:%s" % [line, line_offset, message]
-        end
+  class ErrorReporter #:nodoc:
+    def error(message, source_name, line, line_source, line_offset)
+      if line < 0
+        "\n[ERROR] %s" % message
+      else
+        "\n[ERROR] %s:%s:%s" % [line, line_offset, message]
       end
+    end
 
-      def runtimeError(*args)
-        raise RuntimeError, 'Compression failed. %s' % error(*args)
-      end
+    def runtimeError(*args)
+      raise RuntimeError, 'Compression failed. %s' % error(*args)
     end
+  end
 
-    # Returns the set of arguments that are needed to instantiate a compressor
-    # using the given +options+.
-    def command_arguments(options={})
-      args = [ options[:line_break] ? options[:line_break].to_i : -1 ]
+  module_function
 
-      if options[:type].to_s == 'js'
-        args << !! options[:munge]
-        args << false # verbose?
-        args << !! options[:preserve_semicolons]
-        args << ! options[:optimize] # disable optimizations?
-      end
+  # Returns the set of arguments that are needed to instantiate a compressor
+  # using the given +options+.
+  def command_arguments(options={})
+    args = [ options[:line_break] ? options[:line_break].to_i : -1 ]
 
-      args
+    if options[:type].to_s == 'js'
+      args << !! options[:munge]
+      args << false # verbose?
+      args << !! options[:preserve_semicolons]
+      args << ! options[:optimize] # disable optimizations?
     end
 
-    # Compresses the given +stream_or_string+ of code using the given +options+.
-    # When using this method directly, at least the +:type+ option must be
-    # specified, and should be one of <tt>"css"</tt> or <tt>"js"</tt>. See
-    # YUICompressor#compress_css and YUICompressor#compress_js for details about
-    # which options are acceptable for each type of compressor.
-    #
-    # If a block is given, it will receive the IO output object. Otherwise the
-    # output will be returned as a string.
-    def compress(stream_or_string, options={})
-      raise ArgumentError, 'Option :type required' unless options.key?(:type)
+    args
+  end
 
-      stream = streamify(stream_or_string)
-      output = StringIO.new
+  # Compresses the given +stream_or_string+ of code using the given +options+.
+  # When using this method directly, at least the +:type+ option must be
+  # specified, and should be one of <tt>"css"</tt> or <tt>"js"</tt>. See
+  # YUICompressor#compress_css and YUICompressor#compress_js for details about
+  # which options are acceptable for each type of compressor.
+  #
+  # If a block is given, it will receive the IO output object. Otherwise the
+  # output will be returned as a string.
+  def compress(stream_or_string, options={})
+    raise ArgumentError, 'Option :type required' unless options.key?(:type)
 
-      reader = InputStreamReader.new(stream.to_inputstream)
-      writer = OutputStreamWriter.new(output.to_outputstream)
+    stream = streamify(stream_or_string)
+    output = StringIO.new
 
-      compressor = case options[:type].to_s
-      when 'js'
-        options = default_js_options.merge(options)
-        JavaScriptCompressor.new(reader, ErrorReporter.new)
-      when 'css'
-        options = default_css_options.merge(options)
-        CssCompressor.new(reader)
-      else
-        raise ArgumentError, 'Unknown resource type: %s' % options[:type]
-      end
-
-      compressor.compress(writer, *command_arguments(options))
-      writer.flush
-      output.rewind
+    reader = InputStreamReader.new(stream.to_inputstream)
+    writer = OutputStreamWriter.new(output.to_outputstream)
 
-      if block_given?
-        yield output
-      else
-        output.read
-      end
+    compressor = case options[:type].to_s
+    when 'js'
+      options = default_js_options.merge(options)
+      JavaScriptCompressor.new(reader, ErrorReporter.new)
+    when 'css'
+      options = default_css_options.merge(options)
+      CssCompressor.new(reader)
+    else
+      raise ArgumentError, 'Unknown resource type: %s' % options[:type]
     end
 
+    compressor.compress(writer, *command_arguments(options))
+    writer.flush
+    output.rewind
+
+    if block_given?
+      yield output
+    else
+      output.read
+    end
   end
 end

data/lib/yuicompressor/shell.rb

@@ -5,78 +5,77 @@ rescue LoadError
 end
 
 module YUICompressor
-  # This module contains methods that allow the YUI Compressor to be used by
+  # This file contains methods that allow the YUI Compressor to be used by
   # piping IO to a separate Java process via the system shell. It is used on all
   # Ruby platforms except for JRuby.
-  module Shell
 
-    # Returns an array of flags that should be passed to the jar file on the
-    # command line for the given set of +options+.
-    def command_arguments(options={})
-      args = []
-      args.concat(['--type', options[:type].to_s]) if options[:type]
-      args.concat(['--line-break', options[:line_break].to_s]) if options[:line_break]
+  module_function
 
-      if options[:type].to_s == 'js'
-        args << '--nomunge' unless options[:munge]
-        args << '--preserve-semi' if options[:preserve_semicolons]
-        args << '--disable-optimizations' unless options[:optimize]
-      end
+  # Returns an array of flags that should be passed to the jar file on the
+  # command line for the given set of +options+.
+  def command_arguments(options={})
+    args = []
+    args.concat(['--type', options[:type].to_s]) if options[:type]
+    args.concat(['--line-break', options[:line_break].to_s]) if options[:line_break]
 
-      args
+    if options[:type].to_s == 'js'
+      args << '--nomunge' unless options[:munge]
+      args << '--preserve-semi' if options[:preserve_semicolons]
+      args << '--disable-optimizations' unless options[:optimize]
     end
 
-    # Compresses the given +stream_or_string+ of code using the given +options+.
-    # When using this method directly, at least the +:type+ option must be
-    # specified, and should be one of <tt>"css"</tt> or <tt>"js"</tt>. See
-    # YUICompressor#compress_css and YUICompressor#compress_js for details about
-    # which options are acceptable for each type of compressor.
-    #
-    # In addition to the standard options, this method also accepts a
-    # <tt>:java</tt> option that can be used to specify the location of the Java
-    # binary. This option will default to using <tt>"java"</tt> unless otherwise
-    # specified.
-    #
-    # If a block is given, it will receive the IO output object. Otherwise the
-    # output will be returned as a string.
-    def compress(stream_or_string, options={})
-      raise ArgumentError, 'Option :type required' unless options.key?(:type)
+    args
+  end
 
-      stream = streamify(stream_or_string)
+  # Compresses the given +stream_or_string+ of code using the given +options+.
+  # When using this method directly, at least the +:type+ option must be
+  # specified, and should be one of <tt>"css"</tt> or <tt>"js"</tt>. See
+  # YUICompressor#compress_css and YUICompressor#compress_js for details about
+  # which options are acceptable for each type of compressor.
+  #
+  # In addition to the standard options, this method also accepts a
+  # <tt>:java</tt> option that can be used to specify the location of the Java
+  # binary. This option will default to using <tt>"java"</tt> unless otherwise
+  # specified.
+  #
+  # If a block is given, it will receive the IO output object. Otherwise the
+  # output will be returned as a string.
+  def compress(stream_or_string, options={})
+    raise ArgumentError, 'Option :type required' unless options.key?(:type)
 
-      case options[:type].to_s
-      when 'js'
-        options = default_js_options.merge(options)
-      when 'css'
-        options = default_css_options.merge(options)
-      else
-        raise ArgumentError, 'Unknown resource type: %s' % options[:type]
-      end
+    stream = streamify(stream_or_string)
 
-      command = [ options.delete(:java) || 'java', '-jar', JAR_FILE ]
-      command.concat(command_arguments(options))
+    case options[:type].to_s
+    when 'js'
+      options = default_js_options.merge(options)
+    when 'css'
+      options = default_css_options.merge(options)
+    else
+      raise ArgumentError, 'Unknown resource type: %s' % options[:type]
+    end
 
-      Open3.popen3(command.join(' ')) do |input, output, stderr|
-        begin
-          while buffer = stream.read(4096)
-            input.write(buffer)
-          end
+    command = [ options.delete(:java) || 'java', '-jar', JAR_FILE ]
+    command.concat(command_arguments(options))
 
-          input.close
+    Open3.popen3(command.join(' ')) do |input, output, stderr|
+      begin
+        while buffer = stream.read(4096)
+          input.write(buffer)
+        end
+
+        input.close
 
-          err = stderr.read
-          raise err unless err.empty?
+        err = stderr.read
+        raise err unless err.empty?
 
-          if block_given?
-            yield output
-          else
-            output.read
-          end
-        rescue Exception => e
-          raise RuntimeError, 'Compression failed. %s' % e
+        if block_given?
+          yield output
+        else
+          output.read
         end
+      rescue Exception => e
+        raise RuntimeError, 'Compression failed. %s' % e
       end
     end
-
   end
 end

data/yuicompressor.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'yuicompressor'
-  s.version = '1.0.1'
-  s.date = '2010-08-02'
+  s.version = '1.1.0'
+  s.date = '2010-08-04'
 
   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,34 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: yuicompressor
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
-    - 1
-    - 0
-    - 1
-  version: 1.0.1
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
-  - Michael Jackson
+- Michael Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-08-02 00:00:00 -06:00
+date: 2010-08-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-            version: "0"
-    type: :development
-    version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: A YUI JavaScript and CSS compressor for Ruby and JRuby
 email: mjijackson@gmail.com
 executables: []
@@ -36,52 +39,56 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - README
+- README
 files: 
-  - lib/yuicompressor.rb
-  - lib/yuicompressor/jruby.rb
-  - lib/yuicompressor/shell.rb
-  - test/css_test.rb
-  - test/helper.rb
-  - test/js_test.rb
-  - yuicompressor.gemspec
-  - Rakefile
-  - README
+- lib/yuicompressor/jruby.rb
+- lib/yuicompressor/shell.rb
+- lib/yuicompressor.rb
+- test/css_test.rb
+- test/helper.rb
+- test/js_test.rb
+- yuicompressor.gemspec
+- Rakefile
+- README
 has_rdoc: true
 homepage: http://github.com/mjijackson/yuicompressor
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --line-numbers
-  - --inline-source
-  - --title
-  - YUICompressor
-  - --main
-  - YUICompressor
+- --line-numbers
+- --inline-source
+- --title
+- YUICompressor
+- --main
+- YUICompressor
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A YUI JavaScript and CSS compressor for Ruby and JRuby
 test_files: 
-  - test/css_test.rb
-  - test/js_test.rb
+- test/css_test.rb
+- test/js_test.rb