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

data/lib/sprockets/processor_utils.rb

@@ -1,5 +1,3 @@
-require 'sprockets/autoload_processor'
-
 module Sprockets
   # Functional utilities for dealing with Processor functions.
   #
@@ -16,19 +14,6 @@ module Sprockets
   module ProcessorUtils
     extend self
 
-    # Internal: Setup autoload and wrapper for lazy loaded processor.
-    #
-    #   Sprockets.autoload_processor :CoffeeScriptProcessor, 'sprockets/coffee_script_processor'
-    #
-    # mod      - Symbol name of processor class/module
-    # filename - String require path for module
-    #
-    # Returns AutoloadProcessor.
-    def autoload_processor(mod, filename)
-      autoload(mod, filename)
-      AutoloadProcessor.new(self, mod)
-    end
-
     # Public: Compose processors in right to left order.
     #
     # processors - Array of processors callables
@@ -36,11 +21,18 @@ module Sprockets
     # Returns a composed Proc.
     def compose_processors(*processors)
       context = self
-      obj = method(:call_processors).to_proc.curry[processors]
+
+      if processors.length == 1
+        obj = method(:call_processor).to_proc.curry[processors.first]
+      else
+        obj = method(:call_processors).to_proc.curry[processors]
+      end
+
       metaclass = (class << obj; self; end)
       metaclass.send(:define_method, :cache_key) do
         context.processors_cache_keys(processors)
       end
+
       obj
     end
 
@@ -57,25 +49,39 @@ module Sprockets
     # Returns a Hash with :data and other processor metadata key/values.
     def call_processors(processors, input)
       data = input[:data] || ""
-      metadata = input[:metadata] || {}
+      metadata = (input[:metadata] || {}).dup
 
       processors.reverse_each do |processor|
-        result = processor.call(input.merge(data: data, metadata: metadata))
-        case result
-        when NilClass
-        when Hash
-          data = result.delete(:data) if result.key?(:data)
-          metadata.merge!(result)
-        when String
-          data = result
-        else
-          raise TypeError, "invalid processor return type: #{result.class}"
-        end
+        result = call_processor(processor, input.merge(data: data, metadata: metadata))
+        data = result.delete(:data)
+        metadata.merge!(result)
       end
 
       metadata.merge(data: data)
     end
 
+    # Public: Invoke processor.
+    #
+    # processor - Processor callables
+    # input - Hash of input data to pass to processor
+    #
+    # Returns a Hash with :data and other processor metadata key/values.
+    def call_processor(processor, input)
+      metadata = (input[:metadata] || {}).dup
+      metadata[:data] = input[:data]
+
+      case result = processor.call({data: "", metadata: {}}.merge(input))
+      when NilClass
+        metadata
+      when Hash
+        metadata.merge(result)
+      when String
+        metadata.merge(data: result)
+      else
+        raise TypeError, "invalid processor return type: #{result.class}"
+      end
+    end
+
     # Internal: Get processor defined cached key.
     #
     # processor - Processor function

data/lib/sprockets/resolve.rb

@@ -22,19 +22,28 @@ module Sprockets
     # The String Asset URI is returned or nil if no results are found.
     def resolve(path, options = {})
       path = path.to_s
-      paths = options[:load_paths] || self.paths
+      paths = options[:load_paths] || config[:paths]
       accept = options[:accept]
-      skip_bundle = options.key?(:bundle) ? !options[:bundle] : false
 
       if valid_asset_uri?(path)
-        resolve_asset_uri(path)
+        uri, deps = resolve_asset_uri(path)
       elsif absolute_path?(path)
-        resolve_absolute_path(paths, path, accept, skip_bundle)
+        filename, type, deps = resolve_absolute_path(paths, path, accept)
       elsif relative_path?(path)
-        resolve_relative_path(paths, path, options[:base_path], accept, skip_bundle)
+        filename, type, pipeline, deps = resolve_relative_path(paths, path, options[:base_path], accept)
       else
