sprockets 2.2.3 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be373494a4e64c06e55a9ad11e2c9efae09f1492
-  data.tar.gz: b683ce4b0ed64e683ea98d0b5af268bdeca3f584
+  metadata.gz: 7d49453908a650a88e75856c3002fc529139583d
+  data.tar.gz: c4032fb6c3197b5872097d55365b1e3c8547369d
 SHA512:
-  metadata.gz: fa430704b4ef87304b8a128cb83fbb64c66e24d0bdae3d9e9e343bbebd56bf8823f65cba4a0ad1eb33204308c814910ebdd9c2b570c33fbbf89a2fadd2383b33
-  data.tar.gz: 785eb7a9f36afa38e6f010a573240768a9620ed216f4b20614835ffe9564d258a0e5340c9e8dbf3b538e8b960d9f7fd22342581b5e597dbbfc4e892bac7f7d3a
+  metadata.gz: eeaf6c406818a6736564bad41f732b7f45c18504625caa8e4a71cb0466e6238656ade799b1f4c4c1a5e37c4142f8180e0136cfa6489a88a93e59e70cbf9a5346
+  data.tar.gz: 1d3f359e15024afc8828d45f868b73a8685d21d69a9e93e4dfd57afb7a4043f5e06f84f49d714ebb879e0855ae6c866a83b042770756bf03dbf64fe2288fcfe5

data/README.md

@@ -336,6 +336,13 @@ source file before any subsequent `require` or `include` directives.
 including it in the bundle. This is useful when you need to expire an
 asset's cache in response to a change in another file.
 
+### The `stub` Directive ###
+
+`stub` *path* allows dependency to be excluded from the asset bundle.
+The *path* must be a valid asset and may or may not already be part
+of the bundle. Once stubbed, it is blacklisted and can't be brought
+back by any other `require`.
+
 # Development #
 
 ## Contributing ##
@@ -354,7 +361,21 @@ submit a pull request.
 
 ## Version History ##
 
-**2.2.0** (Unreleased)
+**2.3.2** (March 26, 2012)
+
+* Fix Context#logical_path with dots
+
+**2.3.1** (February 11, 2012)
+
+* Added bytesize to manifest
+* Added Asset#bytesize alias
+* Security: Check path for forbidden access after unescaping
+
+**2.3.0** (January 16, 2012)
+
+* Added special Sass importer that automatically tracks any `@import`ed files.
+
+**2.2.0** (January 10, 2012)
 
 * Added `sprockets` command line utility.
 * Added rake/sprocketstask.

data/lib/sprockets.rb

@@ -23,6 +23,10 @@ module Sprockets
   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"
+  autoload :ScssTemplate,            "sprockets/scss_template"
 
   # Internal utilities
   autoload :ArgumentError,           "sprockets/errors"
@@ -55,8 +59,8 @@ module Sprockets
 
   # CSS engines
   register_engine '.less',   Tilt::LessTemplate
-  register_engine '.sass',   Tilt::SassTemplate
-  register_engine '.scss',   Tilt::ScssTemplate
+  register_engine '.sass',   SassTemplate
+  register_engine '.scss',   ScssTemplate
 
   # Other
   register_engine '.erb',    Tilt::ERBTemplate

data/lib/sprockets/asset.rb

@@ -30,6 +30,7 @@ module Sprockets
 
     attr_reader :logical_path, :pathname
     attr_reader :content_type, :mtime, :length, :digest
+    alias_method :bytesize, :length
 
     def initialize(environment, logical_path, pathname)
       @root         = environment.root

data/lib/sprockets/caching.rb

@@ -2,6 +2,45 @@ module Sprockets
   # `Caching` is an internal mixin whose public methods are exposed on
   # the `Environment` and `Index` classes.
   module Caching
+    # Low level cache getter for `key`. Checks a number of supported
+    # cache interfaces.
+    def cache_get(key)
+      # `Cache#get(key)` for Memcache
+      if cache.respond_to?(:get)
+        cache.get(key)
+
+      # `Cache#[key]` so `Hash` can be used
+      elsif cache.respond_to?(:[])
+        cache[key]
+
+      # `Cache#read(key)` for `ActiveSupport::Cache` support
+      elsif cache.respond_to?(:read)
+        cache.read(key)
+
+      else
+        nil
+      end
+    end
+
+    # Low level cache setter for `key`. Checks a number of supported
+    # cache interfaces.
+    def cache_set(key, value)
+      # `Cache#set(key, value)` for Memcache
+      if cache.respond_to?(:set)
+        cache.set(key, value)
+
+      # `Cache#[key]=value` so `Hash` can be used
+      elsif cache.respond_to?(:[]=)
+        cache[key] = value
+
+      # `Cache#write(key, value)` for `ActiveSupport::Cache` support
+      elsif cache.respond_to?(:write)
+        cache.write(key, value)
+      end
+
+      value
+    end
+
     protected
       # Cache helper method. Takes a `path` argument which maybe a
       # logical path or fully expanded path. The `&block` is passed
@@ -53,44 +92,5 @@ module Sprockets
         cache_set(expand_cache_key(key), hash)
         hash
       end
-
-      # Low level cache getter for `key`. Checks a number of supported
-      # cache interfaces.
-      def cache_get(key)
-        # `Cache#get(key)` for Memcache
-        if cache.respond_to?(:get)
-          cache.get(key)
-
-        # `Cache#[key]` so `Hash` can be used
-        elsif cache.respond_to?(:[])
-          cache[key]
-
-        # `Cache#read(key)` for `ActiveSupport::Cache` support
-        elsif cache.respond_to?(:read)
-          cache.read(key)
-
-        else
-          nil
-        end
-      end
-
-      # Low level cache setter for `key`. Checks a number of supported
-      # cache interfaces.
-      def cache_set(key, value)
-        # `Cache#set(key, value)` for Memcache
-        if cache.respond_to?(:set)
-          cache.set(key, value)
-
-        # `Cache#[key]=value` so `Hash` can be used
-        elsif cache.respond_to?(:[]=)
-          cache[key] = value
-
-        # `Cache#write(key, value)` for `ActiveSupport::Cache` support
-        elsif cache.respond_to?(:write)
-          cache.write(key, value)
-        end
-
-        value
-      end
   end
 end

data/lib/sprockets/context.rb

@@ -53,7 +53,7 @@ module Sprockets
     #     # => 'application'
     #
     def logical_path
-      @logical_path[/^([^.]+)/, 0]
+      @logical_path.chomp(File.extname(@logical_path))
     end
 
     # Returns content type of file
@@ -101,7 +101,7 @@ module Sprockets
 
         raise FileNotFound, "couldn't find file '#{path}'"
       else
-        environment.resolve(path, :base_path => self.pathname.dirname, &block)
+        environment.resolve(path, {:base_path => self.pathname.dirname}.merge(options), &block)
       end
     end
 

data/lib/sprockets/manifest.rb

@@ -91,6 +91,7 @@ module Sprockets
           files[asset.digest_path] = {
             'logical_path' => asset.logical_path,
             'mtime'        => asset.mtime.iso8601,
+            'size'         => asset.bytesize,
             'digest'       => asset.digest
           }
           assets[asset.logical_path] = asset.digest_path

data/lib/sprockets/sass_cache_store.rb

@@ -0,0 +1,25 @@
+require 'sass'
+
+module Sprockets
+  class SassCacheStore < ::Sass::CacheStores::Base
+    attr_reader :environment
+
+    def initialize(environment)
+      @environment = environment
+    end
+
+    def _store(key, version, sha, contents)
+      environment.cache_set("sass/#{key}", {:version => version, :sha => sha, :contents => contents})
+    end
+
+    def _retrieve(key, version, sha)
+      if obj = environment.cache_get("sass/#{key}")
+        return unless obj[:version] == version
+        return unless obj[:sha] == sha
+        obj[:obj]
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/sprockets/sass_importer.rb

@@ -0,0 +1,29 @@
+require 'sass'
+
+module Sprockets
+  # This custom importer adds sprockets dependency tracking on to Sass
+  # `@import` statements. This makes the Sprockets and Sass caching
+  # systems work together.
+  class SassImporter < Sass::Importers::Filesystem
+    def initialize(context, root)
+      @context = context
+      super root.to_s
+    end
+
+    def find_relative(*args)
+      engine = super
+      if engine && (filename = engine.options[:filename])
+        @context.depend_on_asset(filename)
+      end
+      engine
+    end
+
+    def find(*args)
+      engine = super
+      if engine && (filename = engine.options[:filename])
+        @context.depend_on_asset(filename)
+      end
+      engine
+    end
+  end
+end

data/lib/sprockets/sass_template.rb

@@ -0,0 +1,47 @@
+require 'tilt'
+
+module Sprockets
+  # This custom Tilt handler replaces the one built into Tilt. The
+  # main difference is that it uses a custom importer that plays nice
+  # with sprocket's caching system.
+  #
+  # See `SassImporter` for more infomation.
+  class SassTemplate < Tilt::Template
+    self.default_mime_type = 'text/css'
+
+    def self.engine_initialized?
+      defined? ::Sass::Engine
+    end
+
+    def initialize_engine
+      require_template_library 'sass'
+    end
+
+    def prepare
+    end
+
+    def syntax
+      :sass
+    end
+
+    def evaluate(context, locals, &block)
+      # Use custom importer that knows about Sprockets Caching
+      cache_store = SassCacheStore.new(context.environment)
+
+      options = {
+        :filename => eval_file,
+        :line => line,
+        :syntax => syntax,
+        :cache_store => cache_store,
+        :importer => SassImporter.new(context, context.pathname),
+        :load_paths => context.environment.paths.map { |path| SassImporter.new(context, path) }
+      }
+
+      ::Sass::Engine.new(data, options).render
+    rescue ::Sass::SyntaxError => e
+      # Annotates exception message with parse line number
+      context.__LINE__ = e.sass_backtrace.first[:line]
+      raise e
+    end
+  end
+end

data/lib/sprockets/scss_template.rb

@@ -0,0 +1,13 @@
+require 'sprockets/sass_template'
+
+module Sprockets
+  # Scss handler to replace Tilt's builtin one. See `SassTemplate` and
+  # `SassImporter` for more infomation.
+  class ScssTemplate < SassTemplate
+    self.default_mime_type = 'text/css'
+
+    def syntax
+      :scss
+    end
+  end
+end

data/lib/sprockets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.3
 platform: ruby
 authors:
 - Sam Stephenson
@@ -185,6 +185,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Sprockets is a Rack-based asset packaging system that concatenates and
   serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
 email:
@@ -222,6 +236,10 @@ files:
 - lib/sprockets/processing.rb
 - lib/sprockets/processor.rb
 - lib/sprockets/safety_colons.rb
+- lib/sprockets/sass_cache_store.rb
+- lib/sprockets/sass_importer.rb
+- lib/sprockets/sass_template.rb
+- lib/sprockets/scss_template.rb
 - lib/sprockets/server.rb
 - lib/sprockets/static_asset.rb
 - lib/sprockets/trail.rb