uglifier 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abc5fa742a4bcf09fe7f93ab645ce6777708aab6
-  data.tar.gz: 5332624660b317ffa1e1e40cc44a8fd44facd8a4
+  metadata.gz: 585ecdc74ace303e7a9ab552441517c2cd455bb7
+  data.tar.gz: b974ac6688e88acbf12928ce84e035f1edab1519
 SHA512:
-  metadata.gz: 36a3cc5f14f7797f1ca838d8321abe1afd836fdab4a2780ebecbd670778f8e939ed32d7d5382e9df400934955f96aa10835209e6d39e81f91276686b87576774
-  data.tar.gz: 2da7f0e4ca2e183e2b5f6b5cafc1c17d1f5633d7741fb8b21ef381ff3e9fd9d46e9a6105ea921126a1f0e41602326028b030fd4c5b465cacb59f611e3ac58a39
+  metadata.gz: f4ce4b2b9b9bacf055ae287c7c9b290ed9bf0a7cf405a829208e10906d10726ef11815366d2a3572e020d0dd65422605a98fcde2ef2c2c76790a13c9101bd285
+  data.tar.gz: d7c2783bfe8e21e0f11eda932a302f5c60ec8b3361b693ea7a81e1c610e5a5e01234d78c90614207852216dbdc679bac676ddf6e91a219eb1863ef2af5fe90f5

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
   - jruby
   #- rbx-2 # Fails on Travis
 git:
@@ -12,7 +12,7 @@ gemfile:
   - Gemfile
 matrix:
   include:
-    - rvm: 2.1.2
+    - rvm: 2.1.5
       gemfile: gemfiles/rubyracer
     - rvm: 2.0.0
       gemfile: gemfiles/rubyracer

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.6.0 (8 December 2014)
+
+- allow metadata to be appended to minified code
+
 ## 2.5.3 (18 July 2014)
 
 - no changes

data/Gemfile

@@ -9,8 +9,7 @@ platforms :rbx do
 end
 
 if RUBY_VERSION >= '1.9'
-  gem 'rubocop', '~> 0.24', :group => [:development]
+  gem 'rubocop', '~> 0.27', :group => [:development]
 else
   gem 'execjs', '~> 2.0.2'
 end
-

data/README.md

@@ -95,7 +95,9 @@ Available options and their defaults are
   :source_root => nil,          # The URL of the directory which contains :source_filename
   :output_filename => nil,      # The filename or URL where the minified output can be found
   :input_source_map => nil,     # The contents of the source map describing the input
