sass 3.1.0.alpha.221 → 3.1.0.alpha.246

data/test/sass/functions_test.rb

@@ -35,6 +35,10 @@ module Sass::Script::Functions::UserFunctions
   end
 end
 
+module Sass::Script::Functions
+  include Sass::Script::Functions::UserFunctions
+end
+
 class SassFunctionTest < Test::Unit::TestCase
   # Tests taken from:
   #   http://www.w3.org/Style/CSS/Test/CSS3/Color/20070927/html4/t040204-hsl-h-rotating-b.htm

data/test/sass/plugin_test.rb

@@ -19,7 +19,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.mkdir_p tempfile_loc
     FileUtils.mkdir_p tempfile_loc(nil,"more_")
     set_plugin_opts
-    update_all_stylesheets!
+    check_for_updates!
     reset_mtimes
   end
 
@@ -39,21 +39,21 @@ class SassPluginTest < Test::Unit::TestCase
   def test_no_update
     File.delete(tempfile_loc('basic'))
     assert_needs_update 'basic'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_modified
     touch 'basic'
     assert_needs_update 'basic'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'import'
   end
@@ -61,7 +61,7 @@ class SassPluginTest < Test::Unit::TestCase
   def test_update_needed_when_scss_dependency_modified
     touch 'scss_importee'
     assert_needs_update 'import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'scss_importee'
     assert_stylesheet_updated 'import'
   end
@@ -69,7 +69,7 @@ class SassPluginTest < Test::Unit::TestCase
   def test_scss_update_needed_when_dependency_modified
     touch 'basic'
     assert_needs_update 'scss_import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'scss_import'
   end
@@ -77,14 +77,26 @@ class SassPluginTest < Test::Unit::TestCase
   def test_update_needed_when_nested_import_dependency_modified
     touch 'basic'
     assert_needs_update 'nested_import'
-    update_all_stylesheets!
+    check_for_updates!
     assert_stylesheet_updated 'basic'
     assert_stylesheet_updated 'scss_import'
   end
 
+  def test_no_updates_when_always_check_and_always_update_both_false
+    Sass::Plugin.options[:always_update] = false
+    Sass::Plugin.options[:always_check] = false
+
+    touch 'basic'
+    assert_needs_update 'basic'
+    check_for_updates!
+
+    # Check it's still stale
+    assert_needs_update 'basic'
+  end
+
   def test_full_exception_handling
     File.delete(tempfile_loc('bork1'))
-    update_all_stylesheets!
+    check_for_updates!
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
@@ -103,17 +115,17 @@ CSS
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork1'))
-    assert_raise(Sass::SyntaxError) {update_all_stylesheets!}
+    assert_raise(Sass::SyntaxError) {check_for_updates!}
   ensure
     Sass::Plugin.options[:full_exception] = old_full_exception
   end
-  
+
   def test_two_template_directories
     set_plugin_opts :template_location => {
       template_loc => tempfile_loc,
       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
     }
-    update_all_stylesheets!
+    check_for_updates!
     ['more1', 'more_import'].each { |name| assert_renders_correctly(name, :prefix => 'more_') }
   end
 
@@ -124,7 +136,7 @@ CSS
                       template_loc => tempfile_loc,
                       template_loc(nil,'more_') => tempfile_loc(nil,'more_')
                     }
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly('more1_with_line_comments', 'more1', :prefix => 'more_')
   end
 
@@ -146,7 +158,7 @@ CSS
     touch 'basic'
     assert_needs_update "more1", "more_"
     assert_needs_update "basic"
-    update_all_stylesheets!
+    check_for_updates!
     assert_doesnt_need_update "more1", "more_"
     assert_doesnt_need_update "basic"
   end
@@ -162,7 +174,7 @@ CSS
     touch 'basic'
     assert_needs_update "more1", "more_"
     assert_needs_update "basic"
-    update_all_stylesheets!
+    check_for_updates!
     assert_doesnt_need_update "more1", "more_"
     assert_needs_update "basic"
   end
@@ -267,7 +279,7 @@ CSS
 
     touch 'basic', 'more_'
     assert_needs_update "import"
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly("import")
   ensure
     FileUtils.mv(template_loc("basic", "more_"), template_loc("basic"))
@@ -276,7 +288,7 @@ CSS
   def test_cached_relative_import
     old_always_update = Sass::Plugin.options[:always_update]
     Sass::Plugin.options[:always_update] = true
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly('subdir/subdir')
   ensure
     Sass::Plugin.options[:always_update] = old_always_update
@@ -284,9 +296,9 @@ CSS
 
   def test_cached_if
     set_plugin_opts :cache_store => Sass::CacheStores::Filesystem.new(tempfile_loc + '/cache')
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly 'if'
-    update_all_stylesheets!
+    check_for_updates!
     assert_renders_correctly 'if'
   ensure
     set_plugin_opts :cache_store => @@cache_store
@@ -344,7 +356,7 @@ CSS
     if block_given?
       yield
     else
-      update_all_stylesheets!
+      check_for_updates!
     end
 
     assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
@@ -367,23 +379,23 @@ CSS
     if block_given?
       yield
     else
-      update_all_stylesheets!
+      check_for_updates!
     end
   end
 
   def assert_callbacks(*args)
-    return update_all_stylesheets! if args.empty?
+    return check_for_updates! if args.empty?
     assert_callback(*args.pop) {assert_callbacks(*args)}
   end
 
   def assert_no_callbacks(*args)
-    return update_all_stylesheets! if args.empty?
+    return check_for_updates! if args.empty?
     assert_no_callback(*args.pop) {assert_no_callbacks(*args)}
   end
 
-  def update_all_stylesheets!
+  def check_for_updates!
     Sass::Util.silence_sass_warnings do
-      Sass::Plugin.update_stylesheets
+      Sass::Plugin.check_for_updates
     end
   end
 

data/test/sass/script_conversion_test.rb

@@ -67,19 +67,6 @@ class SassScriptConversionTest < Test::Unit::TestCase
   def test_variable
     assert_renders "$foo-bar"
     assert_renders "$flaznicate"
-    assert_warning(<<WARN) {assert_equal "$tumbly-wumbly", render("!tumbly-wumbly")}
-DEPRECATION WARNING:
-On line 1, character 1 of 'test_variable_inline.sass'
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use "$tumbly-wumbly" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-WARN
-  end
-
-  def test_important
-    assert_renders "!important"
-    assert_renders "$foo !important"
   end
 
   def self.test_precedence(outer, inner)
@@ -282,30 +269,6 @@ RUBY
     assert_equal '"foo#{$bar}baz"', render("'foo\#{$bar}baz'")
   end
 
-  def test_sass2_string_interpolation
-    assert_equal 'foo#{$bar}baz', render('"foo#{$bar}baz"', :context => :equals)
-    assert_equal '#{$bar}baz', render('"#{$bar}baz"', :context => :equals)
-    assert_equal 'foo#{$bar}', render('"foo#{$bar}"', :context => :equals)
-
-    assert_equal 'unquote(".foo#{$bar}.bar")', render('".foo#{$bar}.bar"', :context => :equals)
-    assert_equal 'unquote(".foo#{$bar}")', render('".foo#{$bar}"', :context => :equals)
-    assert_equal 'unquote("#{$bar}.bar")', render('"#{$bar}.bar"', :context => :equals)
-
-    assert_equal "unquote(\"f'o\#{$bar}b'z\")", render("'f\\'o\#{$bar}b\\'z'", :context => :equals)
-    assert_equal "unquote('f\"o\#{$bar}b\"z')", render("'f\\\"o\#{$bar}b\\\"z'", :context => :equals)
-    assert_equal "unquote(\"f'o\#{$bar}b\\\"z\")", render("'f\\'o\#{$bar}b\\\"z'", :context => :equals)
-  end
-
-  def test_sass2_urls
-    Sass::Util.silence_sass_warnings do
-      assert_equal 'url(foo/bar.gif)', render('url(foo/bar.gif)', :context => :equals)
-      assert_equal 'url("foo/bar.gif")', render('url("foo/bar.gif")', :context => :equals)
-
-      assert_equal 'url($var)', render('url(!var)', :context => :equals)
-      assert_equal 'url("#{$var}/flip.gif")', render('url("#{!var}/flip.gif")', :context => :equals)
-    end
-  end
-
   private
 
   def assert_renders(script, options = {})
@@ -315,7 +278,6 @@ RUBY
   def render(script, options = {})
     munge_filename(options)
     node = Sass::Script.parse(script, 1, 0, options)
-    node.context = options[:context] if options[:context]
     node.to_sass
   end
 end

data/test/test_helper.rb

@@ -8,9 +8,6 @@ require 'sass'
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
 module Sass::Script::Functions
-  module UserFunctions; end
-  include UserFunctions
-
   def option(name)
     Sass::Script::String.new(@options[name.value.to_sym].to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.221
+  version: 3.1.0.alpha.246
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,6 @@ description: "      Sass makes CSS fun again. Sass is an extension of CSS3, addi
 email: sass-lang@googlegroups.com
 executables: 
 - sass
-- css2sass
 - sass-convert
 extensions: []
 
@@ -170,7 +169,6 @@ files:
 - vendor/fssm/spec/root/file.yml
 - vendor/fssm/spec/root/moo/cow.txt
 - vendor/fssm/spec/spec_helper.rb
-- bin/css2sass
 - bin/sass
 - bin/sass-convert
 - test/sass/css2sass_test.rb

data/bin/css2sass

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../lib/sass'
-require 'sass/exec'
-
-warn <<END
-DEPRECATION WARNING:
-The css2sass tool is deprecated and will be removed in Sass 3.2.
-Use the sass-convert tool instead.
-END
-
-opts = Sass::Exec::SassConvert.new(%w[--from css --to sass] + ARGV)
-opts.parse!