sass-rails 3.2.2 → 3.2.3

data/lib/sass/rails/helpers.rb

@@ -15,7 +15,7 @@ module Sass
         Sass::Script::String.new(%Q{url(#{public_path(asset.value, kind.value)})})
       end
 
-      [:image, :video, :audio, :javascript, :stylesheet].each do |asset_class|
+      [:image, :video, :audio, :javascript, :stylesheet, :font].each do |asset_class|
         class_eval %Q{
           def #{asset_class}_path(asset)
             Sass::Script::String.new(resolver.#{asset_class}_path(asset.value), true)
@@ -26,14 +26,6 @@ module Sass
         }, __FILE__, __LINE__ - 6
       end
 
-      def font_path(asset)
-        asset_path(asset, Sass::Script::String.new("font"))
-      end
-
-      def font_url(asset)
-        asset_url(asset, Sass::Script::String.new("font"))
-      end
-
     protected
 
     def resolver

data/lib/sass/rails/template_handlers.rb

@@ -19,8 +19,12 @@ module Sass::Rails
       nil
     end
 
-    def public_path(path, scope = nil)
-      context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix)
+    def source_path(path, ext)
+      context.asset_paths.compute_source_path(path, ::Rails.application.config.assets.prefix, ext)
+    end
+
+    def public_path(path, scope = nil, options = {})
+      context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix, options)
     end
 
     def process(path)
@@ -46,6 +50,10 @@ module Sass::Rails
     def stylesheet_path(stylesheet)
       context.stylesheet_path(stylesheet)
     end
+
+    def font_path(font)
+      context.font_path(font)
+    end
   end
 
   class SassTemplate < Tilt::SassTemplate
@@ -73,7 +81,7 @@ module Sass::Rails
       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"
+      css_filename = resolver.source_path(scope.logical_path, 'css')
       options.merge(
         :filename => eval_file,
         :css_filename => css_filename,

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.2.2"
+    VERSION = "3.2.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass-rails
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  version: 3.2.3
 platform: ruby
 authors: 
 - wycats
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 -02:00
+date: 2012-01-04 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency