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

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 gemspec
 
 gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
+gem "sfl", "~> 2.0"
 gem "sprockets"
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)

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

@@ -1,7 +1,3 @@
 // Place all the styles related to the <%= name %> controller here.
 // They will automatically be included in application.css.
 // You can use Sass here: http://sass-lang.com/
-
-body.<%= name.parameterize.dasherize %>
-  // Add the <%= name.parameterize.dasherize %> class to your body tag
-  // Then, place scoped styles here.

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

@@ -1,8 +1,3 @@
 // Place all the styles related to the <%= name %> controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
-
-body.<%= name.parameterize.dasherize %> {
-  // Add the <%= name.parameterize.dasherize %> class to your body tag
-  // Then, place scoped styles here.
-}

data/lib/sass/rails/importer.rb

@@ -8,7 +8,9 @@ module Sass::Rails
 
     SASS_EXTENSIONS = {
       ".css.sass" => :sass,
-      ".css.scss" => :scss
+      ".css.scss" => :scss,
+      ".sass" => :sass,
+      ".scss" => :scss
     }
     attr_reader :context
 

data/lib/sass/rails/version.rb

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

data/sass-rails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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 'sprockets',  '>= 2.0.0.beta.9'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/fixtures/sass_project/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-ScssProject::Application.config.session_store :cookie_store, key: '_scss_project_session'
+ScssProject::Application.config.session_store :cookie_store, :key => '_scss_project_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/fixtures/sass_project/config/initializers/wrap_parameters.rb

@@ -4,7 +4,7 @@
 # which will be enabled by default in the upcoming version of Ruby on Rails.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters format: [:json]
+ActionController::Base.wrap_parameters :format => [:json]
 
 # Disable root element in JSON by default.
 if defined?(ActiveRecord)

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

@@ -3,6 +3,7 @@
 @import "globbed/**/*";
 @import "subfolder/plain";
 @import "subfolder/second_level";
+@import "partials/without_css_ext";
 
 .main {
   color: yellow;
@@ -13,4 +14,6 @@
   asset-path: asset-path("rails.png", image);
   asset-url: asset-url("rails.png", image);
   image-url: image-url("rails.png");
-}
+}
+
+@include without-css-ext;

data/test/fixtures/scss_project/app/assets/stylesheets/partials/_without_css_ext.scss

@@ -0,0 +1,3 @@
+@mixin without-css-ext {
+  .without-css-ext { should: work; }
+}

data/test/fixtures/scss_project/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-ScssProject::Application.config.session_store :cookie_store, key: '_scss_project_session'
+ScssProject::Application.config.session_store :cookie_store, :key => '_scss_project_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/fixtures/scss_project/config/initializers/wrap_parameters.rb

@@ -4,7 +4,7 @@
 # which will be enabled by default in the upcoming version of Ruby on Rails.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters format: [:json]
+ActionController::Base.wrap_parameters :format => [:json]
 
 # Disable root element in JSON by default.
 if defined?(ActiveRecord)

data/test/sass_rails_logger_test.rb

@@ -14,7 +14,7 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
         app_root = runcmd 'rails runner "print Rails.root"'
 
         message = "[#{level}]: sass message"
-        runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, '#{message}')"}
+        runcmd %{rails runner "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"}
 
         log_output = File.open("#{app_root}/log/development.log").read
         assert log_output.include?(message), "the #{level} log message was not found in the log file"

data/test/sass_rails_test.rb

@@ -26,14 +26,14 @@ class SassRailsTest < Sass::Rails::TestCase
     within_rails_app "scss_project" do
       runcmd "rails generate controller foo/bar"
       assert_file_exists "app/assets/stylesheets/foo/bar.css.scss"
-      assert_match File.read("app/assets/stylesheets/foo/bar.css.scss"), /\.foo-bar/
+      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 File.read("app/assets/stylesheets/foo/bar.css.sass"), /\.foo-bar/
+      assert_match /\.foo-bar/, File.read("app/assets/stylesheets/foo/bar.css.sass")
     end
   end
   test "templates are registered with sprockets" do
@@ -42,7 +42,7 @@ class SassRailsTest < Sass::Rails::TestCase
   end
   test "sprockets require works correctly" do
     css_output = sprockets_render("scss_project", "css_application.css")
-    assert_match css_output, /globbed/
+    assert_match /globbed/, css_output
   end
   test "sass imports work correctly" do
     css_output = sprockets_render("scss_project", "application.css.scss")
@@ -57,6 +57,7 @@ class SassRailsTest < Sass::Rails::TestCase
     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/
   end
   test "sass asset paths work" do
     css_output = sprockets_render("scss_project", "application.css.scss")

data/test/support/sass_rails_test_case.rb

@@ -151,7 +151,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 = spawn(env, cmd, :out =>w , :err => w, :chdir => working_directory)
+      pid = Kernel.spawn(env, cmd, :out =>w , :err => w, :chdir => working_directory)
       w.close
       Process.wait
       output = r.read

data/test/test_helper.rb

@@ -4,6 +4,7 @@ ENV["RAILS_ENV"] = "test"
 require 'rails'
 require "rails/test_help"
 require 'sass/rails'
+require 'sfl'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass-rails
 version: !ruby/object:Gem::Version 
+  hash: 15424111
   prerelease: 6
-  version: 3.1.0.rc.4
+  segments: 
+  - 3
+  - 1
+  - 0
+  - rc
+  - 5
+  version: 3.1.0.rc.5
 platform: ruby
 authors: 
 - wycats
@@ -11,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-02 00:00:00 -07:00
+date: 2011-07-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +29,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 1
+        - 4
         version: 3.1.4
   type: :runtime
   version_requirements: *id001
@@ -33,6 +45,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15424103
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 1
         version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id002
@@ -44,6 +63,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15424103
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 1
         version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id003
@@ -55,6 +81,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196465
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 9
         version: 2.0.0.beta.9
   type: :runtime
   version_requirements: *id004
@@ -145,6 +178,7 @@ files:
 - 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
@@ -203,17 +237,25 @@ 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.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.
@@ -272,6 +314,7 @@ test_files:
 - 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