sprockets 2.3.3 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d49453908a650a88e75856c3002fc529139583d
-  data.tar.gz: c4032fb6c3197b5872097d55365b1e3c8547369d
+  metadata.gz: 1471328329eb1e6f3a8e218553de19ded2731956
+  data.tar.gz: 8bd2fc9eb30ab785ef04ed901a86ee3e9b416775
 SHA512:
-  metadata.gz: eeaf6c406818a6736564bad41f732b7f45c18504625caa8e4a71cb0466e6238656ade799b1f4c4c1a5e37c4142f8180e0136cfa6489a88a93e59e70cbf9a5346
-  data.tar.gz: 1d3f359e15024afc8828d45f868b73a8685d21d69a9e93e4dfd57afb7a4043f5e06f84f49d714ebb879e0855ae6c866a83b042770756bf03dbf64fe2288fcfe5
+  metadata.gz: ade13ae863b06566bf143574ade26233e005dbf078ed400b6e7b5e0a3b370017b22f464c0e08da0416244c47e3044b1fb7e9705467620cf38e113424d432da1a
+  data.tar.gz: b50b7d1451f79a7d7446ac2ae428b36b6d006d1901e2ab86c0a489b642a30f217eed3a53dbc6f2414413fcad76b9bd427f22131bc853c68119d4a063608adaba

data/README.md

@@ -361,6 +361,34 @@ submit a pull request.
 
 ## Version History ##
 
+**2.4.5** (July 10, 2012)
+
+* Tweaked some logger levels
+
+**2.4.4** (July 2, 2012)
+
+* Canonicalize logical path extensions
+* Check absolute paths passed to depend_on
+
+**2.4.3** (May 16, 2012)
+
+* Exposed :sprockets in sass options
+* Include dependency paths in asset mtime
+
+**2.4.2** (May 7, 2012)
+
+* Fixed MultiJson feature detect
+
+**2.4.1** (April 26, 2012)
+
+* Fixed MultiJson API change
+* Fixed gzip mtime
+
+**2.4.0** (March 27, 2012)
+
+* Added global path registry
+* Added global processor registry
+
 **2.3.2** (March 26, 2012)
 
 * Fix Context#logical_path with dots

data/lib/sprockets.rb

@@ -3,7 +3,6 @@ require 'sprockets/version'
 module Sprockets
   # Environment
   autoload :Base,                    "sprockets/base"
-  autoload :Engines,                 "sprockets/engines"
   autoload :Environment,             "sprockets/environment"
   autoload :Index,                   "sprockets/index"
   autoload :Manifest,                "sprockets/manifest"
@@ -15,14 +14,11 @@ module Sprockets
   autoload :StaticAsset,             "sprockets/static_asset"
 
   # Processing
-  autoload :CharsetNormalizer,       "sprockets/charset_normalizer"
   autoload :Context,                 "sprockets/context"
-  autoload :DirectiveProcessor,      "sprockets/directive_processor"
   autoload :EcoTemplate,             "sprockets/eco_template"
   autoload :EjsTemplate,             "sprockets/ejs_template"
   autoload :JstProcessor,            "sprockets/jst_processor"
   autoload :Processor,               "sprockets/processor"
-  autoload :SafetyColons,            "sprockets/safety_colons"
   autoload :SassCacheStore,          "sprockets/sass_cache_store"
   autoload :SassImporter,            "sprockets/sass_importer"
   autoload :SassTemplate,            "sprockets/sass_template"
@@ -43,8 +39,32 @@ module Sprockets
   end
 
   # Extend Sprockets module to provide global registry
-  extend Engines
-  @engines = {}
+  require 'hike'
+  require 'sprockets/engines'
+  require 'sprockets/mime'
+  require 'sprockets/processing'
+  require 'sprockets/paths'
+  extend Engines, Mime, Processing, Paths
+
+  @trail             = Hike::Trail.new(File.expand_path('..', __FILE__))
+  @mime_types        = {}
+  @engines           = {}
+  @preprocessors     = Hash.new { |h, k| h[k] = [] }
+  @postprocessors    = Hash.new { |h, k| h[k] = [] }
+  @bundle_processors = Hash.new { |h, k| h[k] = [] }
+
+  register_mime_type 'text/css', '.css'
+  register_mime_type 'application/javascript', '.js'
+
+  require 'sprockets/directive_processor'
+  register_preprocessor 'text/css',               DirectiveProcessor
+  register_preprocessor 'application/javascript', DirectiveProcessor
+
+  require 'sprockets/safety_colons'
+  register_postprocessor 'application/javascript', SafetyColons
+
+  require 'sprockets/charset_normalizer'
+  register_bundle_processor 'text/css', CharsetNormalizer
 
   # Cherry pick the default Tilt engines that make sense for
   # Sprockets. We don't need ones that only generate html like HAML.

data/lib/sprockets/asset.rb

@@ -33,6 +33,8 @@ module Sprockets
     alias_method :bytesize, :length
 
     def initialize(environment, logical_path, pathname)
+      raise ArgumentError, "Asset logical path has no extension: #{logical_path}" if File.extname(logical_path) == ""
+
       @root         = environment.root
       @logical_path = logical_path.to_s
       @pathname     = Pathname.new(pathname)
@@ -145,6 +147,7 @@ module Sprockets
         if options[:compress]
           # Run contents through `Zlib`
           gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+          gz.mtime = mtime.to_i
           gz.write to_s
           gz.close
         else

data/lib/sprockets/base.rb

@@ -1,17 +1,16 @@
 require 'sprockets/asset_attributes'
 require 'sprockets/bundled_asset'
 require 'sprockets/caching'
+require 'sprockets/errors'
 require 'sprockets/processed_asset'
-require 'sprockets/processing'
 require 'sprockets/server'
 require 'sprockets/static_asset'
-require 'sprockets/trail'
 require 'pathname'
 
 module Sprockets
   # `Base` class for `Environment` and `Index`.
   class Base
-    include Caching, Processing, Server, Trail
+    include Caching, Paths, Mime, Processing, Engines, Server
 
     # Returns a `Digest` implementation class.
     #
@@ -98,6 +97,98 @@ module Sprockets
       @cache = cache
     end
 
+    def prepend_path(path)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def append_path(path)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def clear_paths
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    # Finds the expanded real path for a given logical path by
+    # searching the environment's paths.
+    #
+    #     resolve("application.js")
+    #     # => "/path/to/app/javascripts/application.js.coffee"
+    #
+    # A `FileNotFound` exception is raised if the file does not exist.
+    def resolve(logical_path, options = {})
+      # If a block is given, preform an iterable search
+      if block_given?
+        args = attributes_for(logical_path).search_paths + [options]
+        @trail.find(*args) do |path|
+          yield Pathname.new(path)
+        end
+      else
+        resolve(logical_path, options) do |pathname|
+          return pathname
+        end
+        raise FileNotFound, "couldn't find file '#{logical_path}'"
+      end
+    end
+
+    # Register a new mime type.
+    def register_mime_type(mime_type, ext)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      @trail.append_extension(ext)
+      super
+    end
+
+    # Registers a new Engine `klass` for `ext`.
+    def register_engine(ext, klass)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      add_engine_to_trail(ext, klass)
+      super
+    end
+
+    def register_preprocessor(mime_type, klass, &block)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def unregister_preprocessor(mime_type, klass)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def register_postprocessor(mime_type, klass, &block)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def unregister_postprocessor(mime_type, klass)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def register_bundle_processor(mime_type, klass, &block)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
+    def unregister_bundle_processor(mime_type, klass)
+      # Overrides the global behavior to expire the index
+      expire_index!
+      super
+    end
+
     # Return an `Index`. Must be implemented by the subclass.
     def index
       raise NotImplementedError
@@ -113,14 +204,14 @@ module Sprockets
     #
     # Subclasses may cache this method.
     def entries(pathname)
