sprockets 3.0.0.beta.6 → 3.0.0.beta.7

data/lib/rake/sprocketstask.rb

@@ -127,9 +127,9 @@ module Rake
       task :clobber => ["clobber_#{name}"]
 
       desc name == :assets ? "Clean old assets" : "Clean old #{name} assets"
-      task "clean_#{name}", [:keep] do |t, args|
+      task "clean_#{name}" do
         with_logger do
-          manifest.clean(Integer(args.keep || self.keep))
+          manifest.clean(keep)
         end
       end
 

data/lib/sprockets.rb

@@ -10,23 +10,13 @@ module Sprockets
 
   # Processing
   autoload :Bundle,                  'sprockets/bundle'
-  autoload :ClosureCompressor,       'sprockets/closure_compressor'
   autoload :CoffeeScriptTemplate,    'sprockets/coffee_script_template'
   autoload :Context,                 'sprockets/context'
   autoload :DirectiveProcessor,      'sprockets/directive_processor'
-  autoload :EcoTemplate,             'sprockets/eco_template'
-  autoload :EjsTemplate,             'sprockets/ejs_template'
-  autoload :ERBTemplate,             'sprockets/erb_template'
-  autoload :JstProcessor,            'sprockets/jst_processor'
-  autoload :SassCompressor,          'sprockets/sass_compressor'
-  autoload :SassTemplate,            'sprockets/sass_template'
-  autoload :ScssTemplate,            'sprockets/sass_template'
-  autoload :UglifierCompressor,      'sprockets/uglifier_compressor'
-  autoload :YUICompressor,           'sprockets/yui_compressor'
+  autoload :FileReader,              'sprockets/file_reader'
 
   # Internal utilities
   autoload :ArgumentError,           'sprockets/errors'
-  autoload :AssetURI,                'sprockets/asset_uri'
   autoload :Cache,                   'sprockets/cache'
   autoload :ContentTypeMismatch,     'sprockets/errors'
   autoload :DigestUtils,             'sprockets/digest_utils'
@@ -34,48 +24,52 @@ module Sprockets
   autoload :Error,                   'sprockets/errors'
   autoload :FileNotFound,            'sprockets/errors'
   autoload :HTTPUtils,               'sprockets/http_utils'
-  autoload :LazyProcessor,           'sprockets/lazy_processor'
   autoload :PathUtils,               'sprockets/path_utils'
   autoload :Utils,                   'sprockets/utils'
 
+  require 'sprockets/processor_utils'
+  extend ProcessorUtils
+
   # Extend Sprockets module to provide global registry
   require 'sprockets/configuration'
   require 'sprockets/context'
+  require 'digest/sha2'
   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
-  @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'
-  @digest_class = Digest::SHA256
+  self.config = {
+    bundle_processors: Hash.new { |h, k| [].freeze }.freeze,
+    bundle_reducers: Hash.new { |h, k| {}.freeze }.freeze,
+    compressors: Hash.new { |h, k| {}.freeze }.freeze,
+    dependencies: Set.new.freeze,
+    dependency_resolvers: {}.freeze,
+    digest_class: Digest::SHA256,
+    engine_mime_types: {}.freeze,
+    engines: {}.freeze,
+    mime_exts: {}.freeze,
+    mime_types: {}.freeze,
+    paths: [].freeze,
+    postprocessors: Hash.new { |h, k| [].freeze }.freeze,
+    preprocessors: Hash.new { |h, k| [].freeze }.freeze,
+    registered_transformers: Hash.new { |h, k| {}.freeze }.freeze,
+    root: File.expand_path('..', __FILE__).freeze,
+    transformers: Hash.new { |h, k| {}.freeze }.freeze,
+    version: ""
+  }.freeze
+
+  @context_class = Context
 
   require 'logger'
   @logger = Logger.new($stderr)
   @logger.level = Logger::FATAL
 
   # Common asset text types
-  register_mime_type 'application/javascript', extensions: ['.js'], charset: EncodingUtils::DETECT_UNICODE
-  register_mime_type 'application/json', extensions: ['.json'], charset: EncodingUtils::DETECT_UNICODE
+  register_mime_type 'application/javascript', extensions: ['.js'], charset: :unicode
+  register_mime_type 'application/json', extensions: ['.json'], charset: :unicode
   register_mime_type 'application/xml', extensions: ['.xml']
-  register_mime_type 'text/css', extensions: ['.css'], charset: EncodingUtils::DETECT_CSS
-  register_mime_type 'text/html', extensions: ['.html', '.htm'], charset: EncodingUtils::DETECT_HTML
+  register_mime_type 'text/css', extensions: ['.css'], charset: :css
+  register_mime_type 'text/html', extensions: ['.html', '.htm'], charset: :html
   register_mime_type 'text/plain', extensions: ['.txt', '.text']
