haml-edge 2.3.179 → 2.3.180

data/test/sass/functions_test.rb

@@ -13,6 +13,10 @@ module Sass::Script::Functions::UserFunctions
   def user_defined
     Sass::Script::String.new("I'm a user-defined string!")
   end
+
+  def _preceding_underscore
+    Sass::Script::String.new("I'm another user-defined string!")
+  end
 end
 
 class SassFunctionTest < Test::Unit::TestCase
@@ -465,10 +469,33 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("\"foo\" is not a color for `complement'", "complement(\"foo\")")
   end
 
+  def test_unquote
+    assert_equal('foo', evaluate('unquote("foo")'))
+    assert_equal('foo', evaluate('unquote(foo)'))
+  end
+
+  def test_unquote_tests_type
+    assert_error_message("#ff0000 is not a string for `unquote'", "unquote(#f00)")
+  end
+
+  def test_quote
+    assert_equal('"foo"', evaluate('quote(foo)'))
+    assert_equal('"foo"', evaluate('quote("foo")'))
+  end
+
+  def test_quote_tests_type
+    assert_error_message("#ff0000 is not a string for `quote'", "quote(#f00)")
+  end
+
   def test_user_defined_function
     assert_equal("I'm a user-defined string!", evaluate("user_defined()"))
   end
 
+  def test_user_defined_function_with_preceding_underscore
+    assert_equal("I'm another user-defined string!", evaluate("_preceding_underscore()"))
+    assert_equal("I'm another user-defined string!", evaluate("-preceding-underscore()"))
+  end
+
   def test_options_on_new_literals_fails
     assert_error_message(<<MSG, "call-options-on-new-literal()")
 The #options attribute is not set on this Sass::Script::String.

data/test/sass/more_results/more_import.css

@@ -24,6 +24,6 @@ body { font: Arial; background: blue; }
 
 @import url(basic.css);
 @import url(../results/complex.css);
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/more_templates/more_import.sass

@@ -1,4 +1,4 @@
-!preconst = "hello"
+$preconst: hello
 
 =premixin
   pre-mixin: here
@@ -6,6 +6,6 @@
 @import importee, basic, basic.css, ../results/complex.css, more_partial
 
 nonimported
-  :myconst = !preconst
-  :otherconst = !postconst
+  :myconst $preconst
+  :otherconst $postconst
   +postmixin

data/test/sass/plugin_test.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 
 class SassPluginTest < Test::Unit::TestCase
   @@templates = %w{
-    complex script parent_ref import alt
+    complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
     options
   }
@@ -50,6 +50,23 @@ class SassPluginTest < Test::Unit::TestCase
     assert_needs_update 'import'
     Sass::Plugin.update_stylesheets
     assert_stylesheet_updated 'basic'
+    assert_stylesheet_updated 'import'
+  end
+
+  def test_update_needed_when_scss_dependency_modified
+    touch 'scss_importee'
+    assert_needs_update 'import'
+    Sass::Plugin.update_stylesheets
+    assert_stylesheet_updated 'scss_importee'
+    assert_stylesheet_updated 'import'
+  end
+
+  def test_scss_update_needed_when_dependency_modified
+    touch 'basic'
+    assert_needs_update 'scss_import'
+    Sass::Plugin.update_stylesheets
+    assert_stylesheet_updated 'basic'
+    assert_stylesheet_updated 'scss_import'
   end
 
   def test_full_exception_handling
@@ -58,11 +75,11 @@ class SassPluginTest < Test::Unit::TestCase
     File.open(tempfile_loc('bork1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...6].join("\n"))
 /*
-Syntax error: Undefined variable: "!bork".
+Syntax error: Undefined variable: "$bork".
         on line 2 of #{template_loc('bork1')}
 
 1: bork
-2:   :bork= !bork
+2:   :bork $bork
 CSS
     end
     File.delete(tempfile_loc('bork1'))
@@ -203,7 +220,7 @@ CSS
     Sass::Plugin.options[:always_update] = false
     touch 'bork1'
     assert_callback(:compilation_error,
-      lambda {|e| e.message == 'Undefined variable: "!bork".'},
+      lambda {|e| e.message == 'Undefined variable: "$bork".'},
       template_loc("bork1"), tempfile_loc("bork1"))
   end
 
@@ -324,12 +341,12 @@ CSS
   end
 
   def assert_needs_update(name)
-    assert(Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+    assert(Sass::Plugin.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
       "Expected #{template_loc(name)} to need an update.")
   end
 
   def assert_doesnt_need_update(name)
-    assert(!Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc),
+    assert(!Sass::Plugin.stylesheet_needs_update?(tempfile_loc(name), template_loc(name)),
       "Expected #{template_loc(name)} not to need an update.")
   end
 
@@ -338,12 +355,15 @@ CSS
   end
 
   def reset_mtimes
-    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass}"].each {|f| File.utime(Time.now, Time.now - 1, f)}
+    atime = Time.now
+    mtime = Time.now - 5
+    Dir["{#{template_loc},#{tempfile_loc}}/**/*.{css,sass,scss}"].each {|f| File.utime(atime, mtime, f)}
   end
 
   def template_loc(name = nil, prefix = nil)
     if name
-      absolutize "#{prefix}templates/#{name}.sass"
+      scss = absolutize "#{prefix}templates/#{name}.scss"
+      File.exists?(scss) ? scss : absolutize("#{prefix}templates/#{name}.sass")
     else
       absolutize "#{prefix}templates"
     end

data/test/sass/results/compact.css

@@ -1,4 +1,4 @@
-#main { width: 15em; color: #0000ff; }
+#main { width: 15em; color: blue; }
 #main p { border-style: dotted; /* Nested comment More nested stuff */ border-width: 2px; }
 #main .cool { width: 100px; }
 

data/test/sass/results/complex.css

@@ -1,10 +1,10 @@
-body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: #fff; background: url(/images/global_bg.gif); }
+body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; color: white; background: url(/images/global_bg.gif); }
 
 #page { width: 900px; margin: 0 auto; background: #440008; border-top-width: 5px; border-top-style: solid; border-top-color: #ff8500; }
 
 #header { height: 75px; padding: 0; }
 #header h1 { float: left; width: 274px; height: 75px; margin: 0; background-image: url(/images/global_logo.gif); /* Crazy nested comment */ background-repeat: no-repeat; text-indent: -9999px; }
-#header .status { float: right; padding-top: .5em; padding-left: .5em; padding-right: .5em; padding-bottom: 0; }
+#header .status { float: right; padding-top: 0.5em; padding-left: 0.5em; padding-right: 0.5em; padding-bottom: 0; }
 #header .status p { float: left; margin-top: 0; margin-right: 0.5em; margin-bottom: 0; margin-left: 0; }
 #header .status ul { float: left; margin: 0; padding: 0; }
 #header .status li { list-style-type: none; display: inline; margin: 0 5px; }
@@ -16,9 +16,9 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 #menu { clear: both; text-align: right; height: 20px; border-bottom: 5px solid #006b95; background: #00a4e4; }
 #menu .contests ul { margin: 0 5px 0 0; padding: 0; }
-#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: #fff; background: #00a4e4; }
+#menu .contests ul li { list-style-type: none; margin: 0 5px; padding: 5px 5px 0 5px; display: inline; font-size: 1.1em; color: white; background: #00a4e4; }
 #menu .contests ul li / This rule isn't a comment! { red: green; }
-#menu .contests a:link, #menu .contests a:visited { color: #fff; text-decoration: none; font-weight: bold; }
+#menu .contests a:link, #menu .contests a:visited { color: white; text-decoration: none; font-weight: bold; }
 #menu .contests a:hover { text-decoration: underline; }
 
 #content { clear: both; }
@@ -82,6 +82,6 @@ body { margin: 0; font: 0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-se
 
 img { border: none; }
 
-button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: #fff; border: none; background: url(/images/btn_short.gif) no-repeat; }
+button.short { width: 60px; height: 22px; padding: 0 0 2px 0; color: white; border: none; background: url(/images/btn_short.gif) no-repeat; }
 
 table { border-collapse: collapse; }

data/test/sass/results/compressed.css

@@ -1 +1 @@
-#main{width:15em;color:#0000ff}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}
+#main{width:15em;color:blue}#main p{border-style:dotted;border-width:2px}#main .cool{width:100px}#left{font-size:2em;font-weight:bold;float:left}

data/test/sass/results/expanded.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: #0000ff;
+  color: blue;
 }
 #main p {
   border-style: dotted;

data/test/sass/results/import.css

@@ -12,6 +12,8 @@ body { font: Arial; background: blue; }
 
 midrule { inthe: middle; }
 
+scss { imported: yes; }
+
 body { font: Arial; background: blue; }
 
 #page { width: 700px; height: 100; }
@@ -24,6 +26,6 @@ body { font: Arial; background: blue; }
 
 @import url(basic.css);
 @import url(../results/complex.css);
-#foo { background-color: #baf; }
+#foo { background-color: #bbaaff; }
 
 nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/mixins.css

@@ -1,12 +1,12 @@
 #main {
   width: 15em;
-  color: #0000ff;
+  color: blue;
 }
 #main p {
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
   border-style: dotted;
   border-width: 2px;
@@ -19,7 +19,7 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
   font-size: 2em;
   font-weight: bold;
@@ -30,9 +30,9 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
-  color: #f00;
+  color: red;
   font-size: 20px;
   float: right;
 }
@@ -41,12 +41,12 @@
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
 }
 
 .complex {
-  color: #f00;
+  color: red;
   font-size: 20px;
   text-decoration: none;
 }
@@ -59,12 +59,12 @@
 }
 * html .complex {
   height: 1px;
-  color: #f00;
+  color: red;
   font-size: 20px;
 }
 
 .more-complex {
-  color: #f00;
+  color: red;
   font-size: 20px;
   text-decoration: none;
   display: inline;
@@ -80,16 +80,16 @@
 }
 * html .more-complex {
   height: 1px;
-  color: #f00;
+  color: red;
   font-size: 20px;
 }
 .more-complex a:hover {
   text-decoration: underline;
-  color: #f00;
+  color: red;
   font-size: 20px;
   border-top-width: 2px;
   border-top-color: #ffcc00;
   border-left-width: 1px;
-  border-left-color: #000;
+  border-left-color: black;
   -moz-border-radius: 10px;
 }

data/test/sass/results/nested.css

@@ -1,6 +1,6 @@
 #main {
   width: 15em;
-  color: #0000ff; }
+  color: blue; }
   #main p {
     border-style: dotted;
     /* Nested comment

data/test/sass/results/parent_ref.css

@@ -1,13 +1,13 @@
-a { color: #000; }
-a:hover { color: #f00; }
+a { color: black; }
+a:hover { color: red; }
 
 p, div { width: 100em; }
 p foo, div foo { width: 10em; }
 p:hover, p bar, div:hover, div bar { height: 20em; }
 
 #cool { border-style: solid; border-width: 2em; }
-.ie7 #cool, .ie6 #cool { content: string(Totally not cool.); }
-.firefox #cool { content: string(Quite cool.); }
+.ie7 #cool, .ie6 #cool { content: string("Totally not cool."); }
+.firefox #cool { content: string("Quite cool."); }
 
 .wow, .snazzy { font-family: fantasy; }
 .wow:hover, .wow:visited, .snazzy:hover, .snazzy:visited { font-weight: bold; }

data/test/sass/results/script.css

@@ -1,7 +1,7 @@
-#main { content: Hello!; qstr: Quo"ted"!; hstr: Hyph-en!; width: 30em; background-color: #000; color: #ffffaa; short-color: #112233; named-color: olive; con: foo bar(9 hi there boom); con2: noquo quo; }
+#main { content: Hello!; qstr: 'Quo"ted"!'; hstr: Hyph-en!; width: 30em; background-color: black; color: #ffffaa; short-color: #112233; named-color: olive; con: "foo" bar(9 hi there "boom"); con2: "noquo" quo; }
 #main #sidebar { background-color: #00ff98; num-normal: 10; num-dec: 10.2; num-dec0: 99; num-neg: -10; esc: 10 +12; many: 6; order: 7; complex: #4c9db1hi16; }
 
-#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: hi there; str-str2: hi there; str-col: 14em solid #112233; str-num: times: 13; col-num: #ff7b9d; col-col: #5173ff; }
+#plus { num-num: 7; num-num-un: 25em; num-num-un2: 23em; num-num-neg: 9.87; num-str: 100px; num-col: #b7b7b7; num-perc: 31%; str-str: "hi there"; str-str2: "hi there"; str-col: "14em solid #112233"; str-num: "times: 13"; col-num: #ff7b9d; col-col: #5173ff; }
 
 #minus { num-num: 900; col-num: #f9f9f4; col-col: #000035; unary-num: -1; unary-const: 10; unary-paren: -11; unary-two: 12; unary-many: 12; unary-crazy: -15; }
 
@@ -11,6 +11,6 @@
 
 #mod { num-num: 2; col-col: #0f0e05; col-num: #020001; }
 
-#const { escaped-quote: !foo; default: Hello! !important; }
+#const { escaped-quote: $foo !bar; default: Hello! !important; }
 
 #regression { a: 4; }

data/test/sass/results/scss_import.css

@@ -0,0 +1,15 @@
+imported { otherconst: hello; myconst: goodbye; pre-mixin: here; }
+
+body { font: Arial; background: blue; }
+
+#page { width: 700px; height: 100; }
+#page #header { height: 300px; }
+#page #header h1 { font-size: 50px; color: blue; }
+
+#content.user.show #container.top #column.left { width: 100px; }
+#content.user.show #container.top #column.right { width: 600px; }
+#content.user.show #container.bottom { background: brown; }
+
+midrule { inthe: middle; }
+
+nonimported { myconst: hello; otherconst: goodbye; post-mixin: here; }

data/test/sass/results/scss_importee.css

@@ -0,0 +1,2 @@
+scss {
+  imported: yes; }

data/test/sass/script_conversion_test.rb

@@ -0,0 +1,153 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/engine'
+
+class SassScriptConversionTest < Test::Unit::TestCase
+  def test_bool
+    assert_renders "true"
+    assert_renders "false"
+  end
+
+  def test_color
+    assert_renders "#abcdef"
+    assert_renders "blue"
+    assert_renders "rgba(0, 1, 2, 0.2)"
+
+    assert_equal "#aabbcc", render("#abc")
+    assert_equal "blue", render("#0000ff")
+  end
+
+  def test_number
+    assert_renders "10"
+    assert_renders "10.35"
+    assert_renders "12px"
+    assert_renders "12.45px"
+
+    assert_equal "12.346", render("12.345678901")
+  end
+
+  def test_string
+    assert_renders '"foo"'
+    assert_renders '"bar baz"'
+    assert_equal '"baz bang"', render("'baz bang'")
+  end
+
+  def test_string_quotes
+    assert_equal "'quote\"quote'", render('"quote\\"quote"')
+    assert_equal '"quote\'quote"', render("'quote\\'quote'")
+    assert_renders '"quote\'quote\\"quote"'
+    assert_equal '"quote\'quote\\"quote"', render("'quote\\'quote\"quote'")
+  end
+
+  def test_string_escapes
+    assert_renders '"foo\\\\bar"'
+  end
+
+  def test_funcall
+    assert_renders "foo(true, blue)"
+    assert_renders "hsla(20deg, 30%, 50%, 0.3)"
+    assert_renders "blam()"
+
+    assert_renders "-\xC3\xBFoo(12px)"
+    assert_renders "-foo(12px)"
+  end
+
+  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 test_comma_operator
+    assert_renders "$foo, $bar $baz"
+    assert_renders "$foo $bar, $baz"
+
+    assert_renders "($foo, $bar) $baz"
+    assert_renders "$foo ($bar, $baz)"
+
+    assert_equal "$foo, $bar $baz", render("$foo, ($bar $baz)")
+    assert_equal "$foo $bar, $baz", render("($foo $bar), $baz")
+  end
+
+  def test_concat_operator
+    assert_renders "$foo $bar or $baz"
+    assert_renders "$foo or $bar $baz"
+
+    assert_renders "($foo $bar) or $baz"
+    assert_renders "$foo or ($bar $baz)"
+
+    assert_equal "$foo $bar or $baz", render("$foo ($bar or $baz)")
+    assert_equal "$foo or $bar $baz", render("($foo or $bar) $baz")
+  end
+
+  def self.test_precedence(outer, inner)
+    op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
+    op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]
+    class_eval <<RUBY
+      def test_precedence_#{outer}_#{inner} 
+        assert_renders "$foo #{op_outer} $bar #{op_inner} $baz"
+        assert_renders "$foo #{op_inner} $bar #{op_outer} $baz"
+
+        assert_renders "($foo #{op_outer} $bar) #{op_inner} $baz"
+        assert_renders "$foo #{op_inner} ($bar #{op_outer} $baz)"
+
+        assert_equal "$foo #{op_outer} $bar #{op_inner} $baz",
+          render("$foo #{op_outer} ($bar #{op_inner} $baz)")
+        assert_equal "$foo #{op_inner} $bar #{op_outer} $baz",
+          render("($foo #{op_inner} $bar) #{op_outer} $baz")
+      end
+RUBY
+  end
+
+  test_precedence :or, :and
+  test_precedence :and, :eq
+  test_precedence :and, :neq
+  test_precedence :eq, :gt
+  test_precedence :eq, :gte
+  test_precedence :eq, :lt
+  test_precedence :eq, :lte
+  test_precedence :gt, :plus
+  test_precedence :gt, :minus
+  test_precedence :plus, :times
+  test_precedence :plus, :div
+  test_precedence :plus, :mod
+
+  def test_unary_op
+    assert_renders "-12px"
+    assert_renders '/"foo"'
+    assert_renders 'not true'
+
+    assert_renders "-(foo(12px))"
+    assert_renders "-(-foo(12px))"
+    assert_renders "-(_foo(12px))"
+    assert_renders "-(\xC3\xBFoo(12px))"
+    assert_renders "-(blue)"
+
+    assert_equal 'not true or false', render('(not true) or false')
+    assert_equal 'not (true or false)', render('not (true or false)')
+  end
+
+  private
+
+  def assert_renders(script, options = {})
+    assert_equal(script, render(script, options))
+  end
+
+  def render(script, options = {})
+    munge_filename(options)
+    Sass::Script.parse(script, 1, 0, options).to_sass
+  end
+end