-      trail.entries(pathname)
+      @trail.entries(pathname)
     end
 
     # Works like `File.stat`.
     #
     # Subclasses may cache this method.
     def stat(path)
-      trail.stat(path)
+      @trail.stat(path)
     end
 
     # Read and compute digest of filename.
@@ -161,6 +252,16 @@ module Sprockets
       else
         begin
           pathname = resolve(logical_path)
+
+          # If logical path is missing a mime type extension, append
+          # the absolute path extname so it has one.
+          #
+          # Ensures some consistency between finding "foo/bar" vs
+          # "foo/bar.js".
+          if File.extname(logical_path) == ""
+            expanded_logical_path = attributes_for(pathname).logical_path
+            logical_path += File.extname(expanded_logical_path)
+          end
         rescue FileNotFound
           return nil
         end

data/lib/sprockets/bundled_asset.rb

@@ -13,8 +13,9 @@ module Sprockets
     def initialize(environment, logical_path, pathname)
       super(environment, logical_path, pathname)
 
-      @processed_asset = environment.find_asset(pathname, :bundle => false)
-      @required_assets = @processed_asset.required_assets
+      @processed_asset  = environment.find_asset(pathname, :bundle => false)
+      @required_assets  = @processed_asset.required_assets
+      @dependency_paths = @processed_asset.dependency_paths
 
       @source = ""
 
@@ -26,7 +27,7 @@ module Sprockets
       @source = context.evaluate(pathname, :data => @source,
                   :processors => environment.bundle_processors(content_type))
 
-      @mtime  = to_a.map(&:mtime).max
+      @mtime  = (to_a + @dependency_paths).map(&:mtime).max
       @length = Rack::Utils.bytesize(source)
       @digest = environment.digest.update(source).hexdigest
     end

data/lib/sprockets/context.rb

@@ -81,7 +81,11 @@ module Sprockets
       attributes = environment.attributes_for(pathname)
 
       if pathname.absolute?
-        pathname
+        if environment.stat(pathname)
+          pathname
+        else
+          raise FileNotFound, "couldn't find file '#{pathname}'"
+        end
 
       elsif content_type = options[:content_type]
         content_type = self.content_type if content_type == :self

data/lib/sprockets/engines.rb

@@ -28,12 +28,12 @@ module Sprockets
   #     Sprockets.register_engine '.sass', SassTemplate
   #
   module Engines
-    # Returns an `Array` of `Engine`s registered on the
-    # `Environment`. If an `ext` argument is supplied, the `Engine`
-    # register under that extension will be returned.
+    # 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
-    #     # => [CoffeeScriptTemplate, SassTemplate, ...]
+    #     # => {".coffee" => CoffeeScriptTemplate, ".sass" => SassTemplate, ...}
     #
     #     environment.engines('.coffee')
     #     # => CoffeeScriptTemplate

data/lib/sprockets/environment.rb

@@ -1,9 +1,6 @@
 require 'sprockets/base'
-require 'sprockets/charset_normalizer'
 require 'sprockets/context'
-require 'sprockets/directive_processor'
 require 'sprockets/index'
-require 'sprockets/safety_colons'
 
 require 'hike'
 require 'logger'
@@ -35,24 +32,23 @@ module Sprockets
       @digest_class = ::Digest::MD5
       @version = ''
 
-      @mime_types        = {}
+      @mime_types        = Sprockets.registered_mime_types
       @engines           = Sprockets.engines
-      @preprocessors     = Hash.new { |h, k| h[k] = [] }
-      @postprocessors    = Hash.new { |h, k| h[k] = [] }
-      @bundle_processors = Hash.new { |h, k| h[k] = [] }
+      @preprocessors     = Sprockets.preprocessors
+      @postprocessors    = Sprockets.postprocessors
+      @bundle_processors = Sprockets.bundle_processors
+
+      Sprockets.paths.each do |path|
+        append_path(path)
+      end
 
       @engines.each do |ext, klass|
         add_engine_to_trail(ext, klass)
       end
 
-      register_mime_type 'text/css', '.css'
-      register_mime_type 'application/javascript', '.js'
-
-      register_preprocessor 'text/css', DirectiveProcessor
-      register_preprocessor 'application/javascript', DirectiveProcessor
-
-      register_postprocessor 'application/javascript', SafetyColons
-      register_bundle_processor 'text/css', CharsetNormalizer
+      @mime_types.each do |ext, type|
+        @trail.append_extension(ext)
+      end
 
       expire_index!
 

data/lib/sprockets/manifest.rb

@@ -37,7 +37,7 @@ module Sprockets
 
       begin
         if File.exist?(@path)
-          data = MultiJson.decode(File.read(@path))
+          data = json_decode(File.read(@path))
         end
       rescue MultiJson::DecodeError => e
         logger.error "#{@path} is invalid: #{e.class} #{e.message}"
@@ -84,7 +84,7 @@ module Sprockets
     #
     def compile(*args)
       paths = environment.each_logical_path(*args).to_a +
-        args.flatten.select { |fn| Pathname.new(fn).absolute? }
+        args.flatten.select { |fn| Pathname.new(fn).absolute? if fn.is_a?(String)}
 
       paths.each do |path|
         if asset = find_asset(path)
@@ -129,7 +129,7 @@ module Sprockets
 
       save
 
-      logger.warn "Removed #{filename}"
+      logger.info "Removed #{filename}"
 
       nil
     end
@@ -152,7 +152,7 @@ module Sprockets
     # Wipe directive
     def clobber
       FileUtils.rm_r(@dir) if File.exist?(@dir)
-      logger.warn "Removed #{@dir}"
+      logger.info "Removed #{@dir}"
       nil
     end
 
@@ -178,7 +178,7 @@ module Sprockets
         ms = benchmark do
           asset = environment.find_asset(logical_path)
         end
-        logger.warn "Compiled #{logical_path}  (#{ms}ms)"
+        logger.debug "Compiled #{logical_path}  (#{ms}ms)"
         asset
       end
 
@@ -186,11 +186,30 @@ module Sprockets
       def save
         FileUtils.mkdir_p dir
         File.open(path, 'w') do |f|
-          f.write MultiJson.encode(@data)
+          f.write json_encode(@data)
         end
       end
 
     private
+      # Feature detect newer MultiJson API
+      if MultiJson.respond_to?(:dump)
+        def json_decode(obj)
+          MultiJson.load(obj)
+        end
+
+        def json_encode(obj)
+          MultiJson.dump(obj)
+        end
+      else
+        def json_decode(obj)
+          MultiJson.decode(obj)
+        end
+
+        def json_encode(obj)
+          MultiJson.encode(obj)
+        end
+      end
+
       def logger
         environment.logger
       end

data/lib/sprockets/mime.rb

@@ -15,6 +15,11 @@ module Sprockets
       end
     end
 
+    # Returns a `Hash` of explicitly registered mime types.
+    def registered_mime_types
+      @mime_types.dup
+    end
+
     if {}.respond_to?(:key)
       def extension_for_mime_type(type)
         mime_types.key(type)
@@ -41,8 +46,4 @@ module Sprockets
       end
     end
   end
-
-  # Extend Sprockets module to provide global registry
-  extend Mime
-  @mime_types = {}
 end

data/lib/sprockets/{trail.rb → paths.rb}

@@ -1,16 +1,11 @@
-require 'sprockets/errors'
-require 'pathname'
-
 module Sprockets
-  # `Trail` is an internal mixin whose public methods are exposed on
-  # the `Environment` and `Index` classes.
-  module Trail
+  module Paths
     # Returns `Environment` root.
     #
     # All relative paths are expanded with root as its base. To be
     # useful set this to your applications root directory. (`Rails.root`)
     def root
-      trail.root.dup
+      @trail.root.dup
     end
 
     # Returns an `Array` of path `String`s.
@@ -21,14 +16,13 @@ module Sprockets
     # have no affect on the environment. See `append_path`,
     # `prepend_path`, and `clear_paths`.
     def paths
-      trail.paths.dup
+      @trail.paths.dup
     end
 
     # Prepend a `path` to the `paths` list.
     #
     # Paths at the end of the `Array` have the least priority.
     def prepend_path(path)
-      expire_index!
       @trail.prepend_path(path)
     end
 
@@ -36,7 +30,6 @@ module Sprockets
     #
     # Paths at the beginning of the `Array` have a higher priority.
     def append_path(path)
-      expire_index!
       @trail.append_path(path)
     end
 
@@ -46,7 +39,6 @@ module Sprockets
     # completely wipe the paths list and reappend them in the order
     # you want.
     def clear_paths
-      expire_index!
       @trail.paths.dup.each { |path| @trail.remove_path(path) }
     end
 
@@ -57,34 +49,10 @@ module Sprockets
     #     # => [".js", ".css", ".coffee", ".sass", ...]
     #
     def extensions
-      trail.extensions.dup
-    end
-
-    # Finds the expanded real path for a given logical path by
-    # searching the environment's paths.
-    #
-    #     resolve("application.js")
-    #     # => "/path/to/app/javascripts/application.js.coffee"
-    #
-    # A `FileNotFound` exception is raised if the file does not exist.
-    def resolve(logical_path, options = {})
-      # If a block is given, preform an iterable search
-      if block_given?
-        args = attributes_for(logical_path).search_paths + [options]
-        trail.find(*args) do |path|
-          yield Pathname.new(path)
-        end
-      else
-        resolve(logical_path, options) do |pathname|
-          return pathname
-        end
-        raise FileNotFound, "couldn't find file '#{logical_path}'"
-      end
+      @trail.extensions.dup
     end
 
     protected
-      def trail
-        @trail
-      end
+      attr_reader :trail
   end
 end

data/lib/sprockets/processed_asset.rb

@@ -19,7 +19,7 @@ module Sprockets
       @dependency_digest = compute_dependency_digest(environment)
 
       elapsed_time = ((Time.now.to_f - start_time) * 1000).to_i
-      environment.logger.info "Compiled #{logical_path}  (#{elapsed_time}ms)  (pid #{Process.pid})"
+      environment.logger.debug "Compiled #{logical_path}  (#{elapsed_time}ms)  (pid #{Process.pid})"
     end
 
     # Interal: Used to check equality

data/lib/sprockets/processing.rb

@@ -7,16 +7,6 @@ module Sprockets
   # `Processing` is an internal mixin whose public methods are exposed on
   # the `Environment` and `Index` classes.
   module Processing
-    include Engines, Mime
-
-    # Register a new mime type.
-    def register_mime_type(mime_type, ext)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      @trail.append_extension(ext)
-      super
-    end
-
     # Returns an `Array` of format extension `String`s.
     #
     #     format_extensions
@@ -26,14 +16,6 @@ module Sprockets
       @trail.extensions - @engines.keys
     end
 
-    # Registers a new Engine `klass` for `ext`.
-    def register_engine(ext, klass)
-      # Overrides the global behavior to expire the index
-      expire_index!
-      add_engine_to_trail(ext, klass)
-      super
-    end
-
     # Deprecated alias for `preprocessors`.
     def processors(*args)
       preprocessors(*args)
@@ -83,13 +65,11 @@ module Sprockets
     #
     # A block can be passed for to create a shorthand processor.
     #
-    #     register_preprocessor :my_processor do |context, data|
+    #     register_preprocessor 'text/css', :my_processor do |context, data|
     #       data.gsub(...)
     #     end
     #
     def register_preprocessor(mime_type, klass, &block)
-      expire_index!
-
       if block_given?
         name  = klass.to_s
         klass = Class.new(Processor) do
@@ -107,13 +87,11 @@ module Sprockets
     #
     # A block can be passed for to create a shorthand processor.
     #
