sass-rails 3.2.6 → 4.0.0.beta1

data/.travis.yml

@@ -1,12 +1,17 @@
+language: ruby
 rvm:
- - 1.8.7
- - 1.9.2
  - 1.9.3
- - ree
- - jruby
- - rbx
+before_install: gem install bundler
 script: bundle exec rake test
 notifications:
   email: false
+  irc:
+    on_success: change
+    on_failure: always
+    channels:
+      - "irc.freenode.org#rails-contrib"
   campfire:
-    secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "CGWvthGkBKNnTnk9YSmf9AXKoiRI33fCl5D3jU4nx3cOPu6kv2R9nMjt9EAo\nOuS4Q85qNSf4VNQ2cUPNiNYSWQ+XiTfivKvDUw/QW9r1FejYyeWarMsSBWA+\n0fADjF1M2dkDIVLgYPfwoXEv7l+j654F1KLKB69F0F/netwP9CQ="

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0.beta1 (Feb 25, 2013)
+---------------------
+
+* Support to Rails 4
+* Drop support to Ruby 1.8
+
 3.1.5.rc.1 (Oct 16, 2011)
 ---------------------
 * Several bug fixes

data/Gemfile

@@ -3,15 +3,9 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in sass-rails.gemspec
 gemspec
 
-# Depend on the latest Rails 3.2
-gem "rails", :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable'
+# Track Rails master
+gem "rails", github: 'rails/rails', branch: 'master'
 
 gem "sqlite3"
 
 gem "sfl", "~> 2.0"
-gem "mocha"
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
-

data/README.markdown

@@ -18,7 +18,7 @@ properties that will be passed to Sass.
 
     MyProject::Application.configure do
       config.sass.line_comments = false
-      config.sass.syntax = :nested
+      config.sass.style = :nested
     end
 
 ## Important Note

data/Rakefile

@@ -10,3 +10,20 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+desc 'Default: run unit tests.'
+task :default => :test
+
+specname = "sass-rails.gemspec"
+deps = `git ls-files`.split("\n") - [specname]
+
+file specname => deps do
+  files       = `git ls-files`.split("\n")
+  test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+
+  require 'erb'
+
+  File.open specname, 'w:utf-8' do |f|
+    f.write ERB.new(File.read("#{specname}.erb")).result(binding)
+  end
+end

data/lib/sass/rails.rb

@@ -1,16 +1,11 @@
 module Sass
-  autoload :Script, 'sass/rails/helpers'
-
   module Rails
     autoload :CssCompressor, 'sass/rails/compressor'
-    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/helpers'
+require 'sass/rails/importer'
 require 'sass/rails/railtie'

data/lib/sass/rails/helpers.rb

@@ -1,52 +1,30 @@
-module Sass
-  module Rails
-    module Helpers
+require 'sprockets/sass_functions'
+require 'active_support/deprecation'
 
-      def asset_data_url(path)
-        data = context_asset_data_uri(path.value)
-        Sass::Script::String.new(%Q{url(#{data})})
-      end
-
-      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, :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)
-          end
-          def #{asset_class}_url(asset)
-            Sass::Script::String.new("url(" + resolver.#{asset_class}_path(asset.value) + ")")
-          end
-        }, __FILE__, __LINE__ - 6
-      end
+module Sprockets
+  module SassFunctions
+    if instance_methods.map(&:to_sym).include?(:asset_path)
+      undef_method :asset_path
+    end
 
-    protected
+    def asset_path(path, kind = nil)
+      ActiveSupport::Deprecation.warn "asset_path with two arguments is deprecated. Use asset_path(#{path}) instead." if kind
 
-    def resolver
-      options[:custom][:resolver]
+      Sass::Script::String.new(sprockets_context.asset_path(path.value), :string)
     end
 
-    def public_path(asset, kind)
-      resolver.public_path(asset, kind.pluralize)
+    if instance_methods.map(&:to_sym).include?(:asset_url)
+      undef_method :asset_url
     end
 
-    def context_asset_data_uri(path)
-      resolver.context.asset_data_uri(path)
-    end
+    def asset_url(path, kind = nil)
+      ActiveSupport::Deprecation.warn "asset_url with two arguments is deprecated. Use asset_url(#{path}) instead." if kind
+
+      Sass::Script::String.new("url(" + sprockets_context.asset_path(path.value) + ")")
     end
-  end
-end
 
-module Sass
-  module Script
-    module Functions
-      include Sass::Rails::Helpers
+    def asset_data_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.asset_data_uri(path.value) + ")")
     end
   end
 end

data/lib/sass/rails/importer.rb

@@ -1,80 +1,41 @@
-require 'sprockets'
+require 'sprockets/sass_importer'
 
-module Sass::Rails
-  class Importer
+module Sprockets
+  class SassImporter < Sass::Importers::Filesystem
     GLOB = /\*|\[.+\]/
-    PARTIAL = /^_/
-    HAS_EXTENSION = /\.css(.s[ac]ss)?$/
 
-    SASS_EXTENSIONS = {
-      ".css.sass" => :sass,
-      ".css.scss" => :scss,
-      ".sass" => :sass,
-      ".scss" => :scss
-    }
-    attr_reader :context
-
-    def initialize(context)
-      @context = context
-      @resolver = Resolver.new(context)
-    end
-
-    def sass_file?(filename)
-      filename = filename.to_s
-      SASS_EXTENSIONS.keys.any?{|ext| filename[ext]}
-    end
-
-    def syntax(filename)
-      filename = filename.to_s
-      SASS_EXTENSIONS.each {|ext, syntax| return syntax if filename[(ext.size+2)..-1][ext]}
-      nil
+    def extensions
+      {
+        "css" => :scss,
+        "css.sass" => :sass,
+        "css.scss" => :scss
+      }.merge!(super)
     end
 
-    def resolve(name, base_pathname = nil)
-      name = Pathname.new(name)
-      if base_pathname && base_pathname.to_s.size > 0
-        root = Pathname.new(context.root_path)
-        name = base_pathname.relative_path_from(root).join(name)
-      end
-      partial_name = name.dirname.join("_#{name.basename}")
-      @resolver.resolve(name) || @resolver.resolve(partial_name)
-    end
-
-    def find_relative(name, base, options)
-      base_pathname = Pathname.new(base)
+    def find_relative_with_glob(name, base, options)
       if name =~ GLOB
-        glob_imports(name, base_pathname, options)
-      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(@resolver.process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
-        end
+        glob_imports(name, Pathname.new(base), options)
       else
-        nil
+        find_relative_without_glob(name, base, options)
       end
     end
+    alias_method :find_relative_without_glob, :find_relative
+    alias_method :find_relative, :find_relative_with_glob
 
-    def find(name, options)
+    def find_with_glob(name, options)
       if name =~ GLOB
         nil # globs must be relative
-      elsif pathname = resolve(name)
-        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(@resolver.process(pathname), options.merge(:filename => pathname.to_s, :importer => self, :syntax => :scss))
-        end
       else
-        nil
+        find_without_glob(name, options)
       end
     end
+    alias_method :find_without_glob, :find
+    alias_method :find, :find_with_glob
 
     def each_globbed_file(glob, base_pathname, options)
       Dir["#{base_pathname}/#{glob}"].sort.each do |filename|
         next if filename == options[:filename]
-        yield filename if File.directory?(filename) || context.asset_requirable?(filename)
+        yield filename if File.directory?(filename) || @context.asset_requirable?(filename)
       end
     end
 
@@ -82,9 +43,9 @@ module Sass::Rails
       contents = ""
       each_globbed_file(glob, base_pathname.dirname, options) do |filename|
         if File.directory?(filename)
-          context.depend_on(filename)
-        elsif context.asset_requirable?(filename)
-          context.depend_on(filename)
+          @context.depend_on(filename)
+        elsif @context.asset_requirable?(filename)
+          @context.depend_on(filename)
           contents << "@import #{Pathname.new(filename).relative_path_from(base_pathname.dirname).to_s.inspect};\n"
         end
       end
@@ -95,28 +56,5 @@ module Sass::Rails
         :syntax => :scss
       ))
     end
-
-    def mtime(name, options)
-      if name =~ GLOB && options[:filename]
-        mtime = nil
-        each_globbed_file(name, Pathname.new(options[:filename]).dirname, options) do |p|
-          mtime ||= File.mtime(p)
-          mtime = [mtime, File.mtime(p)].max
-        end
-        mtime
-      elsif pathname = resolve(name)
-        pathname.mtime
-      end
-    end
-
-    def key(name, options)
-      ["Sprockets:" + File.dirname(File.expand_path(name)), File.basename(name)]
-    end
-
-    def to_s
-      "Sass::Rails::Importer(#{context.pathname})"
-    end
-
   end
-
-end
+end

data/lib/sass/rails/railtie.rb

@@ -28,17 +28,6 @@ module Sass::Rails
     # to the rails generate command
     config.app_generators.stylesheet_engine config.sass.preferred_syntax
 
-    config.before_initialize do |app|
-      require 'sass'
-
-      if app.config.assets.enabled
-        require 'sprockets'
-        Sprockets::Engines #force autoloading
-        Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
-        Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
-      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)
@@ -62,16 +51,11 @@ module Sass::Rails
         config.sass.full_exception = app.config.consider_all_requests_local
       end
 
-      if app.assets
-        app.assets.context_class.extend(SassContext)
-        app.assets.context_class.sass_config = app.config.sass
-      end
-
       Sass.logger = app.config.sass.logger
     end
 
     initializer :setup_compression, :group => :all do |app|
-      if app.config.assets.compress
+      unless Rails.env.development?
         # Use compressed style if none specified
         app.config.sass.style ||= :compressed
         app.config.assets.css_compressor ||= CssCompressor.new(:style => app.config.sass.style)

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.2.6"
+    VERSION = "4.0.0.beta1"
   end
 end

data/sass-rails.gemspec

@@ -8,18 +8,20 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["wycats", "chriseppstein"]
   s.email       = ["wycats@gmail.com", "chris@eppsteins.net"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/rails/sass-rails"
   s.summary     = %q{Sass adapter for the Rails asset pipeline.}
   s.description = %q{Sass adapter for the Rails asset pipeline.}
+  s.license     = %q{MIT}
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_runtime_dependency 'sass',       '>= 3.1.10'
-  s.add_runtime_dependency 'railties',   '~> 3.2.0'
-  s.add_runtime_dependency 'tilt',       '~> 1.3'
+  s.add_runtime_dependency 'sass',            '>= 3.1.10'
+  s.add_runtime_dependency 'railties',        '>= 4.0.0.beta', '< 5.0'
+  s.add_runtime_dependency 'tilt',            '~> 1.3'
+  s.add_runtime_dependency 'sprockets-rails', '~> 2.0.0.rc0'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = [".gitignore",".travis.yml","CHANGELOG.md","Gemfile","MIT-LICENSE","README.markdown","Rakefile","lib/rails/generators/sass/assets/assets_generator.rb","lib/rails/generators/sass/assets/templates/stylesheet.css.sass","lib/rails/generators/sass/scaffold/scaffold_generator.rb","lib/rails/generators/sass_scaffold.rb","lib/rails/generators/scss/assets/assets_generator.rb","lib/rails/generators/scss/assets/templates/stylesheet.css.scss","lib/rails/generators/scss/scaffold/scaffold_generator.rb","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/railtie.rb","lib/sass/rails/version.rb","sass-rails.gemspec","sass-rails.gemspec.erb","test/fixtures/alternate_config_project/.gitignore","test/fixtures/alternate_config_project/Gemfile","test/fixtures/alternate_config_project/README","test/fixtures/alternate_config_project/Rakefile","test/fixtures/alternate_config_project/app/assets/images/1x1.png","test/fixtures/alternate_config_project/app/assets/images/rails.png","test/fixtures/alternate_config_project/app/assets/javascripts/application.js","test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css","test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss","test/fixtures/alternate_config_project/app/controllers/application_controller.rb","test/fixtures/alternate_config_project/app/helpers/application_helper.rb","test/fixtures/alternate_config_project/app/mailers/.gitkeep","test/fixtures/alternate_config_project/app/models/.gitkeep","test/fixtures/alternate_config_project/app/views/layouts/application.html.erb","test/fixtures/alternate_config_project/config.ru","test/fixtures/alternate_config_project/config/application.rb","test/fixtures/alternate_config_project/config/boot.rb","test/fixtures/alternate_config_project/config/database.yml","test/fixtures/alternate_config_project/config/environment.rb","test/fixtures/alternate_config_project/config/environments/development.rb","test/fixtures/alternate_config_project/config/environments/production.rb","test/fixtures/alternate_config_project/config/environments/test.rb","test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb","test/fixtures/alternate_config_project/config/initializers/inflections.rb","test/fixtures/alternate_config_project/config/initializers/mime_types.rb","test/fixtures/alternate_config_project/config/initializers/secret_token.rb","test/fixtures/alternate_config_project/config/initializers/session_store.rb","test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb","test/fixtures/alternate_config_project/config/locales/en.yml","test/fixtures/alternate_config_project/config/routes.rb","test/fixtures/alternate_config_project/db/seeds.rb","test/fixtures/alternate_config_project/doc/README_FOR_APP","test/fixtures/alternate_config_project/lib/tasks/.gitkeep","test/fixtures/alternate_config_project/log/.gitkeep","test/fixtures/alternate_config_project/public/404.html","test/fixtures/alternate_config_project/public/422.html","test/fixtures/alternate_config_project/public/500.html","test/fixtures/alternate_config_project/public/favicon.ico","test/fixtures/alternate_config_project/public/index.html","test/fixtures/alternate_config_project/public/robots.txt","test/fixtures/alternate_config_project/script/rails","test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep","test/fixtures/alternate_config_project/vendor/plugins/.gitkeep","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/db/seeds.rb","test/fixtures/engine_project/engine_project.gemspec","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/db/seeds.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","test/fixtures/sass_project/Rakefile","test/fixtures/sass_project/app/assets/images/rails.png","test/fixtures/sass_project/app/assets/javascripts/application.js","test/fixtures/sass_project/app/assets/stylesheets/application.css","test/fixtures/sass_project/app/controllers/application_controller.rb","test/fixtures/sass_project/app/helpers/application_helper.rb","test/fixtures/sass_project/app/mailers/.gitkeep","test/fixtures/sass_project/app/models/.gitkeep","test/fixtures/sass_project/app/views/layouts/application.html.erb","test/fixtures/sass_project/config.ru","test/fixtures/sass_project/config/application.rb","test/fixtures/sass_project/config/boot.rb","test/fixtures/sass_project/config/database.yml","test/fixtures/sass_project/config/environment.rb","test/fixtures/sass_project/config/environments/development.rb","test/fixtures/sass_project/config/environments/production.rb","test/fixtures/sass_project/config/environments/test.rb","test/fixtures/sass_project/config/initializers/backtrace_silencers.rb","test/fixtures/sass_project/config/initializers/inflections.rb","test/fixtures/sass_project/config/initializers/mime_types.rb","test/fixtures/sass_project/config/initializers/secret_token.rb","test/fixtures/sass_project/config/initializers/session_store.rb","test/fixtures/sass_project/config/initializers/wrap_parameters.rb","test/fixtures/sass_project/config/locales/en.yml","test/fixtures/sass_project/config/routes.rb","test/fixtures/sass_project/db/seeds.rb","test/fixtures/sass_project/doc/README_FOR_APP","test/fixtures/sass_project/lib/tasks/.gitkeep","test/fixtures/sass_project/log/.gitkeep","test/fixtures/sass_project/public/404.html","test/fixtures/sass_project/public/422.html","test/fixtures/sass_project/public/500.html","test/fixtures/sass_project/public/favicon.ico","test/fixtures/sass_project/public/index.html","test/fixtures/sass_project/public/robots.txt","test/fixtures/sass_project/script/rails","test/fixtures/sass_project/vendor/assets/stylesheets/.gitkeep","test/fixtures/sass_project/vendor/plugins/.gitkeep","test/fixtures/scss_project/.gitignore","test/fixtures/scss_project/Gemfile","test/fixtures/scss_project/README","test/fixtures/scss_project/Rakefile","test/fixtures/scss_project/app/assets/images/1x1.png","test/fixtures/scss_project/app/assets/images/rails.png","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","test/fixtures/scss_project/app/assets/stylesheets/partials/_scss_import.css.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/_without_css_ext.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss","test/fixtures/scss_project/app/assets/stylesheets/subfolder/another_plain.css","test/fixtures/scss_project/app/assets/stylesheets/subfolder/plain.css","test/fixtures/scss_project/app/assets/stylesheets/subfolder/second_level.css.scss","test/fixtures/scss_project/app/controllers/application_controller.rb","test/fixtures/scss_project/app/helpers/application_helper.rb","test/fixtures/scss_project/app/mailers/.gitkeep","test/fixtures/scss_project/app/models/.gitkeep","test/fixtures/scss_project/app/views/layouts/application.html.erb","test/fixtures/scss_project/config.ru","test/fixtures/scss_project/config/application.rb","test/fixtures/scss_project/config/boot.rb","test/fixtures/scss_project/config/database.yml","test/fixtures/scss_project/config/environment.rb","test/fixtures/scss_project/config/environments/development.rb","test/fixtures/scss_project/config/environments/production.rb","test/fixtures/scss_project/config/environments/test.rb","test/fixtures/scss_project/config/initializers/backtrace_silencers.rb","test/fixtures/scss_project/config/initializers/inflections.rb","test/fixtures/scss_project/config/initializers/mime_types.rb","test/fixtures/scss_project/config/initializers/secret_token.rb","test/fixtures/scss_project/config/initializers/session_store.rb","test/fixtures/scss_project/config/initializers/wrap_parameters.rb","test/fixtures/scss_project/config/locales/en.yml","test/fixtures/scss_project/config/routes.rb","test/fixtures/scss_project/db/seeds.rb","test/fixtures/scss_project/doc/README_FOR_APP","test/fixtures/scss_project/lib/tasks/.gitkeep","test/fixtures/scss_project/log/.gitkeep","test/fixtures/scss_project/public/404.html","test/fixtures/scss_project/public/422.html","test/fixtures/scss_project/public/500.html","test/fixtures/scss_project/public/favicon.ico","test/fixtures/scss_project/public/index.html","test/fixtures/scss_project/public/robots.txt","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"]
+  s.test_files    = ["test/fixtures/alternate_config_project/.gitignore","test/fixtures/alternate_config_project/Gemfile","test/fixtures/alternate_config_project/README","test/fixtures/alternate_config_project/Rakefile","test/fixtures/alternate_config_project/app/assets/images/1x1.png","test/fixtures/alternate_config_project/app/assets/images/rails.png","test/fixtures/alternate_config_project/app/assets/javascripts/application.js","test/fixtures/alternate_config_project/app/assets/stylesheets/_top_level_partial.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/application.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/css_application.css","test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/globbed.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/globbed/nested/nested_glob.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_sass_import.css.sass","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_scss_import.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/_without_css_ext.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/another_plain.css","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/plain.css","test/fixtures/alternate_config_project/app/assets/stylesheets/subfolder/second_level.css.scss","test/fixtures/alternate_config_project/app/controllers/application_controller.rb","test/fixtures/alternate_config_project/app/helpers/application_helper.rb","test/fixtures/alternate_config_project/app/mailers/.gitkeep","test/fixtures/alternate_config_project/app/models/.gitkeep","test/fixtures/alternate_config_project/app/views/layouts/application.html.erb","test/fixtures/alternate_config_project/config.ru","test/fixtures/alternate_config_project/config/application.rb","test/fixtures/alternate_config_project/config/boot.rb","test/fixtures/alternate_config_project/config/database.yml","test/fixtures/alternate_config_project/config/environment.rb","test/fixtures/alternate_config_project/config/environments/development.rb","test/fixtures/alternate_config_project/config/environments/production.rb","test/fixtures/alternate_config_project/config/environments/test.rb","test/fixtures/alternate_config_project/config/initializers/backtrace_silencers.rb","test/fixtures/alternate_config_project/config/initializers/inflections.rb","test/fixtures/alternate_config_project/config/initializers/mime_types.rb","test/fixtures/alternate_config_project/config/initializers/secret_token.rb","test/fixtures/alternate_config_project/config/initializers/session_store.rb","test/fixtures/alternate_config_project/config/initializers/wrap_parameters.rb","test/fixtures/alternate_config_project/config/locales/en.yml","test/fixtures/alternate_config_project/config/routes.rb","test/fixtures/alternate_config_project/db/seeds.rb","test/fixtures/alternate_config_project/doc/README_FOR_APP","test/fixtures/alternate_config_project/lib/tasks/.gitkeep","test/fixtures/alternate_config_project/log/.gitkeep","test/fixtures/alternate_config_project/public/404.html","test/fixtures/alternate_config_project/public/422.html","test/fixtures/alternate_config_project/public/500.html","test/fixtures/alternate_config_project/public/favicon.ico","test/fixtures/alternate_config_project/public/index.html","test/fixtures/alternate_config_project/public/robots.txt","test/fixtures/alternate_config_project/script/rails","test/fixtures/alternate_config_project/vendor/assets/stylesheets/.gitkeep","test/fixtures/alternate_config_project/vendor/plugins/.gitkeep","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/db/seeds.rb","test/fixtures/engine_project/engine_project.gemspec","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/db/seeds.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","test/fixtures/sass_project/Rakefile","test/fixtures/sass_project/app/assets/images/rails.png","test/fixtures/sass_project/app/assets/javascripts/application.js","test/fixtures/sass_project/app/assets/stylesheets/application.css","test/fixtures/sass_project/app/controllers/application_controller.rb","test/fixtures/sass_project/app/helpers/application_helper.rb","test/fixtures/sass_project/app/mailers/.gitkeep","test/fixtures/sass_project/app/models/.gitkeep","test/fixtures/sass_project/app/views/layouts/application.html.erb","test/fixtures/sass_project/config.ru","test/fixtures/sass_project/config/application.rb","test/fixtures/sass_project/config/boot.rb","test/fixtures/sass_project/config/database.yml","test/fixtures/sass_project/config/environment.rb","test/fixtures/sass_project/config/environments/development.rb","test/fixtures/sass_project/config/environments/production.rb","test/fixtures/sass_project/config/environments/test.rb","test/fixtures/sass_project/config/initializers/backtrace_silencers.rb","test/fixtures/sass_project/config/initializers/inflections.rb","test/fixtures/sass_project/config/initializers/mime_types.rb","test/fixtures/sass_project/config/initializers/secret_token.rb","test/fixtures/sass_project/config/initializers/session_store.rb","test/fixtures/sass_project/config/initializers/wrap_parameters.rb","test/fixtures/sass_project/config/locales/en.yml","test/fixtures/sass_project/config/routes.rb","test/fixtures/sass_project/db/seeds.rb","test/fixtures/sass_project/doc/README_FOR_APP","test/fixtures/sass_project/lib/tasks/.gitkeep","test/fixtures/sass_project/log/.gitkeep","test/fixtures/sass_project/public/404.html","test/fixtures/sass_project/public/422.html","test/fixtures/sass_project/public/500.html","test/fixtures/sass_project/public/favicon.ico","test/fixtures/sass_project/public/index.html","test/fixtures/sass_project/public/robots.txt","test/fixtures/sass_project/script/rails","test/fixtures/sass_project/vendor/assets/stylesheets/.gitkeep","test/fixtures/sass_project/vendor/plugins/.gitkeep","test/fixtures/scss_project/.gitignore","test/fixtures/scss_project/Gemfile","test/fixtures/scss_project/README","test/fixtures/scss_project/Rakefile","test/fixtures/scss_project/app/assets/images/1x1.png","test/fixtures/scss_project/app/assets/images/rails.png","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","test/fixtures/scss_project/app/assets/stylesheets/partials/_scss_import.css.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/_without_css_ext.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_sass.css.sass","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/_relative_scss.css.scss","test/fixtures/scss_project/app/assets/stylesheets/partials/subfolder/relative_not_a_partial.css.scss","test/fixtures/scss_project/app/assets/stylesheets/subfolder/another_plain.css","test/fixtures/scss_project/app/assets/stylesheets/subfolder/plain.css","test/fixtures/scss_project/app/assets/stylesheets/subfolder/second_level.css.scss","test/fixtures/scss_project/app/controllers/application_controller.rb","test/fixtures/scss_project/app/helpers/application_helper.rb","test/fixtures/scss_project/app/mailers/.gitkeep","test/fixtures/scss_project/app/models/.gitkeep","test/fixtures/scss_project/app/views/layouts/application.html.erb","test/fixtures/scss_project/config.ru","test/fixtures/scss_project/config/application.rb","test/fixtures/scss_project/config/boot.rb","test/fixtures/scss_project/config/database.yml","test/fixtures/scss_project/config/environment.rb","test/fixtures/scss_project/config/environments/development.rb","test/fixtures/scss_project/config/environments/production.rb","test/fixtures/scss_project/config/environments/test.rb","test/fixtures/scss_project/config/initializers/backtrace_silencers.rb","test/fixtures/scss_project/config/initializers/inflections.rb","test/fixtures/scss_project/config/initializers/mime_types.rb","test/fixtures/scss_project/config/initializers/secret_token.rb","test/fixtures/scss_project/config/initializers/session_store.rb","test/fixtures/scss_project/config/initializers/wrap_parameters.rb","test/fixtures/scss_project/config/locales/en.yml","test/fixtures/scss_project/config/routes.rb","test/fixtures/scss_project/db/seeds.rb","test/fixtures/scss_project/doc/README_FOR_APP","test/fixtures/scss_project/lib/tasks/.gitkeep","test/fixtures/scss_project/log/.gitkeep","test/fixtures/scss_project/public/404.html","test/fixtures/scss_project/public/422.html","test/fixtures/scss_project/public/500.html","test/fixtures/scss_project/public/favicon.ico","test/fixtures/scss_project/public/index.html","test/fixtures/scss_project/public/robots.txt","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"]
+  s.executables   = []
   s.require_paths = ["lib"]
 end

data/sass-rails.gemspec.erb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sass/rails/version"
+
+Gem::Specification.new do |s|
+  s.name        = "sass-rails"
+  s.version     = Sass::Rails::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["wycats", "chriseppstein"]
+  s.email       = ["wycats@gmail.com", "chris@eppsteins.net"]
+  s.homepage    = "https://github.com/rails/sass-rails"
+  s.summary     = %q{Sass adapter for the Rails asset pipeline.}
+  s.description = %q{Sass adapter for the Rails asset pipeline.}
+  s.license     = %q{MIT}
+
+  s.rubyforge_project = "sass-rails"
+
+  s.add_runtime_dependency 'sass',            '>= 3.1.10'
+  s.add_runtime_dependency 'railties',        '>= 4.0.0.beta', '< 5.0'
+  s.add_runtime_dependency 'tilt',            '~> 1.3'
+  s.add_runtime_dependency 'sprockets-rails', '~> 2.0.0.rc0'
+
+  s.files         = [<%= files.map(&:inspect).join ',' %>]
+  s.test_files    = [<%= test_files.map(&:inspect).join ',' %>]
+  s.executables   = [<%= executables.map(&:inspect).join ',' %>]
+  s.require_paths = ["lib"]
+end

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

@@ -11,8 +11,8 @@
 }
 
 .rails {
-  asset-path: asset-path("rails.png", image);
-  asset-url: asset-url("rails.png", image);
+  asset-path: asset-path("rails.png");
+  asset-url: asset-url("rails.png");
   image-path: image-path("rails.png");
   image-url: image-url("rails.png");
   video-path: video-path("rails.mp4");

data/test/fixtures/alternate_config_project/config/environments/development.rb

@@ -6,8 +6,7 @@ AlternateConfigProject::Application.configure do
   # 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
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/test/fixtures/alternate_config_project/config/environments/test.rb

@@ -11,8 +11,7 @@ AlternateConfigProject::Application.configure do
   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
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/test/fixtures/engine_project/engine_project.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = 'engine_project'
   s.version = '0.0.0'
 
-  s.add_dependency "rails", "~> 3.2.0.rc1"
+  s.add_dependency "rails", "~> 4.0.0.beta"
   s.add_dependency "sqlite3"
-  s.add_dependency "sass-rails", "~> 3.2.0"
+  s.add_dependency "sass-rails", "~> 4.0.0.beta"
 end

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

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # 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

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

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   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

data/test/fixtures/sass_project/Gemfile

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

data/test/fixtures/sass_project/config/environments/development.rb

@@ -6,9 +6,6 @@ ScssProject::Application.configure do
   # 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

data/test/fixtures/sass_project/config/environments/test.rb

@@ -11,9 +11,6 @@ ScssProject::Application.configure do
   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

data/test/fixtures/scss_project/Gemfile

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

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

@@ -11,8 +11,8 @@
 }
 
 .rails {
-  asset-path: asset-path("rails.png", image);
-  asset-url: asset-url("rails.png", image);
+  asset-path: asset-path("rails.png");
+  asset-url: asset-url("rails.png");
   image-path: image-path("rails.png");
   image-url: image-url("rails.png");
   video-path: video-path("rails.mp4");

data/test/fixtures/scss_project/config/environments/development.rb

@@ -6,8 +6,7 @@ ScssProject::Application.configure do
   # 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
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/test/fixtures/scss_project/config/environments/test.rb

@@ -11,9 +11,6 @@ ScssProject::Application.configure do
   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

data/test/sass_rails_logger_test.rb

@@ -3,7 +3,7 @@ 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"'
+      logger_class_name = runcmd 'ruby script/rails runner "print Sass::logger.class.name"'
       assert logger_class_name =~ /#{Regexp.escape(Sass::Rails::Logger.name)}/
     end
   end
@@ -12,7 +12,7 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
     within_rails_app "scss_project" do |app_root|
       [:debug, :warn, :info, :error, :trace].each do |level|
         message = "[#{level}]: sass message"
-        runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"}
+        runcmd %{ruby script/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"
 

data/test/sass_rails_test.rb

@@ -71,6 +71,7 @@ END_OF_COMMAND
       assert_not_output(/conflict/)
     end
   end
+
   test "sass files are generated during scaffold generation of sass projects" do
     within_rails_app "sass_project" do
       generate_scaffold
@@ -79,6 +80,7 @@ END_OF_COMMAND
       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
       generate_scaffold
@@ -87,6 +89,7 @@ END_OF_COMMAND
       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
       generate_scaffold "--stylesheet-engine=sass"
@@ -95,6 +98,7 @@ END_OF_COMMAND
       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
@@ -103,6 +107,7 @@ END_OF_COMMAND
   #     assert_match /\.foo-bar/, File.read("app/assets/stylesheets/foo/bar.css.scss")
   #   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"
@@ -110,49 +115,53 @@ END_OF_COMMAND
   #     assert_match /\.foo-bar/, File.read("app/assets/stylesheets/foo/bar.css.sass")
   #   end
   # end
+  #
   test "sprockets require works correctly" do
     css_output = sprockets_render("scss_project", "css_application.css")
     assert_match /globbed/, css_output
   end
+
   test "sass imports work correctly" do
     css_output = sprockets_render("scss_project", "application.css.scss")
-    assert_match css_output, /main/
-    assert_match css_output, /top-level/
-    assert_match css_output, /partial-sass/
-    assert_match css_output, /partial-scss/
-    assert_match css_output, /sub-folder-relative-sass/
-    assert_match css_output, /sub-folder-relative-scss/
-    assert_match css_output, /not-a-partial/
-    assert_match css_output, /globbed/
-    assert_match css_output, /nested-glob/
-    assert_match css_output, /plain-old-css/
-    assert_match css_output, /another-plain-old-css/
-    assert_match css_output, /without-css-ext/
+    assert_match /main/,                     css_output
+    assert_match /top-level/,                css_output
+    assert_match /partial-sass/,             css_output
+    assert_match /partial-scss/,             css_output
+    assert_match /sub-folder-relative-sass/, css_output
+    assert_match /sub-folder-relative-scss/, css_output
+    assert_match /not-a-partial/,            css_output
+    assert_match /globbed/,                  css_output
+    assert_match /nested-glob/,              css_output
+    assert_match /plain-old-css/,            css_output
+    assert_match /another-plain-old-css/,    css_output
+    assert_match /without-css-ext/,          css_output
   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"}, '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{font-url-with-query-hash:\s*url\(/assets/rails.ttf\?#iefix\)}, 'font-url:\s*url\(/assets/rails.ttf?#iefix\)'
-    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\)'
+    assert_match %r{asset-path:\s*"/assets/rails.png"},                            css_output, 'asset-path:\s*"/assets/rails.png"'
+    assert_match %r{asset-url:\s*url\(/assets/rails.png\)},                        css_output, 'asset-url:\s*url\(/assets/rails.png\)'
+    assert_match %r{image-path:\s*"/assets/rails.png"},                            css_output, 'image-path:\s*"/assets/rails.png"'
+    assert_match %r{image-url:\s*url\(/assets/rails.png\)},                        css_output, 'image-url:\s*url\(/assets/rails.png\)'
+    assert_match %r{video-path:\s*"/assets/rails.mp4"},                            css_output, 'video-path:\s*"/assets/rails.mp4"'
+    assert_match %r{video-url:\s*url\(/assets/rails.mp4\)},                        css_output, 'video-url:\s*url\(/assets/rails.mp4\)'
+    assert_match %r{audio-path:\s*"/assets/rails.mp3"},                            css_output, 'audio-path:\s*"/assets/rails.mp3"'
+    assert_match %r{audio-url:\s*url\(/assets/rails.mp3\)},                        css_output, 'audio-url:\s*url\(/assets/rails.mp3\)'
+    assert_match %r{font-path:\s*"/assets/rails.ttf"},                             css_output, 'font-path:\s*"/assets/rails.ttf"'
+    assert_match %r{font-url:\s*url\(/assets/rails.ttf\)},                         css_output, 'font-url:\s*url\(/assets/rails.ttf\)'
+    assert_match %r{font-url-with-query-hash:\s*url\(/assets/rails.ttf\?#iefix\)}, css_output, 'font-url:\s*url\(/assets/rails.ttf?#iefix\)'
+    assert_match %r{javascript-path:\s*"/assets/rails.js"},                        css_output, 'javascript-path:\s*"/assets/rails.js"'
+    assert_match %r{javascript-url:\s*url\(/assets/rails.js\)},                    css_output, 'javascript-url:\s*url\(/assets/rails.js\)'
+    assert_match %r{stylesheet-path:\s*"/assets/rails.css"},                       css_output, 'stylesheet-path:\s*"/assets/rails.css"'
+    assert_match %r{stylesheet-url:\s*url\(/assets/rails.css\)},                   css_output, '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\((.*?)\)'
+    assert_match asset_data_url_regexp, css_output, 'asset-data-url:\s*url\((.*?)\)'
     asset_data_url_match = css_output.match(asset_data_url_regexp)[1]
     asset_data_url_expected = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCNzY5NDE1QkQ2NkMxMUUwOUUzM0E5Q0E2RTgyQUExQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCNzY5NDE1Q0Q2NkMxMUUwOUUzM0E5Q0E2RTgyQUExQiI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkE3MzcyNTQ2RDY2QjExRTA5RTMzQTlDQTZFODJBQTFCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkI3Njk0MTVBRDY2QzExRTA5RTMzQTlDQTZFODJBQTFCIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2B0HhJ9AAAABBJREFUeNpi%2BP%2F%2FPwNAgAEACPwC%2FtuiTRYAAAAASUVORK5CYII%3D"
     assert_equal asset_data_url_expected, asset_data_url_match
   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

@@ -4,7 +4,6 @@ unless defined?(Bundler)
 end
 require 'fileutils'
 require 'tmpdir'
-require 'sprockets/helpers/rails_helper'
 
 class Sass::Rails::TestCase < ActiveSupport::TestCase
 
@@ -68,8 +67,8 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     Dir.mktmpdir do |tmpdir|
       FileUtils.cp_r "#{sourcedir}/.", tmpdir
       Dir.chdir(tmpdir) do
-        gem_options.each {|name, options| modify_gem_entry name, options}
-        without_gems.each {|name| remove_gem name}
+        gem_options.each { |gem_name, options| modify_gem_entry gem_name, options }
+        without_gems.each { |gem_name| remove_gem name }
         FileUtils.rm("Gemfile.lock") if File.exist?("Gemfile.lock")
         runcmd "bundle install --verbose"
         runcmd "bundle exec rake db:create --trace"
@@ -143,7 +142,7 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     env["BUNDLE_GEMFILE"] = "#{working_directory}/#{gemfile}" if clean_env
     todo = Proc.new do
       r, w = IO.pipe
-      pid = Kernel.spawn(env, cmd, :out =>w , :err => w, :chdir => working_directory)
+      Kernel.spawn(env, cmd, :out => w , :err => w, :chdir => working_directory)
       w.close
       Process.wait
       output = r.read

data/test/test_helper.rb

@@ -8,15 +8,13 @@ require 'rails'
 require "rails/test_help"
 require 'sass/rails'
 require 'sfl'
-require 'mocha'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-
 # If developing against local dependencies, this code will ensure they get picked up
 # in the project fixtures that have their own bundle environment
 $gem_options = {}
-possible_dev_dependencies = %w(sass-rails sass rails actionpack railties sprockets)
+possible_dev_dependencies = %w(sass-rails sass rails actionpack railties sprockets journey sprockets-rails activerecord-deprecated_finders)
 Bundler.load.specs.each do |s|
   if possible_dev_dependencies.include?(s.name)
      gem_path = s.full_gem_path

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 4.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - wycats
@@ -9,50 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.10
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0.beta
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.beta
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc0
 description: Sass adapter for the Rails asset pipeline.
 email:
 - wycats@gmail.com
@@ -61,8 +90,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -82,9 +111,9 @@ files:
 - lib/sass/rails/importer.rb
 - lib/sass/rails/logger.rb
 - lib/sass/rails/railtie.rb
-- lib/sass/rails/template_handlers.rb
 - lib/sass/rails/version.rb
 - sass-rails.gemspec
+- sass-rails.gemspec.erb
 - test/fixtures/alternate_config_project/.gitignore
 - test/fixtures/alternate_config_project/Gemfile
 - test/fixtures/alternate_config_project/README
@@ -290,28 +319,30 @@ files:
 - test/sass_rails_test.rb
 - test/support/sass_rails_test_case.rb
 - test/test_helper.rb
-homepage: ''
-licenses: []
-metadata: {}
+homepage: https://github.com/rails/sass-rails
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: sass-rails
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.
 test_files:
 - test/fixtures/alternate_config_project/.gitignore
@@ -519,3 +550,4 @@ test_files:
 - test/sass_rails_test.rb
 - test/support/sass_rails_test_case.rb
 - test/test_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: fa4a7fa667738b4b4b87420b11c2f45c34cbc250
-  data.tar.gz: f0289349cd742f30ff7fe4cb3f2f192302d4ca80
-SHA512:
-  metadata.gz: 1705f5d67250608735a26f63551ea6c631f3f4fa5786c48470e43a99b907932cdba903cb672573ff0186602880bb061552ddf6645f98982a87be23b60ad1aebd
-  data.tar.gz: 5ec965ecbce68f8fa165c5eddbb17b00bc4d3ae9455073d4a1ab2928f5996bcb6f4cd6a2cce599e3ff02b81ad0dad66deed0d36891fec438b04bb527c5a72005

data/lib/sass/rails/template_handlers.rb

@@ -1,117 +0,0 @@
-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 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)
-      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
-
-    def font_path(font)
-      context.font_path(font)
-    end
-  end
-
-  class SassTemplate < Tilt::SassTemplate
-    self.default_mime_type = 'text/css'
-
-    def self.engine_initialized?
-      defined?(::Sass::Engine)
-    end
-
-    def initialize_engine
-      require_template_library 'sass'
-    end
-
-    def syntax
-      :sass
-    end
-
-    def sass_options_from_rails(scope)
-      scope.environment.context_class.sass_config
-    end
-
-    def sass_options(scope)
-      importer = self.importer(scope)
-      options = sass_options_from_rails(scope)
-      load_paths = (options[:load_paths] || []).dup
-      load_paths.unshift(importer)
-      resolver = Resolver.new(scope)
-      css_filename = resolver.source_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
-        }
-      )
-    end
-
-    def importer(scope)
-      Sass::Rails::Importer.new(scope)
-    end
-
-    def prepare
-    end
-
-    def evaluate(scope, locals, &block)
-      Sass::Engine.new(data, sass_options(scope)).render
-    end
-  end
-
-  class ScssTemplate < SassTemplate
-    self.default_mime_type = 'text/css'
-
-    def syntax
-      :scss
-    end
-  end
-end