sprockets 2.11.3 → 3.7.2

data/lib/sprockets/base.rb

@@ -1,89 +1,26 @@
-require 'sprockets/asset_attributes'
-require 'sprockets/bundled_asset'
-require 'sprockets/caching'
+require 'sprockets/asset'
+require 'sprockets/bower'
+require 'sprockets/cache'
+require 'sprockets/configuration'
+require 'sprockets/digest_utils'
 require 'sprockets/errors'
-require 'sprockets/processed_asset'
+require 'sprockets/loader'
+require 'sprockets/path_digest_utils'
+require 'sprockets/path_dependency_utils'
+require 'sprockets/path_utils'
+require 'sprockets/resolve'
 require 'sprockets/server'
-require 'sprockets/static_asset'
-require 'multi_json'
-require 'pathname'
+require 'sprockets/loader'
+require 'sprockets/uri_tar'
 
 module Sprockets
-  # `Base` class for `Environment` and `Index`.
+  # `Base` class for `Environment` and `Cached`.
   class Base
-    include Caching, Paths, Mime, Processing, Compressing, Engines, Server
-
-    # Returns a `Digest` implementation class.
-    #
-    # Defaults to `Digest::MD5`.
-    attr_reader :digest_class
-
-    # Assign a `Digest` implementation class. This maybe any Ruby
-    # `Digest::` implementation such as `Digest::MD5` or
-    # `Digest::SHA1`.
-    #
-    #     environment.digest_class = Digest::SHA1
-    #
-    def digest_class=(klass)
-      expire_index!
-      @digest_class = klass
-    end
-
-    # The `Environment#version` is a custom value used for manually
-    # expiring all asset caches.
-    #
-    # Sprockets is able to track most file and directory changes and
-    # will take care of expiring the cache for you. However, its
-    # impossible to know when any custom helpers change that you mix
-    # into the `Context`.
-    #
-    # It would be wise to increment this value anytime you make a
-    # configuration change to the `Environment` object.
-    attr_reader :version
-
-    # Assign an environment version.
-    #
-    #     environment.version = '2.0'
-    #
-    def version=(version)
-      expire_index!
-      @version = version
-    end
-
-    # Returns a `Digest` instance for the `Environment`.
-    #
-    # This value serves two purposes. If two `Environment`s have the
-    # same digest value they can be treated as equal. This is more
-    # useful for comparing environment states between processes rather
-    # than in the same. Two equal `Environment`s can share the same
-    # cached assets.
-    #
-    # The value also provides a seed digest for all `Asset`
-    # digests. Any change in the environment digest will affect all of
-    # its assets.
-    def digest
-      # Compute the initial digest using the implementation class. The
-      # Sprockets release version and custom environment version are
-      # mixed in. So any new releases will affect all your assets.
-      @digest ||= digest_class.new.update(VERSION).update(version.to_s)
-
-      # Returned a dupped copy so the caller can safely mutate it with `.update`
-      @digest.dup
-    end
-
-    # Get and set `Logger` instance.
-    attr_accessor :logger
-
-    # Get `Context` class.
-    #
-    # This class maybe mutated and mixed in with custom helpers.
-    #
-    #     environment.context_class.instance_eval do
-    #       include MyHelpers
-    #       def asset_url; end
-    #     end
-    #
-    attr_reader :context_class
+    include PathUtils, PathDependencyUtils, PathDigestUtils, DigestUtils
+    include Configuration
+    include Server
+    include Resolve, Loader
+    include Bower
 
     # Get persistent cache store
     attr_reader :cache
@@ -94,197 +31,57 @@ module Sprockets
     # setters. Either `get(key)`/`set(key, value)`,
     # `[key]`/`[key]=value`, `read(key)`/`write(key, value)`.
     def cache=(cache)
-      expire_index!
-      @cache = cache
-    end
-
-    def prepend_path(path)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def append_path(path)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def clear_paths
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
+      @cache = Cache.new(cache, logger)
     end
 
