haml 2.2.0 → 2.2.1

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/lib/haml/precompiler.rb

@@ -204,13 +204,13 @@ END
       when ELEMENT; render_tag(text)
       when COMMENT; render_comment(text[1..-1].strip)
       when SANITIZE
-        return push_script(unescape_interpolation(text[3..-1].strip), :escape_html => true) if text[1..2] == "=="
+        return push_plain(text[3..-1].strip, :escape_html => true) if text[1..2] == "=="
         return push_script(text[2..-1].strip, :escape_html => true) if text[1] == SCRIPT
-        return push_script(unescape_interpolation(text[1..-1].strip), :escape_html => true) if text[1] == ?\s
+        return push_flat_script(text[2..-1].strip, :escape_html => true) if text[1] == FLAT_SCRIPT
+        return push_plain(text[1..-1].strip, :escape_html => true) if text[1] == ?\s
         push_plain text
       when SCRIPT
-        return push_script(unescape_interpolation(text[2..-1].strip)) if text[1] == SCRIPT
-        return push_script(text[1..-1], :escape_html => true) if options[:escape_html]
+        return push_plain(text[2..-1].strip) if text[1] == SCRIPT
         push_script(text[1..-1])
       when FLAT_SCRIPT; push_flat_script(text[1..-1])
       when SILENT_SCRIPT
@@ -237,9 +237,10 @@ END
       when FILTER; start_filtered(text[1..-1].downcase)
       when DOCTYPE
         return render_doctype(text) if text[0...3] == '!!!'
-        return push_script(unescape_interpolation(text[3..-1].strip)) if text[1..2] == "=="
-        return push_script(text[2..-1].strip) if text[1] == SCRIPT
-        return push_script(unescape_interpolation(text[1..-1].strip)) if text[1] == ?\s
+        return push_plain(text[3..-1].strip, :escape_html => false) if text[1..2] == "=="
+        return push_script(text[2..-1].strip, :escape_html => false) if text[1] == SCRIPT
+        return push_flat_script(text[2..-1].strip, :escape_html => false) if text[1] == FLAT_SCRIPT
+        return push_plain(text[1..-1].strip, :escape_html => false) if text[1] == ?\s
         push_plain text
       when ESCAPE; push_plain text[1..-1]
       else push_plain text
@@ -306,13 +307,13 @@ END
 
     # Renders a block of text as plain text.
     # Also checks for an illegally opened block.
-    def push_plain(text)
+    def push_plain(text, options = {})
       if block_opened?
         raise SyntaxError.new("Illegal nesting: nesting within plain text is illegal.", @next_line.index)
       end
 
       if contains_interpolation?(text)
-        push_script unescape_interpolation(text)
+        push_script unescape_interpolation(text), :escape_html => options[:escape_html]
       else
         push_text text
       end
@@ -333,6 +334,7 @@ END
     def push_script(text, opts = {})
       raise SyntaxError.new("There's no Ruby code for = to evaluate.") if text.empty?
       return if options[:suppress_eval]
+      opts[:escape_html] = options[:escape_html] if opts[:escape_html].nil?
 
       args = %w[preserve_script in_tag preserve_tag escape_html nuke_inner_whitespace]
       args.map! {|name| opts[name.to_sym]}
@@ -363,11 +365,11 @@ END
 
     # Causes <tt>text</tt> to be evaluated, and Haml::Helpers#find_and_flatten
     # to be run on it afterwards.
-    def push_flat_script(text)
+    def push_flat_script(text, options = {})
       flush_merged_text
 
       raise SyntaxError.new("There's no Ruby code for ~ to evaluate.") if text.empty?
-      push_script(text, :preserve_script => true)
+      push_script(text, options.merge(:preserve_script => true))
     end
 
     def start_haml_comment
@@ -615,7 +617,7 @@ END
         return name, [:dynamic, var]
       end
 
