sprockets_uglifier_with_source_maps 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de26fb885769b727d3482302529e5387b87f2cb
-  data.tar.gz: 05e46c1acfe11a7c7da62df1c221373b12a661c2
+  metadata.gz: 3a337e54ddbe94b21c24d01c16ef80f42ce052b6
+  data.tar.gz: c47b967d8c5932d52515834aa6c77db532c784c3
 SHA512:
-  metadata.gz: 6c5c1418015b92e5725cf1268dc0b31dc10cd454d7f7fecf1d97e2525e3d4cc727b70dac990c852d281e8d7c0607d0edee85296e06bc9f03d2165726a6fc7a1f
-  data.tar.gz: 5735157d5a94f232900da0cbc1414c2a5ba362b608b2fe81928824ebd1353aedc1d443b0722c92eab9f205a1761dd6dc33fb35f051e023e35b9fa1033d5f62ab
+  metadata.gz: 6f3de890ee08e02d318c79f46fcb5613b12619e35bd4f9ab1a159725897a52c2ed79a179b1099d29f1564c780cbcb9555ecbf3e43016da2bd4bfa722eba24628
+  data.tar.gz: 350ccacfb57d30b6027be5283c3a87d3cf88296f152c9744cfc193b859941f2a3a49988d6675a054111166c4e34faca53788d4c228eb12a06fe74dfad3acb5ba

data/lib/sprockets_uglifier_with_source_maps.rb

@@ -1,6 +1,5 @@
 require 'sprockets_uglifier_with_source_maps/version'
 require 'sprockets'
-require 'uglifier'
 require 'sprockets_uglifier_with_source_maps/compressor'
 Sprockets.register_compressor 'application/javascript', :uglifier_with_source_maps, SprocketsUglifierWithSM::Compressor
 Sprockets.register_compressor 'application/javascript', :uglify_with_source_maps, SprocketsUglifierWithSM::Compressor

data/lib/sprockets_uglifier_with_source_maps/compressor.rb

@@ -1,30 +1,45 @@
+require 'sprockets/digest_utils'
+require 'sprockets/uglifier_compressor'
+
 module SprocketsUglifierWithSM
   class Compressor < Sprockets::UglifierCompressor
 
-    def evaluate(context, locals, &block)
-      options = {comments: false}.merge!(Rails.application.config.assets.uglifier.to_h)
-      compressed_data, sourcemap = Uglifier.new(options).compile_with_map(data)
+    DEFAULTS = { comments: false }
+
+    def initialize(options = {})
+      # merge in any options passed in from our rails configuration - i wish
+      # rails actually did this by default :/
+      options = options.merge(DEFAULTS).merge!(Rails.application.config.assets.uglifier.to_h)
+      super options
+    end
+
+    def call(input)
+      data = input.fetch(:data)
+      name = input.fetch(:name)
+
+      compressed_data, sourcemap = @uglifier.compile_with_map(data)
 
-      uncompressed_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.uncompressed_prefix, "#{context.logical_path}-#{digest(data)}.js")
-      uncompressed_url = filename_to_url uncompressed_filename
+      uncompressed_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.uncompressed_prefix, "#{name}-#{digest(data)}.js")
+      uncompressed_url      = filename_to_url uncompressed_filename
 
-      sourcemap = JSON.parse(sourcemap)
-      sourcemap['file'] = "#{context.logical_path}.js"
+      sourcemap            = JSON.parse(sourcemap)
+      sourcemap['file']    = "#{name}.js"
       sourcemap['sources'] = [uncompressed_url]
+
       sourcemap = sourcemap.to_json
 
-      sourcemap_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.sourcemaps_prefix, "#{context.logical_path}-#{digest(sourcemap)}.js.map")
+      sourcemap_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.sourcemaps_prefix, "#{name}-#{digest(sourcemap)}.js.map")
 
-      sourcemap_path = File.join(Rails.public_path, sourcemap_filename)
+      sourcemap_path    = File.join(Rails.public_path, sourcemap_filename)
       uncompressed_path = File.join(Rails.public_path, uncompressed_filename)
       FileUtils.mkdir_p [File.dirname(sourcemap_path), File.dirname(uncompressed_path)]
       File.open(sourcemap_path, 'w') { |f| f.write sourcemap }
       File.open(uncompressed_path, 'w') { |f| f.write data }
 
       if Rails.application.config.assets.sourcemaps_gzip
-        [sourcemap_path,uncompressed_path ].each do |f|
+        [sourcemap_path, uncompressed_path].each do |f|
           Zlib::GzipWriter.open("#{f}.gz") do |gz|
-            gz.mtime = File.mtime(f)
+            gz.mtime     = File.mtime(f)
             gz.orig_name = f
             gz.write IO.binread(f)
           end
@@ -50,7 +65,7 @@ module SprocketsUglifierWithSM
     end
 
     def digest(io)
-      Rails.application.assets.digest.update(io).hexdigest
+      Sprockets::DigestUtils.pack_hexdigest Sprockets::DigestUtils.digest(io)
     end
   end
 end

data/lib/sprockets_uglifier_with_source_maps/railtie.rb

@@ -3,7 +3,7 @@ require 'action_controller/railtie'
 module SprocketsUglifierWithSM
   class Railtie < ::Rails::Railtie
 
-    initializer 'sprockets-uglifier-with-source-maps.environment', after: 'sprockets.environment', group: :all do |app|
+    initializer 'sprockets-uglifier-with-source-maps.environment', group: :all do |app|
       config = app.config
       config.assets.sourcemaps_prefix ||= 'maps'
       config.assets.uncompressed_prefix ||= 'sources'

data/lib/sprockets_uglifier_with_source_maps/version.rb

@@ -1,3 +1,3 @@
 module SprocketsUglifierWithSM
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/sprockets_uglifier_with_source_maps.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'sprockets-rails', '>= 3.0.0.beta1'
-  spec.add_runtime_dependency 'uglifier', '>= 2.5'
+  spec.add_runtime_dependency 'sprockets-rails', '~> 3.0'
+  spec.add_runtime_dependency 'uglifier', '~> 2.5'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: sprockets_uglifier_with_source_maps
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Pavlenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
@@ -104,8 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Create javascript source maps for your Rails 4.2 applications
 test_files: []
+has_rdoc: