haml 3.0.0.beta.1 → 3.0.0.beta.2

data/lib/sass/tree/variable_node.rb

@@ -17,7 +17,7 @@ module Sass
       protected
 
       def to_src(tabs, opts, fmt)
-        "#{'  ' * tabs}$#{@name}: #{@expr.to_sass}#{' !default' if @guarded}#{semi fmt}\n"
+        "#{'  ' * tabs}$#{dasherize(@name, opts)}: #{@expr.to_sass(opts)}#{' !default' if @guarded}#{semi fmt}\n"
       end
 
       # Loads the new variable value into the environment.

data/lib/sass/tree/warn_node.rb

@@ -0,0 +1,41 @@
+module Sass
+  module Tree
+    # A dynamic node representing a Sass `@warn` statement.
+    #
+    # @see Sass::Tree
+    class WarnNode < Node
+      # @param expr [Script::Node] The expression to print
+      def initialize(expr)
+        @expr = expr
+        super()
+      end
+
+      protected
+
+      def to_src(tabs, opts, fmt)
+        "#{'  ' * tabs}@warn #{@expr.to_sass(opts)}#{semi fmt}\n"
+      end
+
+      # Prints the expression to STDERR with a stylesheet trace.
+      #
+      # @param environment [Sass::Environment] The lexical environment containing
+      #   variable and mixin values
+      def _perform(environment)
+        environment.push_frame(:filename => filename, :line => line)
+        res = @expr.perform(environment)
+        res = res.value if res.is_a?(Sass::Script::String)
+        msg = "WARNING: #{res}\n"
+        environment.stack.reverse.each_with_index do |entry, i|
+          msg << "        #{i == 0 ? "on" : "from"} line #{entry[:line]}" <<
+            " of #{entry[:filename] || "an unknown file"}"
+          msg << ", in `#{entry[:mixin]}'" if entry[:mixin]
+          msg << "\n"
+        end
+        Haml::Util.haml_warn msg
+        []
+      ensure
+        environment.pop_frame
+      end
+    end
+  end
+end

data/lib/sass/tree/while_node.rb

@@ -14,7 +14,7 @@ module Sass::Tree
     protected
 
     def to_src(tabs, opts, fmt)
-      "#{'  ' * tabs}@while #{@expr.to_sass}" + children_to_src(tabs, opts, fmt)
+      "#{'  ' * tabs}@while #{@expr.to_sass(opts)}" + children_to_src(tabs, opts, fmt)
     end
 
     # Runs the child nodes until the continue expression becomes false.

data/test/haml/engine_test.rb

@@ -671,6 +671,15 @@ HAML
     assert_equal("<a href='#\"'></a>\n", render('%a(href="#\\"")'))
   end
 
+  def test_filter_with_newline_and_interp
+    assert_equal(<<HTML, render(<<HAML))
+\\n
+HTML
+:plain
+  \\n\#{""}
+HAML
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/sass/conversion_test.rb

@@ -251,9 +251,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // foo
-   bar
-     baz
-   bang
+// bar
+//   baz
+// bang
 
 foo bar
   a: b
