sass-rails 3.1.4 → 3.1.5.rc.1

data/README.markdown

@@ -21,6 +21,13 @@ properties that will be passed to Sass.
       config.sass.syntax = :nested
     end
 
+## Important Note
+
+Sprockets provides some directives that are placed inside of comments called `require`, `require_tree`, and
+`require_self`. **<span style="color:#c00">DO NOT USE THEM IN YOUR SASS/SCSS FILES.</span>** They are very 
+primitive and do not work well with Sass files. Instead, use Sass's native `@import` directive which
+`sass-rails` has customized to integrate with the conventions of your rails projects.
+
 ### Options
 
 The [list of supported options](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#options) can be found on the Sass Website with the following  caveats:
@@ -67,4 +74,4 @@ The [list of supported options](http://sass-lang.com/docs/yardoc/file.SASS_REFER
     $ bundle install
     $ bundle exec rake test
 
-If you need to test against local gems, use Bundler's gem :path option in the Gemfile and also edit `test/support/test_helper.rb` and tell the tests where the gem is checked out.
+If you need to test against local gems, use Bundler's gem :path option in the Gemfile and also edit `test/support/test_helper.rb` and tell the tests where the gem is checked out.

data/lib/sass/rails/compressor.rb

@@ -4,11 +4,15 @@ module Sass
   module Rails
     class CssCompressor
       def compress(css)
-        Sass::Engine.new(css,
-                         :syntax => :scss,
-                         :cache => false,
-                         :read_cache => false,
-                         :style => :compressed).render
+        if css.count("\n") > 2
+          Sass::Engine.new(css,
+                           :syntax => :scss,
+                           :cache => false,
+                           :read_cache => false,
+                           :style => :compressed).render
+        else
+          css
+        end
       end
     end
   end

data/lib/sass/rails/railtie.rb

@@ -66,7 +66,7 @@ module Sass::Rails
 
     initializer :setup_compression, :group => :all do |app|
       if app.config.assets.compress
-        # Use sass's css_compressor
+        app.config.sass.style = :compressed
         app.config.assets.css_compressor = CssCompressor.new
       end
     end

data/lib/sass/rails/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module Rails
-    VERSION = "3.1.4"
+    VERSION = "3.1.5.rc.1"
   end
 end

data/sass-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_runtime_dependency 'sass',       '>= 3.1.4'
+  s.add_runtime_dependency 'sass',       '~> 3.1.10'
   s.add_runtime_dependency 'railties',   '~> 3.1.0'
   s.add_runtime_dependency 'actionpack', '~> 3.1.0'
   s.add_runtime_dependency 'tilt',       '~> 1.3.2'

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

@@ -21,6 +21,7 @@
   audio-url: audio-url("rails.mp3");
   font-path: font-path("rails.ttf");
   font-url: font-url("rails.ttf");
+  font-url-with-query-hash: font-url("rails.ttf?#iefix");
   javascript-path: javascript-path("rails.js");
   javascript-url: javascript-url("rails.js");
   stylesheet-path: stylesheet-path("rails.css");

data/test/sass_rails_logger_test.rb

@@ -8,11 +8,9 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
     end
   end
 
-  [:debug, :warn, :info, :error, :trace].each do |level|
-    test "sending a #{level} message to the sass logger writes to the environment log file" do
-      within_rails_app "scss_project" do
-        app_root = runcmd 'rails runner "print Rails.root"'
-
+  test "sending a log messages to the sass logger writes to the environment log file" do
+    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}|)"}
 

data/test/sass_rails_test.rb

@@ -84,6 +84,7 @@ class SassRailsTest < Sass::Rails::TestCase
     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"'

data/test/support/sass_rails_test_case.rb

@@ -59,15 +59,16 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
   #
   # Automatically changes back to the working directory
   # and removes the temp directory when done.
-  def within_rails_app(name, without_gems = [], gem_locations = $gem_locations)
+  def within_rails_app(name, without_gems = [], gem_options = $gem_options)
     sourcedir = File.expand_path("../../fixtures/#{name}", __FILE__)
     Dir.mktmpdir do |tmpdir|
       FileUtils.cp_r "#{sourcedir}/.", tmpdir
       Dir.chdir(tmpdir) do
-        gem_locations.each {|name, path| modify_gem_location name, path}
+        gem_options.each {|name, options| modify_gem_entry name, options}
         without_gems.each {|name| remove_gem name}
+        FileUtils.rm("Gemfile.lock")
         runcmd "bundle install --verbose"
-        yield
+        yield tmpdir
       end
     end
   end
@@ -81,23 +82,29 @@ class Sass::Rails::TestCase < ActiveSupport::TestCase
     end
   end
 
-  def modify_gem_location(gemname, path, gemfile = "Gemfile")
+  def modify_gem_entry(gemname, options, gemfile = "Gemfile")
     found = false
     process_gemfile(gemfile) do |line|
       if line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/
         found = true
-        %Q{gem "#{gemname}", :path => #{path.inspect}\n}
+        gem_entry(gemname, options) + "\n"
       else
         line
       end
     end
     unless found
       File.open(gemfile, "a") do |f|
-        f.print(%Q{\ngem "#{gemname}", :path => #{path.inspect}\n})
+        f.print("\n#{gem_entry(gemname, options)}\n")
       end
     end
   end
 
+  def gem_entry(gemname, options)
+    entry = %Q{gem "#{gemname}", "~> #{options[:version]}"}
+    entry += ", :path => #{options[:path].inspect}" if options[:path]
+    entry
+  end
+
   def remove_gem(gemname)
     process_gemfile(gemfile) do |line|
       line unless line =~ /gem *(["'])#{Regexp.escape(gemname)}\1/

data/test/test_helper.rb

@@ -9,20 +9,19 @@ require 'mocha'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Set locations of local gems in this hash.
-# They will be added/replaced in the generated Gemfiles
-# You should also set them in the local Gemfile
-$gem_locations = {
-  "sass-rails" => File.expand_path("../../", __FILE__)
-}
-
-# Uncomment this if you need to test against a local rails checkout
-# $gem_locations["rails"] = "/Users/chris/Projects/rails"
-# Uncomment this if you need to test against a local sass checkout
-# $gem_locations["sass"] = "/Users/chris/Projects/sass"
-# Uncomment this if you need to test against a local sprockets checkout
-# $gem_locations["sprockets"] = "/Users/chris/Projects/sprockets"
 
+# 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)
+Bundler.load.specs.each do |s|
+  if possible_dev_dependencies.include?(s.name)
+     gem_path = s.full_gem_path
+     gem_options = {:version => s.version}
+     gem_options[:path] = gem_path if File.exists?("#{gem_path}/#{s.name}.gemspec")
+     $gem_options[s.name] = gem_options
+  end
+end
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

metadata

@@ -1,115 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sass-rails
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 3
-  - 1
-  - 4
-  version: 3.1.4
+version: !ruby/object:Gem::Version
+  version: 3.1.5.rc.1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - wycats
 - chriseppstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-01 23:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sass
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70206023317720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 1
-        - 4
-        version: 3.1.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70206023317720
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &70206023317140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70206023317140
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70206023316540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70206023316540
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &70206023316000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sprockets
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70206023316000
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: &70206023315220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70206023315220
 description: Sass adapter for the Rails asset pipeline.
-email: 
+email:
 - wycats@gmail.com
 - chris@eppsteins.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -280,41 +245,31 @@ files:
 - test/sass_rails_test.rb
 - test/support/sass_rails_test_case.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: sass-rails
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sass adapter for the Rails asset pipeline.
-test_files: 
+test_files:
 - test/fixtures/engine_project/.gitignore
 - test/fixtures/engine_project/Gemfile
 - test/fixtures/engine_project/README.rdoc