sprockets 3.0.0.beta.8 → 3.0.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa6fd6b6a93eb875e0c47c454bbeb7d473c92748
-  data.tar.gz: 816d06f0078e7904cdec3955f99d6f8f9745264e
+  metadata.gz: da01c3bbf8752fe3705b073775d7067b1a984239
+  data.tar.gz: 934f3ea753eba823e957005907d594771d053ec2
 SHA512:
-  metadata.gz: ddded5dadd8be6b580f069656908769f42a76a77ee6eeaad12e25dbb9467fb47ece8cb8901c182c8ccd5104d18abb2bbe7a90fb6a4acc98271974bb5e017a69b
-  data.tar.gz: 3a4cd5ee63e6d1666a7c1de9bd019221903bd513decb7915ed8ffe419c518cb9dac7dfe72d32ef2a89a5741a9cd8ba109da98c145af2cf436243eda675b58388
+  metadata.gz: 86023eba8d65c22262182f2602b8c22a6347a634bf894cc969d4d5e7bf94a75198ea4034a3cad71f80c4bfb4ea46cf7bcdf2cad5f1dcdc1877589c9b1a967589
+  data.tar.gz: af13b0c540e0e78f0fa36a567aa2aa98f50680f20468c9d3d8433563f0d16c21d19279e3cac3b6369d532104cecb667a48cf9c6d150061cea41c86bfccb35465

data/README.md

@@ -179,7 +179,7 @@ binding.
 If the `coffee-script` gem is available to your application, you can
 use CoffeeScript to write JavaScript assets in Sprockets. Note that
 the CoffeeScript compiler is written in JavaScript, and you will need
-an [ExecJS](https://github.com/sstephenson/execjs)-supported runtime
+an [ExecJS](https://github.com/rails/execjs)-supported runtime
 on your system to invoke it.
 
 To write JavaScript assets with CoffeeScript, use the extension
@@ -378,7 +378,7 @@ Sprockets 2.x was originally design around [Tilt](https://github.com/rtomayko/ti
 
 Similar to Rack, a processor is a any "callable" (an object that responds to `call`). This maybe a simple Proc or a full class that defines a `def self.call(input)` method. The `call` method accepts an `input` Hash and returns a Hash of metadata.
 
-Also see [`Sprockets::ProcessorUtils`](https://github.com/sstephenson/sprockets/blob/master/lib/sprockets/processor_utils.rb) for public helper methods.
+Also see [`Sprockets::ProcessorUtils`](https://github.com/rails/sprockets/blob/master/lib/sprockets/processor_utils.rb) for public helper methods.
 
 ### input Hash
 
@@ -386,7 +386,7 @@ The `input` Hash defines the following public fields.
 
 * `:data` - String asset contents
 * `:environment` - Current `Sprockets::Environment` instance.
-* `:cache` - A `Sprockets::Cache` instance. See [`Sprockets::Cache#fetch`](https://github.com/sstephenson/sprockets/blob/master/lib/sprockets/cache.rb).
+* `:cache` - A `Sprockets::Cache` instance. See [`Sprockets::Cache#fetch`](https://github.com/rails/sprockets/blob/master/lib/sprockets/cache.rb).
 * `:uri` - String Asset URI.
 * `:filename` - String full path to original file.
 * `:load_path` - String current load path for filename.
@@ -436,14 +436,14 @@ end
 ### Contributing
 
 The Sprockets source code is [hosted on
-GitHub](https://github.com/sstephenson/sprockets). You can check out a
+GitHub](https://github.com/rails/sprockets). You can check out a
 copy of the latest code using Git:
 
-    $ git clone https://github.com/sstephenson/sprockets
+    $ git clone https://github.com/rails/sprockets
 
 If you've found a bug or have a question, please open an issue on the
 [Sprockets issue
-tracker](https://github.com/sstephenson/sprockets/issues). Or, clone
+tracker](https://github.com/rails/sprockets/issues). Or, clone
 the Sprockets repository, write a failing test case, fix the bug and
 submit a pull request.
 
@@ -469,6 +469,7 @@ submit a pull request.
 * Rename `Asset#digest` to `Asset#hexdigest`. `Asset#digest` is deprecated and will
   return a raw byte String in 4.x.
 * Added transitional compatibility flag to `Environment#resolve(path, compat: true)`. 2.x mode operates with `compat: true` and 4.x with `compat: false`
+* `manifest-abc123.json` renamed to `.sprockets-abc123.json`
 
 **2.12.3** (October 28, 2014)
 

data/lib/sprockets.rb

@@ -1,4 +1,5 @@
 require 'sprockets/version'
+require 'sprockets/autoload'
 
 module Sprockets
   # Environment
@@ -10,7 +11,6 @@ module Sprockets
 
   # Processing
   autoload :Bundle,                  'sprockets/bundle'
-  autoload :CoffeeScriptTemplate,    'sprockets/coffee_script_template'
   autoload :Context,                 'sprockets/context'
   autoload :DirectiveProcessor,      'sprockets/directive_processor'
   autoload :FileReader,              'sprockets/file_reader'
@@ -48,6 +48,7 @@ module Sprockets
     mime_exts: {}.freeze,
     mime_types: {}.freeze,
     paths: [].freeze,
+    pipelines: {}.freeze,
     postprocessors: Hash.new { |h, k| [].freeze }.freeze,
     preprocessors: Hash.new { |h, k| [].freeze }.freeze,
     registered_transformers: Hash.new { |h, k| {}.freeze }.freeze,
@@ -97,6 +98,18 @@ module Sprockets
   register_mime_type 'application/x-font-ttf', extensions: ['.ttf']
   register_mime_type 'application/font-woff', extensions: ['.woff']
 
+  register_pipeline :source do |env|
+    []
+  end
+
+  register_pipeline :self do |env, type, file_type, engine_extnames|
+    env.self_processors_for(type, file_type, engine_extnames)
+  end
+
+  register_pipeline :default do |env, type, file_type, engine_extnames|
+    env.default_processors_for(type, file_type, engine_extnames)
+  end
+
   require 'sprockets/directive_processor'
   register_preprocessor 'text/css', DirectiveProcessor.new(
     comments: ["//", ["/*", "*/"]]
@@ -113,28 +126,39 @@ module Sprockets
   register_bundle_metadata_reducer 'application/javascript', :data, Utils.method(:concat_javascript_sources)
   register_bundle_metadata_reducer '*/*', :links, :+
 
-  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')
+  require 'sprockets/closure_compressor'
+  require 'sprockets/sass_compressor'
+  require 'sprockets/uglifier_compressor'
+  require 'sprockets/yui_compressor'
+  register_compressor 'text/css', :sass, SassCompressor
+  register_compressor 'text/css', :scss, SassCompressor
+  register_compressor 'text/css', :yui, YUICompressor
+  register_compressor 'application/javascript', :closure, ClosureCompressor
+  register_compressor 'application/javascript', :uglifier, UglifierCompressor
+  register_compressor 'application/javascript', :uglify, UglifierCompressor
+  register_compressor 'application/javascript', :yui, YUICompressor
 
   # Mmm, CoffeeScript
-  register_engine '.coffee', autoload_processor(:CoffeeScriptProcessor, 'sprockets/coffee_script_processor'), mime_type: 'application/javascript'
+  require 'sprockets/coffee_script_processor'
+  register_engine '.coffee', CoffeeScriptProcessor, mime_type: 'application/javascript'
 
   # JST engines
-  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'
+  require 'sprockets/eco_processor'
+  require 'sprockets/ejs_processor'
+  require 'sprockets/jst_processor'
+  register_engine '.jst', JstProcessor, mime_type: 'application/javascript'
+  register_engine '.eco', EcoProcessor, mime_type: 'application/javascript'
+  register_engine '.ejs', EjsProcessor, mime_type: 'application/javascript'
 
   # CSS engines
-  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'
+  require 'sprockets/sass_processor'
+  register_engine '.sass', SassProcessor, mime_type: 'text/css'
+  register_engine '.scss', ScssProcessor, mime_type: 'text/css'
+  register_bundle_metadata_reducer 'text/css', :sass_dependencies, Set.new, :+
 
   # Other
-  register_engine '.erb', autoload_processor(:ERBProcessor, 'sprockets/erb_processor'), mime_type: 'text/plain'
+  require 'sprockets/erb_processor'
+  register_engine '.erb', ERBProcessor, mime_type: 'text/plain'
 
   register_dependency_resolver 'environment-version' do |env|
     env.version

data/lib/sprockets/autoload.rb

@@ -0,0 +1,11 @@
+module Sprockets
+  module Autoload
+    autoload :Closure, 'sprockets/autoload/closure'
+    autoload :CoffeeScript, 'sprockets/autoload/coffee_script'
+    autoload :Eco, 'sprockets/autoload/eco'
+    autoload :EJS, 'sprockets/autoload/ejs'
+    autoload :Sass, 'sprockets/autoload/sass'
+    autoload :Uglifier, 'sprockets/autoload/uglifier'
+    autoload :YUI, 'sprockets/autoload/yui'
+  end
+end

data/lib/sprockets/autoload/closure.rb

@@ -0,0 +1,7 @@
+require 'closure-compiler'
+
+module Sprockets
+  module Autoload
+    Closure = ::Closure
+  end
+end

data/lib/sprockets/autoload/coffee_script.rb

@@ -0,0 +1,7 @@
+require 'coffee_script'
+
+module Sprockets
+  module Autoload
+    CoffeeScript = ::CoffeeScript
+  end
+end

data/lib/sprockets/autoload/eco.rb

@@ -0,0 +1,7 @@
+require 'eco'
+
+module Sprockets
+  module Autoload
+    Eco = ::Eco
+  end
+end

data/lib/sprockets/autoload/ejs.rb

@@ -0,0 +1,7 @@
+require 'ejs'
+
+module Sprockets
+  module Autoload
+    EJS = ::EJS
+  end
+end

data/lib/sprockets/autoload/sass.rb

@@ -0,0 +1,7 @@
+require 'sass'
+
+module Sprockets
+  module Autoload
+    Sass = ::Sass
+  end
+end

data/lib/sprockets/autoload/uglifier.rb

@@ -0,0 +1,7 @@
+require 'uglifier'
+
+module Sprockets
+  module Autoload
+    Uglifier = ::Uglifier
+  end
+end

data/lib/sprockets/autoload/yui.rb

@@ -0,0 +1,7 @@
+require 'yui/compressor'
+
+module Sprockets
+  module Autoload
+    YUI = ::YUI
+  end
+end

data/lib/sprockets/bundle.rb

@@ -15,8 +15,10 @@ module Sprockets
     def self.call(input)
       env  = input[:environment]
       type = input[:content_type]
+      dependencies = Set.new(input[:metadata][:dependencies])
 
-      processed_uri = env.build_asset_uri(input[:filename], type: type, skip_bundle: true)
+      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)
@@ -24,12 +26,40 @@ module Sprockets
       required.subtract(stubbed)
       assets = required.map { |uri| env.load(uri) }
 
-      dependencies = Set.new(input[:metadata][:dependencies])
       (required + stubbed).each do |uri|
         dependencies.merge(env.load(uri).metadata[:dependencies])
       end
 
-      env.process_bundle_reducers(assets, env.load_bundle_reducers(type)).merge(dependencies: dependencies, included: assets.map(&:uri))
+      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, _)|
+        initial[k] = v if !v.nil?
+      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

data/lib/sprockets/cache.rb

@@ -60,7 +60,7 @@ module Sprockets
     # cache - A compatible backend cache store instance.
     def initialize(cache = nil, logger = self.class.default_logger)
       @cache_wrapper = get_cache_wrapper(cache)
-      @fetch_cache   = Cache::MemoryStore.new(1024)
+      @fetch_cache   = Cache::MemoryStore.new(4096)
       @logger        = logger
     end
 
@@ -107,8 +107,14 @@ module Sprockets
     # Returns a JSON serializable object or nil if there was a cache miss.
     def get(key, local = false)
       expanded_key = expand_key(key)
-      value = @fetch_cache.get(expanded_key) if local
-      value = @cache_wrapper.get(expanded_key) if value.nil?
+
+      if local && value = @fetch_cache.get(expanded_key)
+        return value
+      end
+
+      value = @cache_wrapper.get(expanded_key)
+      @fetch_cache.set(expanded_key, value) if local
+
       value
     end
 
@@ -126,7 +132,7 @@ module Sprockets
     # Returns the value argument.
     def set(key, value, local = false)
       expanded_key = expand_key(key)
-      @fetch_cache.set(expanded_key, value)
+      @fetch_cache.set(expanded_key, value) if local
       @cache_wrapper.set(expanded_key, value)
     end
 
@@ -156,9 +162,12 @@ module Sprockets
       #
       # Returns a String with a length less than 100 characters.
       def peek_key(key)
-        if key.is_a?(String)
+        case key
+        when Integer
+          key.to_s
+        when String
           key[0, PEEK_SIZE].inspect
-        elsif key.is_a?(Array)
+        when Array
           str = []
           key.each { |k| str << peek_key(k) }
           str.join(':')[0, PEEK_SIZE]

data/lib/sprockets/closure_compressor.rb

@@ -1,5 +1,3 @@
-require 'closure-compiler'
-
 module Sprockets
   # Public: Closure Compiler minifier.
   #
@@ -34,11 +32,11 @@ module Sprockets
     attr_reader :cache_key
 
     def initialize(options = {})
-      @compiler = ::Closure::Compiler.new(options)
+      @compiler = Autoload::Closure::Compiler.new(options)
       @cache_key = [
         self.class.name,
-        ::Closure::VERSION,
-        ::Closure::COMPILER_VERSION,
+        Autoload::Closure::VERSION,
+        Autoload::Closure::COMPILER_VERSION,
         VERSION,
         options
       ].freeze

data/lib/sprockets/coffee_script_processor.rb

@@ -1,5 +1,3 @@
-require 'coffee_script'
-
 module Sprockets
   # Processor engine class for the CoffeeScript compiler.
   # Depends on the `coffee-script` and `coffee-script-source` gems.
@@ -10,16 +8,15 @@ module Sprockets
   #
   module CoffeeScriptProcessor
     VERSION = '1'
-    SOURCE_VERSION = ::CoffeeScript::Source.version
 
     def self.cache_key
-      @cache_key ||= [name, SOURCE_VERSION, VERSION].freeze
+      @cache_key ||= [name, Autoload::CoffeeScript::Source.version, VERSION].freeze
     end
 
     def self.call(input)
       data = input[:data]
       input[:cache].fetch(self.cache_key + [data]) do
-        ::CoffeeScript.compile(data)
+        Autoload::CoffeeScript.compile(data)
       end
     end
   end

data/lib/sprockets/compressing.rb

@@ -33,7 +33,7 @@ module Sprockets
       return unless compressor
 
       if compressor.is_a?(Symbol)
-        @css_compressor = klass = compressors['text/css'][compressor] || raise(Error, "unknown compressor: #{compressor}")
+        @css_compressor = klass = config[:compressors]['text/css'][compressor] || raise(Error, "unknown compressor: #{compressor}")
       elsif compressor.respond_to?(:compress)
         klass = LegacyProcProcessor.new(:css_compressor, proc { |context, data| compressor.compress(data) })
         @css_compressor = :css_compressor
@@ -60,7 +60,7 @@ module Sprockets
       return unless compressor
 
       if compressor.is_a?(Symbol)
-        @js_compressor = klass = compressors['application/javascript'][compressor] || raise(Error, "unknown compressor: #{compressor}")
+        @js_compressor = klass = config[:compressors]['application/javascript'][compressor] || raise(Error, "unknown compressor: #{compressor}")
       elsif compressor.respond_to?(:compress)
         klass = LegacyProcProcessor.new(:js_compressor, proc { |context, data| compressor.compress(data) })
         @js_compressor = :js_compressor

data/lib/sprockets/context.rb

@@ -133,7 +133,7 @@ module Sprockets
     #     <%= require_asset "#{framework}.js" %>
     #
     def require_asset(path)
-      @required << resolve(path, accept: @content_type, bundle: false, compat: false)
+      @required << resolve(path, accept: @content_type, pipeline: :self, compat: false)
       nil
     end
 
@@ -141,7 +141,7 @@ module Sprockets
     # `path` must be an asset which may or may not already be included
     # in the bundle.
     def stub_asset(path)
-      @stubbed << resolve(path, accept: @content_type, bundle: false, compat: false)
+      @stubbed << resolve(path, accept: @content_type, pipeline: :self, compat: false)
       nil
     end
 

data/lib/sprockets/dependencies.rb

@@ -63,7 +63,7 @@ module Sprockets
     # Returns resolved Object.
     def resolve_dependency(str)
       scheme = str[/([^:]+)/, 1]
-      if resolver = dependency_resolvers[scheme]
+      if resolver = config[:dependency_resolvers][scheme]
         resolver.call(self, str)
       else
         nil

data/lib/sprockets/directive_processor.rb

@@ -204,7 +204,7 @@ module Sprockets
       #     //= require "./bar"
       #
       def process_require_directive(path)
-        @required << resolve(path, accept: @content_type, bundle: false)
+        @required << resolve(path, accept: @content_type, pipeline: :self)
       end
 
       # `require_self` causes the body of the current file to be inserted
@@ -285,7 +285,7 @@ module Sprockets
       #     //= stub "jquery"
       #
       def process_stub_directive(path)
-        @stubbed << resolve(path, accept: @content_type, bundle: false)
+        @stubbed << resolve(path, accept: @content_type, pipeline: :self)
       end
 
       # Declares a linked dependency on the target asset.
@@ -347,7 +347,7 @@ module Sprockets
       end
 
       def require_paths(paths, deps)
-        resolve_paths(paths, deps, accept: @content_type, bundle: false) do |uri|
+        resolve_paths(paths, deps, accept: @content_type, pipeline: :self) do |uri|
           @required << uri
         end
       end