sprockets 3.0.0.beta.3 → 3.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d80e59406f8e4f42c73b61fc3aa9a8e7b6cd6b37
-  data.tar.gz: fb62b74a69585406a2a5b0628d668ca5e2d50467
+  metadata.gz: bfc75742a9bbe41f39e393933281cc8210d2e2f2
+  data.tar.gz: ceaf8d045782996a37e7e00f48084bf8fbbd7355
 SHA512:
-  metadata.gz: 2b1ba31c1909eba6bb44ad66959b731cd1cef3b8d3c6775ba522da5bf0b825407c0c74587aa8810fffb1df34ec2e696def2990b48e0dcfae4ffac9dfd6270ea7
-  data.tar.gz: a4d49277f457e15d2f9562654a7dcd9e9cda745d867f36446f3a649bafda9d2f017ba05c0e30acadbb5f6006c7f97990dbeb8b613eb33b8f6a6333723aa8d97b
+  metadata.gz: c59092430bb9da574a2fcbb28b1e2d3ef69dfcfc38103e6e95da4de969e8ce6526d24e2900041bd76d9327453f385386e8225684ea8ade1fa20d740cbdf44897
+  data.tar.gz: 95594832c3a2911d30d3e467271d66fc1f367472b4617e4b5137ed70e2c30aa6124cadf6a4a06bced8f00874a9a5481d2a21a7e45813d5f652e77b7772424946

data/lib/sprockets.rb

@@ -40,23 +40,25 @@ module Sprockets
 
   # Extend Sprockets module to provide global registry
   require 'sprockets/configuration'
+  require 'sprockets/context'
   extend Configuration
 
-  @root              = File.expand_path('..', __FILE__).freeze
-  @paths             = [].freeze
-  @mime_types        = {}.freeze
-  @mime_exts         = {}.freeze
-  @encodings         = {}.freeze
-  @engines           = {}.freeze
-  @engine_mime_types = {}.freeze
-  @transformers      = Hash.new { |h, k| {}.freeze }.freeze
-  @preprocessors     = Hash.new { |h, k| [].freeze }.freeze
-  @postprocessors    = Hash.new { |h, k| [].freeze }.freeze
-  @bundle_reducers   = Hash.new { |h, k| {}.freeze }.freeze
-  @bundle_processors = Hash.new { |h, k| [].freeze }.freeze
-  @compressors       = Hash.new { |h, k| {}.freeze }.freeze
-  @context_class     = Context
-  @version           = ''
+  @root                  = File.expand_path('..', __FILE__).freeze
+  @paths                 = [].freeze
+  @mime_types            = {}.freeze
+  @mime_exts             = {}.freeze
+  @encodings             = {}.freeze
+  @engines               = {}.freeze
+  @engine_mime_types     = {}.freeze
+  @transformers          = Hash.new { |h, k| {}.freeze }.freeze
+  @inverted_transformers = Hash.new { |h, k| {}.freeze }.freeze
+  @preprocessors         = Hash.new { |h, k| [].freeze }.freeze
+  @postprocessors        = Hash.new { |h, k| [].freeze }.freeze
+  @bundle_reducers       = Hash.new { |h, k| {}.freeze }.freeze
+  @bundle_processors     = Hash.new { |h, k| [].freeze }.freeze
+  @compressors           = Hash.new { |h, k| {}.freeze }.freeze
+  @context_class         = Context
+  @version               = ''
 
   # Set the default digest
   require 'digest/sha2'
@@ -106,16 +108,17 @@ module Sprockets
   register_encoding :gzip,    EncodingUtils::GZIP
   register_encoding :base64,  EncodingUtils::BASE64
 
+  require 'sprockets/directive_processor'
   register_preprocessor 'text/css', DirectiveProcessor
   register_preprocessor 'application/javascript', DirectiveProcessor
 
+  require 'sprockets/bundle'
   register_bundle_processor 'application/javascript', Bundle
   register_bundle_processor 'text/css', Bundle
 
-  register_bundle_reducer '*/*', :data, :+
-  register_bundle_reducer 'application/javascript', :data, Utils.method(:concat_javascript_sources)
-  register_bundle_reducer '*/*', :dependency_paths, :+
-  register_bundle_reducer '*/*', :links, :+
+  register_bundle_metadata_reducer '*/*', :data, :+
+  register_bundle_metadata_reducer 'application/javascript', :data, Utils.method(:concat_javascript_sources)
+  register_bundle_metadata_reducer '*/*', :links, :+
 
   register_compressor 'text/css', :sass, LazyProcessor.new { SassCompressor }
   register_compressor 'text/css', :scss, LazyProcessor.new { SassCompressor }

