sass-rails 3.1.2 → 3.1.3

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+CHANGELOG
+=========
+
+3.1.2 (Sept 15, 2011)
+---------------------
+
+* Add asset-data-url helper for base-64 encoding of assets within stylesheets.
+* Add explicit dependency on sprockets.
+
+3.1.1 (Sept 13, 2011)
+---------------------
+
+* Add explicit version dependency on tilt.
+* Add MIT License.

data/lib/sass/rails/helpers.rb

@@ -15,25 +15,38 @@ module Sass
         Sass::Script::String.new(%Q{url(#{public_path(asset.value, kind.value)})})
       end
 
-      [:image, :font, :video, :audio, :javascript, :stylesheet].each do |asset_class|
+      [:image, :video, :audio, :javascript, :stylesheet].each do |asset_class|
         class_eval %Q{
           def #{asset_class}_path(asset)
-            asset_path(asset, Sass::Script::String.new("#{asset_class}"))
+            Sass::Script::String.new(resolver.#{asset_class}_path(asset.value), true)
           end
           def #{asset_class}_url(asset)
-            asset_url(asset, Sass::Script::String.new("#{asset_class}"))
+            Sass::Script::String.new("url(" + resolver.#{asset_class}_path(asset.value) + ")")
           end
         }, __FILE__, __LINE__ - 6
       end
 
-    protected
-      def public_path(asset, kind)
-        options[:custom][:resolver].public_path(asset, kind.pluralize)
+      def font_path(asset)
+        asset_path(asset, Sass::Script::String.new("font"))
       end
-      
-      def context_asset_data_uri(path)
-        options[:custom][:resolver].context.asset_data_uri(path)
+
+      def font_url(asset)
+        asset_url(asset, Sass::Script::String.new("font"))
       end
+
+    protected
+
+    def resolver
+      options[:custom][:resolver]
+    end
+
+    def public_path(asset, kind)
+      resolver.public_path(asset, kind.pluralize)
+    end
+
+    def context_asset_data_uri(path)
+      resolver.context.asset_data_uri(path)
+    end
     end
   end
 end
@@ -44,4 +57,4 @@ module Sass
       include Sass::Rails::Helpers
     end
   end
-end
+end

data/lib/sass/rails/railtie.rb

@@ -5,7 +5,9 @@ module Sass::Rails
     module SassContext
       attr_accessor :sass_config
     end
+
     config.sass = ActiveSupport::OrderedOptions.new
+
     # Establish static configuration defaults
     # Emit scss files during stylesheet generation of scaffold
     config.sass.preferred_syntax = :scss
@@ -28,18 +30,18 @@ module Sass::Rails
     # to the rails generate command
     config.app_generators.stylesheet_engine config.sass.preferred_syntax
 
-    config.before_initialize do |app|
-      unless app.config.assets && app.config.assets.enabled
-        raise "The sass-rails plugin requires the asset pipeline to be enabled."
-      end
-
+    config.before_initialize do
       require 'sass'
-      Sprockets::Engines #force autoloading
-      Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
-      Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
+
+      # Assume dependency on sprockets, not on app.config.assets enabled.
+      if defined?(Sprockets::Engines)
+        Sprockets::Engines #force autoloading
+        Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
+        Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
+      end
     end
 
-    initializer :setup_sass do |app|
+    initializer :setup_sass, :group => :assets 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
       alt_syntax = syntax == :sass ? "scss" : "sass"
@@ -58,17 +60,15 @@ module Sass::Rails
       end
       app.assets.context_class.extend(SassContext)
       app.assets.context_class.sass_config = app.config.sass
+
+      Sass.logger = app.config.sass.logger
     end
 
-    initializer :setup_compression do |app|
+    initializer :setup_compression, :group => :assets do |app|
       if app.config.assets.compress
         # Use sass's css_compressor
         app.config.assets.css_compressor = CssCompressor.new
       end
     end
-
-    config.after_initialize do |app|
-      Sass::logger = app.config.sass.logger
-    end
   end
 end

data/lib/sass/rails/template_handlers.rb

@@ -20,12 +20,32 @@ module Sass::Rails
     end
 
     def public_path(path, scope)
-      context.asset_paths.compute_public_path(path, scope)
+      context.asset_paths.compute_public_path(path, ::Rails.application.config.assets.prefix)
     end
 
     def process(path)
       context.environment[path].to_s
     end
+
+    def image_path(img)
+      context.image_path(img)
+    end
+
+    def video_path(video)
+      context.video_path(video)
+    end
+
+    def audio_path(audio)
+      context.audio_path(audio)
+    end
+
+    def javascript_path(javascript)
+      context.javascript_path(javascript)
+    end
+
+    def stylesheet_path(stylesheet)
+      context.stylesheet_path(stylesheet)
+    end
   end
 
   class SassTemplate < Tilt::SassTemplate

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.2"
+    VERSION = "3.1.3"
   end
 end

data/test/fixtures/scss_project/app/assets/stylesheets/application.css.scss

@@ -13,7 +13,18 @@
 .rails {
   asset-path: asset-path("rails.png", image);
   asset-url: asset-url("rails.png", image);
+  image-path: image-path("rails.png");
   image-url: image-url("rails.png");
+  video-path: video-path("rails.mp4");
+  video-url: video-url("rails.mp4");
+  audio-path: audio-path("rails.mp3");
+  audio-url: audio-url("rails.mp3");
+  font-path: font-path("rails.ttf");
+  font-url: font-url("rails.ttf");
+  javascript-path: javascript-path("rails.js");
+  javascript-url: javascript-url("rails.js");
+  stylesheet-path: stylesheet-path("rails.css");
+  stylesheet-url: stylesheet-url("rails.css");
   asset-data-url: asset-data-url("1x1.png");
 }
 

data/test/sass_rails_test.rb

@@ -76,7 +76,18 @@ class SassRailsTest < Sass::Rails::TestCase
     css_output = sprockets_render("scss_project", "application.css.scss")
     assert_match css_output, %r{asset-path:\s*"/assets/rails.png"}, 'asset-path:\s*"/assets/rails.png"'
     assert_match css_output, %r{asset-url:\s*url\(/assets/rails.png\)}, 'asset-url:\s*url\(/assets/rails.png\)'
+    assert_match css_output, %r{image-path:\s*"/assets/rails.png"}, 'image-path:\s*"/assets/rails.png"'
     assert_match css_output, %r{image-url:\s*url\(/assets/rails.png\)}, 'image-url:\s*url\(/assets/rails.png\)'
+    assert_match css_output, %r{video-path:\s*"/videos/rails.mp4"}, 'video-path:\s*"/videos/rails.mp4"'
+    assert_match css_output, %r{video-url:\s*url\(/videos/rails.mp4\)}, 'video-url:\s*url\(/videos/rails.mp4\)'
+    assert_match css_output, %r{audio-path:\s*"/audios/rails.mp3"}, 'audio-path:\s*"/audios/rails.mp3"'
+    assert_match css_output, %r{audio-url:\s*url\(/audios/rails.mp3\)}, 'audio-url:\s*url\(/audios/rails.mp3\)'
+    assert_match css_output, %r{font-path:\s*"/assets/rails.ttf"}, 'font-path:\s*"/assets/rails.ttf"'
+    assert_match css_output, %r{font-url:\s*url\(/assets/rails.ttf\)}, 'font-url:\s*url\(/assets/rails.ttf\)'
+    assert_match css_output, %r{javascript-path:\s*"/assets/rails.js"}, 'javascript-path:\s*"/assets/rails.js"'
+    assert_match css_output, %r{javascript-url:\s*url\(/assets/rails.js\)}, 'javascript-url:\s*url\(/assets/rails.js\)'
+    assert_match css_output, %r{stylesheet-path:\s*"/assets/rails.css"}, 'stylesheet-path:\s*"/assets/rails.css"'
+    assert_match css_output, %r{stylesheet-url:\s*url\(/assets/rails.css\)}, 'stylesheet-url:\s*url\(/assets/rails.css\)'
 
     asset_data_url_regexp = %r{asset-data-url:\s*url\((.*?)\)}
     assert_match css_output, asset_data_url_regexp, 'asset-data-url:\s*url\((.*?)\)'

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass-rails
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 3.1.2
+  hash: 5
+  prerelease: false
+  segments: 
+  - 3
+  - 1
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - wycats
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 -07:00
+date: 2011-09-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 1
+        - 4
         version: 3.1.4
   type: :runtime
   version_requirements: *id001
@@ -33,6 +43,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
   version_requirements: *id002
@@ -44,6 +59,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
   type: :runtime
   version_requirements: *id003
@@ -55,6 +75,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
   version_requirements: *id004
@@ -66,6 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :runtime
   version_requirements: *id005
@@ -81,6 +111,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -263,17 +294,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !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: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: sass-rails
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.