yuicompressor 1.2.1 → 1.3.0

data/README

@@ -51,6 +51,8 @@ When compressing CSS, the following option is available:
                     single line of compressed code. Defaults to no maximum
                     length. If set to 0 each line will be the minimum length
                     possible.
+    :charset        Sests the carset in which to read the input file. Passed
+                    through to the YUICompressor Java library. Default: utf8
 
 When compressing JavaScript, these additional options are available:
 

data/lib/yuicompressor.rb

@@ -2,7 +2,7 @@ require 'stringio'
 
 module YUICompressor
   # The path to the YUI Compressor jar file.
-  JAR_FILE = File.expand_path('../yuicompressor-2.4.4.jar', __FILE__)
+  JAR_FILE = File.expand_path('../yuicompressor-2.4.8.jar', __FILE__)
 
   module_function
 
@@ -18,6 +18,7 @@ module YUICompressor
   #                   single line of compressed code. Defaults to no maximum
   #                   length. If set to 0 each line will be the minimum length
   #                   possible.
+  # +:charset+::      Charset. Default is utf8.
   def compress_css(stream_or_string, options={}, &block)
     compress(stream_or_string, options.merge(:type => 'css'), &block)
   end
@@ -35,20 +36,22 @@ module YUICompressor
   #                           all semicolons in the code. Defaults to +false+.
   # +:optimize+::     Should be +true+ if the compressor should enable all
   #                   micro optimizations. Defaults to +true+.
+  # +:charset+::      Charset. Default is utf8.
   def compress_js(stream_or_string, options={}, &block)
     compress(stream_or_string, options.merge(:type => 'js'), &block)
   end
 
   def default_css_options #:nodoc:
-    { :line_break => nil }
+    { :line_break => nil, :charset => 'utf8' }
   end
 
   def default_js_options #:nodoc:
-    default_css_options.merge(
+    { :line_break => nil,
+      :charset => 'utf8',
       :munge => false,
       :preserve_semicolons => false,
       :optimize => true
-    )
+    }
   end
 
   def streamify(stream_or_string) #:nodoc:

data/lib/yuicompressor/shell.rb

@@ -13,6 +13,7 @@ module YUICompressor
     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.concat(['--charset', options[:charset].to_s]) if options[:charset]
 
     if options[:type].to_s == 'js'
       args << '--nomunge' unless options[:munge]

data/test/css_test.rb

@@ -10,7 +10,7 @@ class CSSTest < Test::Unit::TestCase
     if jruby?
       assert_equal([-1], args)
     else
-      assert_equal([], args)
+      assert_equal(['--charset', 'utf8'], args)
     end
   end
 

data/test/js_test.rb

@@ -10,7 +10,7 @@ class JSTest < Test::Unit::TestCase
     if jruby?
       assert_equal([-1], args)
     else
-      assert_equal([], args)
+      assert_equal(['--charset', 'utf8'], args)
     end
   end
 

data/yuicompressor.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'yuicompressor'
-  s.version = '1.2.1'
-  s.date = '2010-08-04'
+  s.version = '1.3.0'
+  s.date = '2014-01-22'
 
   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,46 +1,42 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yuicompressor
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+version: !ruby/object:Gem::Version
+  version: 1.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-04 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A YUI JavaScript and CSS compressor for Ruby and JRuby
 email: mjijackson@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - lib/yuicompressor/jruby.rb
 - lib/yuicompressor/shell.rb
-- lib/yuicompressor-2.4.4.jar
+- lib/yuicompressor-2.4.8.jar
 - lib/yuicompressor.rb
 - test/_files/jquery-1.4.2.js
 - test/_files/test.css
@@ -51,41 +47,36 @@ files:
 - yuicompressor.gemspec
 - Rakefile
 - README
-has_rdoc: true
 homepage: http://github.com/mjijackson/yuicompressor
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - YUICompressor
 - --main
 - YUICompressor
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A YUI JavaScript and CSS compressor for Ruby and JRuby
-test_files: 
+test_files:
 - test/css_test.rb
 - test/js_test.rb