sass-rails 3.1.0.rc.6 → 3.1.0.rc.7

data/lib/sass/rails.rb

@@ -1,16 +1,12 @@
 module Sass
-  autoload :Script, 'sass/rails/helpers'
-
   module Rails
-    autoload :CssCompressor, 'sass/rails/compressor'
-    autoload :Helpers,       'sass/rails/helpers'
-    autoload :Importer,      'sass/rails/importer'
-    autoload :Logger,        'sass/rails/logger'
-    autoload :Resolver,      'sass/rails/template_handlers'
-    autoload :SassTemplate,  'sass/rails/template_handlers'
-    autoload :ScssTemplate,  'sass/rails/template_handlers'
   end
 end
 
-require 'sass/rails/version'
+require 'sass/rails/compressor'
+require 'sass/rails/logger'
 require 'sass/rails/railtie'
+require 'sass/rails/helpers'
+require 'sass/rails/importer'
+require 'sass/rails/template_handlers'
+require 'sass/rails/version'

data/lib/sass/rails/railtie.rb

@@ -11,9 +11,9 @@ module Sass::Rails
     config.sass.preferred_syntax = :scss
     # Use expanded output instead of the sass default of :nested
     config.sass.style            = :expanded
-    # Write sass cache files to tmp/sass-cache for performance
+    # Write sass cache files for performance
     config.sass.cache            = true
-    # Read sass cache files from tmp/sass-cache for performance
+    # Read sass cache files for performance
     config.sass.read_cache       = true
     # Display line comments above each selector as a debugging aid
     config.sass.line_comments    = true
@@ -22,8 +22,19 @@ module Sass::Rails
     # Send Sass logs to Rails.logger
     config.sass.logger           = Sass::Rails::Logger.new
 
-    config.before_initialize do
-      require 'sprockets/engines'
+    # Set the default stylesheet engine
+    # It can be overridedden by passing:
+    #     --stylesheet_engine=sass
+    # 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
+
+      require 'sass'
+      Sprockets::Engines #force autoloading
       Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
       Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
     end
@@ -34,11 +45,11 @@ module Sass::Rails
       alt_syntax = syntax == :sass ? "scss" : "sass"
       app.config.generators.hide_namespace alt_syntax
 
-      # Set the stylesheet engine to the preferred syntax
+      # Override stylesheet engine to the preferred syntax
       config.app_generators.stylesheet_engine syntax
 
-      # Set the sass cache location to tmp/sass-cache
-      config.sass.cache_location   = File.join(Rails.root, "tmp/sass-cache")
+      # Set the sass cache location
+      config.sass.cache_location   = File.join(Rails.root, "tmp/cache/sass")
 
       # Establish configuration defaults that are evironmental in nature
       if config.sass.full_exception.nil?

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.0.rc.6"
+    VERSION = "3.1.0.rc.7"
   end
 end

data/test/fixtures/engine_project/.gitignore

@@ -0,0 +1,6 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/tmp/

data/test/fixtures/engine_project/Gemfile

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

data/test/fixtures/engine_project/README.rdoc

@@ -0,0 +1,3 @@
+= EngineProject
+
+This project rocks and uses MIT-LICENSE.

data/test/fixtures/engine_project/Rakefile

@@ -0,0 +1,39 @@
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'EngineProject'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/test/fixtures/engine_project/app/controllers/engine_project/application_controller.rb

@@ -0,0 +1,4 @@
+module EngineProject
+  class ApplicationController < ActionController::Base
+  end
+end

data/test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb

@@ -0,0 +1,4 @@
+module EngineProject
+  module ApplicationHelper
+  end
+end

data/test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>EngineProject</title>
+  <%= stylesheet_link_tag    "engine_project/application" %>
+  <%= javascript_include_tag "engine_project/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/fixtures/engine_project/config/routes.rb

@@ -0,0 +1,2 @@
+EngineProject::Engine.routes.draw do
+end

data/test/fixtures/engine_project/lib/engine_project.rb

@@ -0,0 +1,4 @@
+require "engine_project/engine"
+
+module EngineProject
+end

data/test/fixtures/engine_project/lib/engine_project/engine.rb

@@ -0,0 +1,5 @@
+module EngineProject
+  class Engine < Rails::Engine
+    isolate_namespace EngineProject
+  end
+end

data/test/fixtures/engine_project/lib/engine_project/version.rb

@@ -0,0 +1,3 @@
+module EngineProject
+  VERSION = "0.0.1"
+end

data/test/fixtures/engine_project/lib/tasks/engine_project_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :engine_project do
+#   # Task goes here
+# end

data/test/fixtures/engine_project/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../test/dummy/script/rails',  __FILE__)

data/test/fixtures/engine_project/test/dummy/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Dummy::Application.load_tasks

