squash_javascript 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e35a0503ef448fa8f429d08cb40018c2517212
-  data.tar.gz: 697f9aff6acb9315352be561122f69a103f6b4c7
+  metadata.gz: 68f1704dc23d354b114eab772f1959406ffa1087
+  data.tar.gz: 28e4307569359cc8a069c665e85746c6967be568
 SHA512:
-  metadata.gz: d7e5d2d20a98a2fca3e9745776cd434d1b7059cd91378188a34e8f950872e0d87078a0e4898cf2993282cc60857b4d582f2f2895728f0757216fe974afd3b576
-  data.tar.gz: 83e11c7ad7ae4cd6d7bed4d6006d98b8b767734914863be212e20ec4d8b96813d2959ccf9ceb9be57847c27f68057bd7d352ed5349791b760c766f7f604ad9fd
+  metadata.gz: 88a3ae10fdf148cea0aa4b05f7ef986de4710e372b3c92199eb51f49229911944589765f486f922a119863ae7273be88eb23b9c07702292159ff64f28bf9dbd8
+  data.tar.gz: ecab0f1059e9d3af1f0d2f0fd7aa382ddd485d39133ba91608886be0fc55a19e14c288241d0a8203f90ba01dfdaecec50c131fae6049dd2d471329741dc88bcc

data/lib/squash/javascript/patches.rb

@@ -4,6 +4,15 @@ require 'sprockets'
 # @private
 class Sprockets::Asset
   def sourcemap
+    resource_path = [Rails.application.config.assets.prefix, logical_path].join('/')
+
+    if included
+      return included.inject(SourceMap::Map.new([], resource_path)) do |map, path|
+        asset = @environment.load(path)
+        asset.sourcemap + map
+      end
+    end
+
     relative_path = if pathname.to_s.include?(Rails.root.to_s)
                       pathname.relative_path_from(Rails.root)
                     else
@@ -12,7 +21,6 @@ class Sprockets::Asset
     # any extensions after the ".js" can be removed, because they will have
     # already been processed
     relative_path.gsub! /(?<=\.js)\..*$/, ''
-    resource_path = [Rails.application.config.assets.prefix, logical_path].join('/')
 
     mappings = Array.new
     to_s.lines.each_with_index do |_, index|
@@ -22,12 +30,3 @@ class Sprockets::Asset
     SourceMap::Map.new(mappings, resource_path)
   end
 end
-
-# @private
-class Sprockets::BundledAsset < Sprockets::Asset
-  def sourcemap
-    to_a.inject(SourceMap::Map.new) do |map, asset|
-      map + asset.sourcemap
-    end
-  end
-end

data/lib/squash/javascript/tasks/sourcemaps.rake

@@ -34,7 +34,7 @@ namespace :sourcemaps do
       Rails.application.assets.each_logical_path(Rails.application.config.assets.precompile) do |path|
         next unless path.end_with?('.js')
         asset = Rails.application.assets.find_asset(path)
-        next unless asset.kind_of?(Sprockets::BundledAsset)
+        next unless asset.included
         map = asset.sourcemap
         Squash::Uploader.new(Squash::Ruby.configuration(:api_host),
                              skip_verification: Squash::Ruby.configuration(:skip_verification)
@@ -45,7 +45,7 @@ namespace :sourcemaps do
                        'revision'    => Squash::Ruby.current_revision,
                        'sourcemap'   => Base64.encode64(Zlib::Deflate.deflate(map.as_json.to_json)),
                        'from'        => 'concatenated',
-                       'to'          => 'compiled',
+                       'to'          => 'compiled'
                    }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squash_javascript
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Tim Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Squash client for JavaScript projects