-    #     register_postprocessor :my_processor do |context, data|
+    #     register_postprocessor 'text/css', :my_processor do |context, data|
     #       data.gsub(...)
     #     end
     #
     def register_postprocessor(mime_type, klass, &block)
-      expire_index!
-
       if block_given?
         name  = klass.to_s
         klass = Class.new(Processor) do
@@ -135,8 +113,6 @@ module Sprockets
     #     unregister_preprocessor 'text/css', Sprockets::DirectiveProcessor
     #
     def unregister_preprocessor(mime_type, klass)
-      expire_index!
-
       if klass.is_a?(String) || klass.is_a?(Symbol)
         klass = @preprocessors[mime_type].detect { |cls|
           cls.respond_to?(:name) &&
@@ -152,8 +128,6 @@ module Sprockets
     #     unregister_postprocessor 'text/css', Sprockets::DirectiveProcessor
     #
     def unregister_postprocessor(mime_type, klass)
-      expire_index!
-
       if klass.is_a?(String) || klass.is_a?(Symbol)
         klass = @postprocessors[mime_type].detect { |cls|
           cls.respond_to?(:name) &&
@@ -192,8 +166,6 @@ module Sprockets
     #     end
     #
     def register_bundle_processor(mime_type, klass, &block)
-      expire_index!
-
       if block_given?
         name  = klass.to_s
         klass = Class.new(Processor) do
@@ -210,8 +182,6 @@ module Sprockets
     #     unregister_bundle_processor 'text/css', Sprockets::CharsetNormalizer
     #
     def unregister_bundle_processor(mime_type, klass)
-      expire_index!
-
       if klass.is_a?(String) || klass.is_a?(Symbol)
         klass = @bundle_processors[mime_type].detect { |cls|
           cls.respond_to?(:name) &&
@@ -234,8 +204,6 @@ module Sprockets
     #
     # The compressor object must respond to `compress` or `compile`.
     def css_compressor=(compressor)
-      expire_index!
-
       unregister_bundle_processor 'text/css', :css_compressor
       return unless compressor
 
@@ -256,8 +224,6 @@ module Sprockets
     #
     # The compressor object must respond to `compress` or `compile`.
     def js_compressor=(compressor)
-      expire_index!
-
       unregister_bundle_processor 'application/javascript', :js_compressor
       return unless compressor
 

data/lib/sprockets/sass_template.rb

@@ -34,7 +34,11 @@ module Sprockets
         :syntax => syntax,
         :cache_store => cache_store,
         :importer => SassImporter.new(context, context.pathname),
-        :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path) }
+        :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path) },
+        :sprockets => {
+          :context => context,
+          :environment => context.environment
+        }
       }
 
       ::Sass::Engine.new(data, options).render

data/lib/sprockets/static_asset.rb

@@ -30,6 +30,7 @@ module Sprockets
         pathname.open('rb') do |rd|
           File.open("#{filename}+", 'wb') do |wr|
             gz = Zlib::GzipWriter.new(wr, Zlib::BEST_COMPRESSION)
+            gz.mtime = mtime.to_i
             buf = ""
             while rd.read(16384, buf)
               gz.write(buf)

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "2.3.3"
+  VERSION = "2.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.6
 platform: ruby
 authors:
 - Sam Stephenson
@@ -232,6 +232,7 @@ files:
 - lib/sprockets/jst_processor.rb
 - lib/sprockets/manifest.rb
 - lib/sprockets/mime.rb
+- lib/sprockets/paths.rb
 - lib/sprockets/processed_asset.rb
 - lib/sprockets/processing.rb
 - lib/sprockets/processor.rb
@@ -242,7 +243,6 @@ files:
 - lib/sprockets/scss_template.rb
 - lib/sprockets/server.rb
 - lib/sprockets/static_asset.rb
-- lib/sprockets/trail.rb
 - lib/sprockets/utils.rb
 - lib/sprockets/version.rb
 homepage: http://getsprockets.org/