sass-rails 3.1.5 → 3.1.6

data/lib/sass/rails/railtie.rb

@@ -41,6 +41,11 @@ module Sass::Rails
       end
     end
 
+    # Remove the sass middleware if it gets inadvertently enabled by applications.
+    config.after_initialize do |app|
+      app.config.middleware.delete(Sass::Plugin::Rack) if defined?(Sass::Plugin::Rack)
+    end
+
     initializer :setup_sass, :group => :all do |app|
       # Only emit one kind of syntax because though we have registered two kinds of generators
       syntax     = app.config.sass.preferred_syntax.to_sym

data/lib/sass/rails/template_handlers.rb

@@ -19,7 +19,7 @@ module Sass::Rails
       nil
     end
 
-    def public_path(path, scope)
+    def public_path(path, scope = nil)
       context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix)
     end
 
@@ -72,14 +72,17 @@ module Sass::Rails
       options = sass_options_from_rails(scope)
       load_paths = (options[:load_paths] || []).dup
       load_paths.unshift(importer)
+      resolver = Resolver.new(scope)
+      css_filename = File.join(::Rails.public_path, resolver.public_path(scope.logical_path)) + ".css"
       options.merge(
         :filename => eval_file,
+        :css_filename => css_filename,
         :line => line,
         :syntax => syntax,
         :importer => importer,
         :load_paths => load_paths,
         :custom => {
-          :resolver => Resolver.new(scope)
+          :resolver => resolver
         }
       )
     end

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.5"
+    VERSION = "3.1.6"
   end
 end

data/sass-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_runtime_dependency 'sass',       '~> 3.1.10'
+  s.add_runtime_dependency 'sass',       '>= 3.1.10'
   s.add_runtime_dependency 'railties',   '~> 3.1.0'
   s.add_runtime_dependency 'actionpack', '~> 3.1.0'
   s.add_runtime_dependency 'tilt',       '~> 1.3.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &18487800 !ruby/object:Gem::Requirement
+  requirement: &70317020519500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *18487800
+  version_requirements: *70317020519500
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &18487300 !ruby/object:Gem::Requirement
+  requirement: &70317020516840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *18487300
+  version_requirements: *70317020516840
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &18486840 !ruby/object:Gem::Requirement
+  requirement: &70317020504560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *18486840
+  version_requirements: *70317020504560
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &18486380 !ruby/object:Gem::Requirement
+  requirement: &70317020485440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *18486380
+  version_requirements: *70317020485440
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com