-    # Finds the expanded real path for a given logical path by
-    # searching the environment's paths.
-    #
-    #     resolve("application.js")
-    #     # => "/path/to/app/javascripts/application.js.coffee"
-    #
-    # A `FileNotFound` exception is raised if the file does not exist.
-    def resolve(logical_path, options = {})
-      # If a block is given, preform an iterable search
-      if block_given?
-        args = attributes_for(logical_path).search_paths + [options]
-        @trail.find(*args) do |path|
-          pathname = Pathname.new(path)
-          if %w( .bower.json bower.json component.json ).include?(pathname.basename.to_s)
-            bower = json_decode(pathname.read)
-            case bower['main']
-            when String
-              yield pathname.dirname.join(bower['main'])
-            when Array
-              extname = File.extname(logical_path)
-              bower['main'].each do |fn|
-                if extname == "" || extname == File.extname(fn)
-                  yield pathname.dirname.join(fn)
-                end
-              end
-            end
-          else
-            yield pathname
-          end
-        end
-      else
-        resolve(logical_path, options) do |pathname|
-          return pathname
-        end
-        raise FileNotFound, "couldn't find file '#{logical_path}'"
-      end
-    end
-
-    # Register a new mime type.
-    def register_mime_type(mime_type, ext)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      @trail.append_extension(ext)
-      super
-    end
-
-    # Registers a new Engine `klass` for `ext`.
-    def register_engine(ext, klass)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      add_engine_to_trail(ext, klass)
-      super
-    end
-
-    def register_preprocessor(mime_type, klass, &block)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def unregister_preprocessor(mime_type, klass)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def register_postprocessor(mime_type, klass, &block)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def unregister_postprocessor(mime_type, klass)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def register_bundle_processor(mime_type, klass, &block)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    def unregister_bundle_processor(mime_type, klass)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      super
-    end
-
-    # Return an `Index`. Must be implemented by the subclass.
-    def index
+    # Return an `Cached`. Must be implemented by the subclass.
+    def cached
       raise NotImplementedError
     end
+    alias_method :index, :cached
 
-    if defined? Encoding.default_external
-      # Define `default_external_encoding` accessor on 1.9.
-      # Defaults to UTF-8.
-      attr_accessor :default_external_encoding
-    end
-
-    # Works like `Dir.entries`.
-    #
-    # Subclasses may cache this method.
-    def entries(pathname)
-      @trail.entries(pathname)
-    end
-
-    # Works like `File.stat`.
+    # Internal: Compute digest for path.
     #
-    # Subclasses may cache this method.
-    def stat(path)
-      @trail.stat(path)
-    end
-
-    # Read and compute digest of filename.
+    # path - String filename or directory path.
     #
-    # Subclasses may cache this method.
+    # Returns a String digest or nil.
     def file_digest(path)
       if stat = self.stat(path)
-        # If its a file, digest the contents
-        if stat.file?
-          digest.file(path.to_s)
-
-        # If its a directive, digest the list of filenames
-        elsif stat.directory?
-          contents = self.entries(path).join(',')
-          digest.update(contents)
+        # Caveat: Digests are cached by the path's current mtime. Its possible
+        # for a files contents to have changed and its mtime to have been
+        # negligently reset thus appearing as if the file hasn't changed on
+        # disk. Also, the mtime is only read to the nearest second. It's
+        # also possible the file was updated more than once in a given second.
+        key = UnloadedAsset.new(path, self).file_digest_key(stat.mtime.to_i)
+        cache.fetch(key) do
+          self.stat_digest(path, stat)
         end
       end
     end
 
-    # Internal. Return a `AssetAttributes` for `path`.
-    def attributes_for(path)
-      AssetAttributes.new(self, path)
+    # Find asset by logical path or expanded path.
+    def find_asset(path, options = {})
+      uri, _ = resolve(path, options.merge(compat: false))
+      if uri
+        load(uri)
+      end
     end
 
-    # Internal. Return content type of `path`.
-    def content_type_of(path)
-      attributes_for(path).content_type
-    end
+    def find_all_linked_assets(path, options = {})
+      return to_enum(__method__, path, options) unless block_given?
 
-    # Find asset by logical path or expanded path.
-    def find_asset(path, options = {})
-      logical_path = path
-      pathname     = Pathname.new(path)
+      asset = find_asset(path, options)
+      return unless asset
 
-      if pathname.absolute?
-        return unless stat(pathname)
-        logical_path = attributes_for(pathname).logical_path
-      else
-        begin
-          pathname = resolve(logical_path)
+      yield asset
+      stack = asset.links.to_a
 
-          # If logical path is missing a mime type extension, append
-          # the absolute path extname so it has one.
-          #
-          # Ensures some consistency between finding "foo/bar" vs
-          # "foo/bar.js".
-          if File.extname(logical_path) == ""
-            expanded_logical_path = attributes_for(pathname).logical_path
-            logical_path += File.extname(expanded_logical_path)
-          end
-        rescue FileNotFound
-          return nil
-        end
+      while uri = stack.shift
+        yield asset = load(uri)
+        stack = asset.links.to_a + stack
       end
 
