optimize-js 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915f704285fce599270dc45534481e0ae1bc8bb1
-  data.tar.gz: d81dd20291c07af188f0bc7ffaae32a5a2f4a35a
+  metadata.gz: f6e94f7d70d435d2aa88e38dad070121faa1e9a4
+  data.tar.gz: 4864ce820894cd9fe44007b9f98195583982b528
 SHA512:
-  metadata.gz: 94068f2bdf737177e24d7b3f4f77da29855f73e585b529e954ab645190591464b777a08a99da94d5b7ce64ecd6c988bddc9fdf79346f7d623c7283c46bb391e4
-  data.tar.gz: 3eb6f9f753f36fdff6810af70b116bee9f97a61f5ec71faa1aa693975e77afc93bcbd5b2956eb5df3638e1c9dfcf675367f5a9e98da7aeec6577c8db1a6a32fd
+  metadata.gz: 2d36e60193c79e776bb75e74968544c5cc413b6c68b3ca78bdad8695e5a35a275a095926d72af3b2681fa9da51b6e1a78091f00241a745b3ceb7b8e802436a4e
+  data.tar.gz: 136820a3d75ff31cbe98bc2cadeae64044556304d6db332b2761b1b0f8591caf0370aa734953c49d4e5d263db61e6f3b0cd9710b49a618a3c840b501dc31bd67

data/Appraisals

@@ -1,18 +1,22 @@
 appraise 'rails-3' do
   gem 'rails', '~> 3'
   gem 'sprockets', '~> 2'
+  gem 'uglifier'
 end
 
 appraise 'rails-4-with-sprockets-2' do
   gem 'rails', '~> 4'
   gem 'sprockets', '~> 3'
+  gem 'uglifier'
 end
 
 appraise 'rails-4-with-sprockets-3' do
   gem 'rails', '~> 4'
   gem 'sprockets', '~> 3'
+  gem 'uglifier'
 end
 
 appraise 'rails-5' do
   gem 'rails', '~> 5'
+  gem 'uglifier'
 end

data/Gemfile

@@ -3,3 +3,5 @@
 
 source 'https://rubygems.org'
 gemspec
+gem 'rails', '~> 4.2'
+gem 'uglifier'

data/Gemfile.lock

@@ -1,22 +1,115 @@
 PATH
   remote: .
   specs:
