sass 3.1.0.alpha.261 → 3.1.0.alpha.262

data/REVISION

@@ -1 +1 @@
-6c4103830c546f347dbed1be211dec4e7ab0f591
+d9b9e527c5f56934fbf0db348796494ce5a7c576

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.261
+3.1.0.alpha.262

data/lib/sass/importers/filesystem.rb

@@ -50,8 +50,9 @@ module Sass
       # If a full uri is passed, this removes the root from it
       # otherwise returns the name unchanged
       def remove_root(name)
-        if name.index("..") != 0 && name.index(@root) == 0
-          name[@root.length..-1]
+        root = @root.end_with?('/') ? @root : @root + '/'
+        if name.index(root) == 0
+          name[root.length..-1]
         else
           name
         end

data/lib/sass/plugin/staleness_checker.rb

@@ -54,6 +54,7 @@ module Sass
       #   that is compiled to `css_file`.
       # @return [Boolean] Whether the stylesheet needs to be updated.
       def stylesheet_needs_update?(css_file, template_file, importer = nil)
+        template_file = File.expand_path(template_file)
         begin
           css_mtime = File.mtime(css_file)
         rescue Errno::ENOENT

data/lib/sass/script/functions.rb

@@ -1217,6 +1217,8 @@ module Sass::Script
         raise ArgumentError.new("List index #{n} must be an integer")
       elsif n.to_i < 1
         raise ArgumentError.new("List index #{n} must be greater than or equal to 1")
+      elsif list.to_a.size == 0
+        raise ArgumentError.new("List index is #{n} but list has no items")
       elsif n.to_i > (size = list.to_a.size)
         raise ArgumentError.new("List index is #{n} but list is only #{size} item#{'s' if size != 1} long")
       end
@@ -1249,8 +1251,8 @@ module Sass::Script
       unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      sep1 = list1.separator if list1.is_a?(Sass::Script::List)
-      sep2 = list2.separator if list2.is_a?(Sass::Script::List)
+      sep1 = list1.separator if list1.is_a?(Sass::Script::List) && !list1.value.empty?
+      sep2 = list2.separator if list2.is_a?(Sass::Script::List) && !list2.value.empty?
       Sass::Script::List.new(
         list1.to_a + list2.to_a,
         if separator.value == 'auto'

data/lib/sass/script/list.rb

@@ -33,7 +33,8 @@ module Sass::Script
 
     # @see Node#to_s
     def to_s(opts = {})
-      return value.map {|e| e.to_s(opts)}.join(sep_str)
+      raise Sass::SyntaxError.new("() isn't a valid CSS value.") if value.empty?
+      return value.reject {|e| e.is_a?(List) && e.value.empty?}.map {|e| e.to_s(opts)}.join(sep_str)
     end
 
     # @see Node#to_sass

data/lib/sass/script/parser.rb

@@ -393,9 +393,10 @@ RUBY
         return variable unless try_tok(:lparen)
         was_in_parens = @in_parens
         @in_parens = true
-        e = assert_expr(:expr)
+        line = @lexer.line
+        e = expr
         assert_tok(:rparen)
-        return e
+        return e || node(List.new([], :space), line)
       ensure
         @in_parens = was_in_parens
       end

data/test/sass/functions_test.rb

@@ -875,6 +875,8 @@ MSG
     assert_equal("3", evaluate("length((foo, bar, baz bip))"))
     assert_equal("3", evaluate("length((foo, bar, (baz, bip)))"))
     assert_equal("1", evaluate("length(#f00)"))
+    assert_equal("0", evaluate("length(())"))
+    assert_equal("4", evaluate("length(1 2 () 3)"))
   end
 
   def test_nth
@@ -888,6 +890,7 @@ MSG
     assert_error_message("List index 1.5 must be an integer for `nth'", "nth(foo, 1.5)")
     assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
     assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
+    assert_error_message("List index is 1 but list has no items for `nth'", "nth((), 1)")
   end
 
   def test_join
@@ -911,6 +914,20 @@ MSG
     assert_equal("1 2 3 4", evaluate("join((1, 2), (3, 4), space)"))
     assert_equal("1, 2", evaluate("join(1, 2, comma)"))
 
+    assert_equal("1 2", evaluate("join(1 2, ())"))
+    assert_equal("1, 2", evaluate("join((1, 2), ())"))
+    assert_equal("true", evaluate("(1 2) == join(1 2, ())"))
+    assert_equal("true", evaluate("(1, 2) == join((1, 2), ())"))
+    assert_equal("false", evaluate("(1 2 ()) == join(1 2, ())"))
+    assert_equal("false", evaluate("(1, 2, ()) == join((1, 2), ())"))
+
+    assert_equal("1 2", evaluate("join((), 1 2)"))
+    assert_equal("1, 2", evaluate("join((), (1, 2))"))
+    assert_equal("true", evaluate("(1 2) == join((), 1 2)"))
+    assert_equal("true", evaluate("(1, 2) == join((), (1, 2))"))
+    assert_equal("false", evaluate("(1 2 ()) == join((), 1 2)"))
+    assert_equal("false", evaluate("(1, 2, ()) == join((), (1, 2))"))
+
     assert_error_message("Separator name must be space, comma, or auto for `join'", "join(1, 2, baboon)")
   end
 
@@ -935,6 +952,16 @@ MSG
     assert_equal("1 2 3, 4", evaluate("append((1, 2), (3, 4), space)"))
     assert_equal("1, 2", evaluate("append(1, 2, comma)"))
 
+    assert_equal("1 2", evaluate("append(1 2, ())"))
+    assert_equal("1, 2", evaluate("append((1, 2), ())"))
+    assert_equal("true", evaluate("(1 2 ()) == append(1 2, ())"))
+    assert_equal("true", evaluate("(1, 2, ()) == append((1, 2), ())"))
+
+    assert_equal("1 2", evaluate("append((), 1 2)"))
+    assert_equal("1, 2", evaluate("append((), (1, 2))"))
+    assert_equal("false", evaluate("(1 2) == append((), 1 2)"))
+    assert_equal("true", evaluate("(1 2) == nth(append((), 1 2), 1)"))
+
     assert_error_message("Separator name must be space, comma, or auto for `append'", "append(1, 2, baboon)")
   end
 

data/test/sass/script_test.rb

@@ -406,6 +406,14 @@ SASS
     assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
   end
 
+  def test_empty_list
+    assert_equal "1 2 3", resolve("1 2 () 3")
+    assert_equal "1 2 3", resolve("1 2 3 ()")
+    assert_equal "1 2 3", resolve("() 1 2 3")
+    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("()")}
+    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.261
+  version: 3.1.0.alpha.262
 platform: ruby
 authors: 
 - Nathan Weizenbaum