-  :screw_ie8 => false           # Don't bother to generate safe code for IE8
+  :screw_ie8 => false,          # Don't bother to generate safe code for IE8
+  :source_map_url => false,     # Url for source mapping to be appended in minified source
+  :source_url => false          # Url to original source to be appended in minified source
 }
 ```
 

data/lib/uglifier.rb

@@ -6,7 +6,9 @@ require "uglifier/version"
 
 # A wrapper around the UglifyJS interface
 class Uglifier
+  # Error class for compilation errors.
   Error = ExecJS::Error
+  # JavaScript code to call UglifyJS
   JS = <<-JS
     function comments(option) {
       if (Object.prototype.toString.call(option) === '[object Array]') {
@@ -55,6 +57,15 @@ class Uglifier
     var stream = UglifyJS.OutputStream(gen_code_options);
 
     ast.print(stream);
+
+    if (options.source_map_options.map_url) {
+      stream += "\\n//# sourceMappingURL=" + options.source_map_options.map_url;
+    }
+
+    if (options.source_map_options.url) {
+      stream += "\\n//# sourceURL=" + options.source_map_options.url;
+    }
+
     if (options.generate_map) {
         return [stream.toString(), source_map.toString()];
     } else {
@@ -62,7 +73,7 @@ class Uglifier
     }
   JS
 
-  # UglifyJS source patch
+  # UglifyJS source path
   SourcePath = File.expand_path("../uglify.js", __FILE__)
   # ES5 shims source path
   ES5FallbackPath = File.expand_path("../es5.js", __FILE__)
@@ -124,48 +135,45 @@ class Uglifier
     :source_root => nil, # The URL of the directory which contains :source_filename
     :output_filename => nil, # The filename or URL where the minified output can be found
     :input_source_map => nil, # The contents of the source map describing the input
-    :screw_ie8 => false # Don't bother to generate safe code for IE8
+    :screw_ie8 => false, # Don't bother to generate safe code for IE8
+    :source_map_url => false, # Url for source mapping to be appended in minified source
+    :source_url => false # Url for original source to be appended in minified source
   }
   # rubocop:enable LineLength
 
   # Minifies JavaScript code using implicit context.
   #
-  # source should be a String or IO object containing valid JavaScript.
-  # options contain optional overrides to Uglifier::DEFAULTS
-  #
-  # Returns minified code as String
+  # @param source [IO, String] valid JS source code.
+  # @param options [Hash] optional overrides to +Uglifier::DEFAULTS+
+  # @return [String] minified code.
   def self.compile(source, options = {})
     new(options).compile(source)
   end
 
   # Minifies JavaScript code and generates a source map using implicit context.
   #
-  # source should be a String or IO object containing valid JavaScript.
-  # options contain optional overrides to Uglifier::DEFAULTS
-  #
-  # Returns a pair of [minified code as String, source map as a String]
+  # @param source [IO, String] valid JS source code.
+  # @param options [Hash] optional overrides to +Uglifier::DEFAULTS+
+  # @return [Array(String, String)] minified code and source map.
   def self.compile_with_map(source, options = {})
     new(options).compile_with_map(source)
   end
 
   # Initialize new context for Uglifier with given options
   #
-  # options - Hash of options to override Uglifier::DEFAULTS
+  # @param options [Hash] optional overrides to +Uglifier::DEFAULTS+
   def initialize(options = {})
     (options.keys - DEFAULTS.keys - [:comments, :squeeze, :copyright])[0..1].each do |missing|
       raise ArgumentError, "Invalid option: #{missing}"
     end
     @options = options
-    @context = ExecJS.compile(File.open(ES5FallbackPath, "r:UTF-8").read +
-                              File.open(SplitFallbackPath, "r:UTF-8").read +
-                              File.open(SourcePath, "r:UTF-8").read)
+    @context = ExecJS.compile(uglifyjs_source)
   end
 
   # Minifies JavaScript code
   #
-  # source should be a String or IO object containing valid JavaScript.
-  #
-  # Returns minified code as String
+  # @param source [IO, String] valid JS source code.
+  # @return [String] minified code.
   def compile(source)
     run_uglifyjs(source, false)
   end
@@ -173,15 +181,20 @@ class Uglifier
 
   # Minifies JavaScript code and generates a source map
   #
-  # source should be a String or IO object containing valid JavaScript.
-  #
-  # Returns a pair of [minified code as String, source map as a String]
+  # @param source [IO, String] valid JS source code.
+  # @return [Array(String, String)] minified code and source map.
   def compile_with_map(source)
     run_uglifyjs(source, true)
   end
 
   private
 
+  def uglifyjs_source
+    [ES5FallbackPath, SplitFallbackPath, SourcePath].map do |file|
+      File.open(file, "r:UTF-8") { |f| f.read }
+    end.join("\n")
+  end
+
   # Run UglifyJS for given source code
   def run_uglifyjs(source, generate_map)
     @context.exec(Uglifier::JS % json_encode(
@@ -263,7 +276,9 @@ class Uglifier
     {
       :file => @options[:output_filename],
       :root => @options[:source_root],
-      :orig => @options[:input_source_map]
+      :orig => @options[:input_source_map],
+      :map_url => @options[:source_map_url],
+      :url => @options[:source_url]
     }
   end
 

data/lib/uglifier/version.rb

@@ -1,3 +1,4 @@
 class Uglifier
-  VERSION = "2.5.3"
+  # Current version of Uglifier.
+  VERSION = "2.6.0"
 end

data/spec/source_map_spec.rb

@@ -3,16 +3,8 @@ require 'stringio'
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Uglifier" do
-  it "generates source maps" do
-    source = File.open("lib/uglify.js", "r:UTF-8").read
-    minified, map = Uglifier.new.compile_with_map(source)
-    expect(minified.length).to be < source.length
-    expect(map.length).to be > 0
-    expect { JSON.parse(map) }.not_to raise_error
-  end
-
-  it "generates source maps with the correct meta-data" do
-    source = <<-JS
+  let(:source) do
+    <<-JS
       function hello () {
         function world () {
           return 2;
@@ -21,7 +13,17 @@ describe "Uglifier" do
         return world() + world();
       };
     JS
+  end
+
+  it "generates source maps" do
+    source = File.open("lib/uglify.js", "r:UTF-8").read
+    minified, map = Uglifier.new.compile_with_map(source)
+    expect(minified.length).to be < source.length
+    expect(map.length).to be > 0
+    expect { JSON.parse(map) }.not_to raise_error
+  end
 
+  it "generates source maps with the correct meta-data" do
     _, map = Uglifier.compile_with_map(source,
                                        :source_filename => "ahoy.js",
                                        :output_filename => "ahoy.min.js",
@@ -83,4 +85,26 @@ describe "Uglifier" do
     expect(map.mappings.first[:source_line]).to eq(1)
     expect(map.mappings.last[:source_line]).to eq(6)
   end
+
+  it "appens source map url" do
+    minified, _ = Uglifier.compile_with_map(
+      source,
+      :source_filename => "ahoy.js",
+      :output_filename => "ahoy.min.js",
+      :source_root => "http://localhost/",
+      :source_map_url => "http://example.com/map"
+    )
+    expect(minified).to include("\n//# sourceMappingURL=http://example.com/map")
+  end
+
+  it "appens source url" do
+    minified, _ = Uglifier.compile_with_map(
+      source,
+      :source_filename => "ahoy.js",
+      :output_filename => "ahoy.min.js",
+      :source_root => "http://localhost/",
+      :source_url => "http://example.com/source"
+    )
+    expect(minified).to include("\n//# sourceURL=http://example.com/source")
+  end
 end

data/uglifier.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "execjs", ">= 0.3.0"
   spec.add_runtime_dependency "json", ">= 1.8.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rake", "~> 10.3.0"
+  spec.add_development_dependency "rake", "~> 10.4"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rdoc", ">= 3.11"
   spec.add_development_dependency "source_map", ">= 0"

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.11'
 - !ruby/object:Gem::Dependency
   name: source_map
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible
@@ -118,12 +118,12 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gitignore
-- .gitmodules
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -151,17 +151,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for UglifyJS JavaScript compressor