@@ -309,9 +309,9 @@ SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
 /* foo
-   bar
-     baz
-   bang
+ * bar
+ *   baz
+ * bang
 
 foo bar
   a: b
@@ -337,9 +337,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 /* foo
-   bar
-     baz
-   bang
+ * bar
+ *   baz
+ * bang
 
 foo bar
   a: b
@@ -358,8 +358,8 @@ SCSS
     assert_scss_to_sass <<SASS, <<SCSS
 foo
   /*      foo
-     bar
-         baz
+   * bar
+   *     baz
   a: b
 SASS
 foo {
@@ -387,8 +387,8 @@ SASS
   def test_immediately_preceding_comments
     assert_renders <<SASS, <<SCSS
 /* Foo
-   Bar
-   Baz
+ * Bar
+ * Baz
 .foo#bar
   a: b
 SASS
@@ -401,8 +401,8 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // Foo
-   Bar
-   Baz
+// Bar
+// Baz
 =foo
   a: b
 SASS
@@ -777,6 +777,71 @@ SCSS
     assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
+  # Hacks
+
+  def test_declaration_hacks
+    assert_renders <<SASS, <<SCSS
+foo
+  _name: val
+  *name: val
+  #name: val
+  .name: val
+  name: val
+SASS
+foo {
+  _name: val;
+  *name: val;
+  #name: val;
+  .name: val;
+  name: val; }
+SCSS
+  end
+
+  def test_old_declaration_hacks
+    assert_renders <<SASS, <<SCSS, :old => true
+foo
+  :_name val
+  :*name val
+  :#name val
+  :.name val
+  :name val
+SASS
+foo {
+  _name: val;
+  *name: val;
+  #name: val;
+  .name: val;
+  name: val; }
+SCSS
+  end
+
+  def test_selector_hacks
+    assert_selector_renders = lambda do |s|
+      assert_renders <<SASS, <<SCSS
+#{s}
+  a: b
+SASS
+#{s} {
+  a: b; }
+SCSS
+    end
+
+    assert_selector_renders['> E']
+    assert_selector_renders['+ E']
+    assert_selector_renders['~ E']
+    assert_selector_renders['>> E']
+
+    assert_selector_renders['E*']
+    assert_selector_renders['E*.foo']
+    assert_selector_renders['E*:hover']
+  end
+
+  def test_disallowed_colon_hack
+    assert_raise(Sass::SyntaxError, '":foo: bar" is not allowed in the Sass syntax') do
+      to_sass("foo {:name: val;}", :syntax => :scss)
+    end
+  end
+
   # Sass 3 Deprecation conversions
 
   def test_simple_quoted_strings_unquoted_with_equals
@@ -833,6 +898,53 @@ foo
 SASS
   end
 
+  def test_nested_properties
+    assert_renders <<SASS, <<SCSS
+div
+  before: before
+  background:
+    color: blue
+    repeat: no-repeat
+  after: after
+SASS
+div {
+  before: before;
+  background: {
+    color: blue;
+    repeat: no-repeat; };
+  after: after; }
+
+SCSS
+  end
+
+  def test_dasherize
+    assert_sass_to_scss(<<SCSS, <<SASS, :dasherize => true)
+@mixin under-scored-mixin($under-scored-arg: $under-scored-default) {
+  bar: $under-scored-arg; }
+
+div {
+  foo: under-scored-fn($under-scored-var + "before\#{$another-under-scored-var}after");
+  @include under-scored-mixin($passed-arg);
+  selector-\#{$under-scored-interp}: bold; }
+
+@if $under-scored {
+  @for $for-var from $from-var to $to-var {
+    @while $while-var == true {
+      $while-var: false; } } }
+SCSS
+=under_scored_mixin($under_scored_arg: $under_scored_default)
+  bar: $under_scored_arg
+div
+  foo: under_scored_fn($under_scored_var + "before\#{$another_under_scored_var}after")
+  +under_scored_mixin($passed_arg)
+  selector-\#{$under_scored_interp}: bold
+@if $under_scored
+  @for $for_var from $from_var to $to_var
+    @while $while_var == true
+      $while_var : false
+SASS
+  end
+
   private
 
   def assert_sass_to_sass(sass, options = {})

data/test/sass/css2sass_test.rb

@@ -105,20 +105,20 @@ elephant.rawr
   rampages: excessively
 
 /* actual multiline
-  comment
+ *comment
 
 span.turkey
   isdinner: true
 
 .turducken
   /* Sounds funny
-     doesn't it
+   * doesn't it
   chimera: not_really
 
 #overhere
   bored: sorta
   /*                  it's for a good
-     cause
+   * cause
   better_than: thread_pools
 
 #one_more
@@ -237,6 +237,37 @@ SASS
 CSS
   end
 
+  # Regressions
+
+  def test_nesting_within_media
+    assert_equal(<<SASS, css2sass(<<CSS))
+@media all
+  .next .vevent
+    padding-left: 0
+    padding-right: 0
+SASS
+@media all {
+  .next .vevent {
+    padding-left: 0;
+    padding-right: 0; } }
+CSS
+  end
+
+  def test_multiline_selector_within_media_and_with_child_selector
+    assert_equal(<<SASS, css2sass(<<CSS))
+@media all
+  foo bar, baz
+    padding-left: 0
+    padding-right: 0
+SASS
+@media all {
+  foo bar,
+  baz {
+    padding-left: 0;
+    padding-right: 0; } }
+CSS
+  end
+
   # Error reporting
 
   def test_error_reporting

data/test/sass/engine_test.rb

@@ -81,10 +81,10 @@ MSG
     "a\n  b: c\na\n    d: e" => ["The line was indented 2 levels deeper than the previous line.", 4],
     "a\n  b: c\n  a\n        d: e" => ["The line was indented 3 levels deeper than the previous line.", 4],
     "a\n \tb: c" => ["Indentation can't use both tabs and spaces.", 2],
-    "=a(" => 'Invalid CSS after "(": expected ")", was ""',
-    "=a(b)" => 'Invalid CSS after "(": expected ")", was "b)"',
-    "=a(,)" => 'Invalid CSS after "(": expected ")", was ",)"',
-    "=a(!)" => 'Invalid CSS after "(": expected ")", was "!)"',
+    "=a(" => 'Invalid CSS after "(": expected variable (e.g. $foo), was ""',
+    "=a(b)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was "b)"',
+    "=a(,)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was ",)"',
+    "=a($)" => 'Invalid CSS after "(": expected variable (e.g. $foo), was "$)"',
     "=a($foo bar)" => 'Invalid CSS after "($foo ": expected ")", was "bar)"',
     "=foo\n  bar: baz\n+foo" => ["Properties aren't allowed at the root of a document.", 2],
     "a-\#{$b\n  c: d" => ['Invalid CSS after "a-#{$b": expected "}", was ""', 1],
@@ -107,6 +107,9 @@ MSG
     '@if' => "Invalid if directive '@if': expected expression.",
     '@while' => "Invalid while directive '@while': expected expression.",
     '@debug' => "Invalid debug directive '@debug': expected expression.",
+    %Q{@debug "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath debug directives.",
+    '@warn' => "Invalid warn directive '@warn': expected expression.",
+    %Q{@warn "a message"\n  "nested message"} => "Illegal nesting: Nothing may be nested beneath warn directives.",
     "/* foo\n    bar\n  baz" => "Inconsistent indentation: previous line was indented by 4 spaces, but this line was indented by 2 spaces.",
 
     # Regression tests
@@ -937,7 +940,7 @@ SASS
   def test_equals_warning_for_mixin_args
     assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SASS))}
 DEPRECATION WARNING:
-On line 1, character 6 of 'test_equals_warning_for_mixin_args_inline.sass'
+On line 1, character 10 of 'test_equals_warning_for_mixin_args_inline.sass'
 Setting mixin argument defaults with = has been deprecated and will be removed in version 3.2.
 Use "$arg: 1px" instead.
 
@@ -1301,6 +1304,18 @@ foo {
 CSS
   end
 
+  def test_loud_comments_with_starred_lines
+    assert_equal(<<CSS, render(<<SASS))
+/* This is a comment that
+ * continues to the second line.
+ * And even to the third! */
+CSS
+/* This is a comment that
+ * continues to the second line.
+ * And even to the third!
+SASS
+  end
+
   def test_comment_indentation_at_beginning_of_doc
     assert_equal <<CSS, render(<<SASS)
 /* foo
@@ -1709,6 +1724,58 @@ SASS
     end
   end
 
+  def test_warn_directive
+  expected_warning = <<EXPECTATION
+WARNING: this is a warning
+        on line 4 of test_warn_directive_inline.sass
+
+WARNING: this is a mixin warning
+        on line 2 of test_warn_directive_inline.sass, in `foo'
+        from line 7 of test_warn_directive_inline.sass
+EXPECTATION
+    assert_warning expected_warning do
+      assert_equal <<CSS, render(<<SASS)
+bar {
+  c: d; }
+CSS
+=foo
+  @warn "this is a mixin warning"
+
+@warn "this is a warning"
+bar
+  c: d
+  +foo
+SASS
+    end
+  end
+
+  def test_warn_directive_when_quiet
+    assert_warning "" do
+      assert_equal <<CSS, render(<<SASS, :quiet => true)
+CSS
+@warn "this is a warning"
+SASS
+    end
+  end
+
+  def test_warn_with_imports
+    expected_warning = <<WARN
+WARNING: In the main file
+        on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+
+WARNING: Imported
+        on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
+        from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+
+WARNING: In an imported mixin
+        on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
+        from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+WARN
+    assert_warning expected_warning do
+      renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]
+    end
+  end
+
   # Regression tests
 
   def test_parens_in_mixins
@@ -1834,6 +1901,15 @@ a
 SASS
   end
 
+  def test_mixin_no_arg_error
+    assert_raise(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable name, was ")"') do
+      render(<<SASS)
+=foo($bar,)
+  bip: bap
+SASS
+    end
+  end
+
   # Encodings
 
   unless Haml::Util.ruby1_8?
@@ -1891,3 +1967,4 @@ SASS
     Sass::Files.send(:sassc_filename, sassc_path, Sass::Engine::DEFAULT_OPTIONS)
   end
 end
+