haml 3.0.13 → 3.0.14

data/VERSION

@@ -1 +1 @@
-3.0.13
+3.0.14

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 3.0.13
+;; Version: 3.0.14
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html
@@ -57,13 +57,6 @@ re-indented along with the line itself."
   :type 'boolean
   :group 'haml)
 
-(defface haml-tab-face
-  '((((class color)) (:background "hotpink"))
-    (t (:reverse-video t)))
-  "Face to use for highlighting tabs in Haml files."
-  :group 'faces
-  :group 'haml)
-
 (defvar haml-indent-function 'haml-indent-p
   "A function for checking if nesting is allowed.
 This function should look at the current line and return t
@@ -73,19 +66,19 @@ The function can also return a positive integer to indicate
 a specific level to which the current line could be indented.")
 
 (defconst haml-tag-beg-re
-  "^ *\\(?:[%\\.#][a-z0-9_:\\-]*\\)+\\(?:(.*)\\|{.*}\\|\\[.*\\]\\)*"
+  "^[ \t]*\\(?:[%\\.#][a-z0-9_:\\-]*\\)+\\(?:(.*)\\|{.*}\\|\\[.*\\]\\)*"
   "A regexp matching the beginning of a Haml tag, through (), {}, and [].")
 
 (defvar haml-block-openers
   `(,(concat haml-tag-beg-re "[><]*[ \t]*$")
-    "^ *[&!]?[-=~].*do[ \t]*\\(|.*|[ \t]*\\)?$"
-    ,(concat "^ *[&!]?[-=~][ \t]*\\("
+    "^[ \t]*[&!]?[-=~].*do[ \t]*\\(|.*|[ \t]*\\)?$"
+    ,(concat "^[ \t]*[&!]?[-=~][ \t]*\\("
              (regexp-opt '("if" "unless" "while" "until" "else"
                            "begin" "elsif" "rescue" "ensure" "when"))
              "\\)")
-    "^ */\\(\\[.*\\]\\)?[ \t]*$"
-    "^ *-#"
-    "^ *:")
+    "^[ \t]*/\\(\\[.*\\]\\)?[ \t]*$"
+    "^[ \t]*-#"
+    "^[ \t]*:")
   "A list of regexps that match lines of Haml that open blocks.
 That is, a Haml line that can have text nested beneath it should
 be matched by a regexp in this list.")
@@ -95,7 +88,7 @@ be matched by a regexp in this list.")
 (defun haml-nested-regexp (re)
   "Create a regexp to match a block starting with RE.
 The line containing RE is matched, as well as all lines indented beneath it."
-  (concat "^\\( *\\)" re "\\(\n\\(?:\\(?:\\1 .*\\| *\\)\n\\)*\\(?:\\1 .*\\| *\\)?\\)?"))
+  (concat "^\\([ \t]*\\)" re "\\(\n\\(?:\\(?:\\1 .*\\| *\\)\n\\)*\\(?:\\1 .*\\| *\\)?\\)?"))
 
 (defconst haml-font-lock-keywords
   `((,(haml-nested-regexp "\\(?:-#\\|/\\).*")  0 font-lock-comment-face)
@@ -108,12 +101,11 @@ The line containing RE is matched, as well as all lines indented beneath it."
     (haml-highlight-interpolation         1 font-lock-variable-name-face prepend)
     (haml-highlight-ruby-tag              1 font-lock-preprocessor-face)
     (haml-highlight-ruby-script           1 font-lock-preprocessor-face)
-    ("^ *\\(\t\\)"                        1 'haml-tab-face)
     ("^!!!.*"                             0 font-lock-constant-face)
     ("| *$"                               0 font-lock-string-face)))
 
-(defconst haml-filter-re "^ *:\\w+")
-(defconst haml-comment-re "^ *\\(?:-\\#\\|/\\)")
+(defconst haml-filter-re "^[ \t]*:\\w+")
+(defconst haml-comment-re "^[ \t]*\\(?:-\\#\\|/\\)")
 
 (defun haml-fontify-region (beg end keywords syntax-table syntactic-keywords)
   "Fontify a region between BEG and END using another mode's fontification.
@@ -208,7 +200,7 @@ This requires that `markdown-mode' be available."
 (defun haml-highlight-ruby-script (limit)
   "Highlight a Ruby script expression (-, =, or ~).
 LIMIT works as it does in `re-search-forward'."
-  (when (re-search-forward "^ *\\(-\\|[&!]?[=~]\\) \\(.*\\)$" limit t)
+  (when (re-search-forward "^[ \t]*\\(-\\|[&!]?[=~]\\) \\(.*\\)$" limit t)
     (haml-fontify-region-as-ruby (match-beginning 2) (match-end 2))))
 
 (defun haml-highlight-ruby-tag (limit)
@@ -223,7 +215,7 @@ For example, this will highlight all of the following:
   %p[@bar]
   %p= 'baz'
   %p{:foo => 'bar'}[@bar]= 'baz'"
-  (when (re-search-forward "^ *[%.#]" limit t)
+  (when (re-search-forward "^[ \t]*[%.#]" limit t)
     (forward-char -1)
 
     ;; Highlight tag, classes, and ids
@@ -407,7 +399,6 @@ With ARG, do it that many times."
   (set (make-local-variable 'indent-region-function) 'haml-indent-region)
   (set (make-local-variable 'parse-sexp-lookup-properties) t)
   (setq comment-start "-#")
-  (setq indent-tabs-mode nil)
   (setq font-lock-defaults '((haml-font-lock-keywords) t t)))
 
 ;; Useful functions
@@ -620,18 +611,18 @@ TYPE is the type of text parsed ('name or 'value)
 and BEG and END delimit that text in the buffer."
   (let ((eol (save-excursion (end-of-line) (point))))
     (while (not (haml-move ")"))
-      (haml-move " *")
+      (haml-move "[ \t]*")
       (unless (haml-move "[a-z0-9_:\\-]+")
-        (return-from haml-parse-new-attr-hash (haml-move " *$")))
+        (return-from haml-parse-new-attr-hash (haml-move "[ \t]*$")))
       (funcall fn 'name (match-beginning 0) (match-end 0))
-      (haml-move " *")
+      (haml-move "[ \t]*")
       (when (haml-move "=")
-        (haml-move " *")
+        (haml-move "[ \t]*")
         (unless (looking-at "[\"'@a-z]") (return-from haml-parse-new-attr-hash))
         (let ((beg (point)))
           (haml-limited-forward-sexp eol)
           (funcall fn 'value beg (point)))
-        (haml-move " *")))
+        (haml-move "[ \t]*")))
     nil))
 
 (defun haml-compute-indentation ()
@@ -704,10 +695,19 @@ back-dent the line by `haml-indent-offset' spaces.  On reaching column
   "Add N spaces to the beginning of each line in the region.
 If N is negative, will remove the spaces instead.  Assumes all
 lines in the region have indentation >= that of the first line."
-  (let ((ci (current-indentation)))
+  (let* ((ci (current-indentation))
+         (indent-rx
+          (concat "^"
+                  (if indent-tabs-mode
+                      (concat (make-string (/ ci tab-width) ?\t)
+                              (make-string (mod ci tab-width) ?\t))
+                    (make-string ci ?\s)))))
     (save-excursion
-      (while (re-search-forward (concat "^" (make-string ci ?\s)) (mark) t)
-        (replace-match (make-string (max 0 (+ ci n)) ?\s))))))
+      (while (re-search-forward indent-rx (mark) t)
+        (let ((ci (current-indentation)))
+          (delete-horizontal-space)
+          (beginning-of-line)
+          (indent-to (max 0 (+ ci n))))))))
 
 (defun haml-electric-backspace (arg)
   "Delete characters or back-dent the current line.
@@ -730,8 +730,8 @@ the current line."
             (haml-mark-sexp-but-not-next-line)
           (set-mark (save-excursion (end-of-line) (point))))
         (haml-reindent-region-by (* (- arg) haml-indent-offset))
-        (back-to-indentation)
-        (pop-mark)))))
+        (pop-mark)))
+    (back-to-indentation)))
 
 (defun haml-kill-line-and-indent ()
   "Kill the current line, and re-indent all lines nested beneath it."

data/extra/sass-mode.el

@@ -4,11 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 3.0.13
+;; Version: 3.0.14
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
-;; Package-Requires: ((haml-mode "3.0.13"))
+;; Package-Requires: ((haml-mode "3.0.14"))
 
 ;;; Commentary:
 

data/lib/haml/exec.rb

@@ -1,6 +1,5 @@
 require 'optparse'
 require 'fileutils'
-require 'rbconfig'
 
 module Haml
   # This module handles the various Haml executables (`haml`, `sass`, `sass-convert`, etc).
@@ -80,7 +79,7 @@ module Haml
           @options[:trace] = true
         end
 
-        if RbConfig::CONFIG['host_os'] =~ /mswin|windows/i
+        if ::Haml::Util.windows?
           opts.on('--unix-newlines', 'Use Unix-style newlines in written files.') do
             @options[:unix_newlines] = true
           end
@@ -338,9 +337,9 @@ END
       # and runs the Sass compiler appropriately.
       def process_result
         if !@options[:update] && !@options[:watch] &&
-            @args.first && @args.first.include?(':')
+            @args.first && colon_path?(@args.first)
           if @args.size == 1
-            @args = @args.first.split(':', 2)
+            @args = split_colon_path(@args.first)
           else
             @options[:update] = true
           end
@@ -389,7 +388,10 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
-        if @args[1] && !@args[0].include?(':')
+        p [colon_path?(@args[0]), split_colon_path(@args[0])]
+        exit
+
+        if @args[1] && !colon_path?(@args[0])
           flag = @options[:update] ? "--update" : "--watch"
           err =
             if !File.exist?(@args[1])
@@ -403,7 +405,7 @@ File #{@args[1]} #{err}.
 MSG
         end
 
-        dirs, files = @args.map {|name| name.split(':', 2)}.
+        dirs, files = @args.map {|name| split_colon_path(name)}.
           partition {|i, _| File.directory? i}
         files.map! {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}
         dirs.map! {|from, to| [from, to || from]}
@@ -437,6 +439,22 @@ MSG
 
         ::Sass::Plugin.watch(files)
       end
+
+      def colon_path?(path)
+        !split_colon_path(path)[1].nil?
+      end
+
+      def split_colon_path(path)
+        one, two = path.split(':', 2)
+        if one && two && #::Haml::Util.windows? &&
+            one =~ /\A[A-Za-z]\Z/ && two =~ /\A[\/\\]/
+          # If we're on Windows and we were passed a drive letter path,
+          # don't split on that colon.
+          one2, two = two.split(':', 2)
+          one = one + ':' + one2
+        end
+        return one, two
+      end
     end
 
     # The `haml` executable.

data/lib/haml/helpers/action_view_mods.rb

@@ -107,9 +107,9 @@ module ActionView
           return content_tag_without_haml(name, *args) {preserve(&block)}
         end
 
-        returning content_tag_without_haml(name, *args, &block) do |content|
-          return Haml::Helpers.preserve(content) if preserve && content
-        end
+        content = content_tag_without_haml(name, *args, &block)
+        content = Haml::Helpers.preserve(content) if preserve && content
+        content
       end
 
       alias_method :content_tag_without_haml, :content_tag

data/lib/haml/precompiler.rb

@@ -242,29 +242,20 @@ END
         # Handle stuff like - end.join("|")
         @to_close_stack.last << false if text =~ /^-\s*end\b/ && !block_opened?
 
-        case_stmt = text =~ /^-\s*case\b/
         keyword = mid_block_keyword?(text)
         block = block_opened? && !keyword
 
         # It's important to preserve tabulation modification for keywords
         # that involve choosing between posible blocks of code.
         if %w[else elsif when].include?(keyword)
-          # @to_close_stack may not have a :script on top
-          # when the preceding "- if" has nothing nested
-          if @to_close_stack.last && @to_close_stack.last.first == :script
-            @dont_indent_next_line, @dont_tab_up_next_text = @to_close_stack.last[1..2]
-          else
-            push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
-          end
+          @dont_indent_next_line, @dont_tab_up_next_text = @to_close_stack.last[1..2]
 
           # when is unusual in that either it will be indented twice,
           # or the case won't have created its own indentation
           if keyword == "when"
             push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text, false])
           end
-        elsif block || case_stmt
-          push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
-        elsif block && case_stmt
+        elsif block || text =~ /^-\s*(case|if)\b/
           push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
         end
       when FILTER; start_filtered(text[1..-1].downcase)
@@ -491,7 +482,7 @@ END
     # that can then be merged with another attributes hash.
     def self.parse_class_and_id(list)
       attributes = {}
-      list.scan(/([#.])([-_a-zA-Z0-9]+)/) do |type, property|
+      list.scan(/([#.])([-:_a-zA-Z0-9]+)/) do |type, property|
         case type
         when '.'
           if attributes['class']
@@ -573,7 +564,7 @@ END
 
     # Parses a line into tag_name, attributes, attributes_hash, object_ref, action, value
     def parse_tag(line)
-      raise SyntaxError.new("Invalid tag: \"#{line}\".") unless match = line.scan(/%([-:\w]+)([-\w\.\#]*)(.*)/)[0]
+      raise SyntaxError.new("Invalid tag: \"#{line}\".") unless match = line.scan(/%([-:\w]+)([-:\w\.\#]*)(.*)/)[0]
       tag_name, attributes, rest = match
       new_attributes_hash = old_attributes_hash = last_line = object_ref = nil
       attributes_hashes = []

data/lib/haml/util.rb

@@ -3,6 +3,8 @@ require 'set'
 require 'enumerator'
 require 'stringio'
 require 'strscan'
+require 'rbconfig'
+
 require 'haml/root'
 require 'haml/util/subset_map'
 
@@ -366,6 +368,15 @@ module Haml
       return ActionView::SafeBuffer
     end
 
+    ## Cross-OS Compatibility
+
+    # Whether or not this is running on Windows.
+    #
+    # @return [Boolean]
+    def windows?
+      RbConfig::CONFIG['host_os'] =~ /mswin|windows/i
+    end
+
     ## Cross-Ruby-Version Compatibility
 
     # Whether or not this is running under Ruby 1.8 or lower.

data/lib/sass/plugin.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'rbconfig'
 
 require 'sass'
 require 'sass/plugin/configuration'
@@ -76,7 +75,7 @@ module Sass
 
       template_location_array.each do |template_location, css_location|
 
-        Dir.glob(File.join(template_location, "**", "*.s[ca]ss")).each do |file|
+        Dir.glob(File.join(template_location, "**", "*.s[ca]ss")).sort.each do |file|
           # Get the relative path to the file
           name = file.sub(template_location.sub(/\/*$/, '/'), "")
           css = css_filename(name, css_location)
@@ -228,7 +227,7 @@ module Sass
 
       # Finally, write the file
       flag = 'w'
-      flag = 'wb' if RbConfig::CONFIG['host_os'] =~ /mswin|windows/i && options[:unix_newlines]
+      flag = 'wb' if Haml::Util.windows? && options[:unix_newlines]
       File.open(css, flag) {|file| file.print(result)}
     end
 

data/lib/sass/scss/parser.rb

@@ -179,19 +179,33 @@ module Sass
         expr = sass_script(:parse)
         ss
         node = block(node(Sass::Tree::IfNode.new(expr)), :directive)
+        pos = @scanner.pos
         ss
-        else_block(node)
+
+        else_block(node) ||
+          begin
+            # Backtrack in case there are any comments we want to parse
+            @scanner.pos = pos
+            node
+          end
       end
 
       def else_block(node)
-        return node unless tok(/@else/)
+        return unless tok(/@else/)
         ss
         else_node = block(
           Sass::Tree::IfNode.new((sass_script(:parse) if tok(/if/))),
           :directive)
         node.add_else(else_node)
+        pos = @scanner.pos
         ss
-        else_block(node)
+
+        else_block(node) ||
+          begin
+            # Backtrack in case there are any comments we want to parse
+            @scanner.pos = pos
+            node
+          end
       end
 
       def extend_directive

data/test/haml/engine_test.rb

@@ -165,6 +165,14 @@ MESSAGE
     assert_equal("<p id='html_a_b'>foo</p>\n", render("%p(id='html'){:id => %w[a b]} foo")) # html attrs
   end
 
+  def test_colon_in_class_attr
+    assert_equal("<p class='foo:bar' />\n", render("%p.foo:bar/"))
+  end
+
+  def test_colon_in_id_attr
+    assert_equal("<p id='foo:bar' />\n", render("%p#foo:bar/"))
+  end
+
   def test_dynamic_attributes_with_no_content
     assert_equal(<<HTML, render(<<HAML))
 <p>
@@ -660,6 +668,15 @@ HTML
 - else
   foo
 HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+foo
+HTML
+- if true
+  - if false
+  - else
+    foo
+HAML
   end
 
   def test_html_attributes_with_hash

data/test/haml/helper_test.rb

@@ -180,6 +180,10 @@ HAML
     assert_equal("<p id='some_id'></p>\n", render("- haml_tag 'p#some_id'"))
   end
 
+  def test_haml_tag_name_attribute_with_colon_id
+    assert_equal("<p id='some:id'></p>\n", render("- haml_tag 'p#some:id'"))
+  end
+
   def test_haml_tag_without_name_but_with_id
     assert_equal("<div id='some_id'></div>\n", render("- haml_tag '#some_id'"))
   end
@@ -188,6 +192,10 @@ HAML
     assert_equal("<div class='foo'></div>\n", render("- haml_tag '.foo'"))
   end
 
+  def test_haml_tag_without_name_but_with_colon_class
+    assert_equal("<div class='foo:bar'></div>\n", render("- haml_tag '.foo:bar'"))
+  end
+
   def test_haml_tag_name_with_id_and_class
     assert_equal("<p class='foo' id='some_id'></p>\n", render("- haml_tag 'p#some_id.foo'"))
   end

data/test/sass/scss/scss_test.rb

@@ -190,6 +190,32 @@ CSS
 SCSS
   end
 
+  def test_comment_after_if_directive
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: b;
+  /* This is a comment */
+  c: d; }
+CSS
+foo {
+  @if true {a: b}
+  /* This is a comment */
+  c: d }
+SCSS
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  a: b;
+  /* This is a comment */
+  c: d; }
+CSS
+foo {
+  @if true {a: b}
+  @else {x: y}
+  /* This is a comment */
+  c: d }
+SCSS
+  end
+
   def test_while_directive
     assert_equal <<CSS, render(<<SCSS)
 .foo {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 0
-  - 13
-  version: 3.0.13
+  - 14
+  version: 3.0.14
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency