Source maps

.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
 
 notifications:
   email: false

LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2011 Sam Stephenson
-Copyright (c) 2011 Joshua Peek
+Copyright (c) 2014 Sam Stephenson
+Copyright (c) 2014 Joshua Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -13,7 +13,7 @@ Install Sprockets from RubyGems:
 
 Or include it in your project's `Gemfile` with Bundler:
 
-    gem 'sprockets', '~> 2.0'
+    gem 'sprockets', '~> 3.0'
 
 # Understanding the Sprockets Environment #
 
@@ -139,6 +139,15 @@ filename. For example, a CSS file written in SCSS might have the name
 `layout.css.scss`, while a JavaScript file written in CoffeeScript
 might have the name `dialog.js.coffee`.
 
+## Minifying Assets ##
+
+Several JavaScript and CSS minifiers are available through shorthand.
+
+``` ruby
+environment.js_compressor  = :uglify
+environment.css_compressor = :scss
+```
+
 ## Styling with Sass and SCSS ##
 
 [Sass](http://sass-lang.com/) is a language that compiles to CSS and
@@ -237,7 +246,7 @@ include:
   database, in a JavaScript asset via JSON
 - embedding version constants loaded from another file
 
-See the [Helper Methods](#FIXME) section for more information about
+See the [Helper Methods](lib/sprockets/context.rb) section for more information about
 interacting with `Sprockets::Context` instances via ERB.
 
 ### String Interpolation Syntax ###
@@ -339,14 +348,14 @@ asset's cache in response to a change in another file.
 ### The `depend_on_asset` Directive ###
 
 `depend_on_asset` *path* works like `depend_on`, but operates
-recursively reading the the file and following the directives found.
+recursively reading the file and following the directives found.
 
 ### The `stub` Directive ###
 
 `stub` *path* allows dependency to be excluded from the asset bundle.
 The *path* must be a valid asset and may or may not already be part
-of the bundle. Once stubbed, it is blacklisted and can't be brought
-back by any other `require`.
+of the bundle. `stub` should only be used at the top level bundle, not
+within any subdependencies.
 
 # Development #
 
@@ -366,6 +375,11 @@ submit a pull request.
 
 ## Version History ##
 
+**3.0.0**
+
+* Default digest changed to SHA1. To continue using MD5.
+  `env.digest_class = Digest::MD5`.
+
 **2.10.0** (May 24, 2013)
 
 * Support for `bower.json`
@@ -398,7 +412,7 @@ submit a pull request.
 
 **2.8.0** (October 16, 2012)
 
-* Allow manifest location to be seperated from output directory
+* Allow manifest location to be separated from output directory
 * Pass logical path and absolute path to each_logical_path iterator
 
 **2.7.0** (October 10, 2012)
@@ -471,7 +485,7 @@ submit a pull request.
 
 **2.1.2** (November 20, 2011)
 
-* Disabled If-Modified-Since server checks. Fixes some browser caching issues when serving the asset body only. If-None-Match caching is sufficent.
+* Disabled If-Modified-Since server checks. Fixes some browser caching issues when serving the asset body only. If-None-Match caching is sufficient.
 
 **2.1.1** (November 18, 2011)
 
@@ -504,9 +518,9 @@ submit a pull request.
 
 # License #
 
-Copyright &copy; 2011 Sam Stephenson <<[email protected]>>
+Copyright &copy; 2014 Sam Stephenson <<[email protected]>>
 
-Copyright &copy; 2011 Joshua Peek <<[email protected]>>
+Copyright &copy; 2014 Joshua Peek <<[email protected]>>
 
 Sprockets is distributed under an MIT-style license. See LICENSE for
 details.

lib/sprockets.rb

@@ -14,10 +14,14 @@ module Sprockets
   autoload :StaticAsset,             "sprockets/static_asset"
 
   # Processing
+  autoload :Template,                "sprockets/template"
   autoload :Context,                 "sprockets/context"
+  autoload :CoffeeScriptTemplate,    "sprockets/coffee_script_template"
   autoload :EcoTemplate,             "sprockets/eco_template"
   autoload :EjsTemplate,             "sprockets/ejs_template"
+  autoload :ERBTemplate,             "sprockets/erb_template"
   autoload :JstProcessor,            "sprockets/jst_processor"
+  autoload :LessTemplate,            "sprockets/less_template"
   autoload :Processor,               "sprockets/processor"
   autoload :SassCacheStore,          "sprockets/sass_cache_store"
   autoload :SassFunctions,           "sprockets/sass_functions"
@@ -86,23 +90,19 @@ module Cache
   require 'sprockets/yui_compressor'
   register_compressor 'application/javascript', :yui, YUICompressor
 
-  # Cherry pick the default Tilt engines that make sense for
-  # Sprockets. We don't need ones that only generate html like HAML.
-
   # Mmm, CoffeeScript
-  register_engine '.coffee', Tilt::CoffeeScriptTemplate
+  register_engine '.coffee', CoffeeScriptTemplate
 
   # JST engines
   register_engine '.jst',    JstProcessor
   register_engine '.eco',    EcoTemplate
   register_engine '.ejs',    EjsTemplate
 
   # CSS engines
-  register_engine '.less',   Tilt::LessTemplate
+  register_engine '.less',   LessTemplate
   register_engine '.sass',   SassTemplate
   register_engine '.scss',   ScssTemplate
 
   # Other
-  register_engine '.erb',    Tilt::ERBTemplate
-  register_engine '.str',    Tilt::StringTemplate
+  register_engine '.erb',    ERBTemplate
 end

lib/sprockets/asset_attributes.rb

@@ -17,17 +17,18 @@ def initialize(environment, path)
     def search_paths
       paths = [pathname.to_s]
 
-      path_without_extensions = extensions.inject(pathname) { |p, ext| p.sub(ext, '') }
+      extension = format_extension
+      path_without_extension = extension ?
+        pathname.sub(extension, '') :
+        pathname
 
       # optimization: bower.json can only be nested one level deep
-      if !path_without_extensions.to_s.index('/')
-        paths << path_without_extensions.join("bower.json").to_s
-        # DEPRECATED bower configuration file
-        paths << path_without_extensions.join("component.json").to_s
+      if !path_without_extension.to_s.index('/')
+        paths << path_without_extension.join("bower.json").to_s
       end
 
-      if pathname.basename(extensions.join).to_s != 'index'
-        paths << path_without_extensions.join("index#{extensions.join}").to_s
+      if pathname.basename(extension.to_s).to_s != 'index'
+        paths << path_without_extension.join("index#{extension}").to_s
       end
 
       paths

lib/sprockets/base.rb

@@ -15,14 +15,14 @@ class Base
 
     # Returns a `Digest` implementation class.
     #
-    # Defaults to `Digest::MD5`.
+    # Defaults to `Digest::SHA1`.
     attr_reader :digest_class
 
     # Assign a `Digest` implementation class. This maybe any Ruby
-    # `Digest::` implementation such as `Digest::MD5` or
-    # `Digest::SHA1`.
+    # `Digest::` implementation such as `Digest::SHA1` or
+    # `Digest::MD5`.
     #
-    #     environment.digest_class = Digest::SHA1
+    #     environment.digest_class = Digest::MD5
     #
     def digest_class=(klass)
       expire_index!
@@ -130,7 +130,7 @@ def resolve(logical_path, options = {})
         args = attributes_for(logical_path).search_paths + [options]
         @trail.find(*args) do |path|
           pathname = Pathname.new(path)
-          if %w( bower.json component.json ).include?(pathname.basename.to_s)
+          if pathname.basename.to_s == "bower.json"
             bower = json_decode(pathname.read)
             case bower['main']
             when String
@@ -218,20 +218,6 @@ def index
       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`.
-    #
-    # Subclasses may cache this method.
-    def stat(path)
-      @trail.stat(path)
-    end
-
     # Read and compute digest of filename.
     #
     # Subclasses may cache this method.
@@ -296,59 +282,6 @@ def [](*args)
       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)} " +
@@ -406,42 +339,6 @@ def circular_call_protection(path)
         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 json_decode(obj)
         JSON.parse(obj, create_additions: false)
       end

lib/sprockets/bundled_asset.rb

@@ -14,7 +14,7 @@ class BundledAsset < Asset
     def initialize(environment, logical_path, pathname)
       super(environment, logical_path, pathname)
 
-      @processed_asset  = environment.find_asset(pathname, :bundle => false)
+      @processed_asset  = environment.find_asset(pathname, bundle: false)
       @required_assets  = @processed_asset.required_assets
       @dependency_paths = @processed_asset.dependency_paths
 
@@ -26,11 +26,9 @@ def initialize(environment, logical_path, pathname)
 
       # Run bundle processors on concatenated source
       context = environment.context_class.new(environment, logical_path, pathname)
-      options = { :data => @source,
-                  :map => @map,
-                  :processors => environment.bundle_processors(content_type) }
-      @source = context.evaluate(pathname, options)
-      @map    = options[:map]
+
+      @source = context.evaluate(pathname, data: @source, map: @map,
+                  processors: environment.bundle_processors(content_type))
 
       @mtime  = (to_a + @dependency_paths).map(&:mtime).max
       @length = Rack::Utils.bytesize(source)
@@ -41,7 +39,7 @@ def initialize(environment, logical_path, pathname)
     def init_with(environment, coder)
       super
 
-      @processed_asset = environment.find_asset(pathname, :bundle => false)
+      @processed_asset = environment.find_asset(pathname, bundle: false)
       @required_assets = @processed_asset.required_assets
 
       if @processed_asset.dependency_digest != coder['required_assets_digest']

lib/sprockets/charset_normalizer.rb

@@ -1,5 +1,3 @@
-require 'tilt'
-
 module Sprockets
   # Some browsers have issues with stylesheets that contain multiple
   # `@charset` definitions. The issue surfaces while using Sass since
@@ -18,11 +16,8 @@ module Sprockets
   #
   #     environment.unregister_bundle_processor 'text/css', Sprockets::CharsetNormalizer
   #
-  class CharsetNormalizer < Tilt::Template
-    def prepare
-    end
-
-    def evaluate(context, locals, &block)
+  class CharsetNormalizer < Template
+    def render(context)
       charset = nil
 
       # Find and strip out any `@charset` definitions