data/lib/sprockets/asset.rb

@@ -15,11 +15,19 @@ module Sprockets
     #
     # Returns Asset.
     def initialize(environment, attributes = {})
-      @environment = environment
-      @attributes = attributes
-      attributes.each do |name, value|
-        instance_variable_set("@#{name}", value)
-      end
+      @environment  = environment
+      @attributes   = attributes
+      @content_type = attributes[:content_type]
+      @filename     = attributes[:filename]
+      @id           = attributes[:id]
+      @integrity    = attributes[:integrity]
+      @load_path    = attributes[:load_path]
+      @logical_path = attributes[:logical_path]
+      @metadata     = attributes[:metadata]
+      @mtime        = attributes[:mtime]
+      @name         = attributes[:name]
+      @source       = attributes[:source]
+      @uri          = attributes[:uri]
     end
 
     # Internal: Return all internal instance variables as a hash.
@@ -104,7 +112,7 @@ module Sprockets
     # Returns Array of Assets.
     def to_a
       if metadata[:included]
-        metadata[:included].map { |uri| @environment.find_asset_by_uri(uri) }
+        metadata[:included].map { |uri| @environment.load(uri) }
       else
         [self]
       end
@@ -123,7 +131,7 @@ module Sprockets
     #
     # Returns String.
     def source
-      if defined? @source
+      if @source
         @source
       else
         # File is read everytime to avoid memory bloat of large binary files
@@ -150,10 +158,14 @@ module Sprockets
     # Public: Get charset of source.
     #
     # Returns a String charset name or nil if binary.
-    attr_reader :charset
+    def charset
+      metadata[:charset]
+    end
 
     # Public: Returns Integer length of source.
-    attr_reader :length
+    def length
+      metadata[:length]
+    end
     alias_method :bytesize, :length
 
     # Deprecated: Returns Time of the last time the source was modified.
@@ -167,7 +179,7 @@ module Sprockets
 
     # Public: Returns String hexdigest of source.
     def hexdigest
-      DigestUtils.pack_hexdigest(@digest)
+      DigestUtils.pack_hexdigest(metadata[:digest])
     end
 
     # Deprecated: Returns String hexdigest of source.
@@ -180,7 +192,7 @@ module Sprockets
 
     # Public: Returns String base64 digest of source.
     def base64digest
-      DigestUtils.pack_base64digest(@digest)
+      DigestUtils.pack_base64digest(metadata[:digest])
     end
 
     # Public: A "named information" URL for subresource integrity.
@@ -197,7 +209,7 @@ module Sprockets
       yield to_s
     end
 
-    # Public: Save asset to disk.
+    # Deprecated: Save asset to disk.
     #
     # filename - String target
     #

data/lib/sprockets/asset_uri.rb

@@ -1,4 +1,3 @@
-require 'sprockets/errors'
 require 'uri'
 
 module Sprockets

data/lib/sprockets/base.rb

@@ -1,17 +1,25 @@
+require 'sprockets/asset_uri'
 require 'sprockets/asset'
 require 'sprockets/bower'
+require 'sprockets/cache'
+require 'sprockets/configuration'
+require 'sprockets/digest_utils'
 require 'sprockets/errors'
+require 'sprockets/http_utils'
 require 'sprockets/legacy'
+require 'sprockets/loader'
+require 'sprockets/path_digest_utils'
+require 'sprockets/path_utils'
 require 'sprockets/resolve'
 require 'sprockets/server'
 
 module Sprockets
   # `Base` class for `Environment` and `Cached`.
   class Base
-    include PathUtils, HTTPUtils, DigestUtils
+    include PathDigestUtils, PathUtils, HTTPUtils, DigestUtils
     include Configuration
     include Server
-    include Resolve
+    include Resolve, Loader
     include Bower
     include Legacy
 
@@ -46,41 +54,18 @@ module Sprockets
         # disk. Also, the mtime is only read to the nearest second. Its
         # also possible the file was updated more than once in a given second.
         cache.fetch(['file_digest', path, stat.mtime.to_i]) do
-          if stat.directory?
-            # If its a directive, digest the list of filenames
-            digest_class.digest(self.entries(path).join(','))
-          elsif stat.file?
-            # If its a file, digest the contents
-            digest_class.file(path.to_s).digest
-          end
+          self.stat_digest(path, stat)
         end
       end
     end
 
-    # Internal: Compute digest for a set of paths.
-    #
-    # paths - Array of filename or directory paths.
-    #
-    # Returns a String digest.
-    def files_digest(paths)
-      digest(paths.map { |path| file_digest(path) })
-    end
-
     # Find asset by logical path or expanded path.
     def find_asset(path, options = {})
