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

data/lib/sprockets/sass_template.rb

@@ -1,289 +1,7 @@
-require 'rack/utils'
-require 'sass'
-require 'uri'
+require 'sprockets/sass_processor'
 
 module Sprockets
-  # Template engine class for the SASS/SCSS compiler. Depends on the `sass` gem.
-  #
-  # For more infomation see:
-  #
-  #   https://github.com/sass/sass
-  #   https://github.com/rails/sass-rails
-  #
-  class SassTemplate
-    # Internal: Defines default sass syntax to use. Exposed so the ScssTemplate
-    # may override it.
-    def self.syntax
-      :sass
-    end
-
-    def self.call(*args)
-      new.call(*args)
-    end
-
-    # Public: Initialize template with custom options.
-    #
-    # options - Hash
-    #   cache_version - String custom cache version. Used to force a cache
-    #                   change after code changes are made to Sass Functions.
-    #
-    def initialize(options = {}, &block)
-      @cache_version = options[:cache_version]
-
-      @functions = Module.new do
-        include Functions
-        include options[:functions] if options[:functions]
-        class_eval(&block) if block_given?
-      end
-    end
-
-    def call(input)
-      context = input[:environment].context_class.new(input)
-
-      options = {
-        filename: input[:filename],
-        syntax: self.class.syntax,
-        cache_store: CacheStore.new(input[:cache], @cache_version),
-        load_paths: input[:environment].paths,
-        sprockets: {
-          context: context,
-          environment: input[:environment],
-          dependencies: context.metadata[:dependency_paths]
-        }
-      }
-
-      engine = ::Sass::Engine.new(input[:data], options)
-
-      css = Utils.module_include(::Sass::Script::Functions, @functions) do
-        engine.render
-      end
-
-      # Track all imported files
-      engine.dependencies.map do |dependency|
-        context.metadata[:dependency_paths] << dependency.options[:filename]
-      end
-
-      context.metadata.merge(data: css)
-    end
-
-    # Public: Functions injected into Sass context during Sprockets evaluation.
-    #
-    # This module may be extended to add global functionality to all Sprockets
-    # Sass environments. Though, scoping your functions to just your environment
-    # is preferred.
-    #
-    # module Sprockets::SassTemplate::Functions
-    #   def asset_path(path, options = {})
-    #   end
-    # end
-    #
-    module Functions
-      # Public: Generate a url for asset path.
-      #
-      # Default implementation is deprecated. Currently defaults to
-      # Context#asset_path.
-      #
-      # Will raise NotImplementedError in the future. Users should provide their
-      # own base implementation.
-      #
-      # Returns a Sass::Script::String.
-      def asset_path(path, options = {})
-        path = path.value
-
-        path, _, query, fragment = URI.split(path)[5..8]
-        path     = sprockets_context.asset_path(path, options)
-        query    = "?#{query}" if query
-        fragment = "##{fragment}" if fragment
-
-        ::Sass::Script::String.new("#{path}#{query}#{fragment}", :string)
-      end
-
-      # Public: Generate a asset url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def asset_url(path, options = {})
-        ::Sass::Script::String.new("url(#{asset_path(path, options).value})")
-      end
-
-      # Public: Generate url for image path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def image_path(path)
-        asset_path(path, type: :image)
-      end
-
-      # Public: Generate a image url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def image_url(path)
-        asset_url(path, type: :image)
-      end
-
-      # Public: Generate url for video path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def video_path(path)
-        asset_path(path, type: :video)
-      end
-
-      # Public: Generate a video url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def video_url(path)
-        asset_url(path, type: :video)
-      end
-
-      # Public: Generate url for audio path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def audio_path(path)
-        asset_path(path, type: :audio)
-      end
-
-      # Public: Generate a audio url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def audio_url(path)
-        asset_url(path, type: :audio)
-      end
-
-      # Public: Generate url for font path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def font_path(path)
-        asset_path(path, type: :font)
-      end
-
-      # Public: Generate a font url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def font_url(path)
-        asset_url(path, type: :font)
-      end
-
-      # Public: Generate url for javascript path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def javascript_path(path)
-        asset_path(path, type: :javascript)
-      end
-
-      # Public: Generate a javascript url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def javascript_url(path)
-        asset_url(path, type: :javascript)
-      end
-
-      # Public: Generate url for stylesheet path.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def stylesheet_path(path)
-        asset_path(path, type: :stylesheet)
-      end
-
-      # Public: Generate a stylesheet url() link.
-      #
-      # path - Sass::Script::String URL path
-      #
-      # Returns a Sass::Script::String.
-      def stylesheet_url(path)
-        asset_url(path, type: :stylesheet)
-      end
-
-      # Public: Generate a data URI for asset path.
-      #
-      # path - Sass::Script::String logical asset path
-      #
-      # Returns a Sass::Script::String.
-      def asset_data_url(path)
-        if asset = sprockets_environment.find_asset(path.value, accept_encoding: 'base64')
-          sprockets_dependencies << asset.filename
-          url = "data:#{asset.content_type};base64,#{Rack::Utils.escape(asset.to_s)}"
-          ::Sass::Script::String.new("url(" + url + ")")
-        end
-      end
-
-      protected
-        # Public: The Environment.
-        #
-        # Returns Sprockets::Environment.
-        def sprockets_environment
-          options[:sprockets][:environment]
-        end
-
-        # Public: Mutatable set dependency paths.
-        #
-        # Returns a Set.
-        def sprockets_dependencies
-          options[:sprockets][:dependencies]
-        end
-
-        # Deprecated: Get the Context instance. Use APIs on
-        # sprockets_environment or sprockets_dependencies directly.
-        #
-        # Returns a Context instance.
-        def sprockets_context
-          options[:sprockets][:context]
-        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 ScssTemplate < SassTemplate
-    def self.syntax
-      :scss
-    end
-  end
-
-  # Deprecated: Use Sprockets::SassTemplate::Functions instead.
-  SassFunctions = SassTemplate::Functions
-
-  # Deprecated: Use Sprockets::SassTemplate::CacheStore instead.
-  SassCacheStore = SassTemplate::CacheStore
+  # Deprecated
+  SassTemplate = SassProcessor
+  ScssTemplate = ScssProcessor
 end

data/lib/sprockets/server.rb

@@ -48,7 +48,7 @@ module Sprockets
 
       # 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. 
+      # 2.x just ignored it.
       if options[:bundle] == false
         fingerprint = nil
       end
@@ -63,13 +63,6 @@ module Sprockets
         if_none_match = env['HTTP_IF_NONE_MATCH'][/^"(\w+)"$/, 1]
       end
 
-      if !if_match && !if_none_match && env['HTTP_ACCEPT_ENCODING']
-        # Accept-Encoding negotiation is only enabled for non-fingerprinted
-        # assets. Avoids the "Apache ETag gzip" bug. Just Google it.
-        # https://issues.apache.org/bugzilla/show_bug.cgi?id=39727
-        options[:accept_encoding] = env['HTTP_ACCEPT_ENCODING']
-      end
-
       asset = find_asset(path, options)
 
       if asset.nil?
@@ -252,11 +245,6 @@ module Sprockets
       def headers(env, asset, length)
         headers = {}
 
-        # Set content encoding
-        if asset.encoding
-          headers["Content-Encoding"] = asset.encoding
-        end
-
         # Set content length header
         headers["Content-Length"] = length.to_s
 

data/lib/sprockets/transformers.rb

@@ -1,5 +1,11 @@
+require 'sprockets/http_utils'
+require 'sprockets/processor_utils'
+require 'sprockets/utils'
+
 module Sprockets
   module Transformers
+    include HTTPUtils, ProcessorUtils, Utils
+
     # Public: Two level mapping of a source mime type to a target mime type.
     #
     #   environment.transformers
@@ -8,17 +14,9 @@ module Sprockets
     #          }
     #        }
     #
-    attr_reader :transformers
-
-    # Public: Two level mapping of target mime type to source mime type.
-    #
-    #   environment.inverted_transformers
-    #   # => { 'application/javascript' => {
-    #            'text/coffeescript' => ConvertCoffeeScriptToJavaScript
-    #          }
-    #        }
-    #
-    attr_reader :inverted_transformers
+    def transformers
+      config[:transformers]
+    end
 
     # Public: Register a transformer from and to a mime type.
     #
@@ -35,12 +33,10 @@ module Sprockets
     #
     # Returns nothing.
     def register_transformer(from, to, proc)
-      mutate_hash_config(:transformers, from) do |transformers|
+      self.config = hash_reassoc(config, :registered_transformers, from) do |transformers|
         transformers.merge(to => proc)
       end
-      mutate_hash_config(:inverted_transformers, to) do |transformers|
-        transformers.merge(from => proc)
-      end
+      compute_transformers!
     end
 
     # Internal: Resolve target mime type that the source type should be
@@ -79,25 +75,66 @@ module Sprockets
       accepts = []
       parsed_accepts.each do |(type, q)|
         accepts.push([type, q])
-        inverted_transformers[type].keys.each do |subtype|
+        config[:inverted_transformers][type].each do |subtype|
           accepts.push([subtype, q * 0.8])
         end
       end
       accepts
     end
 
-    # Internal: Find and load transformer by from and to mime type.
+    # Internal: Compose multiple transformer steps into a single processor
+    # function.
     #
-    # from - String mime type
-    # to   - String mime type
+    # transformers - Two level Hash of a source mime type to a target mime type
+    # types - Array of mime type steps
     #
-    # Returns Array of Procs.
-    def unwrap_transformer(from, to)
-      if processor = transformers[from][to]
-        [unwrap_processor(processor)]
-      else
-        []
+    # Returns Processor.
+    def compose_transformers(transformers, types)
+      if types.length < 2
+        raise ArgumentError, "too few transform types: #{types.inspect}"
+      end
+
+      processors = []
+      enum = types.each
+
+      loop do
+        src, dst = enum.next, enum.peek
+        unless processor = transformers[src][dst]
+          raise ArgumentError, "missing transformer for type: #{src} to #{dst}"
+        end
+        processors.concat config[:postprocessors][src]
+        processors << processor
+        processors.concat config[:preprocessors][dst]
+      end
+
+      if processors.size > 1
+        compose_processors(*processors.reverse)
+      elsif processors.size == 1
+        processors.first
       end
     end
+
+    private
+      def compute_transformers!
+        registered_transformers = self.config[:registered_transformers]
+        transformers = Hash.new { {} }
+        inverted_transformers = Hash.new { Set.new }
+
+        registered_transformers.keys.flat_map do |key|
+          dfs_paths([key]) { |k| registered_transformers[k].keys }
+        end.each do |types|
+          src, dst = types.first, types.last
+          processor = compose_transformers(registered_transformers, types)
+
+          transformers[src] = {} unless transformers.key?(src)
+          transformers[src][dst] = processor
+
+          inverted_transformers[dst] = Set.new unless inverted_transformers.key?(dst)
+          inverted_transformers[dst] << src
+        end
+
+        self.config = hash_reassoc(config, :transformers) { transformers }
+        self.config = hash_reassoc(config, :inverted_transformers) { inverted_transformers }
+      end
   end
 end