sprockets 4.0.0.beta2 → 4.0.0.beta3

data/lib/sprockets/resolve.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'sprockets/http_utils'
 require 'sprockets/path_dependency_utils'
@@ -46,7 +47,7 @@ module Sprockets
       uri, deps = resolve(path, **kargs)
 
       unless uri
-        message = "couldn't find file '#{path}'"
+        message = String.new("couldn't find file '#{path}'")
 
         if relative_path?(path) && kargs[:base_path]
           load_path, _ = paths_split(config[:paths], kargs[:base_path])

data/lib/sprockets/sass_cache_store.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sass'
 
 module Sprockets

data/lib/sprockets/sass_compressor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/autoload'
 require 'sprockets/digest_utils'
 require 'sprockets/source_map_utils'

data/lib/sprockets/sass_functions.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 # Deprecated: Require sprockets/sass_processor instead
 require 'sprockets/sass_processor'

data/lib/sprockets/sass_importer.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 # Deprecated: Require sprockets/sass_processor instead
 require 'sprockets/sass_processor'

data/lib/sprockets/sass_processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rack/utils'
 require 'sprockets/autoload'
 require 'sprockets/source_map_utils'
@@ -81,7 +82,10 @@ module Sprockets
 
       map = SourceMapUtils.combine_source_maps(
         input[:metadata][:map],
-        SourceMapUtils.decode_json_source_map(map.to_json(css_uri: '', type: :inline))["mappings"]
+        expand_map_sources(
+          SourceMapUtils.decode_json_source_map(map.to_json(css_uri: '', type: :inline))["mappings"],
+          input[:environment]
+        )
       )
 
       # Track all imported files
@@ -94,6 +98,16 @@ module Sprockets
       context.metadata.merge(data: css, sass_dependencies: sass_dependencies, map: map)
     end
 
+    private
+
+    def expand_map_sources(mapping, env)
+      mapping.each do |map|
+        uri, _ = env.resolve!(map[:source], pipeline: :source)
+        source_path = env.load(uri).digest_path
+        map[:source] = source_path
+      end
+    end
+
     # Public: Build the cache store to be used by the Sass engine.
     #
     # input - the input hash.
@@ -104,7 +118,6 @@ module Sprockets
     def build_cache_store(input, version)
       CacheStore.new(input[:cache], version)
     end
-    private :build_cache_store
 
     def merge_options(options)
       defaults = @sass_config.dup
@@ -116,7 +129,6 @@ module Sprockets
       options.merge!(defaults)
       options
     end
-    private :merge_options
 
     # Public: Functions injected into Sass context during Sprockets evaluation.
     #

data/lib/sprockets/sassc_compressor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/autoload'
 require 'sprockets/sass_compressor'
 require 'base64'
@@ -14,7 +15,9 @@ module Sprockets
     end
 
     def call(input)
-      data = Autoload::SassC::Engine.new(input[:data], @options.merge(filename: 'filename')).render
+      # SassC requires the template to be modifiable
+      input_data = input[:data].frozen? ? input[:data].dup : input[:data]
+      data = Autoload::SassC::Engine.new(input_data, @options.merge(filename: 'filename')).render
 
       match_data = data.match(/(.*)\n\/\*# sourceMappingURL=data:application\/json;base64,(.+) \*\//m)
       css, map = match_data[1], Base64.decode64(match_data[2])

data/lib/sprockets/sassc_processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/sass_processor'
 require 'base64'
 
@@ -33,6 +34,10 @@ module Sprockets
         change_source(SourceMapUtils.decode_json_source_map(map)["mappings"], input[:source_path])
       )
 
+      engine.dependencies.each do |dependency|
+        context.metadata[:dependencies] << URIUtils.build_file_digest_uri(dependency.filename)
+      end
+
       context.metadata.merge(data: css, map: map)
     end
 

data/lib/sprockets/server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 require 'time'
 require 'rack/utils'
@@ -234,7 +235,7 @@ module Sprockets
         headers = {}
 
         # Set caching headers
-        headers["Cache-Control"] = "public"
+        headers["Cache-Control"] = String.new("public")
         headers["ETag"]          = %("#{etag}")
 
         # If the request url contains a fingerprint, set a long

data/lib/sprockets/source_map_comment_processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sprockets
   class SourceMapCommentProcessor
     def self.call(input)

data/lib/sprockets/source_map_processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 
 module Sprockets
@@ -20,6 +21,12 @@ module Sprockets
       asset  = env.load(uri)
       map    = asset.metadata[:map] || []
 
+      # TODO: Because of the default piplene hack we have to apply dependencies
+      #       from compiled asset to the source map, otherwise the source map cache
+      #       will never detect the changes from directives
+      dependencies = Set.new(input[:metadata][:dependencies])
+      dependencies.merge(asset.metadata[:dependencies])
+
       map.map { |m| m[:source] }.uniq.compact.each do |source|
         # TODO: Resolve should expect fingerprints
         fingerprint = source[/-([0-9a-f]{7,128})\.[^.]+\z/, 1]
@@ -29,12 +36,12 @@ module Sprockets
           path = source
         end
         uri, _ = env.resolve!(path)
