sprockets 2.2.3 → 2.3.0.beta

data/README.md

@@ -354,7 +354,11 @@ submit a pull request.
 
 ## Version History ##
 
-**2.2.0** (Unreleased)
+**2.3.0** (Unreleased)
+
+* 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/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

@@ -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/directive_processor.rb

@@ -126,7 +126,7 @@ module Sprockets
       @directives ||= header.lines.each_with_index.map { |line, index|
         if directive = line[DIRECTIVE_PATTERN, 1]
           name, *args = Shellwords.shellwords(directive)
-          if respond_to?("process_#{name}_directive", true)
+          if respond_to?("process_#{name}_directive")
             [index + 1, name, *args]
           end
         end

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/server.rb

@@ -25,6 +25,11 @@ module Sprockets
 
       msg = "Served asset #{env['PATH_INFO']} -"
 
+      # URLs containing a `".."` are rejected for security reasons.
+      if forbidden_request?(env)
+        return forbidden_response
+      end
+
       # Mark session as "skipped" so no `Set-Cookie` header is set
       env['rack.session.options'] ||= {}
       env['rack.session.options'][:defer] = true
@@ -38,11 +43,6 @@ module Sprockets
         path = path.sub("-#{fingerprint}", '')
       end
 
-      # URLs containing a `".."` are rejected for security reasons.
-      if forbidden_request?(path)
-        return forbidden_response
-      end
-
       # Look up the asset.
       asset = find_asset(path, :bundle => !body_only?(env))
 
@@ -85,12 +85,12 @@ module Sprockets
     end
 
     private
-      def forbidden_request?(path)
+      def forbidden_request?(env)
         # Prevent access to files elsewhere on the file system
         #
         #     http://example.org/assets/../../../etc/passwd
         #
-        path.include?("..") || Pathname.new(path).absolute?
+        env["PATH_INFO"].include?("..")
       end
 
       # Returns a 403 Forbidden response tuple
@@ -222,7 +222,7 @@ module Sprockets
       #     # => "0aa2105d29558f3eb790d411d7d8fb66"
       #
       def path_fingerprint(path)
-        path[/-([0-9a-f]{7,40})\.[^.]+\z/, 1]
+        path[/-([0-9a-f]{7,40})\.[^.]+$/, 1]
       end
 
       # URI.unescape is deprecated on 1.9. We need to use URI::Parser

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "2.2.3"
+  VERSION = "2.3.0.beta"
 end

metadata

@@ -1,205 +1,240 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sprockets
-version: !ruby/object:Gem::Version
-  version: 2.2.3
+version: !ruby/object:Gem::Version 
+  hash: 31098233
+  prerelease: 6
+  segments: 
+  - 2
+  - 3
+  - 0
+  - beta
+  version: 2.3.0.beta
 platform: ruby
-authors:
+authors: 
 - Sam Stephenson
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-13 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: hike
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
     - - "!="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: coffee-script-source
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: coffee-script-source
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: eco
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: eco
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ejs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ejs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: execjs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: sass
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Sprockets is a Rack-based asset packaging system that concatenates and
-  serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
-email:
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+  type: :development
+  version_requirements: *id013
+description: Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
+email: 
 - sstephenson@gmail.com
 - josh@joshpeek.com
-executables:
+executables: 
 - sprockets
 extensions: []
+
 extra_rdoc_files: []
-files:
-- LICENSE
+
+files: 
 - README.md
-- bin/sprockets
+- LICENSE
 - lib/rake/sprocketstask.rb
-- lib/sprockets.rb
 - lib/sprockets/asset.rb
 - lib/sprockets/asset_attributes.rb
 - lib/sprockets/base.rb
@@ -222,32 +257,52 @@ 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
 - lib/sprockets/utils.rb
 - lib/sprockets/version.rb
+- lib/sprockets.rb
+- bin/sprockets
+has_rdoc: true
 homepage: http://getsprockets.org/
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: sprockets
-rubygems_version: 2.2.2
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Rack-based asset packaging system
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: be373494a4e64c06e55a9ad11e2c9efae09f1492
-  data.tar.gz: b683ce4b0ed64e683ea98d0b5af268bdeca3f584
-SHA512:
-  metadata.gz: fa430704b4ef87304b8a128cb83fbb64c66e24d0bdae3d9e9e343bbebd56bf8823f65cba4a0ad1eb33204308c814910ebdd9c2b570c33fbbf89a2fadd2383b33
-  data.tar.gz: 785eb7a9f36afa38e6f010a573240768a9620ed216f4b20614835ffe9564d258a0e5340c9e8dbf3b538e8b960d9f7fd22342581b5e597dbbfc4e892bac7f7d3a