data/test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree . 
+*/

data/test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/fixtures/engine_project/test/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/fixtures/engine_project/test/dummy/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/test/fixtures/engine_project/test/dummy/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require
+require "engine_project"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+  end
+end
+

data/test/fixtures/engine_project/test/dummy/config/boot.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
+
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/fixtures/engine_project/test/dummy/config/database.yml

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/test/fixtures/engine_project/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/fixtures/engine_project/test/dummy/config/environments/development.rb

@@ -0,0 +1,27 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
+end

data/test/fixtures/engine_project/test/dummy/config/environments/production.rb

@@ -0,0 +1,51 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/fixtures/engine_project/test/dummy/config/environments/test.rb

@@ -0,0 +1,39 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/fixtures/engine_project/test/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/fixtures/engine_project/test/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = 'd6e88517fac324a6d3fa410aa3a90b74b625b0805b4a56377f183909840ec2e55cc7d14e3a6d422fc33e10d25aa658d2a340dd344126b6e8a7321a3e43e688e4'

data/test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store

data/test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActionController::Base.wrap_parameters :format => [:json]
+
+# Disable root element in JSON by default.
+if defined?(ActiveRecord)
+  ActiveRecord::Base.include_root_in_json = false
+end

data/test/fixtures/engine_project/test/dummy/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/test/fixtures/engine_project/test/dummy/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+
+  mount EngineProject::Engine => "/engine_project"
+end

data/test/fixtures/engine_project/test/dummy/public/404.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>

data/test/fixtures/engine_project/test/dummy/public/422.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

data/test/fixtures/engine_project/test/dummy/public/500.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  </div>
+</body>
+</html>

data/test/fixtures/engine_project/test/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/test/sass_rails_logger_test.rb

@@ -4,7 +4,7 @@ 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
+      assert logger_class_name =~ /#{Regexp.escape(Sass::Rails::Logger.name)}/
     end
   end
 
@@ -16,6 +16,8 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
         message = "[#{level}]: sass message"
         runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"}
 
+        assert File.exists?("#{app_root}/log/development.log"), "log file was not created"
+
         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

data/test/sass_rails_test.rb

@@ -22,6 +22,22 @@ class SassRailsTest < Sass::Rails::TestCase
       assert_not_output(/conflict/)
     end
   end
+  test "scss files are generated during scaffold generation of a engine project" do
+    within_rails_app "engine_project" do
+      runcmd "rails generate scaffold foo"
+      assert_file_exists "app/assets/stylesheets/engine_project/foos.css.scss"
+      assert_file_exists "app/assets/stylesheets/scaffolds.css.scss"
+      assert_not_output(/conflict/)
+    end
+  end
+  test "sass files are generated during scaffold generation of a engine project, if is called with --stylesheet-engine=sass" do
+    within_rails_app "engine_project" do
+      runcmd "rails generate scaffold foo --stylesheet-engine=sass"
+      assert_file_exists "app/assets/stylesheets/engine_project/foos.css.sass"
+      assert_file_exists "app/assets/stylesheets/scaffolds.css.sass"
+      assert_not_output(/conflict/)
+    end
+  end
   # DISABLED because we've removed the feature for now.
   # test "scss template has correct dasherized css class for namespaced controllers" do
   #   within_rails_app "scss_project" do

metadata

@@ -2,7 +2,7 @@
 name: sass-rails
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.1.0.rc.6
+  version: 3.1.0.rc.7
 platform: ruby
 authors: 
 - wycats
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-08-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,53 @@ files:
 - lib/sass/rails/template_handlers.rb
 - lib/sass/rails/version.rb
 - sass-rails.gemspec