-        resolve_logical_path(paths, path, accept, skip_bundle)
+        filename, type, pipeline, deps = resolve_logical_path(paths, path, accept)
       end
+
+      if filename
+        params = {}
+        params[:type] = type if type
+        params[:pipeline] = pipeline if pipeline
+        params[:pipeline] = options[:pipeline] if options[:pipeline]
+        uri = build_asset_uri(filename, params)
+      end
+
+      return uri, deps
     end
 
     # Public: Same as resolve() but raises a FileNotFound exception instead of
@@ -57,36 +66,35 @@ module Sprockets
         return uri, Set.new([build_file_digest_uri(filename)])
       end
 
-      def resolve_absolute_path(paths, filename, accept, skip_bundle)
+      def resolve_absolute_path(paths, filename, accept)
         deps = Set.new
         filename = File.expand_path(filename)
 
         # Ensure path is under load paths
-        return nil, deps unless paths_split(paths, filename)
+        return nil, nil, deps unless paths_split(paths, filename)
 
-        mime_type = parse_path_extnames(filename)[1]
+        _, mime_type, _, _ = parse_path_extnames(filename)
         type = resolve_transform_type(mime_type, accept)
-        return nil, deps if accept && !type
+        return nil, nil, deps if accept && !type
 
-        return nil, deps unless file?(filename)
+        return nil, nil, deps unless file?(filename)
 
-        uri = build_asset_uri(filename, type: type, skip_bundle: skip_bundle)
         deps << build_file_digest_uri(filename)
-        return uri, deps
+        return filename, type, deps
       end
 
-      def resolve_relative_path(paths, path, dirname, accept, skip_bundle)
+      def resolve_relative_path(paths, path, dirname, accept)
         filename = File.expand_path(path, dirname)
         load_path, _ = paths_split(paths, dirname)
         if load_path && logical_path = split_subpath(load_path, filename)
-          resolve_logical_path([load_path], logical_path, accept, skip_bundle)
+          resolve_logical_path([load_path], logical_path, accept)
         else
-          [nil, Set.new]
+          return nil, nil, Set.new
         end
       end
 
-      def resolve_logical_path(paths, logical_path, accept, skip_bundle)
-        logical_name, mime_type, _ = parse_path_extnames(logical_path)
+      def resolve_logical_path(paths, logical_path, accept)
+        logical_name, mime_type, _, pipeline = parse_path_extnames(logical_path)
         parsed_accept = parse_accept_options(mime_type, accept)
         transformed_accepts = expand_transform_accepts(parsed_accept)
         filename, mime_type, deps = resolve_under_paths(paths, logical_name, transformed_accepts)
@@ -94,10 +102,9 @@ module Sprockets
         if filename
           deps << build_file_digest_uri(filename)
           type = resolve_transform_type(mime_type, parsed_accept)
-          uri = build_asset_uri(filename, type: type, skip_bundle: skip_bundle)
-          return uri, deps
+          return filename, type, pipeline, deps
         else
-          return nil, deps
+          return nil, nil, nil, deps
         end
       end
 
@@ -168,7 +175,7 @@ module Sprockets
         candidates = []
         entries, deps = self.entries_with_dependencies(dirname)
         entries.each do |entry|
-          name, type, _ = parse_path_extnames(entry)
+          name, type, _, _ = parse_path_extnames(entry)
           if basename == name
             candidates << [File.join(dirname, entry), type]
           end
@@ -186,12 +193,15 @@ module Sprockets
       #     # => ["foo", "application/javascript", [".coffee", ".erb"]]
       #
       def parse_path_extnames(path)
+        engines = []
         extname, value = match_path_extname(path, config[:_extnames])
+
         if extname
-          return path.chomp(extname), value[:type], value[:engines]
-        else
-          return path, nil, []
+          path = path.chomp(extname)
+          type, engines, pipeline = value.values_at(:type, :engines, :pipeline)
         end
+
+        return path, type, engines, pipeline
       end
   end
 end

data/lib/sprockets/sass_cache_store.rb