-  register_mime_type 'text/yaml', extensions: ['.yml', '.yaml'], charset: EncodingUtils::DETECT_UNICODE
+  register_mime_type 'text/yaml', extensions: ['.yml', '.yaml'], charset: :unicode
 
   # Common image types
   register_mime_type 'image/x-icon', extensions: ['.ico']
@@ -103,14 +97,13 @@ module Sprockets
   register_mime_type 'application/x-font-ttf', extensions: ['.ttf']
   register_mime_type 'application/font-woff', extensions: ['.woff']
 
-  # HTTP content encodings
-  register_encoding :deflate, EncodingUtils::DEFLATE
-  register_encoding :gzip,    EncodingUtils::GZIP
-  register_encoding :base64,  EncodingUtils::BASE64
-
   require 'sprockets/directive_processor'
-  register_preprocessor 'text/css', DirectiveProcessor
-  register_preprocessor 'application/javascript', DirectiveProcessor
+  register_preprocessor 'text/css', DirectiveProcessor.new(
+    comments: ["//", ["/*", "*/"]]
+  )
+  register_preprocessor 'application/javascript', DirectiveProcessor.new(
+    comments: ["//", ["/*", "*/"]] + ["#", ["###", "###"]]
+  )
 
   require 'sprockets/bundle'
   register_bundle_processor 'application/javascript', Bundle
@@ -120,31 +113,44 @@ module Sprockets
   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 }
-  register_compressor 'text/css', :yui, LazyProcessor.new { YUICompressor }
-  register_compressor 'application/javascript', :closure, LazyProcessor.new { ClosureCompressor }
-  register_compressor 'application/javascript', :uglifier, LazyProcessor.new { UglifierCompressor }
-  register_compressor 'application/javascript', :uglify, LazyProcessor.new { UglifierCompressor }
-  register_compressor 'application/javascript', :yui, LazyProcessor.new { YUICompressor }
+  register_compressor 'text/css', :sass, autoload_processor(:SassCompressor, 'sprockets/sass_compressor')
+  register_compressor 'text/css', :scss, autoload_processor(:SassCompressor, 'sprockets/sass_compressor')
+  register_compressor 'text/css', :yui, autoload_processor(:YUICompressor, 'sprockets/yui_compressor')
+  register_compressor 'application/javascript', :closure, autoload_processor(:ClosureCompressor, 'sprockets/closure_compressor')
+  register_compressor 'application/javascript', :uglifier, autoload_processor(:UglifierCompressor, 'sprockets/uglifier_compressor')
+  register_compressor 'application/javascript', :uglify, autoload_processor(:UglifierCompressor, 'sprockets/uglifier_compressor')
+  register_compressor 'application/javascript', :yui, autoload_processor(:YUICompressor, 'sprockets/yui_compressor')
 
   # Mmm, CoffeeScript
-  register_mime_type 'text/coffeescript', extensions: ['.coffee']
-  register_engine '.coffee', LazyProcessor.new { CoffeeScriptTemplate }, mime_type: 'application/javascript'
+  register_engine '.coffee', autoload_processor(:CoffeeScriptProcessor, 'sprockets/coffee_script_processor'), mime_type: 'application/javascript'
 
   # JST engines
-  register_mime_type 'text/eco', extensions: ['.eco']
-  register_mime_type 'text/ejs', extensions: ['.ejs']
-  register_engine '.jst',    LazyProcessor.new { JstProcessor }, mime_type: 'application/javascript'
-  register_engine '.eco',    LazyProcessor.new { EcoTemplate },  mime_type: 'application/javascript'
-  register_engine '.ejs',    LazyProcessor.new { EjsTemplate },  mime_type: 'application/javascript'
+  register_engine '.jst', autoload_processor(:JstProcessor, 'sprockets/jst_processor'), mime_type: 'application/javascript'
+  register_engine '.eco', autoload_processor(:EcoProcessor, 'sprockets/eco_processor'), mime_type: 'application/javascript'
+  register_engine '.ejs', autoload_processor(:EjsProcessor, 'sprockets/ejs_processor'), mime_type: 'application/javascript'
 
   # CSS engines
-  register_mime_type 'text/sass', extensions: ['.sass']
-  register_mime_type 'text/scss', extensions: ['.scss']
-  register_engine '.sass',   LazyProcessor.new { SassTemplate }, mime_type: 'text/css'
-  register_engine '.scss',   LazyProcessor.new { ScssTemplate }, mime_type: 'text/css'
+  register_engine '.sass', autoload_processor(:SassProcessor, 'sprockets/sass_processor'), mime_type: 'text/css'
+  register_engine '.scss', autoload_processor(:ScssProcessor, 'sprockets/sass_processor'), mime_type: 'text/css'
 
   # Other
-  register_engine '.erb',    LazyProcessor.new { ERBTemplate }, mime_type: 'text/plain'
+  register_engine '.erb', autoload_processor(:ERBProcessor, 'sprockets/erb_processor'), mime_type: 'text/plain'
+
+  register_dependency_resolver 'environment-version' do |env|
+    env.version
+  end
+  register_dependency_resolver 'environment-paths' do |env|
+    env.paths
+  end
+  register_dependency_resolver 'file-digest' do |env, str|
+    env.file_digest(env.parse_file_digest_uri(str))
+  end
+  register_dependency_resolver 'processors' do |env, str|
+    env.resolve_processors_cache_key_uri(str)
+  end
+
+  depend_on 'environment-version'
+  depend_on 'environment-paths'
 end
+
+require 'sprockets/legacy'

data/lib/sprockets/asset.rb

@@ -1,6 +1,5 @@
-require 'base64'
 require 'fileutils'
-require 'pathname'
+require 'sprockets/digest_utils'
 
 module Sprockets
   class Asset
@@ -49,13 +48,6 @@ module Sprockets
     # Public: Returns String path of asset.
     attr_reader :filename
 
-    # Deprecated: Use #filename instead.
-    #
-    # Returns Pathname.
-    def pathname
-      @pathname ||= Pathname.new(filename)
-    end
-
     # Internal: Unique asset object ID.
     #
     # Returns a String.
@@ -97,36 +89,6 @@ module Sprockets
       metadata[:included]
     end
 
-    # Deprecated: Expand asset into an `Array` of parts.
-    #
-    # Appending all of an assets body parts together should give you
-    # the asset's contents as a whole.
-    #
-    # This allows you to link to individual files for debugging
-    # purposes.
-    #
-    # Use Asset#included instead. Keeping a full copy of the bundle's processed
-    # assets in memory (and in cache) is expensive and redundant. The common use
-    # case is to relink to the assets anyway.
-    #
-    # Returns Array of Assets.
-    def to_a
-      if metadata[:included]
-        metadata[:included].map { |uri| @environment.load(uri) }
-      else
-        [self]
-      end
-    end
-
-    # Deprecated: Get all required Assets.
-    #
-    # See Asset#to_a
-    #
-    # Returns Array of Assets.
-    def dependencies
-      to_a.reject { |a| a.filename.eql?(self.filename) }
-    end
-
     # Public: Return `String` of concatenated source.
     #
     # Returns String.
@@ -146,15 +108,6 @@ module Sprockets
       source
     end
 
-    # Public: HTTP encoding for Asset, "deflate", "gzip", etc.
-    #
-    # Note: This is not the Ruby Encoding of the source. See Asset#charset.
-    #
-    # Returns a String or nil if encoding is "identity".
-    def encoding
-      metadata[:encoding]
-    end
-
     # Public: Get charset of source.
     #
     # Returns a String charset name or nil if binary.
@@ -168,15 +121,6 @@ module Sprockets
     end
     alias_method :bytesize, :length
 
-    # Deprecated: Returns Time of the last time the source was modified.
-    #
-    # Time resolution is normalized to the nearest second.
-    #
-    # Returns Time.
-    def mtime
-      Time.at(@mtime)
-    end
-
     # Public: Returns String hexdigest of source.
     def hexdigest
       DigestUtils.pack_hexdigest(metadata[:digest])
@@ -231,10 +175,7 @@ module Sprockets
     #
     # Returns String.
     def inspect
-      "#<#{self.class}:#{id} " +
-        "filename=#{filename.inspect}, " +
-        "digest=#{digest.inspect}" +
-        ">"
+      "#<#{self.class}:#{object_id.to_s(16)} #{uri.inspect}>"
     end
 
     # Public: Implements Object#hash so Assets can be used as a Hash key or

data/lib/sprockets/autoload_processor.rb