-      build_asset(logical_path, pathname, options)
+      nil
     end
 
     # Preferred `find_asset` shorthand.
@@ -295,153 +92,19 @@ module Sprockets
       find_asset(*args)
     end
 
-    def each_entry(root, &block)
-      return to_enum(__method__, root) unless block_given?
-      root = Pathname.new(root) unless root.is_a?(Pathname)
-
-      paths = []
-      entries(root).sort.each do |filename|
-        path = root.join(filename)
-        paths << path
-
-        if stat(path).directory?
-          each_entry(path) do |subpath|
-            paths << subpath
-          end
-        end
-      end
-
-      paths.sort_by(&:to_s).each(&block)
-
-      nil
-    end
-
-    def each_file
-      return to_enum(__method__) unless block_given?
-      paths.each do |root|
-        each_entry(root) do |path|
-          if !stat(path).directory?
-            yield path
-          end
-        end
-      end
-      nil
-    end
-
-    def each_logical_path(*args, &block)
-      return to_enum(__method__, *args) unless block_given?
-      filters = args.flatten
-      files = {}
-      each_file do |filename|
-        if logical_path = logical_path_for_filename(filename, filters)
-          unless files[logical_path]
-            if block.arity == 2
-              yield logical_path, filename.to_s
-            else
-              yield logical_path
-            end
-          end
-
-          files[logical_path] = true
-        end
-      end
-      nil
-    end
-
     # Pretty inspect
     def inspect
       "#<#{self.class}:0x#{object_id.to_s(16)} " +
         "root=#{root.to_s.inspect}, " +
-        "paths=#{paths.inspect}, " +
-        "digest=#{digest.to_s.inspect}" +
-        ">"
+        "paths=#{paths.inspect}>"
     end
 
-    protected
-      # Clear index after mutating state. Must be implemented by the subclass.
-      def expire_index!
-        raise NotImplementedError
-      end
-
-      def build_asset(logical_path, pathname, options)
-        pathname = Pathname.new(pathname)
-
-        # If there are any processors to run on the pathname, use
-        # `BundledAsset`. Otherwise use `StaticAsset` and treat is as binary.
-        if attributes_for(pathname).processors.any?
-          if options[:bundle] == false
-            circular_call_protection(pathname.to_s) do
-              ProcessedAsset.new(index, logical_path, pathname)
-            end
-          else
-            BundledAsset.new(index, logical_path, pathname)
-          end
-        else
-          StaticAsset.new(index, logical_path, pathname)
-        end
-      end
-
-      def cache_key_for(path, options)
-        "#{path}:#{options[:bundle] ? '1' : '0'}"
-      end
-
-      def circular_call_protection(path)
-        reset = Thread.current[:sprockets_circular_calls].nil?
-        calls = Thread.current[:sprockets_circular_calls] ||= Set.new
-        if calls.include?(path)
-          raise CircularDependencyError, "#{path} has already been required"
-        end
-        calls << path
-        yield
-      ensure
-        Thread.current[:sprockets_circular_calls] = nil if reset
-      end
-
-      def logical_path_for_filename(filename, filters)
-        logical_path = attributes_for(filename).logical_path.to_s
-
-        if matches_filter(filters, logical_path, filename)
-          return logical_path
-        end
-
-        # If filename is an index file, retest with alias
-        if File.basename(logical_path)[/[^\.]+/, 0] == 'index'
-          path = logical_path.sub(/\/index\./, '.')
-          if matches_filter(filters, path, filename)
-            return path
-          end
-        end
-
-        nil
-      end
-
-      def matches_filter(filters, logical_path, filename)
-        return true if filters.empty?
-
-        filters.any? do |filter|
-          if filter.is_a?(Regexp)
-            filter.match(logical_path)
-          elsif filter.respond_to?(:call)
-            if filter.arity == 1
-              filter.call(logical_path)
-            else
-              filter.call(logical_path, filename.to_s)
-            end
-          else
-            File.fnmatch(filter.to_s, logical_path)
-          end
-        end
-      end
+    def compress_from_root(uri)
+      URITar.new(uri, self).compress
+    end
 