-    optimize-js (1.0)
+    optimize-js (1.0.1)
       execjs (>= 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    actionmailer (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.7.1)
+      actionview (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
+      builder (~> 3.1)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      arel (~> 6.0)
+    activesupport (4.2.7.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
+    arel (6.0.3)
+    builder (3.2.2)
+    concurrent-ruby (1.0.3)
+    erubis (2.7.0)
     execjs (2.7.0)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
     power_assert (0.3.1)
+    rack (1.6.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.7.1)
+      actionmailer (= 4.2.7.1)
+      actionpack (= 4.2.7.1)
+      actionview (= 4.2.7.1)
+      activejob (= 4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activerecord (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.7.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.7.1)
+      actionpack (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     test-unit (3.1.9)
       power_assert
     thor (0.19.4)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -25,8 +118,10 @@ DEPENDENCIES
   appraisal (~> 2.1)
   bundler (~> 1.7)
   optimize-js!
+  rails (~> 4.2)
   rake (~> 10.0)
   test-unit (~> 3.1)
+  uglifier
 
 BUNDLED WITH
    1.13.2

data/gemfiles/rails_3.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3"
+gem "uglifier"
 gem "sprockets", "~> 2"
 
 gemspec :path => "../"

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    optimize-js (1.0)
+    optimize-js (1.0.1)
       execjs (>= 1)
 
 GEM
@@ -91,6 +91,8 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.52)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -103,6 +105,7 @@ DEPENDENCIES
   rake (~> 10.0)
   sprockets (~> 2)
   test-unit (~> 3.1)
+  uglifier
 
 BUNDLED WITH
    1.13.2

data/gemfiles/rails_4_with_sprockets_2.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4"
+gem "uglifier"
 gem "sprockets", "~> 3"
 
 gemspec :path => "../"

data/gemfiles/rails_4_with_sprockets_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    optimize-js (1.0)
+    optimize-js (1.0.1)
       execjs (>= 1)
 
 GEM
@@ -108,6 +108,8 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -120,6 +122,7 @@ DEPENDENCIES
   rake (~> 10.0)
   sprockets (~> 3)
   test-unit (~> 3.1)
+  uglifier
 
 BUNDLED WITH
    1.13.2

data/gemfiles/rails_4_with_sprockets_3.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4"
+gem "uglifier"
 gem "sprockets", "~> 3"
 
 gemspec :path => "../"

data/gemfiles/rails_4_with_sprockets_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    optimize-js (1.0)
+    optimize-js (1.0.1)
       execjs (>= 1)
 
 GEM
@@ -108,6 +108,8 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -120,6 +122,7 @@ DEPENDENCIES
   rake (~> 10.0)
   sprockets (~> 3)
   test-unit (~> 3.1)
+  uglifier
 
 BUNDLED WITH
    1.13.2

data/gemfiles/rails_5.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5"
+gem "uglifier"
 
 gemspec :path => "../"

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    optimize-js (1.0)
+    optimize-js (1.0.1)
       execjs (>= 1)
 
 GEM
@@ -110,6 +110,8 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    uglifier (3.0.4)
+      execjs (>= 0.3.0, < 3)
     websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -124,6 +126,7 @@ DEPENDENCIES
   rails (~> 5)
   rake (~> 10.0)
   test-unit (~> 3.1)
+  uglifier
 
 BUNDLED WITH
    1.13.2

data/lib/optimize-js.rb

@@ -25,4 +25,5 @@ module OptimizeJS
   end
 end
 
+require 'optimize-js/sprockets-patch'
 require 'optimize-js/railtie' if defined?(Rails)

data/lib/optimize-js/railtie.rb

@@ -16,8 +16,10 @@ class OptimizeJS::Railtie < Rails::Railtie
 
   initializer 'sprockets.optimize_js', group: :all, after: 'sprockets.environment' do |app|
     configure_assets(app) do |env|
-      # Sprockets 2, 3, and 4
-      env.register_bundle_processor 'application/javascript', OptimizeJS::SprocketsProcessor
+      unless app.config.assets.compile
+        env.register_bundle_processor 'application/javascript', OptimizeJS::SprocketsProcessor
+      end
     end
   end
 end
+

data/lib/optimize-js/sprockets-patch.rb

@@ -0,0 +1,19 @@
+def OptimizeJS.patch_sprockets_js_compressor(base)
+  base.instance_exec do
+    alias_method :original_js_compressor=, :js_compressor=
+
+    define_method :js_compressor= do |compressor|
+      unregister_bundle_processor 'application/javascript', OptimizeJS::SprocketsProcessor
+      send(:original_js_compressor=, compressor)
+      register_bundle_processor 'application/javascript', OptimizeJS::SprocketsProcessor
+    end
+  end
+end
+
+begin
+  require 'sprockets/compressing'
+  OptimizeJS.patch_sprockets_js_compressor Sprockets::Compressing
+rescue LoadError
+  require 'sprockets/processing'
+  OptimizeJS.patch_sprockets_js_compressor Sprockets::Processing
+end

data/lib/optimize-js/sprockets-processor.rb

@@ -9,7 +9,7 @@ class OptimizeJS::SprocketsProcessor
     @source   = block.call
   end
 
-  def render(context, empty_hash_wtf)
+  def render(context, _)
     self.class.run(@filename, @source, context)
   end
 

data/lib/optimize-js/version.rb

@@ -2,6 +2,6 @@
 # frozen_string_literal: true
 
 module OptimizeJS
-  GEM_VERSION = '1.0.1'
+  GEM_VERSION = '1.0.2'
   JS_VERSION = '1.0.2'
 end

data/test/fixtures/javascripts/application.js

@@ -1 +1,4 @@
-!function() {}();
+// =require_self
+// =require application/foo
+
+!function() { console.log('application.js'); }();

data/test/fixtures/javascripts/application/foo.js

@@ -0,0 +1 @@
+!function() { console.log('foo.js'); }();

data/test/test-rails-integration.rb

@@ -19,9 +19,13 @@ class RailsIntegrationTest < Test::Unit::TestCase
     app = create_rails_application
     app.initialize!
     task = create_sprockets_task(app)
-
     task.instance_exec { manifest.compile(assets) }
-    assert_equal app.assets['application.js'].to_s.strip, '!(function() {})();'
+
+    expected = <<-JAVASCRIPT.strip
+      !(function(){console.log("application.js")})(),!(function(){console.log("foo.js")})();
+    JAVASCRIPT
+    
+    assert_equal expected, app.assets['application.js'].to_s.strip
   end
 
   def setup
@@ -46,8 +50,10 @@ private
       config.assets.enabled = true
       config.assets.gzip = false
       config.assets.paths = [Rails.root.join('test/fixtures/javascripts').to_s]
-      config.assets.precompile = %w( 'application.js' )
-      config.paths['public'] = Rails.root.join('tmp').to_s
+      config.assets.precompile = %w( application.js )
+      config.assets.js_compressor = :uglifier
+      config.assets.compress = true
+      config.paths['public'] = [Rails.root.join('tmp').to_s]
       config.active_support.deprecation = :stderr
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: optimize-js
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-10 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -106,11 +106,13 @@ files:
 - gemfiles/rails_5.gemfile.lock
 - lib/optimize-js.rb
 - lib/optimize-js/railtie.rb
+- lib/optimize-js/sprockets-patch.rb
 - lib/optimize-js/sprockets-processor.rb
 - lib/optimize-js/version.rb
 - optimize-js.gemspec
 - optimize-js.web.min.js
 - test/fixtures/javascripts/application.js
+- test/fixtures/javascripts/application/foo.js
 - test/test-optimize-js.rb
 - test/test-rails-integration.rb
 - test/test-sprockets-integration.rb
@@ -140,6 +142,7 @@ specification_version: 4
 summary: Ruby wrapper and Rails asset pipeline integration for optimize-js.
 test_files:
 - test/fixtures/javascripts/application.js
+- test/fixtures/javascripts/application/foo.js
 - test/test-optimize-js.rb
 - test/test-rails-integration.rb
 - test/test-sprockets-integration.rb