sprockets 2.11.3 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92a457a4b3e0eb70d84a01ffb4631434724d2d2d
-  data.tar.gz: 5fc9b324ba6359844ff7aae3b939dfa1280d6802
+  metadata.gz: 8efd52cbc36180a9d159eccda49e71d3b979ac45
+  data.tar.gz: e6ab087dec16c64f2b48607039283e030a9aed04
 SHA512:
-  metadata.gz: 465dba63f0800fc7478858e0c3fdf98f5ca2d35f0c179d1bf2af6278f8813320303f6b762b9748c2d5ecc790e82a8058a8be200317cbd1521a62ab5d6181ab8c
-  data.tar.gz: b3d7d6657eae4938d75e1e88a26991d57cab783216ba5455227d2a5f6dc9590dfc32adf7271ff0946dc212c543e295c04347bc438fd684052841db83e1fe25ba
+  metadata.gz: 75c5d0b9cd9cc3001bc7dadc320e8a82b8f8fffac55ce4e49936f720da3ce25d5dd2a8c56e4e93f5ea603b1e69666b7eed80b6d8aaf7936e7f73ed0001316a5e
+  data.tar.gz: ec401d6e2fa75d1dc25d7c3a64db8130663c2eb3aeb46cfe8dfebc3a86a4c0a912ffa7694a2fb2c570b9cb0ed5f3bd6f9e1f7212d79275c0fe2a4f542be31eeb

data/README.md

@@ -366,6 +366,11 @@ submit a pull request.
 
 ## Version History ##
 
+**2.12.0** (March 13, 2014)
+
+* Avoid context reference in SassImporter hack so its Marshallable. Fixes
+ issues with Sass 3.3.x.
+
 **2.11.0** (February 19, 2014)
 
 * Support for `.bower.json`

data/lib/sprockets/sass_importer.rb

@@ -1,19 +1,20 @@
 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.
+  # This custom importer that tracks all imported filenames during
+  # compile.
   class SassImporter < Sass::Importers::Filesystem
-    def initialize(context, root)
-      @context = context
-      super root.to_s
+    attr_reader :imported_filenames
+
+    def initialize(*args)
+      @imported_filenames = []
+      super
     end
 
     def find_relative(*args)
       engine = super
       if engine && (filename = engine.options[:filename])
-        @context.depend_on(filename)
+        @imported_filenames << filename
       end
       engine
     end
@@ -21,7 +22,7 @@ module Sprockets
     def find(*args)
       engine = super
       if engine && (filename = engine.options[:filename])
-        @context.depend_on(filename)
+        @imported_filenames << filename
       end
       engine
     end

data/lib/sprockets/sass_template.rb

@@ -42,15 +42,21 @@ module Sprockets
         :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) },
+        :importer => SassImporter.new(context.pathname.to_s),
+        :load_paths => context.environment.paths.map { |path| SassImporter.new(path.to_s) },
         :sprockets => {
           :context => context,
           :environment => context.environment
         }
       }
 
-      ::Sass::Engine.new(data, options).render
+      result = ::Sass::Engine.new(data, options).render
+
+      # Track all imported files
+      filenames = ([options[:importer].imported_filenames] + options[:load_paths].map(&:imported_filenames)).flatten.uniq
+      filenames.each { |filename| context.depend_on(filename) }
+
+      result
     rescue ::Sass::SyntaxError => e
       # Annotates exception message with parse line number
       context.__LINE__ = e.sass_backtrace.first[:line]

data/lib/sprockets/server.rb

@@ -33,16 +33,16 @@ module Sprockets
       # Extract the path from everything after the leading slash
       path = unescape(env['PATH_INFO'].to_s.sub(/^\//, ''))
 
-      # Strip fingerprint
-      if fingerprint = path_fingerprint(path)
-        path = path.sub("-#{fingerprint}", '')
-      end
-
       # URLs containing a `".."` are rejected for security reasons.
       if forbidden_request?(path)
         return forbidden_response
       end
 
+      # Strip fingerprint
+      if fingerprint = path_fingerprint(path)
+        path = path.sub("-#{fingerprint}", '')
+      end
+
       # Look up the asset.
       asset = find_asset(path, :bundle => !body_only?(env))
 
@@ -90,7 +90,7 @@ module Sprockets
         #
         #     http://example.org/assets/../../../etc/passwd
         #
-        path.include?("..") || Pathname.new(path).absolute?
+        path.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.11.3"
+  VERSION = "2.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.12.0
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hike
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sprockets
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Rack-based asset packaging system