sprockets_uglifier_with_source_maps 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93335675b385d5414755b625b2243a1af4aa6a81
-  data.tar.gz: 0c4532f47fdc81881b4e9a80bb3af018d370942d
+  metadata.gz: fe966a556721536fa55d4695e1bcd024c71bdde3
+  data.tar.gz: d23d9deecbbf9c2fcea3fd7543a44928425bd0e9
 SHA512:
-  metadata.gz: b3228b0eebf8f657de32befc52e6944ef61f86098562db05ade4fff1d57f1433dc1ccabbdc5d64e86a19a5a3a43a03e3ac252c7a8b0e2fac6c595707e6cede4a
-  data.tar.gz: 23eb2fbeaad91ca8491afba04fe585dc67d9d6c326fb279e29ee31c747e8fb258339068c621bd54aa728ee12bf47eab31b60f72bf31f73f3d7860902b122b30c
+  metadata.gz: 3fc0f191b883413078db8d1bc66dfd0f1d76db53873282175185e23e9936dc045ff97eb6547b7ef977905192d94f9b25755d6075026db66538aa683385a08168
+  data.tar.gz: d46c8f28bb7a3cba1c4ca04d05c5a47809ca3c88e1226a2329b870158033348ed3c4dd576c7a104dded37b233b33613314e052ecc36ed1d9b479d2a837ecaf52

data/README.md

@@ -25,7 +25,6 @@ Or install it yourself as:
 
     $ gem install sprockets_uglifier_with_source_maps
 
-
 ## Usage
 
 In your Rails applications environment configuration:
@@ -42,9 +41,13 @@ These subdirs may be configured:
     config.assets.sourcemaps_prefix = 'my_maps'
     config.assets.uncompressed_prefix = 'my_sources'
 
-You can optionally gzip your maps and sources as well (since these files live outside of the assets pipeline this won't happen automatically):
+Alternatively, sources can be embedded into sourcemaps' `sourcesContent` field:
+
+    config.assets.sourcemaps_embed_source = true
 
-    config.assets.sourcemaps_gzip = true
+You can optionally skip gzipping your maps and sources:
+
+    config.assets.sourcemaps_gzip = false
 
 By default maps and sources are defined relatively and will be fetched from the same domain your js file is served from. If you are using a CDN you may not want this - instead you might want to use a direct link to your site so you can more easily implement IP or Basic Auth protection:
 
@@ -75,6 +78,9 @@ If you use CloudFront you might want to generate a signed url for these files th
     $ head -c115 public/assets/maps/application-a3aff92c860f3876615c2d158f724865.js.map
     {"version":3,"file":"application.js","sources":["/assets/sources/application-73a007cf2d51c423a4420b649344b52e.js"],
 
+## Troubleshooting
+
+If sourcemaps are not generated, try `rm -rf tmp/cache`.
 
 ## Contributing
 

data/lib/sprockets_uglifier_with_source_maps/compressor.rb

@@ -7,9 +7,7 @@ module SprocketsUglifierWithSM
     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)
+      @options = DEFAULTS.merge(Rails.application.config.assets.uglifier.to_h).merge!(options)
       super @options
     end
 
@@ -18,41 +16,53 @@ module SprocketsUglifierWithSM
       name = input.fetch(:name)
 
       uglifier = Sprockets::Autoload::Uglifier.new(@options)
-      compressed_data, sourcemap = uglifier.compile_with_map(data)
 
-      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
+      compressed_data, sourcemap_json = uglifier.compile_with_map(data)
 
-      sourcemap            = JSON.parse(sourcemap)
-      sourcemap['file']    = "#{name}.js"
-      sourcemap['sources'] = [uncompressed_url]
+      sourcemap = JSON.parse(sourcemap_json)
 
-      sourcemap = sourcemap.to_json
-
-      sourcemap_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.sourcemaps_prefix, "#{name}-#{digest(sourcemap)}.js.map")
+      if Rails.application.config.assets.sourcemaps_embed_source
+        sourcemap['sourcesContent'] = [data]
+      else
+        uncompressed_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.uncompressed_prefix, "#{name}-#{digest(data)}.js")
+        uncompressed_path     = File.join(Rails.public_path, uncompressed_filename)
+        uncompressed_url      = filename_to_url(uncompressed_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 }
+        FileUtils.mkdir_p File.dirname(uncompressed_path)
+        File.open(uncompressed_path, 'w') { |f| f.write data }
+        gzip_file(uncompressed_path) if gzip?
 
-      if Rails.application.config.assets.sourcemaps_gzip
-        [sourcemap_path, uncompressed_path].each do |f|
-          Zlib::GzipWriter.open("#{f}.gz") do |gz|
-            gz.mtime     = File.mtime(f)
-            gz.orig_name = f
-            gz.write IO.binread(f)
-          end
-        end
+        sourcemap['sources'] = [uncompressed_url]
       end
+      sourcemap['file'] = "#{name}.js"
+
+      sourcemap_json     = sourcemap.to_json
+      sourcemap_filename = File.join(Rails.application.config.assets.prefix, Rails.application.config.assets.sourcemaps_prefix, "#{name}-#{digest(sourcemap_json)}.js.map")
+      sourcemap_path     = File.join(Rails.public_path, sourcemap_filename)
+      sourcemap_url      = filename_to_url(sourcemap_filename)
+
+      FileUtils.mkdir_p File.dirname(sourcemap_path)
+      File.open(sourcemap_path, 'w') { |f| f.write sourcemap_json }
+      gzip_file(sourcemap_path) if gzip?
 
-      sourcemap_url = filename_to_url sourcemap_filename
       compressed_data.concat "\n//# sourceMappingURL=#{sourcemap_url}\n"
     end
 
     private
 
+    def gzip?
+      config = Rails.application.config.assets
+      config.sourcemaps_gzip || (config.sourcemaps_gzip.nil? && config.gzip)
+    end
+
+    def gzip_file(path)
+      Zlib::GzipWriter.open("#{path}.gz") do |gz|
+        gz.mtime     = File.mtime(path)
+        gz.orig_name = path
+        gz.write IO.binread(path)
+      end
+    end
+
     def filename_to_url(filename)
       url_root = Rails.application.config.assets.sourcemaps_url_root
       case url_root

data/lib/sprockets_uglifier_with_source_maps/railtie.rb

@@ -7,7 +7,6 @@ module SprocketsUglifierWithSM
       config = app.config
       config.assets.sourcemaps_prefix ||= 'maps'
       config.assets.uncompressed_prefix ||= 'sources'
-      config.assets.sourcemaps_gzip ||= false
       config.assets.sourcemaps_url_root ||= false
     end
   end

data/lib/sprockets_uglifier_with_source_maps/version.rb

@@ -1,3 +1,3 @@
 module SprocketsUglifierWithSM
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets_uglifier_with_source_maps
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexander Pavlenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets-rails