@@ -1,2 +1,29 @@
-# Deprecated: Require sprockets/sass_processor instead
-require 'sprockets/sass_processor'
+require 'sass'
+
+module Sprockets
+  class SassProcessor
+    # Internal: Cache wrapper for Sprockets cache adapter.
+    class CacheStore < ::Sass::CacheStores::Base
+      VERSION = '1'
+
+      def initialize(cache, version)
+        @cache, @version = cache, "#{VERSION}/#{version}"
+      end
+
+      def _store(key, version, sha, contents)
+        @cache.set("#{@version}/#{version}/#{key}/#{sha}", contents, true)
+      end
+
+      def _retrieve(key, version, sha)
+        @cache.get("#{@version}/#{version}/#{key}/#{sha}", true)
+      end
+
+      def path_to(key)
+        key
+      end
+    end
+  end
+
+  # Deprecated: Use Sprockets::SassProcessor::CacheStore instead.
+  SassCacheStore = SassProcessor::CacheStore
+end

data/lib/sprockets/sass_compressor.rb

@@ -1,5 +1,3 @@
-require 'sass'
-
 module Sprockets
   # Public: Sass CSS minifier.
   #
@@ -27,7 +25,7 @@ module Sprockets
       instance.call(input)
     end
 
-    def cache_key
+    def self.cache_key
       instance.cache_key
     end
 
@@ -37,7 +35,7 @@ module Sprockets
       @options = options
       @cache_key = [
         self.class.name,
-        ::Sass::VERSION,
+        Autoload::Sass::VERSION,
         VERSION,
         options
       ].freeze
@@ -52,7 +50,7 @@ module Sprockets
           read_cache: false,
           style: :compressed
         }.merge(@options)
-        ::Sass::Engine.new(data, options).render
+        Autoload::Sass::Engine.new(data, options).render
       end
     end
   end

data/lib/sprockets/sass_processor.rb

@@ -1,5 +1,4 @@
 require 'rack/utils'
-require 'sass'
 require 'uri'
 
 module Sprockets
@@ -11,6 +10,8 @@ module Sprockets
   #   https://github.com/rails/sass-rails
   #
   class SassProcessor
+    autoload :CacheStore, 'sprockets/sass_cache_store'
+
     # Internal: Defines default sass syntax to use. Exposed so the ScssProcessor
     # may override it.
     def self.syntax
@@ -45,7 +46,7 @@ module Sprockets
       @cache_key = [
         self.class.name,
         VERSION,
-        Sass::VERSION,
+        Autoload::Sass::VERSION,
         @cache_version
       ].freeze
 
@@ -71,18 +72,20 @@ module Sprockets
         }
       }
 
-      engine = ::Sass::Engine.new(input[:data], options)
+      engine = Autoload::Sass::Engine.new(input[:data], options)
 
-      css = Utils.module_include(::Sass::Script::Functions, @functions) do
+      css = Utils.module_include(Autoload::Sass::Script::Functions, @functions) do
         engine.render
       end
 
       # Track all imported files
+      sass_dependencies = Set.new([input[:filename]])
       engine.dependencies.map do |dependency|
+        sass_dependencies << dependency.options[:filename]
         context.metadata[:dependencies] << URIUtils.build_file_digest_uri(dependency.options[:filename])
       end
 
-      context.metadata.merge(data: css)
+      context.metadata.merge(data: css, sass_dependencies: sass_dependencies)
     end
 
     # Public: Functions injected into Sass context during Sprockets evaluation.
@@ -114,7 +117,7 @@ module Sprockets
         query    = "?#{query}" if query
         fragment = "##{fragment}" if fragment
 
-        ::Sass::Script::String.new("#{path}#{query}#{fragment}", :string)
+        Autoload::Sass::Script::String.new("#{path}#{query}#{fragment}", :string)
       end
 
       # Public: Generate a asset url() link.
@@ -123,7 +126,7 @@ module Sprockets
       #
       # Returns a Sass::Script::String.
       def asset_url(path, options = {})
-        ::Sass::Script::String.new("url(#{asset_path(path, options).value})")
+        Autoload::Sass::Script::String.new("url(#{asset_path(path, options).value})")
       end
 
       # Public: Generate url for image path.
@@ -241,7 +244,7 @@ module Sprockets
       # Returns a Sass::Script::String.
       def asset_data_url(path)
         url = sprockets_context.asset_data_uri(path.value)
-        ::Sass::Script::String.new("url(" + url + ")")
+        Autoload::Sass::Script::String.new("url(" + url + ")")
       end
 
       protected
@@ -268,27 +271,6 @@ module Sprockets
         end
 
     end
-
-    # Internal: Cache wrapper for Sprockets cache adapter.
-    class CacheStore < ::Sass::CacheStores::Base
-      VERSION = '1'
-
-      def initialize(cache, version)
-        @cache, @version = cache, "#{VERSION}/#{version}"
-      end
-
-      def _store(key, version, sha, contents)
-        @cache.set("#{@version}/#{version}/#{key}/#{sha}", contents)
-      end
-
-      def _retrieve(key, version, sha)
-        @cache.get("#{@version}/#{version}/#{key}/#{sha}")
-      end
-
-      def path_to(key)
-        key
-      end
-    end
   end
 
   class ScssProcessor < SassProcessor
@@ -299,7 +281,4 @@ module Sprockets
 
   # Deprecated: Use Sprockets::SassProcessor::Functions instead.
   SassFunctions = SassProcessor::Functions
-
-  # Deprecated: Use Sprockets::SassProcessor::CacheStore instead.
-  SassCacheStore = SassProcessor::CacheStore
 end

data/lib/sprockets/server.rb

@@ -44,12 +44,14 @@ module Sprockets
 
       # Look up the asset.
       options = {}
-      options[:bundle] = !body_only?(env)
+      options[:pipeline] = :self if body_only?(env)
+
+      asset = find_asset(path, options)
 
       # 2.x/3.x compatibility hack. Just ignore fingerprints on ?body=1 requests.
       # 3.x/4.x prefers strong validation of fingerprint to body contents, but
       # 2.x just ignored it.
-      if options[:bundle] == false
+      if asset && parse_asset_uri(asset.uri)[1][:pipeline] == "self"
         fingerprint = nil
       end
 
@@ -63,8 +65,6 @@ module Sprockets
         if_none_match = env['HTTP_IF_NONE_MATCH'][/^"(\w+)"$/, 1]
       end
 
-      asset = find_asset(path, options)
-
       if asset.nil?
         status = :not_found
       elsif fingerprint && asset.etag != fingerprint

data/lib/sprockets/transformers.rb

@@ -58,7 +58,7 @@ module Sprockets
     #
     # Returns String mime type or nil is no type satisfied the accept value.
     def resolve_transform_type(type, accept)
-      find_best_mime_type_match(accept || '*/*', [type].compact + transformers[type].keys)
+      find_best_mime_type_match(accept || '*/*', [type].compact + config[:transformers][type].keys)
     end
 
     # Internal: Expand accept type list to include possible transformed types.

data/lib/sprockets/uglifier_compressor.rb

@@ -1,5 +1,3 @@
-require 'uglifier'
-
 module Sprockets
   # Public: Uglifier/Uglify compressor.
   #
@@ -35,7 +33,7 @@ module Sprockets
 
     def initialize(options = {})
       # Feature detect Uglifier 2.0 option support
-      if Uglifier::DEFAULTS[:copyright]
+      if Autoload::Uglifier::DEFAULTS[:copyright]
         # Uglifier < 2.x
         options[:copyright] ||= false
       else
@@ -43,11 +41,11 @@ module Sprockets
         options[:copyright] ||= :none
       end
 
-      @uglifier = ::Uglifier.new(options)
+      @uglifier = Autoload::Uglifier.new(options)
 
       @cache_key = [
         self.class.name,
-        ::Uglifier::VERSION,
+        Autoload::Uglifier::VERSION,
         VERSION,
         options
       ].freeze