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

data/lib/sprockets/eco_processor.rb

@@ -0,0 +1,32 @@
+require 'eco'
+
+module Sprockets
+  # Processor engine class for the Eco compiler. Depends on the `eco` gem.
+  #
+  # For more infomation see:
+  #
+  #   https://github.com/sstephenson/ruby-eco
+  #   https://github.com/sstephenson/eco
+  #
+  module EcoProcessor
+    VERSION = '1'
+
+    def self.cache_key
+      @cache_key ||= [name, ::Eco::Source::VERSION, VERSION].freeze
+    end
+
+    # Compile template data with Eco compiler.
+    #
+    # Returns a JS function definition String. The result should be
+    # assigned to a JS variable.
+    #
+    #     # => "function(...) {...}"
+    #
+    def self.call(input)
+      data = input[:data]
+      input[:cache].fetch(cache_key + [data]) do
+        ::Eco.compile(data)
+      end
+    end
+  end
+end

data/lib/sprockets/eco_template.rb

@@ -1,29 +1,6 @@
-require 'eco'
+require 'sprockets/eco_processor'
 
 module Sprockets
-  # Template engine class for the Eco compiler. Depends on the `eco` gem.
-  #
-  # For more infomation see:
-  #
-  #   https://github.com/sstephenson/ruby-eco
-  #   https://github.com/sstephenson/eco
-  #
-  module EcoTemplate
-    VERSION = '1'
-
-    # Compile template data with Eco compiler.
-    #
-    # Returns a JS function definition String. The result should be
-    # assigned to a JS variable.
-    #
-    #     # => "function(...) {...}"
-    #
-    def self.call(input)
-      data = input[:data]
-      key  = ['EcoTemplate', ::Eco::Source::VERSION, VERSION, data]
-      input[:cache].fetch(key) do
-        ::Eco.compile(data)
-      end
-    end
-  end
+  # Deprecated
+  EcoTemplate = EcoProcessor
 end

data/lib/sprockets/ejs_processor.rb

@@ -0,0 +1,31 @@
+require 'ejs'
+
+module Sprockets
+  # Processor engine class for the EJS compiler. Depends on the `ejs` gem.
+  #
+  # For more infomation see:
+  #
+  #   https://github.com/sstephenson/ruby-ejs
+  #
+  module EjsProcessor
+    VERSION = '1'
+
+    def self.cache_key
+      @cache_key ||= [name, VERSION].freeze
+    end
+
+    # Compile template data with EJS compiler.
+    #
+    # Returns a JS function definition String. The result should be
+    # assigned to a JS variable.
+    #
+    #     # => "function(obj){...}"
+    #
+    def self.call(input)
+      data = input[:data]
+      input[:cache].fetch(cache_key + [data]) do
+        ::EJS.compile(data)
+      end
+    end
+  end
+end

data/lib/sprockets/ejs_template.rb

@@ -1,28 +1,6 @@
-require 'ejs'
+require 'sprockets/ejs_processor'
 
 module Sprockets
-  # Template engine class for the EJS compiler. Depends on the `ejs` gem.
-  #
-  # For more infomation see:
-  #
-  #   https://github.com/sstephenson/ruby-ejs
-  #
-  module EjsTemplate
-    VERSION = '1'
-
-    # Compile template data with EJS compiler.
-    #
-    # Returns a JS function definition String. The result should be
-    # assigned to a JS variable.
-    #
-    #     # => "function(obj){...}"
-    #
-    def self.call(input)
-      data = input[:data]
-      key  = ['EjsTemplate', VERSION, data]
-      input[:cache].fetch(key) do
-        ::EJS.compile(data)
-      end
-    end
-  end
+  # Deprecated
+  EjsTemplate = EjsProcessor
 end

data/lib/sprockets/encoding_utils.rb

@@ -3,6 +3,8 @@ require 'stringio'
 require 'zlib'
 
 module Sprockets
+  # Internal: HTTP transport encoding and charset detecting related functions.
+  # Mixed into Environment.
   module EncodingUtils
     extend self
 
@@ -24,9 +26,6 @@ module Sprockets
       deflater.finish
     end
 
-    # Public: Alias for CodingUtils.deflate
-    DEFLATE = method(:deflate)
-
     # Internal: Unmarshal optionally deflated data.
     #
     # Checks leading marshal header to see if the bytes are uncompressed
@@ -65,9 +64,6 @@ module Sprockets
       io.string
     end
 
-    # Public: Alias for CodingUtils.gzip
-    GZIP = method(:gzip)
-
     # Public: Use base64 to encode data.
     #
     # str - String data
@@ -77,12 +73,12 @@ module Sprockets
       Base64.strict_encode64(str)
     end
 
-    # Public: Alias for CodingUtils.base64
-    BASE64 = method(:base64)
-
 
     ## Charset encodings ##
 
+    # Internal: Shorthand aliases for detecter functions.
+    CHARSET_DETECT = {}
+
     # Internal: Mapping unicode encodings to byte order markers.
     BOM = {
       Encoding::UTF_32LE => [0xFF, 0xFE, 0x00, 0x00],
@@ -115,9 +111,7 @@ module Sprockets
 
       str
     end
-
-    # Public: Alias for EncodingUtils.detect_unicode
-    DETECT = method(:detect)
+    CHARSET_DETECT[:default] = method(:detect)
 
     # Internal: Use Charlock Holmes to detect encoding.
     #
@@ -151,9 +145,7 @@ module Sprockets
 
       str
     end
-
-    # Public: Alias for EncodingUtils.detect_unicode
-    DETECT_UNICODE = method(:detect_unicode)
+    CHARSET_DETECT[:unicode] = method(:detect_unicode)
 
     # Public: Detect and strip BOM from possible unicode string.
     #
@@ -201,9 +193,7 @@ module Sprockets
 
       str
     end
-
-    # Public: Alias for EncodingUtils.detect_css
-    DETECT_CSS = method(:detect_css)
+    CHARSET_DETECT[:css] = method(:detect_css)
 
     # Internal: @charset bytes
     CHARSET_START = [0x40, 0x63, 0x68, 0x61, 0x72, 0x73, 0x65, 0x74, 0x20, 0x22]
@@ -263,8 +253,6 @@ module Sprockets
 
       str
     end
-
-    # Public: Alias for EncodingUtils.detect_html
-    DETECT_HTML = method(:detect_html)
+    CHARSET_DETECT[:html] = method(:detect_html)
   end
 end

data/lib/sprockets/engines.rb

@@ -1,4 +1,3 @@
-require 'sprockets/lazy_processor'
 require 'sprockets/legacy_tilt_processor'
 require 'sprockets/utils'
 
@@ -7,11 +6,11 @@ module Sprockets
   #
   # An engine is a type of processor that is bound to a filename
   # extension. `application.js.coffee` indicates that the
-  # `CoffeeScriptTemplate` engine will be ran on the file.
+  # `CoffeeScriptProcessor` engine will be ran on the file.
   #
   # Extensions can be stacked and will be evaulated from right to
-  # left. `application.js.coffee.erb` will first run `ERBTemplate`
-  # then `CoffeeScriptTemplate`.
+  # left. `application.js.coffee.erb` will first run `ERBProcessor`
+  # then `CoffeeScriptProcessor`.
   #
   # All `Engine`s must follow the `Template` interface. It is
   # recommended to subclass `Template`.
@@ -23,63 +22,62 @@ module Sprockets
   #
   # The global registry is exposed for plugins to register themselves.
   #
-  #     Sprockets.register_engine '.sass', SassTemplate
+  #     Sprockets.register_engine '.sass', SassProcessor
   #
   module Engines
+    include Utils
+
     # Returns a `Hash` of `Engine`s registered on the `Environment`.
     # If an `ext` argument is supplied, the `Engine` associated with
     # that extension will be returned.
     #
     #     environment.engines
-    #     # => {".coffee" => CoffeeScriptTemplate, ".sass" => SassTemplate, ...}
+    #     # => {".coffee" => CoffeeScriptProcessor, ".sass" => SassProcessor, ...}
     #
-    attr_reader :engines
+    def engines
+      config[:engines]
+    end
 
     # Internal: Returns a `Hash` of engine extensions to mime types.
     #
     # # => { '.coffee' => 'application/javascript' }
-    attr_reader :engine_mime_types
-
-    # Internal: Find and load engines by extension.
-    #
-    # extnames - Array of String extnames
-    #
-    # Returns Array of Procs.
-    def unwrap_engines(extnames)
-      extnames.map { |ext|
-        engines[ext]
-      }.map { |engine|
-        unwrap_processor(engine)
-      }
+    def engine_mime_types
+      config[:engine_mime_types]
     end
 
     # Registers a new Engine `klass` for `ext`. If the `ext` already
     # has an engine registered, it will be overridden.
     #
-    #     environment.register_engine '.coffee', CoffeeScriptTemplate
+    #     environment.register_engine '.coffee', CoffeeScriptProcessor
     #
     def register_engine(ext, klass, options = {})
       ext = Sprockets::Utils.normalize_extension(ext)
 
-      if klass.class == Sprockets::LazyProcessor || klass.respond_to?(:call)
-        mutate_config(:engines) do |engines|
+      if klass.class == Sprockets::AutoloadProcessor || klass.respond_to?(:call)
+        processor = klass
+        self.config = hash_reassoc(config, :engines) do |engines|
           engines.merge(ext => klass)
         end
         if options[:mime_type]
-          mutate_config(:engine_mime_types) do |mime_types|
+          self.config = hash_reassoc(config, :engine_mime_types) do |mime_types|
             mime_types.merge(ext.to_s => options[:mime_type])
           end
         end
       else
-        mutate_config(:engines) do |engines|
-          engines.merge(ext => LegacyTiltProcessor.new(klass))
+        processor = LegacyTiltProcessor.new(klass)
+        self.config = hash_reassoc(config, :engines) do |engines|
+          engines.merge(ext => processor)
         end
         if klass.respond_to?(:default_mime_type) && klass.default_mime_type
-          mutate_config(:engine_mime_types) do |mime_types|
+          self.config = hash_reassoc(config, :engine_mime_types) do |mime_types|
             mime_types.merge(ext.to_s => klass.default_mime_type)
           end
         end
       end
+
+      self.config = hash_reassoc(config, :_extnames) do
+        compute_extname_map
+      end
     end
   end
 end

data/lib/sprockets/environment.rb

@@ -11,7 +11,7 @@ module Sprockets
     #
     def initialize(root = ".")
       initialize_configuration(Sprockets)
-      @root = File.expand_path(root)
+      self.root = root
       self.cache = Cache::MemoryStore.new
       yield self if block_given?
     end
@@ -29,5 +29,13 @@ module Sprockets
     def find_asset(*args)
       cached.find_asset(*args)
     end
+
+    def find_all_linked_assets(*args, &block)
+      cached.find_all_linked_assets(*args, &block)
+    end
+
+    def load(*args)
+      cached.load(*args)
+    end
   end
 end

data/lib/sprockets/erb_processor.rb

@@ -0,0 +1,30 @@
+require 'erb'
+
+module Sprockets
+  class ERBProcessor
+    # Public: Return singleton instance with default options.
+    #
+    # Returns ERBProcessor object.
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def initialize(&block)
+      @block = block
+    end
+
+    def call(input)
+      engine = ::ERB.new(input[:data], nil, '<>')
+      context = input[:environment].context_class.new(input)
+      klass = (class << context; self; end)
+      klass.class_eval(&@block) if @block
+      engine.def_method(klass, :_evaluate_template, input[:filename])
+      data = context._evaluate_template
+      context.metadata.merge(data: data)
+    end
+  end
+end

data/lib/sprockets/erb_template.rb

@@ -1,23 +1,6 @@
-require 'erb'
+require 'sprockets/erb_processor'
 
 module Sprockets
-  class ERBTemplate
-    def self.call(input)
-      new.call(input)
-    end
-
-    def initialize(&block)
-      @block = block
-    end
-
-    def call(input)
-      engine = ::ERB.new(input[:data], nil, '<>')
-      context = input[:environment].context_class.new(input)
-      klass = (class << context; self; end)
-      klass.class_eval(&@block) if @block
-      engine.def_method(klass, :_evaluate_template, input[:filename])
-      data = context._evaluate_template
-      context.metadata.merge(data: data)
-    end
-  end
+  # Deprecated
+  ERBTemplate = ERBProcessor
 end

data/lib/sprockets/file_reader.rb

@@ -0,0 +1,15 @@
+require 'set'
+
+module Sprockets
+  # Internal: The first processor in the pipeline that reads the file into
+  # memory and passes it along as `input[:data]`.  
+  class FileReader
+    def self.call(input)
+      env = input[:environment]
+      data = env.read_file(input[:filename], input[:content_type])
+      dependencies = Set.new(input[:metadata][:dependencies])
+      dependencies += [env.build_file_digest_uri(input[:filename])]
+      { data: data, dependencies: dependencies }
+    end
+  end
+end

data/lib/sprockets/http_utils.rb

@@ -1,4 +1,6 @@
 module Sprockets
+  # Internal: HTTP URI utilities. Many adapted from Rack::Utils. Mixed into
+  # Environment.
   module HTTPUtils
     extend self
 

data/lib/sprockets/jst_processor.rb

@@ -22,8 +22,15 @@ module Sprockets
       'this.JST'
     end
 
-    def self.call(*args)
-      new.call(*args)
+    # Public: Return singleton instance with default options.
+    #
+    # Returns JstProcessor object.
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
     end
 
     def initialize(options = {})