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

data/README.md

@@ -38,7 +38,7 @@ Sass is a little more complicated;
 where they'll be automatically compiled
 to corresponding CSS files in `public/stylesheets` when needed
 (the Sass template directory is customizable...
-see [the Sass reference](http://sass-lang.com/docs/yardoc/SASS_REFERENCE.md.html#template_location-option) for details).
+see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
 
 For Merb, `.html.haml` views will work without any further modification.
 To enable Sass, you also need to add a dependency.
@@ -129,7 +129,7 @@ like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here.
-Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.md)
+Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
 for full details.
 
 #### Indentation
@@ -151,10 +151,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#variables_
-[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#nested_rules_
+[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
+[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
 [mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
-[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#import
+[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -163,7 +163,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#syntax
+[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -232,7 +232,7 @@ You can even give them arguments.
     }
 
 A comprehensive list of features is available
-in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md).
+in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
 
 ## Executables
 

data/REMEMBER

@@ -7,6 +7,7 @@ Don't conflict with Object#extend.
 http://camendesign.com/design/ provides some interesting formatting and nesting issues for sass-convert
 Charles Roper's example code for media queries doesn't fare well in css2sass either
 
-Handle unicode escapes (and other escapes?) gracefully in script idents with sass-convert
 Add period to SCSS syntax errors?
 Better #{} in prop names
+Faster than Less
+Comma multiline for Haml

data/Rakefile

@@ -70,7 +70,7 @@ at_exit { File.delete(scope('REVISION')) rescue nil }
 
 desc "Install Haml as a gem."
 task :install => [:package] do
-  sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
+  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
   sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
@@ -191,14 +191,16 @@ task :release_edge do
     sh %{git merge origin/master}
 
     # Get the current master branch version
-    version = File.read(scope('VERSION')).strip.split('.').map {|n| n.to_i}
-    unless version[1] % 2 == 1 && version[2] == 0
+    version = File.read(scope('VERSION')).strip.split('.')
+    pr = version[3]
+    version = version.map {|n| n.to_i}
+    unless pr || (version[1] % 2 == 1 && version[2] == 0)
       raise "#{version.join('.')} is not a development version" 
     end
 
     # Bump the edge gem version
     edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
-    if edge_version[0..1] != version[0..1]
+    if !pr && (edge_version[0..1] != version[0..1])
       # A new master branch version was released, reset the edge gem version
       edge_version[0..1] = version[0..1]
       edge_version[2] = 0

data/VERSION

@@ -1 +1 @@
-3.0.0.beta.1
+3.0.0.beta.2

data/lib/haml/exec.rb

@@ -15,14 +15,11 @@ module Haml
 
       # Parses the command-line arguments and runs the executable.
       # Calls `Kernel#exit` at the end, so it never returns.
+      #
+      # @see #parse
       def parse!
         begin
-          @opts = OptionParser.new(&method(:set_opts))
-          @opts.parse!(@args)
-
-          process_result
-
-          @options
+          parse
         rescue Exception => e
           raise e if @options[:trace] || e.is_a?(SystemExit)
 
@@ -32,6 +29,19 @@ module Haml
         exit 0
       end
 
+      # Parses the command-line arguments and runs the executable.
+      # This does not handle exceptions or exit the program.
+      #
+      # @see #parse!
+      def parse
+        @opts = OptionParser.new(&method(:set_opts))
+        @opts.parse!(@args)
+
+        process_result
+
+        @options
+      end
+
       # @return [String] A description of the executable
       def to_s
         @opts.to_s
@@ -105,6 +115,39 @@ module Haml
         @options[:input], @options[:output] = input, output
       end
 
+      # @private
+      COLORS = { :red => 31, :green => 32, :yellow => 33 }
+
+      # Prints a status message about performing the given action,
+      # colored using the given color (via terminal escapes) if possible.
+      #
+      # @param name [#to_s] A short name for the action being performed.
+      #   Shouldn't be longer than 11 characters.
+      # @param color [Symbol] The name of the color to use for this action.
+      #   Can be `:red`, `:green`, or `:yellow`.
+      def puts_action(name, color, arg)
+        printf color(color, "%11s %s\n"), name, arg
+      end
+
+      # Wraps the given string in terminal escapes
+      # causing it to have the given color.
+      # If terminal esapes aren't supported on this platform,
+      # just returns the string instead.
+      #
+      # @param color [Symbol] The name of the color to use.
+      #   Can be `:red`, `:green`, or `:yellow`.
+      # @param str [String] The string to wrap in the given color.
+      # @return [String] The wrapped string.
+      def color(color, str)
+        raise "[BUG] Unrecognized color #{color}" unless COLORS[color]
+
+        # Almost any real Unix terminal will support color,
+        # so we just filter for Windows terms (which don't set TERM)
+        # and not-real terminals, which aren't ttys.
+        return str if ENV["TERM"].nil? || ENV["TERM"].empty? || !STDOUT.tty?
+        return "\e[#{COLORS[color]}m#{str}\e[0m"
+      end
+
       private
 
       def open_file(filename, flag = 'r')
@@ -233,6 +276,9 @@ END
                 'Output style. Can be nested (default), compact, compressed, or expanded.') do |name|
           @options[:for_engine][:style] = name.to_sym
         end
+        opts.on('-q', '--quiet', 'Silence warnings during compilation.') do
+          @options[:for_engine][:quiet] = true
+        end
         opts.on('-g', '--debug-info',
                 'Emit extra information in the generated CSS that can be used by the FireSass Firebug plugin.') do
           @options[:for_engine][:debug_info] = true
@@ -358,23 +404,6 @@ MSG
 
         ::Sass::Plugin.watch(files)
       end
-
-      # @private
-      COLORS = { :red => 31, :green => 32, :yellow => 33 }
-
-      def puts_action(name, color, arg)
-        printf color(color, "%11s %s\n"), name, arg
-      end
-
-      def color(color, str)
-        raise "[BUG] Unrecognized color #{color}" unless COLORS[color]
-
-        # Almost any real Unix terminal will support color,
-        # so we just filter for Windows terms (which don't set TERM)
-        # and not-real terminals, which aren't ttys.
-        return str if ENV["TERM"].empty? || !STDOUT.tty?
-        return "\e[#{COLORS[color]}m#{str}\e[0m"
-      end
     end
 
     # The `haml` executable.
@@ -565,6 +594,9 @@ END
           'By default, this is inferred from the input filename.',
           'If there is none, defaults to css.') do |name|
           @options[:from] = name.downcase.to_sym
+          unless [:css, :scss, :sass, :sass2].include?(@options[:from])
+            raise "Unknown format for sass-convert --from: #{name}"
+          end
         end
 
         opts.on('-T', '--to FORMAT',
@@ -572,6 +604,14 @@ END
           'By default, this is inferred from the output filename.',
           'If there is none, defaults to sass.') do |name|
           @options[:to] = name.downcase.to_sym
+          unless [:scss, :sass].include?(@options[:to])
+            raise "Unknown format for sass-convert --to: #{name}"
+          end
+        end
+
+        opts.on('-R', '--recursive',
+          'Convert all the files in a directory. Requires --from and --to.') do
+          @options[:recursive] = true
         end
 
         opts.on('-i', '--in-place',
@@ -580,6 +620,10 @@ END
           @options[:in_place] = true
         end
 
+        opts.on('--dasherize', 'Convert underscores to dashes') do
+          @options[:for_tree][:dasherize] = true
+        end
+
         opts.on('--old', 'Output the old-style ":prop val" property syntax.',
                          'Only meaningful when generating Sass.') do
           @options[:for_tree][:old] = true
@@ -596,12 +640,63 @@ END
       # and runs the CSS compiler appropriately.
       def process_result
         require 'sass'
-        super
 
+        if @options[:recursive]
+          process_directory
+          return
+        end
+
+        super
         input = @options[:input]
+        raise "Error: '#{input}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
         output = @options[:output]
         output = input if @options[:in_place]
+        process_file(input, output)
+      end
+
+      def process_directory
+        input = @options[:input] = @args.shift
+        output = @options[:output] = @args.shift
+        raise "Error: --from required when using --recursive." unless @options[:from]
+        raise "Error: --to required when using --recursive." unless @options[:to]
+        raise "Error: '#{@options[:input]}' is not a directory" unless File.directory?(@options[:input])
+        if @options[:output] && File.exists?(@options[:output]) && !File.directory?(@options[:output])
+          raise "Error: '#{@options[:output]}' is not a directory"
+        end
+        @options[:output] ||= @options[:input]
+
+        ext = @options[:from]
+        ext = :sass if ext == :sass2
+        Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|
+          output =
+            if @options[:in_place]
+              f
+            elsif @options[:output]
+              output_name = f.gsub(/\.(c|sa|sc)ss$/, ".#{@options[:to]}")
+              output_name[0...@options[:input].size] = @options[:output]
+              output_name
+            else
+              f.gsub(/\.(c|sa|sc)ss$/, ".#{@options[:to]}")
+            end
+
+          unless File.directory?(File.dirname(output))
+            puts_action :directory, :green, File.dirname(output)
+            FileUtils.mkdir_p(File.dirname(output))
+          end
+          puts_action :convert, :green, f
+          if File.exists?(output)
+            puts_action :overwrite, :yellow, output
+          else
+            puts_action :create, :green, output
+          end
+
+          input = open_file(f)
+          output = @options[:in_place] ? input : open_file(output, "w")
+          process_file(input, output)
+        end
+      end
 
+      def process_file(input, output)
         if input.is_a?(File)
           @options[:from] ||=
             case input.path

data/lib/haml/filters.rb

@@ -100,7 +100,11 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            text = unescape_interpolation(text).gsub("\\n", "\n")
+            text = unescape_interpolation(text).gsub(/(\\+)n/) do |s|
+              escapes = $1.size
+              next s if escapes % 2 == 0
+              ("\\" * (escapes - 1)) + "\n"
+            end
             newline if text.gsub!(/\n"\Z/, "\\n\"")
             push_script <<RUBY.strip, :escape_html => false
 find_and_preserve(#{filter.inspect}.render_with_options(#{text}, _hamlout.options))

data/lib/haml/helpers.rb

@@ -348,7 +348,9 @@ MESSAGE
         haml_buffer.capture_position = position
         block.call(*args)
 
-        captured = haml_buffer.buffer.slice!(position..-1).split(/^/)
+        captured = haml_buffer.buffer.slice!(position..-1)
+        return captured if haml_buffer.options[:ugly]
+        captured = captured.split(/^/)
 
         min_tabs = nil
         captured.each do |line|
@@ -511,7 +513,7 @@ MESSAGE
     # @param text [String] The string to sanitize
     # @return [String] The sanitized string
     def html_escape(text)
-      text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}
+      Haml::Util.silence_warnings {text.to_s.gsub(/[\"><&]/n) {|s| HTML_ESCAPE[s]}}
     end
 
     # Escapes HTML entities in `text`, but without escaping an ampersand

data/lib/haml/helpers/action_view_mods.rb

@@ -125,9 +125,8 @@ module ActionView
         @template_object.send :is_haml?
       end
 
-      unless defined?(ActionView::Helpers) && defined?(ActionView::Helpers::ActiveRecordInstanceTag)
-        alias_method :content_tag_without_haml, :content_tag
-        alias_method :content_tag, :content_tag_with_haml
+      def content_tag(*args)
+        content_tag_with_haml(*args)
       end
     end
 

data/lib/haml/precompiler.rb

@@ -905,6 +905,7 @@ END
             when "strict";   '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
             when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'
             when "mobile";   '<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">'
+            when "rdfa";     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">'
             when "basic";    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">'
             else             '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
             end

data/lib/sass.rb

@@ -15,7 +15,7 @@ module Sass
   extend Haml::Version
 
   # A string representing the version of Sass.
-  # A more fine-grained representation is available from {Sass.version}.
+  # A more fine-grained representation is available from {Haml::Version#version Sass.version}.
   VERSION = version[:string] unless defined?(Sass::VERSION)
 end
 

data/lib/sass/css.rb

@@ -79,7 +79,10 @@ module Sass
     # @param root [Tree::Node] The parent node
     def expand_commas(root)
       root.children.map! do |child|
-        next child unless Tree::RuleNode === child && child.rule.first.include?(',')
+        unless child.is_a?(Tree::RuleNode) && child.rule.first.include?(',')
+          expand_commas(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
         child.rule.first.split(',').map do |rule|
           node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
@@ -126,9 +129,12 @@ module Sass
     def parent_ref_rules(root)
       current_rule = nil
       root.children.map! do |child|
-        next child unless child.is_a?(Tree::RuleNode)
+        unless child.is_a?(Tree::RuleNode)
+          parent_ref_rules(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
 
-        first, rest = child.rule.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
+        first, rest = child.rule.first.scan(/\A(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?\Z/m).first
 
         if current_rule.nil? || current_rule.rule.first != first
           current_rule = Tree::RuleNode.new([first])
@@ -164,9 +170,12 @@ module Sass
     # @param root [Tree::Node] The parent node
     def remove_parent_refs(root)
       root.children.each do |child|
-        if child.is_a?(Tree::RuleNode)
+        case child
+        when Tree::RuleNode
           child.rule.first.gsub! /^& +/, ''
           remove_parent_refs child
+        when Tree::DirectiveNode
+          remove_parent_refs child
         end
       end
     end
@@ -195,7 +204,14 @@ module Sass
     #
     # @param root [Tree::Node] The parent node
     def flatten_rules(root)
-      root.children.each { |child| flatten_rule(child) if child.is_a?(Tree::RuleNode) }
+      root.children.each do |child|
+        case child
+        when Tree::RuleNode
+          flatten_rule(child)
+        when Tree::DirectiveNode
+          flatten_rules(child)
+        end
+      end
     end
 
     # Flattens a single rule
@@ -236,7 +252,10 @@ module Sass
     def fold_commas(root)
       prev_rule = nil
       root.children.map! do |child|
-        next child unless child.is_a?(Tree::RuleNode)
+        unless child.is_a?(Tree::RuleNode)
+          fold_commas(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
 
         if prev_rule && prev_rule.children == child.children
           prev_rule.rule.first << ", #{child.rule.first}"

data/lib/sass/engine.rb

@@ -13,6 +13,7 @@ require 'sass/tree/if_node'
 require 'sass/tree/while_node'
 require 'sass/tree/for_node'
 require 'sass/tree/debug_node'
+require 'sass/tree/warn_node'
 require 'sass/tree/import_node'
 require 'sass/environment'
 require 'sass/script'
@@ -164,9 +165,9 @@ module Sass
     # @return [String] The CSS
     # @raise [Sass::SyntaxError] if there's an error in the document
     def render
-      to_tree.render
+      return _to_tree.render unless @options[:quiet]
+      Haml::Util.silence_haml_warnings {_to_tree.render}
     end
-
     alias_method :to_css, :render
 
     # Parses the document into its parse tree.
@@ -174,6 +175,13 @@ module Sass
     # @return [Sass::Tree::Node] The root of the parse tree.
     # @raise [Sass::SyntaxError] if there's an error in the document
     def to_tree
+      return _to_tree unless @options[:quiet]
+      Haml::Util.silence_haml_warnings {_to_tree}
+    end
+
+    private
+
+    def _to_tree
       @template = check_encoding(@template) {|msg, line| raise Sass::SyntaxError.new(msg, :line => line)}
 
       if @options[:syntax] == :scss
@@ -191,8 +199,6 @@ module Sass
       raise e
     end
 
-    private
-
     def tabulate(string)
       tab_str = nil
       comment_tab_str = nil
@@ -415,7 +421,7 @@ WARNING
         if eq.strip[0] == SCRIPT_CHAR
           expr.context = :equals
           Script.equals_warning("properties", name,
-            Sass::Tree::PropNode.val_to_sass(expr), false,
+            Sass::Tree::PropNode.val_to_sass(expr, @options), false,
             @line, line.offset + 1, @options[:filename])
         end
       end
@@ -461,10 +467,13 @@ WARNING
 
       # If value begins with url( or ",
       # it's a CSS @import rule and we don't want to touch it.
-      if directive == "import" && value !~ /^(url\(|")/
+      if directive == "import" && value !~ /^(url\(|["'])/
         raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
           :line => @line + 1) unless line.children.empty?
-        value.split(/,\s*/).map {|f| Tree::ImportNode.new(f)}
+        value.split(/,\s*/).map do |f|
+          f = $1 || $2 || $3 if f =~ Sass::SCSS::RX::STRING || f =~ Sass::SCSS::RX::URI
+          Tree::ImportNode.new(f)
+        end
       elsif directive == "mixin"
         parse_mixin_definition(line)
       elsif directive == "include"
@@ -485,6 +494,12 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
         Tree::DebugNode.new(parse_script(value, :offset => offset))
+      elsif directive == "warn"
+        raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath warn directives.",
+          :line => @line + 1) unless line.children.empty?
+        offset = line.offset + line.text.index(value).to_i
+        Tree::WarnNode.new(parse_script(value, :offset => offset))
       else
         Tree::DirectiveNode.new(line.text)
       end
@@ -573,6 +588,7 @@ WARNING
       end
 
       return silent ? "//" : "/* */" if content.empty?
+      content.each {|l| l.gsub!(/^\* /, '')}
       content.map! {|l| (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
       content.last.gsub!(%r{ ?\*/ *$}, '')