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

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.sass-cache

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in sass-rails.gemspec
 gemspec
 
-gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
 gem "sfl", "~> 2.0"
 gem "sprockets"
+gem "mocha"
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
 # gem 'ruby-debug'

data/lib/sass/rails.rb

@@ -1,13 +1,16 @@
 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/compressor'
-require 'sass/rails/logger'
-require 'sass/rails/railtie'
-require 'sass/rails/monkey_patches'
-require 'sass/rails/helpers'
-require 'sass/rails/importer'
-require 'sass/rails/template_handlers'
 require 'sass/rails/version'
+require 'sass/rails/railtie'

data/lib/sass/rails/logger.rb

@@ -1,3 +1,5 @@
+require 'sass/logger'
+
 module Sass
   module Rails
     class Logger < Sass::Logger::Base

data/lib/sass/rails/railtie.rb

@@ -1,5 +1,10 @@
+require 'sprockets/railtie'
+
 module Sass::Rails
   class Railtie < ::Rails::Railtie
+    module SassContext
+      attr_accessor :sass_config
+    end
     config.sass = ActiveSupport::OrderedOptions.new
     # Establish static configuration defaults
     # Emit scss files during stylesheet generation of scaffold
@@ -17,6 +22,12 @@ module Sass::Rails
     # Send Sass logs to Rails.logger
     config.sass.logger           = Sass::Rails::Logger.new
 
+    config.before_initialize do
+      require 'sprockets/engines'
+      Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
+      Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate
+    end
+
     initializer :setup_sass do |app|
       # Only emit one kind of syntax because though we have registered two kinds of generators
       syntax     = app.config.sass.preferred_syntax.to_sym
@@ -34,6 +45,8 @@ module Sass::Rails
         # Display a stack trace in the css output when in development-like environments.
         config.sass.full_exception = app.config.consider_all_requests_local
       end
+      app.assets.context_class.extend(SassContext)
+      app.assets.context_class.sass_config = app.config.sass
     end
 
     initializer :setup_compression do |app|

data/lib/sass/rails/template_handlers.rb

@@ -84,7 +84,3 @@ module Sass::Rails
     end
   end
 end
-
-Sprockets::Engines #invoke autoloading
-Sprockets.register_engine '.sass', Sass::Rails::SassTemplate
-Sprockets.register_engine '.scss', Sass::Rails::ScssTemplate

data/lib/sass/rails/version.rb

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

data/sass-rails.gemspec

@@ -15,9 +15,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "sass-rails"
 
   s.add_runtime_dependency 'sass',       '>= 3.1.4'
-  s.add_runtime_dependency 'railties',   '~> 3.1.0.rc1'
-  s.add_runtime_dependency 'actionpack', '~> 3.1.0.rc1'
-  s.add_runtime_dependency 'sprockets',  '>= 2.0.0.beta.9'
+  s.add_runtime_dependency 'railties',   '~> 3.1.0.rc6'
+  s.add_runtime_dependency 'actionpack', '~> 3.1.0.rc6'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/sass_rails_test.rb

@@ -22,24 +22,21 @@ class SassRailsTest < Sass::Rails::TestCase
       assert_not_output(/conflict/)
     end
   end
-  test "scss template has correct dasherized css class for namespaced controllers" do
-    within_rails_app "scss_project" do
-      runcmd "rails generate controller foo/bar"
-      assert_file_exists "app/assets/stylesheets/foo/bar.css.scss"
-      assert_match /\.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"
-      assert_file_exists "app/assets/stylesheets/foo/bar.css.sass"
-      assert_match /\.foo-bar/, File.read("app/assets/stylesheets/foo/bar.css.sass")
-    end
-  end
-  test "templates are registered with sprockets" do
-    assert_equal Sass::Rails::SassTemplate, Sprockets.engines[".sass"]
-    assert_equal Sass::Rails::ScssTemplate, Sprockets.engines[".scss"]
-  end
+  # 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
+  #     runcmd "rails generate controller foo/bar"
+  #     assert_file_exists "app/assets/stylesheets/foo/bar.css.scss"
+  #     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"
+  #     assert_file_exists "app/assets/stylesheets/foo/bar.css.sass"
+  #     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
@@ -61,9 +58,9 @@ class SassRailsTest < Sass::Rails::TestCase
   end
   test "sass asset paths work" do
     css_output = sprockets_render("scss_project", "application.css.scss")
-    assert_match css_output, %r{asset-path:\s*"/assets/rails.png"}
-    assert_match css_output, %r{asset-url:\s*url\(/assets/rails.png\)}
-    assert_match css_output, %r{image-url:\s*url\(/assets/rails.png\)}
+    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-url:\s*url\(/assets/rails.png\)}, 'image-url:\s*url\(/assets/rails.png\)'
   end
   test "css compressor compresses" do
     assert_equal "div{color:red}\n", Sass::Rails::CssCompressor.new.compress(<<CSS)

data/test/support/sass_rails_test_case.rb

@@ -1,5 +1,10 @@
+unless defined?(Bundler)
+  $stderr.puts "You didn't run bundle exec did you? Try again: bundle exec rake test"
+  exit 1
+end
 require 'fileutils'
 require 'tmpdir'
+require 'sprockets/helpers/rails_helper'
 
 class Sass::Rails::TestCase < ActiveSupport::TestCase
 
@@ -32,34 +37,9 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
   end
 
   def sprockets_render(project, filename)
-    env = Sprockets::Environment.new
-    env.context_class.class_eval do
-      def self.assets=(assets)
-        @assets = assets
-      end
-      def self.assets
-        @assets
-      end
-      def self.sass_config
-        Sass::Rails::Railtie.config.sass
-      end
-      def config
-        @config ||= ActiveSupport::InheritableOptions.new
-      end
-      include Sprockets::Helpers::RailsHelper
-      def asset_paths_with_testing
-        paths = asset_paths_without_testing
-        unless paths.is_a?(TestAssetPaths)
-          paths.extend(TestAssetPaths)
-          paths.assets = self.class.assets
-        end
-        paths
-      end
-      alias_method_chain :asset_paths, :testing
+    within_rails_app(project) do
+      runcmd "ruby script/rails runner 'puts Rails.application.assets[#{filename.inspect}]'"
     end
-    env.context_class.assets = env
-    env.paths << fixture_path("#{project}/app/assets/stylesheets")
-    env[filename].to_s
   end
 
   def assert_file_exists(filename)

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'rails'
 require "rails/test_help"
 require 'sass/rails'
 require 'sfl'
+require 'mocha'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sass-rails
 version: !ruby/object:Gem::Version 
-  hash: 15424111
   prerelease: 6
-  segments: 
-  - 3
-  - 1
-  - 0
-  - rc
-  - 5
-  version: 3.1.0.rc.5
+  version: 3.1.0.rc.6
 platform: ruby
 authors: 
 - wycats
@@ -18,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -07:00
+date: 2011-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,11 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 1
-        - 4
         version: 3.1.4
   type: :runtime
   version_requirements: *id001
@@ -45,14 +33,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424103
-        segments: 
-        - 3
-        - 1
-        - 0
-        - rc
-        - 1
-        version: 3.1.0.rc1
+        version: 3.1.0.rc6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,34 +44,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424103
-        segments: 
-        - 3
-        - 1
-        - 0
-        - rc
-        - 1
-        version: 3.1.0.rc1
+        version: 3.1.0.rc6
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sprockets
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 62196465
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 9
-        version: 2.0.0.beta.9
-  type: :runtime
-  version_requirements: *id004
 description: Sass adapter for the Rails asset pipeline.
 email: 
 - wycats@gmail.com
@@ -119,7 +75,6 @@ files:
 - lib/sass/rails/helpers.rb
 - lib/sass/rails/importer.rb
 - lib/sass/rails/logger.rb
-- lib/sass/rails/monkey_patches.rb
 - lib/sass/rails/railtie.rb
 - lib/sass/rails/template_handlers.rb
 - lib/sass/rails/version.rb
@@ -237,25 +192,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: sass-rails
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.

data/lib/sass/rails/monkey_patches.rb

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