+- test/fixtures/engine_project/.gitignore
+- test/fixtures/engine_project/Gemfile
+- test/fixtures/engine_project/README.rdoc
+- test/fixtures/engine_project/Rakefile
+- test/fixtures/engine_project/app/assets/images/engine_project/.gitkeep
+- test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js
+- test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css
+- test/fixtures/engine_project/app/controllers/engine_project/application_controller.rb
+- test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
+- test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
+- test/fixtures/engine_project/config/routes.rb
+- test/fixtures/engine_project/lib/engine_project.rb
+- test/fixtures/engine_project/lib/engine_project/engine.rb
+- test/fixtures/engine_project/lib/engine_project/version.rb
+- test/fixtures/engine_project/lib/tasks/engine_project_tasks.rake
+- test/fixtures/engine_project/script/rails
+- test/fixtures/engine_project/test/dummy/Rakefile
+- test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js
+- test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css
+- test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb
+- test/fixtures/engine_project/test/dummy/app/helpers/application_helper.rb
+- test/fixtures/engine_project/test/dummy/app/mailers/.gitkeep
+- test/fixtures/engine_project/test/dummy/app/models/.gitkeep
+- test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb
+- test/fixtures/engine_project/test/dummy/config.ru
+- test/fixtures/engine_project/test/dummy/config/application.rb
+- test/fixtures/engine_project/test/dummy/config/boot.rb
+- test/fixtures/engine_project/test/dummy/config/database.yml
+- test/fixtures/engine_project/test/dummy/config/environment.rb
+- test/fixtures/engine_project/test/dummy/config/environments/development.rb
+- test/fixtures/engine_project/test/dummy/config/environments/production.rb
+- test/fixtures/engine_project/test/dummy/config/environments/test.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/backtrace_silencers.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/mime_types.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
+- test/fixtures/engine_project/test/dummy/config/locales/en.yml
+- test/fixtures/engine_project/test/dummy/config/routes.rb
+- test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
+- test/fixtures/engine_project/test/dummy/log/.gitkeep
+- test/fixtures/engine_project/test/dummy/public/404.html
+- test/fixtures/engine_project/test/dummy/public/422.html
+- test/fixtures/engine_project/test/dummy/public/500.html
+- test/fixtures/engine_project/test/dummy/public/favicon.ico
+- test/fixtures/engine_project/test/dummy/script/rails
 - test/fixtures/sass_project/.gitignore
 - test/fixtures/sass_project/Gemfile
 - test/fixtures/sass_project/README
@@ -207,6 +254,53 @@ signing_key:
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.
 test_files: 
+- test/fixtures/engine_project/.gitignore
+- test/fixtures/engine_project/Gemfile
+- test/fixtures/engine_project/README.rdoc
+- test/fixtures/engine_project/Rakefile
+- test/fixtures/engine_project/app/assets/images/engine_project/.gitkeep
+- test/fixtures/engine_project/app/assets/javascripts/engine_project/application.js
+- test/fixtures/engine_project/app/assets/stylesheets/engine_project/application.css
+- test/fixtures/engine_project/app/controllers/engine_project/application_controller.rb
+- test/fixtures/engine_project/app/helpers/engine_project/application_helper.rb
+- test/fixtures/engine_project/app/views/layouts/engine_project/application.html.erb
+- test/fixtures/engine_project/config/routes.rb
+- test/fixtures/engine_project/lib/engine_project.rb
+- test/fixtures/engine_project/lib/engine_project/engine.rb
+- test/fixtures/engine_project/lib/engine_project/version.rb
+- test/fixtures/engine_project/lib/tasks/engine_project_tasks.rake
+- test/fixtures/engine_project/script/rails
+- test/fixtures/engine_project/test/dummy/Rakefile
+- test/fixtures/engine_project/test/dummy/app/assets/javascripts/application.js
+- test/fixtures/engine_project/test/dummy/app/assets/stylesheets/application.css
+- test/fixtures/engine_project/test/dummy/app/controllers/application_controller.rb
+- test/fixtures/engine_project/test/dummy/app/helpers/application_helper.rb
+- test/fixtures/engine_project/test/dummy/app/mailers/.gitkeep
+- test/fixtures/engine_project/test/dummy/app/models/.gitkeep
+- test/fixtures/engine_project/test/dummy/app/views/layouts/application.html.erb
+- test/fixtures/engine_project/test/dummy/config.ru
+- test/fixtures/engine_project/test/dummy/config/application.rb
+- test/fixtures/engine_project/test/dummy/config/boot.rb
+- test/fixtures/engine_project/test/dummy/config/database.yml
+- test/fixtures/engine_project/test/dummy/config/environment.rb
+- test/fixtures/engine_project/test/dummy/config/environments/development.rb
+- test/fixtures/engine_project/test/dummy/config/environments/production.rb
+- test/fixtures/engine_project/test/dummy/config/environments/test.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/backtrace_silencers.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/inflections.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/mime_types.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/secret_token.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb
+- test/fixtures/engine_project/test/dummy/config/initializers/wrap_parameters.rb
+- test/fixtures/engine_project/test/dummy/config/locales/en.yml
+- test/fixtures/engine_project/test/dummy/config/routes.rb
+- test/fixtures/engine_project/test/dummy/lib/assets/.gitkeep
+- test/fixtures/engine_project/test/dummy/log/.gitkeep
+- test/fixtures/engine_project/test/dummy/public/404.html
+- test/fixtures/engine_project/test/dummy/public/422.html
+- test/fixtures/engine_project/test/dummy/public/500.html
+- test/fixtures/engine_project/test/dummy/public/favicon.ico
+- test/fixtures/engine_project/test/dummy/script/rails
 - test/fixtures/sass_project/.gitignore
 - test/fixtures/sass_project/Gemfile
 - test/fixtures/sass_project/README