-      if uri = resolve_asset_uri(path, options)
-        Asset.new(self, build_asset_by_uri(uri))
+      if uri = locate(path, options)
+        load(uri)
       end
     end
 
-    def find_asset_by_uri(uri)
-      _, params = AssetURI.parse(uri)
-      asset = params.key?(:id) ?
-        build_asset_by_id_uri(uri) :
-        build_asset_by_uri(uri)
-      Asset.new(self, asset)
-    end
-
     def find_all_linked_assets(path, options = {})
       return to_enum(__method__, path, options) unless block_given?
 
@@ -91,7 +76,7 @@ module Sprockets
       stack = asset.links.to_a
 
       while uri = stack.shift
-        yield asset = find_asset_by_uri(uri)
+        yield asset = load(uri)
         stack = asset.links.to_a + stack
       end
 
@@ -112,103 +97,5 @@ module Sprockets
         "root=#{root.to_s.inspect}, " +
         "paths=#{paths.inspect}>"
     end
-
-    protected
-      def build_asset_by_id_uri(uri)
-        path, params = AssetURI.parse(uri)
-
-        # Internal assertion, should be routed through build_asset_by_uri
-        unless id = params.delete(:id)
-          raise ArgumentError, "expected uri to have an id: #{uri}"
-        end
-
-        asset = build_asset_by_uri(AssetURI.build(path, params))
-
-        if id && asset[:id] != id
-          raise VersionNotFound, "could not find specified id: #{id}"
-        end
-
-        asset
-      end
-
-      def build_asset_by_uri(uri)
-        filename, params = AssetURI.parse(uri)
-
-        # Internal assertion, should be routed through build_asset_by_id_uri
-        if params.key?(:id)
-          raise ArgumentError, "expected uri to have no id: #{uri}"
-        end
-
-        type = params[:type]
-        load_path, logical_path = paths_split(self.paths, filename)
-
-        if !file?(filename)
-          raise FileNotFound, "could not find file: #{filename}"
-        elsif type && !resolve_path_transform_type(filename, type)
-          raise ConversionError, "could not convert to type: #{type}"
-        elsif !load_path
-          raise FileOutsidePaths, "#{filename} is no longer under a load path: #{self.paths.join(', ')}"
-        end
-
-        logical_path, file_type, engine_extnames = parse_path_extnames(logical_path)
-        logical_path = normalize_logical_path(logical_path)
-
-        asset = {
-          uri: uri,
-          load_path: load_path,
-          filename: filename,
-          name: logical_path,
-          logical_path: logical_path
-        }
-
-        if type
-          asset[:content_type] = type
-          asset[:logical_path] += mime_types[type][:extensions].first
-        end
-
-        processed_processors = unwrap_preprocessors(file_type) +
-          unwrap_engines(engine_extnames).reverse +
-          unwrap_transformer(file_type, type) +
-          unwrap_postprocessors(type)
-
-        bundled_processors = params[:skip_bundle] ? [] : unwrap_bundle_processors(type)
-
-        processors = bundled_processors.any? ? bundled_processors : processed_processors
-        processors += unwrap_encoding_processors(params[:encoding])
-
-        # Read into memory and process if theres a processor pipeline or the
-        # content type is text.
-        if processors.any? || mime_type_charset_detecter(type)
-          asset.merge!(process(
-            [method(:read_input)] + processors,
-            asset[:uri],
-            asset[:filename],
-            asset[:load_path],
-            asset[:name],
-            asset[:content_type]
-          ))
-        else
-          asset.merge!({
-            encoding: Encoding::BINARY,
-            length: self.stat(asset[:filename]).size,
-            digest: file_digest(asset[:filename]),
-            metadata: {}
-          })
-        end
-
-        metadata = asset[:metadata]
-        metadata[:dependency_paths] = Set.new(metadata[:dependency_paths]).merge([asset[:filename]])
-        metadata[:dependency_sources_digest] = files_digest(metadata[:dependency_paths])
-
-        asset[:integrity] = integrity_uri(asset[:digest], asset[:content_type])
-
-        asset[:id]  = pack_hexdigest(digest(asset))
-        asset[:uri] = AssetURI.build(filename, params.merge(id: asset[:id]))
-
-        # TODO: Avoid tracking Asset mtime
-        asset[:mtime] = metadata[:dependency_paths].map { |p| stat(p).mtime.to_i }.max
-
-        asset
-      end
   end
 end

data/lib/sprockets/bundle.rb

@@ -1,3 +1,5 @@
+require 'sprockets/asset_uri'
+
 module Sprockets
   # Internal: Bundle processor takes a single file asset and prepends all the
   # `:required` URIs to the contents.
@@ -17,7 +19,7 @@ module Sprockets
       processed_uri = AssetURI.build(input[:filename], type: type, skip_bundle: true)
 
       cache = Hash.new do |h, uri|
-        h[uri] = env.find_asset_by_uri(uri)
+        h[uri] = env.load(uri)
       end
 
       find_required = proc { |uri| cache[uri].metadata[:required] }
@@ -26,7 +28,12 @@ module Sprockets
       required.subtract(stubbed)
       assets = required.map { |uri| cache[uri] }
 
-      env.process_bundle_reducers(assets, env.unwrap_bundle_reducers(type)).merge(included: assets.map(&:uri))
+      dependency_paths = Set.new
+      (required + stubbed).each do |uri|
+        dependency_paths += cache[uri].metadata[:dependency_paths]
+      end
+
+      env.process_bundle_reducers(assets, env.unwrap_bundle_reducers(type)).merge(dependency_paths: dependency_paths, included: assets.map(&:uri))
     end
   end
 end

data/lib/sprockets/cached_environment.rb

@@ -1,3 +1,4 @@
+require 'sprockets/asset_uri'
 require 'sprockets/base'
 
 module Sprockets
@@ -18,6 +19,7 @@ module Sprockets
       @stats   = Hash.new { |h, k| h[k] = _stat(k) }
       @entries = Hash.new { |h, k| h[k] = _entries(k) }
       @digests = Hash.new { |h, k| h[k] = _file_digest(k) }
+      @uris    = Hash.new { |h, k| h[k] = _load(k) }
     end
 
     # No-op return self as cached environment.
@@ -44,6 +46,12 @@ module Sprockets
       @digests[path]
     end
 
+    # Internal: Cache Environment#load
+    alias_method :_load, :load
+    def load(uri)
+      @uris[uri]
+    end
+
     protected
       def asset_dependency_graph_cache_key(uri)
         filename, _ = AssetURI.parse(uri)
@@ -57,39 +65,47 @@ module Sprockets
         ]
       end
 
-      def asset_digest_uri_cache_key(uri)
+      def asset_uri_cache_key(uri)
         [
-          'asset-digest-uri',
+          'asset-uri',
           VERSION,
           self.version,
           uri
         ]
       end
 
-      def build_asset_by_digest_uri(uri)
-        cache.fetch(asset_digest_uri_cache_key(uri)) do
+      def load_asset_by_id_uri(uri)
+        cache.fetch(asset_uri_cache_key(uri)) do
           super
         end
       end
 
-      def build_asset_by_uri(uri)
+      def load_asset_by_uri(uri)
         dep_graph_key = asset_dependency_graph_cache_key(uri)
 
-        dependency_paths, dependency_sources_digest, digest_uri = cache._get(dep_graph_key)
-        if dependency_paths && dependency_sources_digest && digest_uri
-          if files_digest(dependency_paths) == dependency_sources_digest
-            if asset = cache._get(asset_digest_uri_cache_key(digest_uri))
-              return asset
-            end
-          end
+        if asset = get_asset_dependency_graph_cache(dep_graph_key)
+          asset
+        else
+          asset = super
+          set_asset_dependency_graph_cache(dep_graph_key, asset)
+          asset
         end
+      end
 
-        asset = super
+      def get_asset_dependency_graph_cache(key)
+        return unless cached = cache._get(key)
+        paths, digest, uri = cached
 
-        dependency_sources_digest, dependency_paths = asset[:metadata].values_at(:dependency_sources_digest, :dependency_paths)
-        cache._set(dep_graph_key, [dependency_paths, dependency_sources_digest, asset[:uri]])
-        cache.fetch(asset_digest_uri_cache_key(asset[:uri])) { asset }
+        if files_digest(paths) == digest
+          cache._get(asset_uri_cache_key(uri))
+        end
+      end
 
+      def set_asset_dependency_graph_cache(key, asset)
+        uri = asset[:uri]
+        digest, paths = asset[:metadata].values_at(:dependency_sources_digest, :dependency_paths)
+        cache._set(key, [paths, digest, uri])
+        cache.fetch(asset_uri_cache_key(uri)) { asset }
         asset
       end
 
@@ -100,4 +116,7 @@ module Sprockets
         raise RuntimeError, "can't modify immutable cached environment"
       end
   end
+
+  # Deprecated
+  Index = CachedEnvironment
 end