sass-rails 3.1.0.rc.2 → 3.1.0.rc.3

data/README.markdown

@@ -44,6 +44,22 @@ The [list of supported options](http://sass-lang.com/docs/yardoc/file.SASS_REFER
   files (containing mixins and variables) because it is difficult to control the
   cascade ordering for imports that contain styles using this approach.
 
+* **Asset Helpers**. When using the asset pipeline, paths to assets must be rewritten.
+  When referencing assets use the following asset helpers:
+
+  * `asset_path($relative-asset-path, $asset-class)` - Returns a string to the asset.
+    For example: `asset_path("rails.png", image)` becomes `"/assets/rails.png"`
+  * `asset_url($relative-asset-path, $asset-class)` - Returns url reference to the asset.
+    
+    For example: `asset_url("rails.png", image)` becomes `url(/assets/rails.png)`
+  * As a convenience, for each of the following asset classes there are
+    corresponding `_path` and `_url` helpers:
+    image, font, video, audio, javascript, stylesheet.
+    
+    For example: `image_url("rails.png")` becomes `url(/assets/rails.png)` and
+    `image_path("rails.png")` becomes `"/assets/rails.png"`.
+  
+
 ## Running Tests
 
     $ bundle install

data/lib/rails/generators/sass/assets/templates/stylesheet.css.sass

@@ -2,5 +2,5 @@
 // They will automatically be included in application.css.
 // You can use Sass here: http://sass-lang.com/
 
-body.<%= name.dasherize %>
+body.<%= name.parameterize.dasherize %>
   // Place scoped styles here

data/lib/rails/generators/scss/assets/templates/stylesheet.css.scss

@@ -2,6 +2,6 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-body.<%= name.dasherize %> {
+body.<%= name.parameterize.dasherize %> {
   // Place scoped styles here
 }

data/lib/sass/rails.rb

@@ -4,8 +4,10 @@ module Sass
 end
 
 require 'sass/rails/compressor'
+require 'sass/rails/logger'
 require 'sass/rails/railtie'
 require 'sass/rails/monkey_patches'
+require 'sass/rails/helpers'
 require 'sass/rails/importer'
 require 'sass/rails/template_handlers'
 require 'sass/rails/version'

data/lib/sass/rails/helpers.rb

@@ -0,0 +1,38 @@
+module Sass
+  module Rails
+    module Helpers
+
+      def asset_path(asset, kind)
+        Sass::Script::String.new(public_path(asset.value, kind.value), true)
+      end
+
+      def asset_url(asset, kind)
+        Sass::Script::String.new(%Q{url(#{public_path(asset.value, kind.value)})})
+      end
+
+      [:image, :font, :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}"))
+          end
+          def #{asset_class}_url(asset)
+            asset_url(asset, Sass::Script::String.new("#{asset_class}"))
+          end
+        }, __FILE__, __LINE__ - 7
+      end
+
+    protected
+      def public_path(asset, kind)
+        options[:custom][:resolver].public_path(asset, kind.pluralize)
+      end
+    end
+  end
+end
+
+module Sass
+  module Script
+    module Functions
+      include Sass::Rails::Helpers
+    end
+  end
+end

data/lib/sass/rails/importer.rb

@@ -14,6 +14,7 @@ module Sass::Rails
 
     def initialize(context)
       @context = context
+      @resolver = Resolver.new(context)
     end
 
     def sass_file?(filename)
@@ -30,22 +31,23 @@ module Sass::Rails
     def resolve(name, base_pathname = nil)
       name = Pathname.new(name)
       if base_pathname && base_pathname.to_s.size > 0
-        name = base_pathname.dirname.relative_path_from(context.pathname.dirname).join(name)
+        root = Pathname.new(context.root_path)
+        name = base_pathname.relative_path_from(root).join(name)
       end
       partial_name = name.dirname.join("_#{name.basename}")
-      sprockets_resolve(name) || sprockets_resolve(partial_name)
+      @resolver.resolve(name) || @resolver.resolve(partial_name)
     end
 
     def find_relative(name, base, options)
       base_pathname = Pathname.new(base)
       if name =~ GLOB
         glob_imports(name, base_pathname, options)
-      elsif pathname = resolve(name, base_pathname)
+      elsif pathname = resolve(name, base_pathname.dirname)
         context.depend_on(pathname)
         if sass_file?(pathname)
           Sass::Engine.new(pathname.read, options.merge(:filename => pathname.to_s, :importer => self, :syntax => syntax(pathname)))
         else
-          Sass::Engine.new(sprockets_process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
+          Sass::Engine.new(@resolver.process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
         end
       else
         nil
@@ -60,7 +62,7 @@ module Sass::Rails
         if sass_file?(pathname)
           Sass::Engine.new(pathname.read, options.merge(:filename => pathname.to_s, :importer => self, :syntax => syntax(pathname)))
         else
-          Sass::Engine.new(sprockets_process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
+          Sass::Engine.new(@resolver.process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
         end
       else
         nil
@@ -68,7 +70,7 @@ module Sass::Rails
     end
 
     def each_globbed_file(glob, base_pathname, options)
-      Dir["#{base_pathname.dirname}/#{glob}"].sort.each do |filename|
+      Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
         next if filename == options[:filename]
         yield filename if File.directory?(filename) || context.asset_requirable?(filename)
       end
@@ -76,7 +78,7 @@ module Sass::Rails
 
     def glob_imports(glob, base_pathname, options)
       contents = ""
-      each_globbed_file(glob, base_pathname, options) do |filename|
+      each_globbed_file(glob, base_pathname.dirname, options) do |filename|
         if File.directory?(filename)
           context.depend_on(filename)
         elsif context.asset_requirable?(filename)
@@ -95,7 +97,7 @@ module Sass::Rails
     def mtime(name, options)
       if name =~ GLOB && options[:filename]
         mtime = nil
-        each_globbed_file(name, Pathname.new(options[:filename]), options) do |p|
+        each_globbed_file(name, Pathname.new(options[:filename]).dirname, options) do |p|
           mtime ||= File.mtime(p)
           mtime = [mtime, File.mtime(p)].max
         end
@@ -113,16 +115,6 @@ module Sass::Rails
       "Sass::Rails::Importer(#{context.pathname})"
     end
 
-    private
-      def sprockets_resolve(path)
-        context.resolve(path, :content_type => :self)
-      rescue Sprockets::FileNotFound, Sprockets::ContentTypeMismatch
-        nil
-      end
-
-      def sprockets_process(path)
-        context.environment[path].to_s
-      end
   end
 
 end

data/lib/sass/rails/logger.rb

@@ -0,0 +1,19 @@
+module Sass
+  module Rails
+    class Logger < Sass::Logger::Base
+      def _log(level, message)
+
+        case level
+          when :trace, :debug
+            ::Rails.logger.debug message
+          when :warn
+            ::Rails.logger.warn message
+          when :error
+            ::Rails.logger.error message
+          when :info
+            ::Rails.logger.info message
+        end
+      end
+    end
+  end
+end

data/lib/sass/rails/monkey_patches.rb

@@ -1,20 +1,36 @@
-require 'sprockets/railtie'
+module Sass::Rails::SassContext
+  attr_accessor :sass_config
+end
 
-module Sprockets
-  class Railtie < ::Rails::Railtie
-
-    module SassContext
-      attr_accessor :sass_config
-    end
+module Sass::Rails::SprocketsConfig
+  def self.included(base)
+    base.alias_method_chain :asset_environment, :sass_config
+  end
 
-    protected
+  def asset_environment_with_sass_config(app, *args)
+    env = asset_environment_without_sass_config(app, *args)
+    env.context_class.extend(Sass::Rails::SassContext)
+    env.context_class.sass_config = app.config.sass
+    env
+  end
+end
 
-    def asset_environment_with_sass_config(app, *args)
-      env = asset_environment_without_sass_config(app, *args)
-      env.context_class.extend(SassContext)
-      env.context_class.sass_config = app.config.sass
-      env
+begin
+  # Before sprockets was extracted from rails
+  require 'sprockets/railtie'
+  module Sprockets
+    class Railtie < ::Rails::Railtie
+      include Sass::Rails::SprocketsConfig
+    end
+  end
+rescue LoadError
+  # After sprockets was extracted into sprockets-rails
+  require 'sprockets/rails/railtie'
+  module Sprockets
+    module Rails
+      class Railtie < ::Rails::Railtie
+        include Sass::Rails::SprocketsConfig
+      end
     end
-    alias_method_chain :asset_environment, :sass_config
   end
 end

data/lib/sass/rails/railtie.rb

@@ -12,6 +12,10 @@ module Sass::Rails
     config.sass.read_cache       = true
     # Display line comments above each selector as a debugging aid
     config.sass.line_comments    = true
+    # Initialize the load paths to an empty array
+    config.sass.load_paths       = []
+    # Send Sass logs to Rails.logger
+    config.sass.logger           = Sass::Rails::Logger.new
 
     initializer :setup_sass do |app|
       # Only emit one kind of syntax because though we have registered two kinds of generators
@@ -30,7 +34,6 @@ module Sass::Rails
         # Display a stack trace in the css output when in development-like environments.
         config.sass.full_exception = app.config.consider_all_requests_local
       end
-
     end
 
     initializer :setup_compression do |app|
@@ -39,5 +42,9 @@ module Sass::Rails
         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

@@ -2,6 +2,32 @@ require 'tilt'
 require 'sprockets'
 
 module Sass::Rails
+
+  class Resolver
+
+    attr_accessor :context
+
+    def initialize(context)
+      @context = context
+    end
+
+    def resolve(path, content_type = :self)
+      options = {}
+      options[:content_type] = content_type unless content_type.nil?
+      context.resolve(path, options)
+    rescue Sprockets::FileNotFound, Sprockets::ContentTypeMismatch
+      nil
+    end
+
+    def public_path(path, scope)
+      context.asset_paths.compute_public_path(path, scope)
+    end
+
+    def process(path)
+      context.environment[path].to_s
+    end
+  end
+
   class SassTemplate < Tilt::SassTemplate
     self.default_mime_type = 'text/css'
 
@@ -31,7 +57,10 @@ module Sass::Rails
         :line => line,
         :syntax => syntax,
         :importer => importer,
-        :load_paths => load_paths
+        :load_paths => load_paths,
+        :custom => {
+          :resolver => Resolver.new(scope)
+        }
       )
     end
 

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.0.rc.2"
+    VERSION = "3.1.0.rc.3"
   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.2'
+  s.add_runtime_dependency 'sass',       '>= 3.1.3'
   s.add_runtime_dependency 'railties',   '~> 3.1.0.rc1'
   s.add_runtime_dependency 'actionpack', '~> 3.1.0.rc1'
   s.add_runtime_dependency 'sprockets', '>= 2.0.0.beta.9'

data/test/fixtures/sass_project/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails'
+gem 'rails', "~> 3.1.0.rc4"
 gem 'sqlite3'
 
 # Asset template engines

data/test/fixtures/scss_project/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails'
+gem 'rails', "~> 3.1.0.rc4"
 gem 'sqlite3'
 
 # Asset template engines

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

@@ -8,3 +8,9 @@
   color: yellow;
   @include background-from-partial(red);
 }
+
+.rails {
+  asset-path: asset-path("rails.png", image);
+  asset-url: asset-url("rails.png", image);
+  image-url: image-url("rails.png");
+}

data/test/fixtures/scss_project/app/assets/stylesheets/css_application.css

@@ -0,0 +1,7 @@
+/*
+ *= require partials/_sass_import
+ *= require partials/_scss_import
+ *= require_tree ./globbed
+ *= require subfolder/plain
+ *= require subfolder/second_level
+ */

data/test/sass_rails_logger_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class SassRailsLoggerTest < Sass::Rails::TestCase
+  test "setting a sass-rails logger as the sass default logger" do
+    within_rails_app "scss_project" do
+      logger_class_name = runcmd 'rails runner "print Sass::logger.class.name"'
+      assert_equal Sass::Rails::Logger.name, logger_class_name
+    end
+  end
+
+  [:debug, :warn, :info, :error, :trace].each do |level|
+    test "sending a #{level} message to the sass logger writes to the environment log file" do
+      within_rails_app "scss_project" do
+        app_root = runcmd 'rails runner "print Rails.root"'
+
+        message = "[#{level}]: sass message"
+        runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, '#{message}')"}
+
+        log_output = File.open("#{app_root}/log/development.log").read
+        assert log_output.include?(message), "the #{level} log message was not found in the log file"
+      end
+    end
+  end
+end

data/test/sass_rails_test.rb

@@ -14,7 +14,7 @@ class SassRailsTest < Sass::Rails::TestCase
       assert_not_output(/conflict/)
     end
   end
-  test "sass files are generated during scaffold generation sass projects" do
+  test "sass files are generated during scaffold generation of sass projects" do
     within_rails_app "sass_project" do
       runcmd "rails generate scaffold foo"
       assert_file_exists "app/assets/stylesheets/foos.css.sass"
@@ -22,10 +22,28 @@ class SassRailsTest < Sass::Rails::TestCase
       assert_not_output(/conflict/)
     end
   end
+  test "scss template has correct dasherized css class for namespaced controllers" do
+    within_rails_app "scss_project" do
+      runcmd "rails generate controller foo/bar"
+      assert_file_exists "app/assets/stylesheets/foo/bar.css.scss"
+      assert_match File.read("app/assets/stylesheets/foo/bar.css.scss"), /\.foo-bar/
+    end
+  end
+  test "sass template has correct dasherized css class for namespaced controllers" do
+    within_rails_app "sass_project" do
+      runcmd "rails generate controller foo/bar"
+      assert_file_exists "app/assets/stylesheets/foo/bar.css.sass"
+      assert_match File.read("app/assets/stylesheets/foo/bar.css.sass"), /\.foo-bar/
+    end
+  end
   test "templates are registered with sprockets" do
     assert_equal Sass::Rails::SassTemplate, Sprockets.engines[".sass"]
     assert_equal Sass::Rails::ScssTemplate, Sprockets.engines[".scss"]
   end
+  test "sprockets require works correctly" do
+    css_output = sprockets_render("scss_project", "css_application.css")
+    assert_match css_output, /globbed/
+  end
   test "sass imports work correctly" do
     css_output = sprockets_render("scss_project", "application.css.scss")
     assert_match css_output, /main/
@@ -40,6 +58,12 @@ class SassRailsTest < Sass::Rails::TestCase
     assert_match css_output, /plain-old-css/
     assert_match css_output, /another-plain-old-css/
   end
+  test "sass asset paths work" do
+    css_output = sprockets_render("scss_project", "application.css.scss")
+    assert_match css_output, %r{asset-path:\s*"/assets/rails.png"}
+    assert_match css_output, %r{asset-url:\s*url\(/assets/rails.png\)}
+    assert_match css_output, %r{image-url:\s*url\(/assets/rails.png\)}
+  end
   test "css compressor compresses" do
     assert_equal "div{color:red}\n", Sass::Rails::CssCompressor.new.compress(<<CSS)
 div {

data/test/support/sass_rails_test_case.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
 require 'tmpdir'
+require 'action_view/helpers/capture_helper'
+
 
 class Sass::Rails::TestCase < ActiveSupport::TestCase
 
@@ -27,15 +29,39 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     File.expand_path("../../fixtures/#{path}", __FILE__)
   end
 
+  module TestAssetPaths
+    attr_accessor :assets
+  end
+
   def sprockets_render(project, filename)
-    @env = Sprockets::Environment.new
-    @env.context_class.class_eval do
+    env = Sprockets::Environment.new
+    env.context_class.class_eval do
+      def self.assets=(assets)
+        @assets = assets
+      end
+      def self.assets
+        @assets
+      end
       def self.sass_config
         Sass::Rails::Railtie.config.sass
       end
+      def config
+        @config ||= ActiveSupport::InheritableOptions.new
+      end
+      include Sprockets::Helpers::RailsHelper
+      def asset_paths_with_testing
+        paths = asset_paths_without_testing
+        unless paths.is_a?(TestAssetPaths)
+          paths.extend(TestAssetPaths)
+          paths.assets = self.class.assets
+        end
+        paths
+      end
+      alias_method_chain :asset_paths, :testing
     end
-    @env.paths << fixture_path("#{project}/app/assets/stylesheets")
-    @env[filename].to_s
+    env.context_class.assets = env
+    env.paths << fixture_path("#{project}/app/assets/stylesheets")
+    env[filename].to_s
   end
 
   def assert_file_exists(filename)

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sass-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424097
   prerelease: 6
-  segments: 
-  - 3
-  - 1
-  - 0
-  - rc
-  - 2
-  version: 3.1.0.rc.2
+  version: 3.1.0.rc.3
 platform: ruby
 authors: 
 - wycats
@@ -18,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -07:00
+date: 2011-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +22,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 1
-        - 2
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,13 +33,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424103
-        segments: 
-        - 3
-        - 1
-        - 0
-        - rc
-        - 1
         version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id002
@@ -63,13 +44,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424103
-        segments: 
-        - 3
-        - 1
-        - 0
-        - rc
-        - 1
         version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id003
@@ -81,13 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196465
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 9
         version: 2.0.0.beta.9
   type: :runtime
   version_requirements: *id004
@@ -116,7 +83,9 @@ files:
 - lib/sass-rails.rb
 - lib/sass/rails.rb
 - lib/sass/rails/compressor.rb
+- lib/sass/rails/helpers.rb
 - lib/sass/rails/importer.rb
+- lib/sass/rails/logger.rb
 - lib/sass/rails/monkey_patches.rb
 - lib/sass/rails/railtie.rb
 - lib/sass/rails/template_handlers.rb
@@ -171,6 +140,7 @@ files:
 - test/fixtures/scss_project/app/assets/javascripts/application.js
 - test/fixtures/scss_project/app/assets/stylesheets/_top_level_partial.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/application.css.scss
+- test/fixtures/scss_project/app/assets/stylesheets/css_application.css
 - test/fixtures/scss_project/app/assets/stylesheets/globbed/globbed.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/partials/_sass_import.css.sass
@@ -215,6 +185,7 @@ files:
 - test/fixtures/scss_project/script/rails
 - test/fixtures/scss_project/vendor/assets/stylesheets/.gitkeep
 - test/fixtures/scss_project/vendor/plugins/.gitkeep
+- test/sass_rails_logger_test.rb
 - test/sass_rails_test.rb
 - test/support/sass_rails_test_case.rb
 - test/test_helper.rb
@@ -232,25 +203,17 @@ 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: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: sass-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.
@@ -304,6 +267,7 @@ test_files:
 - test/fixtures/scss_project/app/assets/javascripts/application.js
 - test/fixtures/scss_project/app/assets/stylesheets/_top_level_partial.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/application.css.scss
+- test/fixtures/scss_project/app/assets/stylesheets/css_application.css
 - test/fixtures/scss_project/app/assets/stylesheets/globbed/globbed.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss
 - test/fixtures/scss_project/app/assets/stylesheets/partials/_sass_import.css.sass
@@ -348,6 +312,7 @@ test_files:
 - test/fixtures/scss_project/script/rails
 - test/fixtures/scss_project/vendor/assets/stylesheets/.gitkeep
 - test/fixtures/scss_project/vendor/plugins/.gitkeep
+- test/sass_rails_logger_test.rb
 - test/sass_rails_test.rb
 - test/support/sass_rails_test_case.rb
 - test/test_helper.rb