@@ -0,0 +1,48 @@
+module Sprockets
+  # Internal: Used for lazy loading processors.
+  #
+  # Libraries should not use lazily loaded processors. They are only needed
+  # internally by Sprockets since it has optionally dependencies such as
+  # CoffeeScript that may not be available in the gem environment.
+  class AutoloadProcessor
+    # Initialize AutoloadProcessor wrapper
+    #
+    # See ProcessorUtils.autoload_processor for constructor method.
+    #
+    # mod  - Parent Module of processor class/module
+    # name - Symbol name of processor class/module
+    def initialize(mod, name)
+      @mod  = mod
+      @name = name.to_sym
+    end
+
+    # Full name of module.
+    #
+    # Returns String.
+    def name
+      "#{@mod}::#{@name}"
+    end
+
+    # Check if target constant is already loaded.
+    #
+    # Returns Boolean.
+    def const_loaded?
+      @mod.autoload?(@name)
+    end
+
+    # Delegate to processor#cache_key
+    def cache_key
+      load_processor.cache_key if load_processor.respond_to?(:cache_key)
+    end
+
+    # Delegate to processor#call
+    def call(*args)
+      load_processor.call(*args)
+    end
+
+    private
+      def load_processor
+        @processor ||= @mod.const_get(@name)
+      end
+  end
+end

data/lib/sprockets/base.rb

@@ -1,14 +1,12 @@
-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_dependency_utils'
 require 'sprockets/path_utils'
 require 'sprockets/resolve'
 require 'sprockets/server'
@@ -16,12 +14,11 @@ require 'sprockets/server'
 module Sprockets
   # `Base` class for `Environment` and `Cached`.
   class Base
-    include PathDigestUtils, PathUtils, HTTPUtils, DigestUtils
+    include PathUtils, PathDependencyUtils, PathDigestUtils, DigestUtils
     include Configuration
     include Server
     include Resolve, Loader
     include Bower
-    include Legacy
 
     # Get persistent cache store
     attr_reader :cache
@@ -61,7 +58,8 @@ module Sprockets
 
     # Find asset by logical path or expanded path.
     def find_asset(path, options = {})
-      if uri = locate(path, options)
+      uri, _ = resolve(path, options.merge(compat: false))
+      if uri
         load(uri)
       end
     end

data/lib/sprockets/bower.rb

@@ -12,9 +12,9 @@ module Sprockets
     # load_path    - String environment path
     # logical_path - String path relative to base
     #
-    # Returns nothing.
-    def resolve_alternates(load_path, logical_path, &block)
-      super
+    # 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('/')
@@ -26,12 +26,15 @@ module Sprockets
           filename  = filenames.detect { |fn| self.file?(fn) }
 
           if filename
-            read_bower_main(dirname, filename, &block)
+            deps << build_file_digest_uri(filename)
+            read_bower_main(dirname, filename) do |path|
+              candidates << path
+            end
           end
         end
       end
 
-      nil
+      return candidates, deps
     end
 
     # Internal: Read bower.json's main directive.

data/lib/sprockets/bundle.rb

@@ -1,4 +1,5 @@
-require 'sprockets/asset_uri'
+require 'set'
+require 'sprockets/utils'
 
 module Sprockets
   # Internal: Bundle processor takes a single file asset and prepends all the
@@ -15,25 +16,20 @@ module Sprockets
       env  = input[:environment]
       type = input[:content_type]
 
-      # TODO: Rebuilding this URI is a bit of a smell
-      processed_uri = AssetURI.build(input[:filename], type: type, skip_bundle: true)
+      processed_uri = env.build_asset_uri(input[:filename], type: type, skip_bundle: true)
 
-      cache = Hash.new do |h, uri|
-        h[uri] = env.load(uri)
-      end
-
-      find_required = proc { |uri| cache[uri].metadata[:required] }
+      find_required = proc { |uri| env.load(uri).metadata[:required] }
       required = Utils.dfs(processed_uri, &find_required)
-      stubbed  = Utils.dfs(cache[processed_uri].metadata[:stubbed], &find_required)
+      stubbed  = Utils.dfs(env.load(processed_uri).metadata[:stubbed], &find_required)
       required.subtract(stubbed)
-      assets = required.map { |uri| cache[uri] }
+      assets = required.map { |uri| env.load(uri) }
 
-      dependency_paths = Set.new
+      dependencies = Set.new(input[:metadata][:dependencies])
       (required + stubbed).each do |uri|
-        dependency_paths += cache[uri].metadata[:dependency_paths]
+        dependencies.merge(env.load(uri).metadata[:dependencies])
       end
 
-      env.process_bundle_reducers(assets, env.unwrap_bundle_reducers(type)).merge(dependency_paths: dependency_paths, included: assets.map(&:uri))
+      env.process_bundle_reducers(assets, env.load_bundle_reducers(type)).merge(dependencies: dependencies, included: assets.map(&:uri))
     end
   end
 end