-      re = /((?:\\.|\#[^{]|[^#{quote}\\#])*)(#{quote}|#\{)/
+      re = /((?:\\.|\#[^{]|[^#{quote}\\#])*#?)(#{quote}|#\{)/
       content = []
       loop do
         return false unless scanner.scan(re)
@@ -651,8 +653,9 @@ END
         parse = true
         value = unescape_interpolation(value[1..-1].strip) if value[0] == ?=
       when '&', '!'
-        if value[0] == ?=
+        if value[0] == ?= || value[0] == ?~
           parse = true
+          preserve_script = (value[0] == ?~)
           value =
             if value[1] == ?=
               unescape_interpolation(value[2..-1].strip)

data/lib/sass/engine.rb

@@ -12,7 +12,7 @@ require 'sass/tree/if_node'
 require 'sass/tree/while_node'
 require 'sass/tree/for_node'
 require 'sass/tree/debug_node'
-require 'sass/tree/file_node'
+require 'sass/tree/import_node'
 require 'sass/environment'
 require 'sass/script'
 require 'sass/error'
@@ -227,21 +227,23 @@ END
 
     def build_tree(parent, line, root = false)
       @line = line.index
-      node = parse_line(parent, line, root)
+      node_or_nodes = parse_line(parent, line, root)
 
-      # Node is a symbol if it's non-outputting, like a variable assignment,
-      # or an array if it's a group of nodes to add
-      return node unless node.is_a? Tree::Node
+      Array(node_or_nodes).each do |node|
+        # Node is a symbol if it's non-outputting, like a variable assignment
+        next unless node.is_a? Tree::Node
 
-      node.line = line.index
-      node.filename = line.filename
+        node.line = line.index
+        node.filename = line.filename
 
-      if node.is_a?(Tree::CommentNode)
-        node.lines = line.children
-      else
-        append_children(node, line.children, false)
+        if node.is_a?(Tree::CommentNode)
+          node.lines = line.children
+        else
+          append_children(node, line.children, false)
+        end
       end
-      return node
+
+      node_or_nodes
     end
 
     def append_children(parent, children, root)
@@ -279,7 +281,7 @@ END
         case child
         when Tree::MixinDefNode
           raise SyntaxError.new("Mixins may only be defined at the root of a document.", line.index)
-        when Tree::DirectiveNode, Tree::FileNode
+        when Tree::ImportNode
           raise SyntaxError.new("Import directives may only be used at the root of a document.", line.index)
         end
       end
@@ -365,7 +367,7 @@ END
       # it's a CSS @import rule and we don't want to touch it.
       if directive == "import" && value !~ /^(url\(|")/
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.", @line + 1) unless line.children.empty?
-        import(value)
+        value.split(/,\s*/).map {|f| Tree::ImportNode.new(f)}
       elsif directive == "for"
         parse_for(line, root, value)
       elsif directive == "else"
@@ -470,27 +472,5 @@ END
       offset = options[:offset] || 0
       Script.parse(script, line, offset, @options[:filename])
     end
-
-    def import_paths
-      paths = (@options[:load_paths] || []).dup
-      paths.unshift(File.dirname(@options[:filename])) if @options[:filename]
-      paths
-    end
-
-    def import(files)
-      files.split(/,\s*/).map do |filename|
-        engine = nil
-
-        begin
-          filename = Sass::Files.find_file_to_import(filename, import_paths)
-        rescue Exception => e
-          raise SyntaxError.new(e.message, @line)
-        end
-
-        next Tree::DirectiveNode.new("@import url(#{filename})") if filename =~ /\.css$/
-
-        Tree::FileNode.new(filename)
-      end.flatten
-    end
   end
 end

data/lib/sass/script/lexer.rb

@@ -65,10 +65,11 @@ module Sass
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      def initialize(str, line, offset)
+      def initialize(str, line, offset, filename)
         @scanner = str.is_a?(StringScanner) ? str : StringScanner.new(str)
         @line = line
         @offset = offset
+        @filename = filename
         @prev = nil
       end
 
@@ -158,7 +159,18 @@ module Sass
       end
 
       def op
+        prev_chr = @scanner.string[@scanner.pos - 1].chr
         return unless op = @scanner.scan(REGULAR_EXPRESSIONS[:op])
+        if @prev && op == '-' && prev_chr !~ /\s/ &&
+            [:bool, :ident, :const].include?(@prev.type)
+          warn(<<END)
+DEPRECATION WARNING:
+On line #{@line}, character #{last_match_position}#{" of '#{@filename}'" if @filename}
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+END
+        end
+
         [OPERATORS[op]]
       end
 

data/lib/sass/script/parser.rb

@@ -14,7 +14,7 @@ module Sass
       #   Used for error reporting
       def initialize(str, line, offset, filename = nil)
         @filename = filename
-        @lexer = Lexer.new(str, line, offset)
+        @lexer = Lexer.new(str, line, offset, filename)
       end
 
       # Parses a SassScript expression within an interpolated segment (`#{}`).

data/lib/sass/tree/comment_node.rb

@@ -49,13 +49,14 @@ module Sass::Tree
     # @see #invisible?
     def to_s(tabs = 0, _ = nil)
       return if invisible?
+      spaces = '  ' * (tabs - 1)
 
       content = (value.split("\n") + lines.map {|l| l.text})
+      return spaces + "/* */" if content.empty?
       content.map! {|l| (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '')
       content.last.gsub!(%r{ ?\*/ *$}, '')
 
-      spaces = '  ' * (tabs - 1)
       spaces + "/* " + content.join(style == :compact ? '' : "\n#{spaces} *") + " */"
     end
 

data/lib/sass/tree/directive_node.rb

@@ -5,10 +5,7 @@ module Sass::Tree
   # only CSS directives like `@media` and `@font-face` become {DirectiveNode}s.
   #
   # `@import` is a bit of a weird case;
-  # if it's importing a Sass file,
-  # it becomes a {FileNode},
-  # but if it's importing a plain CSS file,
-  # it becomes a {DirectiveNode}.
+  # it becomes an {ImportNode}.
   #
   # @see Sass::Tree
   class DirectiveNode < Node

data/lib/sass/tree/{file_node.rb → import_node.rb}

@@ -3,10 +3,10 @@ module Sass
     # A static node that wraps the {Sass::Tree} for an `@import`ed file.
     # It doesn't have a functional purpose other than to add the `@import`ed file
     # to the backtrace if an error occurs.
-    class FileNode < Node
-      # @param filename [String] The name of the imported file
-      def initialize(filename)
-        @filename = filename
+    class ImportNode < Node
+      # @param imported_filename [String] The name of the imported file
+      def initialize(imported_filename)
+        @imported_filename = imported_filename
         super()
       end
 
@@ -30,12 +30,36 @@ module Sass
       # @param environment [Sass::Environment] The lexical environment containing
       #   variable and mixin values
       def perform!(environment)
-        self.children = Sass::Files.tree_for(filename, @options).children
+        return unless full_filename = import
+        self.children = Sass::Files.tree_for(full_filename, @options).children
         self.children = perform_children(environment)
       rescue Sass::SyntaxError => e
         e.add_backtrace_entry(@filename)
         raise e
       end
+
+      private
+
+      def import_paths
+        paths = (@options[:load_paths] || []).dup
+        paths.unshift(File.dirname(@options[:filename])) if @options[:filename]
+        paths
+      end
+
+      def import
+        begin
+          full_filename = Sass::Files.find_file_to_import(@imported_filename, import_paths)
+        rescue Exception => e
+          raise SyntaxError.new(e.message, self.line)
+        end
+
+        if full_filename =~ /\.css$/
+          @to_s = "@import url(#{full_filename});"
+          return false
+        end
+
+        return full_filename
+      end
     end
   end
 end

data/test/haml/engine_test.rb

@@ -359,6 +359,72 @@ HTML
 HAML
   end
 
+  def test_escape_html
+    html = <<HTML
+&amp;
+&
+&amp;
+HTML
+
+    assert_equal(html, render(<<HAML, :escape_html => true))
+&= "&"
+!= "&"
+= "&"
+HAML
+
+    assert_equal(html, render(<<HAML, :escape_html => true))
+&~ "&"
+!~ "&"
+~ "&"
+HAML
+
+    assert_equal(html, render(<<HAML, :escape_html => true))
+& \#{"&"}
+! \#{"&"}
+\#{"&"}
+HAML
+
+    assert_equal(html, render(<<HAML, :escape_html => true))
+&== \#{"&"}
+!== \#{"&"}
+== \#{"&"}
+HAML
+
+    tag_html = <<HTML
+<p>&amp;</p>
+<p>&</p>
+<p>&amp;</p>
+HTML
+
+    assert_equal(tag_html, render(<<HAML, :escape_html => true))
+%p&= "&"
+%p!= "&"
+%p= "&"
+HAML
+
+    assert_equal(tag_html, render(<<HAML, :escape_html => true))
+%p&~ "&"
+%p!~ "&"
+%p~ "&"
+HAML
+
+    assert_equal(tag_html, render(<<HAML, :escape_html => true))
+%p& \#{"&"}
+%p! \#{"&"}
+%p \#{"&"}
+HAML
+
+    assert_equal(tag_html, render(<<HAML, :escape_html => true))
+%p&== \#{"&"}
+%p!== \#{"&"}
+%p== \#{"&"}
+HAML
+  end
+
+  def test_new_attrs_with_hash
+    assert_equal("<a href='#'></a>\n", render('%a(href="#")'))
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/sass/engine_test.rb

@@ -126,8 +126,8 @@ class SassEngineTest < Test::Unit::TestCase
                  render("p\n\ta: b\n\tq\n\t\tc: d\n"))
   end
   
-  def test_exceptions
-    EXCEPTION_MAP.each do |key, value|
+  EXCEPTION_MAP.each do |key, value|
+    define_method("test_exception (#{key.inspect})") do
       line = 10
       begin
         Sass::Engine.new(key, :filename => __FILE__, :line => line).render
@@ -790,6 +790,20 @@ CSS
 SASS
   end
 
+  def test_empty_comment
+    assert_equal(<<CSS, render(<<SASS))
+/* */
+a {
+  /* */
+  b: c; }
+CSS
+/*
+a
+  /*
+  b: c
+SASS
+  end
+
   private
   
   def render(sass, options = {})

data/test/sass/plugin_test.rb

@@ -34,7 +34,7 @@ class SassPluginTest < Test::Unit::TestCase
   end
 
   def test_update_needed_when_modified
-    sleep(1)
+    sleep 1
     FileUtils.touch(template_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
     Sass::Plugin.update_stylesheets
@@ -42,7 +42,7 @@ class SassPluginTest < Test::Unit::TestCase
   end
 
   def test_update_needed_when_dependency_modified
-    sleep(1)
+    sleep 1
     FileUtils.touch(template_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
     Sass::Plugin.update_stylesheets
@@ -89,15 +89,6 @@ class SassPluginTest < Test::Unit::TestCase
     assert_renders_correctly('more1_with_line_comments', 'more1', :prefix => 'more_')
   end
 
-  def test_rails_update    
-    File.delete(tempfile_loc('basic'))
-    assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
-
-    ActionController::Base.new.process
-
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
-  end
-
   def test_merb_update
     begin
       require 'merb'
@@ -131,6 +122,21 @@ class SassPluginTest < Test::Unit::TestCase
     assert !File.exists?(tempfile_loc('_partial'))
   end
 
+  ## Regression
+
+  def test_cached_dependencies_update
+    FileUtils.mv(template_loc("basic"), template_loc("basic", "more_"))
+    set_plugin_opts :load_paths => [result_loc, template_loc(nil, "more_")]
+
+    sleep 1
+    FileUtils.touch(template_loc("basic", "more_"))
+    assert Sass::Plugin.stylesheet_needs_update?("import", template_loc, tempfile_loc)
+    Sass::Plugin.update_stylesheets
+    assert_renders_correctly("import")
+  ensure
+    FileUtils.mv(template_loc("basic", "more_"), template_loc("basic"))
+  end
+
  private
 
   def assert_renders_correctly(*arguments)
@@ -191,6 +197,11 @@ class SassPluginTest < Test::Unit::TestCase
       :always_update => true,
     }.merge(overrides)
   end
+
+  def wait_a_tick
+    time = Time.now
+    loop {break if Time.now.sec != time.sec}
+  end
 end
 
 module Sass::Plugin
@@ -207,8 +218,3 @@ class Sass::Engine
     old_render
   end
 end
-
-class ActionController::Base
-  undef :sass_old_process
-  def sass_old_process(*args); end
-end

data/test/sass/script_test.rb

@@ -61,22 +61,22 @@ foo \#{"\\\#{" + "baz"} bang
 SASS
   end
 
-  def test_warning_reporting
+  def test_implicit_string_warning
     assert_warning(<<WARN) {eval("foo")}
 DEPRECATION WARNING:
-On line 1, character 1 of 'test_warning_reporting_inline.sass'
+On line 1, character 1 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {eval("1 + foo")}
 DEPRECATION WARNING:
-On line 1, character 5 of 'test_warning_reporting_inline.sass'
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {render("@if 1 + foo")}
 DEPRECATION WARNING:
-On line 1, character 9 of 'test_warning_reporting_inline.sass'
+On line 1, character 9 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
@@ -84,7 +84,7 @@ WARN
     # Regression
     assert_warning(<<WARN) {render("@if if")}
 DEPRECATION WARNING:
-On line 1, character 5 of 'test_warning_reporting_inline.sass'
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'if' was not quoted. Please add double quotes (e.g. "if").
 WARN
@@ -102,6 +102,24 @@ WARN
     assert_equal "public_instance_methods()", resolve("public_instance_methods()")
   end
 
+  def test_hyphen_warning
+    a = Sass::Script::String.new("a")
+    b = Sass::Script::String.new("b")
+    assert_warning(<<WARN) {eval("!a-!b", {}, env("a" => a, "b" => b))}
+DEPRECATION WARNING:
+On line 1, character 3 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+WARN
+
+    assert_warning(<<WARN) {eval("true-false")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+WARN
+  end
+
   def test_ruby_equality
     assert_equal eval('"foo"'), eval('"foo"')
     assert_equal eval('1'), eval('1.0')

data/test/sass/templates/import.sass

@@ -3,7 +3,7 @@
 =premixin
   pre-mixin: here
 
-@import importee, basic, basic.css, ../results/complex.css, partial
+@import importee.sass, basic.sass, basic.css, ../results/complex.css, partial.sass
 
 nonimported
   :myconst = !preconst

data/test/test_helper.rb

@@ -7,6 +7,8 @@ $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'haml'
 require 'sass'
 
+Sass::RAILS_LOADED = true
+
 # required because of Sass::Plugin
 unless defined? RAILS_ROOT
   RAILS_ROOT = '.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-06 00:00:00 -07:00
+date: 2009-07-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ files:
 - lib/sass/tree/node.rb
 - lib/sass/tree/for_node.rb
 - lib/sass/tree/debug_node.rb
+- lib/sass/tree/import_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/mixin_node.rb
 - lib/sass/tree/directive_node.rb
-- lib/sass/tree/file_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/variable_node.rb