-      # Feature detect newer MultiJson API
-      if MultiJson.respond_to?(:dump)
-        def json_decode(obj)
-          MultiJson.load(obj)
-        end
-      else
-        def json_decode(obj)
-          MultiJson.decode(obj)
-        end
-      end
+    def expand_from_root(uri)
+      URITar.new(uri, self).expand
+    end
   end
 end

data/lib/sprockets/bower.rb

@@ -0,0 +1,58 @@
+require 'json'
+
+module Sprockets
+  module Bower
+    # Internal: All supported bower.json files.
+    #
+    # https://github.com/bower/json/blob/0.4.0/lib/json.js#L7
+    POSSIBLE_BOWER_JSONS = ['bower.json', 'component.json', '.bower.json']
+
+    # Internal: Override resolve_alternates to install bower.json behavior.
+    #
+    # load_path    - String environment path
+    # logical_path - String path relative to base
+    #
+    # Returns candiate filenames.
+    def resolve_alternates(load_path, logical_path)
+      candidates, deps = super
+
+      # bower.json can only be nested one level deep
+      if !logical_path.index('/')
+        dirname = File.join(load_path, logical_path)
+
+        if directory?(dirname)
+          filenames = POSSIBLE_BOWER_JSONS.map { |basename| File.join(dirname, basename) }
+          filename  = filenames.detect { |fn| self.file?(fn) }
+
+          if filename
+            deps << build_file_digest_uri(filename)
+            read_bower_main(dirname, filename) do |path|
+              candidates << path
+            end
+          end
+        end
+      end
+
+      return candidates, deps
+    end
+
+    # Internal: Read bower.json's main directive.
+    #
+    # dirname  - String path to component directory.
+    # filename - String path to bower.json.
+    #
+    # Returns nothing.
+    def read_bower_main(dirname, filename)
+      bower = JSON.parse(File.read(filename), create_additions: false)
+
+      case bower['main']
+      when String
+        yield File.expand_path(bower['main'], dirname)
+      when Array
+        bower['main'].each do |name|
+          yield File.expand_path(name, dirname)
+        end
+      end
+    end
+  end
+end

data/lib/sprockets/bundle.rb

@@ -0,0 +1,69 @@
+require 'set'
+require 'sprockets/utils'
+
+module Sprockets
+  # Internal: Bundle processor takes a single file asset and prepends all the
+  # `:required` URIs to the contents.
+  #
+  # Uses pipeline metadata:
+  #
+  #   :required - Ordered Set of asset URIs to prepend
+  #   :stubbed  - Set of asset URIs to substract from the required set.
+  #
+  # Also see DirectiveProcessor.
+  class Bundle
+    def self.call(input)
+      env  = input[:environment]
+      type = input[:content_type]
+      dependencies = Set.new(input[:metadata][:dependencies])
+
+      processed_uri, deps = env.resolve(input[:filename], accept: type, pipeline: :self, compat: false)
+      dependencies.merge(deps)
+
+      find_required = proc { |uri| env.load(uri).metadata[:required] }
+      required = Utils.dfs(processed_uri, &find_required)
+      stubbed  = Utils.dfs(env.load(processed_uri).metadata[:stubbed], &find_required)
+      required.subtract(stubbed)
+      assets = required.map { |uri| env.load(uri) }
+
+      (required + stubbed).each do |uri|
+        dependencies.merge(env.load(uri).metadata[:dependencies])
+      end
+
+      reducers = Hash[env.match_mime_type_keys(env.config[:bundle_reducers], type).flat_map(&:to_a)]
+      process_bundle_reducers(assets, reducers).merge(dependencies: dependencies, included: assets.map(&:uri))
+    end
+
+    # Internal: Run bundle reducers on set of Assets producing a reduced
+    # metadata Hash.
+    #
+    # assets - Array of Assets
+    # reducers - Array of [initial, reducer_proc] pairs
+    #
+    # Returns reduced asset metadata Hash.
+    def self.process_bundle_reducers(assets, reducers)
+      initial = {}
+      reducers.each do |k, (v, _)|
+        if v.respond_to?(:call)
+          initial[k] = v.call
+        elsif !v.nil?
+          initial[k] = v
+        end
+      end
+
+      assets.reduce(initial) do |h, asset|
+        reducers.each do |k, (_, block)|
+          value = k == :data ? asset.source : asset.metadata[k]
+          if h.key?(k)
+            if !value.nil?
+              h[k] = block.call(h[k], value)
+            end
+          else
+            h[k] = value
+          end
+        end
+        h
+      end
+    end
+  end
+end