-        links << env.load(uri).uri
+        links << uri
       end
 
       json = env.encode_json_source_map(map, filename: asset.logical_path)
 
-      { data: json, links: links }
+      { data: json, links: links, dependencies: dependencies }
     end
   end
 end

data/lib/sprockets/source_map_utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'json'
 
 module Sprockets

data/lib/sprockets/transformers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/http_utils'
 require 'sprockets/processor_utils'
 require 'sprockets/utils'

data/lib/sprockets/uglifier_compressor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/autoload'
 require 'sprockets/digest_utils'
 require 'sprockets/source_map_utils'
@@ -16,7 +17,7 @@ module Sprockets
   #       Sprockets::UglifierCompressor.new(comments: :copyright)
   #
   class UglifierCompressor
-    VERSION = '2'
+    VERSION = '3'
 
     # Public: Return singleton instance with default options.
     #
@@ -36,27 +37,23 @@ module Sprockets
     attr_reader :cache_key
 
     def initialize(options = {})
-      # Feature detect Uglifier 2.0 option support
-      if Autoload::Uglifier::DEFAULTS[:copyright]
-        # Uglifier < 2.x
-        options[:copyright] ||= false
-      else
-        # Uglifier >= 2.x
-        options[:copyright] ||= :none
-      end
+      options[:comments] ||= :none
 
-      @uglifier = Autoload::Uglifier.new(options)
+      @options = options
       @cache_key = "#{self.class.name}:#{Autoload::Uglifier::VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze
     end
 
     def call(input)
-      js, map = @uglifier.compile_with_map(input[:data])
+      if Autoload::Uglifier::VERSION.to_i < 2
+        raise "uglifier 1.x is no longer supported, please upgrade to 2.x"
+      end
+      @uglifier ||= Autoload::Uglifier.new(@options)
 
+      js, map = @uglifier.compile_with_map(input[:data])
       map = SourceMapUtils.combine_source_maps(
         input[:metadata][:map],
         SourceMapUtils.decode_json_source_map(map)["mappings"]
       )
-
       { data: js, map: map }
     end
   end

data/lib/sprockets/unloaded_asset.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/uri_utils'
 require 'sprockets/uri_tar'
 

data/lib/sprockets/uri_tar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/path_utils'
 
 module Sprockets
@@ -14,10 +15,8 @@ module Sprockets
       @env  = env
       uri   = uri.to_s
       if uri.include?("://".freeze)
-        uri_array = uri.split("://".freeze)
-        @scheme   = uri_array.shift
-        @scheme   << "://".freeze
-        @path     = uri_array.join("".freeze)
+        @scheme, _, @path = uri.partition("://".freeze)
+        @scheme << "://".freeze
       else
         @scheme = "".freeze
         @path   = uri

data/lib/sprockets/uri_utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'uri'
 
 module Sprockets
@@ -57,7 +58,7 @@ module Sprockets
     #
     # Returns String.
     def join_file_uri(scheme, host, path, query)
-      str = "#{scheme}://"
+      str = String.new("#{scheme}://")
       str << host if host
       path = "/#{path}" unless path.start_with?("/".freeze)
       str << URI::Generic::DEFAULT_PARSER.escape(path)

data/lib/sprockets/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'set'
 
 module Sprockets
@@ -75,16 +76,19 @@ module Sprockets
     def string_end_with_semicolon?(str)
       i = str.size - 1
       while i >= 0
-        c = str[i]
+        c = str[i].ord
         i -= 1
-        if c == "\n" || c == " " || c == "\t"
-          next
-        elsif c != ";"
-          return false
-        else
-          return true
+
+        # Need to compare against the ordinals because the string can be UTF_8 or UTF_32LE encoded
+        # 0x0A == "\n"
+        # 0x20 == " "
+        # 0x09 == "\t"
+        # 0x3B == ";"
+        unless c == 0x0A || c == 0x20 || c == 0x09
+          return c === 0x3B
         end
       end
+
       true
     end
 
@@ -96,11 +100,21 @@ module Sprockets
     #
     # Returns buf String.
     def concat_javascript_sources(buf, source)
-      if buf.bytesize > 0
-        buf << ";" unless string_end_with_semicolon?(buf)
-        buf << "\n" unless buf.end_with?("\n")
+      if source.bytesize > 0
+        buf << source
+
+        # If the source contains non-ASCII characters, indexing on it becomes O(N).
+        # This will lead to O(N^2) performance in string_end_with_semicolon?, so we should use 32 bit encoding to make sure indexing stays O(1)
+        source = source.encode(Encoding::UTF_32LE) unless source.ascii_only?
+
+        if !string_end_with_semicolon?(source)
+          buf << ";\n"
+        elsif source[source.size - 1].ord != 0x0A
+          buf << "\n"
+        end
       end
-      buf << source
+
+      buf
     end
 
     # Internal: Inject into target module for the duration of the block.

data/lib/sprockets/utils/gzip.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sprockets
   module Utils
     class Gzip

data/lib/sprockets/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Sprockets
-  VERSION = "4.0.0.beta2"
+  VERSION = "4.0.0.beta3"
 end

data/lib/sprockets/yui_compressor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'sprockets/autoload'
 require 'sprockets/digest_utils'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack