sass 3.2.0.alpha.35 → 3.2.0.alpha.49

data/test/sass/extend_test.rb

@@ -1339,6 +1339,71 @@ CSS
 SCSS
   end
 
+  def test_basic_placeholder_selector
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  color: blue; }
+CSS
+%foo {color: blue}
+.bar {@extend %foo}
+SCSS
+  end
+
+  def test_unused_placeholder_selector
+    assert_equal <<CSS, render(<<SCSS)
+.baz {
+  color: blue; }
+CSS
+%foo {color: blue}
+%bar {color: red}
+.baz {@extend %foo}
+SCSS
+  end
+
+  def test_placeholder_descendant_selector
+    assert_equal <<CSS, render(<<SCSS)
+#context .bar a {
+  color: blue; }
+CSS
+#context %foo a {color: blue}
+.bar {@extend %foo}
+SCSS
+  end
+
+  def test_placeholder_selector_with_multiple_extenders
+    assert_equal <<CSS, render(<<SCSS)
+.bar, .baz {
+  color: blue; }
+CSS
+%foo {color: blue}
+.bar {@extend %foo}
+.baz {@extend %foo}
+SCSS
+  end
+
+  def test_placeholder_selector_as_modifier
+    assert_equal <<CSS, render(<<SCSS)
+a.baz.bar {
+  color: blue; }
+CSS
+a%foo.baz {color: blue}
+.bar {@extend %foo}
+div {@extend %foo}
+SCSS
+  end
+
+  def test_placeholder_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  color: blue; }
+CSS
+$foo: foo;
+
+%\#{$foo} {color: blue}
+.bar {@extend %foo}
+SCSS
+  end
+
   private
 
   def render(sass, options = {})

data/test/sass/importer_test.rb

@@ -176,10 +176,17 @@ CSS
       file_system_importer
     )
   end
+
   def fixture_dir
     File.join(File.dirname(__FILE__), "fixtures")
   end
+
   def fixture_file(path)
     File.join(fixture_dir, path)
   end
+
+  def test_absolute_files_across_template_locations
+    importer = Sass::Importers::Filesystem.new(absolutize 'templates')
+    assert_not_nil importer.mtime(absolutize('more_templates/more1.sass'), {})
+  end
 end

data/test/sass/plugin_test.rb

@@ -183,6 +183,7 @@ CSS
 
   def test_updating_stylesheets_callback
     # Should run even when there's nothing to update
+    Sass::Plugin.options[:template_location] = nil
     assert_callback :updating_stylesheets, []
   end
 
@@ -196,25 +197,25 @@ CSS
     assert_no_callback :updating_stylesheets
   end
 
-  def test_updating_stylesheet_callback_for_updated_template
+  def test_updated_stylesheet_callback_for_updated_template
     Sass::Plugin.options[:always_update] = false
     touch 'basic'
-    assert_no_callback :updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
+    assert_no_callback :updated_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_callbacks(
-        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
-  def test_updating_stylesheet_callback_for_fresh_template
+  def test_updated_stylesheet_callback_for_fresh_template
     Sass::Plugin.options[:always_update] = false
-    assert_no_callback :updating_stylesheet
+    assert_no_callback :updated_stylesheet
   end
 
-  def test_updating_stylesheet_callback_for_error_template
+  def test_updated_stylesheet_callback_for_error_template
     Sass::Plugin.options[:always_update] = false
     touch 'bork1'
-    assert_no_callback :updating_stylesheet
+    assert_no_callback :updated_stylesheet
   end
 
   def test_not_updating_stylesheet_callback_for_fresh_template
@@ -226,8 +227,8 @@ CSS
     Sass::Plugin.options[:always_update] = false
     assert_callback :not_updating_stylesheet, template_loc("complex"), tempfile_loc("complex") do
       assert_no_callbacks(
-        [:updating_stylesheet, template_loc("basic"), tempfile_loc("basic")],
-        [:updating_stylesheet, template_loc("import"), tempfile_loc("import")])
+        [:updated_stylesheet, template_loc("basic"), tempfile_loc("basic")],
+        [:updated_stylesheet, template_loc("import"), tempfile_loc("import")])
     end
   end
 
@@ -347,9 +348,11 @@ CSS
 
   def assert_callback(name, *expected_args)
     run = false
+    received_args = nil
     Sass::Plugin.send("on_#{name}") do |*args|
-      run ||= expected_args.zip(args).all? do |ea, a|
-        ea.respond_to?(:call) ? ea.call(a) : ea == a
+      received_args = args
+      run ||= expected_args.zip(received_args).all? do |ea, ra|
+        ea.respond_to?(:call) ? ea.call(ra) : ea == ra
       end
     end
 
@@ -359,7 +362,7 @@ CSS
       check_for_updates!
     end
 
-    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}"
+    assert run, "Expected #{name} callback to be run with arguments:\n  #{expected_args.inspect}\nHowever, it got:\n  #{received_args.inspect}"
   end
 
   def assert_no_callback(name, *unexpected_args)

data/test/sass/script_conversion_test.rb

@@ -223,6 +223,8 @@ RUBY
     assert_renders '#{1 + 2}, #{3 + 4}'
     assert_renders '#{1 + 2} ,#{3 + 4}'
     assert_renders '#{1 + 2},#{3 + 4}'
+    assert_renders '#{1 + 2}, #{3 + 4}, #{5 + 6}'
+    assert_renders '3, #{3 + 4}, 11'
 
     assert_renders '3 / #{3 + 4}'
     assert_renders '3 /#{3 + 4}'

data/test/sass/script_test.rb

@@ -7,6 +7,14 @@ module Sass::Script::Functions::UserFunctions
     val.options[:foo]
     Sass::Script::String.new("Options defined!")
   end
+
+  def arg_error
+    assert_options
+  end
+end
+
+module Sass::Script::Functions
+  include Sass::Script::Functions::UserFunctions
 end
 
 class SassScriptTest < Test::Unit::TestCase
@@ -130,6 +138,8 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal '3, 7', resolve('#{1 + 2}, #{3 + 4}')
     assert_equal '3 ,7', resolve('#{1 + 2} ,#{3 + 4}')
     assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
+    assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
+    assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')
@@ -414,6 +424,14 @@ SASS
     assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
   end
 
+  def test_deep_argument_error_not_unwrapped
+    assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
+  end
+
+  def test_shallow_argument_error_unwrapped
+    assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/scss_test.rb

@@ -1094,6 +1094,15 @@ SCSS
 
   # Regression
 
+  def test_prop_name_interpolation_after_hyphen
+    assert_equal <<CSS, render(<<SCSS)
+a {
+  -foo-bar: b; }
+CSS
+a { -\#{"foo"}-bar: b; }
+SCSS
+  end
+
   def test_star_plus_and_parent
     assert_equal <<CSS, render(<<SCSS)
 * + html foo {
@@ -1296,4 +1305,29 @@ CSS
 foo {color: darken(black, 10%)}
 SCSS
   end
+
+  # ref: https://github.com/nex3/sass/issues/104
+  def test_no_buffer_overflow
+    template = render <<SCSS
+.aaa {
+  background-color: white;
+}
+.aaa .aaa .aaa {
+  background-color: black;
+}   
+.bbb {
+  @extend .aaa;
+} 
+.xxx {
+  @extend .bbb;
+}
+.yyy {
+  @extend .bbb;
+}
+.zzz {
+  @extend .bbb;
+}
+SCSS
+    Sass::SCSS::Parser.new(template, "test.scss").parse
+  end
 end

data/test/sass/test_helper.rb

@@ -3,6 +3,6 @@ $:.unshift test_dir unless $:.include?(test_dir)
 
 class Test::Unit::TestCase
   def absolutize(file)
-    "#{File.dirname(__FILE__)}/#{file}"
+    File.expand_path("#{File.dirname(__FILE__)}/#{file}")
   end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'sass'
+require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.2.0.alpha.35
+  version: 3.2.0.alpha.49
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 -04:00
+date: 2012-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -141,7 +142,6 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/trace_node.rb
 - lib/sass/util.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb