haml 2.0.9 → 2.0.10

data/Rakefile

@@ -64,7 +64,8 @@ at_exit { File.delete('REVISION') rescue nil }
 desc "Install Haml as a gem."
 task :install => [:package] do
   sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
-  sh %{#{sudo} gem install --no-ri pkg/haml-#{File.read('VERSION').strip}}
+  gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
+  sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read('VERSION').strip}}
 end
 
 desc "Release a new Haml package to Rubyforge. Requires the NAME and VERSION flags."
@@ -181,4 +182,4 @@ namespace :test do
       `rm -rf test/rails`
     end
   end
-end
+end

data/VERSION

@@ -1 +1 @@
-2.0.9
+2.0.10

data/lib/haml/buffer.rb

@@ -18,6 +18,10 @@ module Haml
     # It's nil at the top level (see #toplevel?).
     attr_accessor :upper
 
+    # nil if there's no capture_haml block running,
+    # and the position at which it's beginning the capture if there is one.
+    attr_accessor :capture_position
+
     # See #active?
     attr_writer :active
 
@@ -178,6 +182,17 @@ module Haml
       @real_tabs += 1 unless self_closing || nuke_inner_whitespace
     end
 
+    # Remove the whitespace from the right side of the buffer string.
+    # Doesn't do anything if we're at the beginning of a capture_haml block.
+    def rstrip!
+      if capture_position.nil?
+        buffer.rstrip!
+        return
+      end
+
+      buffer << buffer.slice!(capture_position..-1).rstrip
+    end
+
     def self.merge_attrs(to, from)
       if to['id'] && from['id']
         to['id'] << '_' << from.delete('id')

data/lib/haml/helpers.rb

@@ -7,6 +7,23 @@ module Haml
   # that a Haml template is parsed in, so all these methods are at your
   # disposal from within the template.
   module Helpers
+    # An object that raises an error when #to_s is called.
+    # It's used to raise an error when the return value of a helper is used
+    # when it shouldn't be.
+    class ErrorReturn
+      def initialize(message)
+        @message = message
+      end
+
+      def to_s
+        raise Haml::Error.new(@message)
+      end
+
+      def inspect
+        "Haml::Helpers::ErrorReturn(#{@message.inspect})"
+      end
+    end
+
     self.extend self
 
     @@action_view_defined = defined?(ActionView)
@@ -65,7 +82,7 @@ module Haml
     #
     # Uses preserve to convert any newlines inside whitespace-sensitive tags
     # into the HTML entities for endlines.
-    # @tags@ is an array of tags to preserve.
+    # +tags+ is an array of tags to preserve.
     # It defaults to the value of the <tt>:preserve</tt> option.
     def find_and_preserve(input = '', tags = haml_buffer.options[:preserve], &block)
       return find_and_preserve(capture_haml(&block)) if block
@@ -258,6 +275,7 @@ module Haml
       with_haml_buffer(buffer) do
         position = haml_buffer.buffer.length
 
+        haml_buffer.capture_position = position
         block.call(*args)
 
         captured = haml_buffer.buffer.slice!(position..-1).split(/^/)
@@ -273,6 +291,8 @@ module Haml
           line[min_tabs..-1]
         end.join
       end
+    ensure
+      haml_buffer.capture_position = nil
     end
 
     def puts(*args) # :nodoc:
@@ -342,6 +362,11 @@ END
     #   </table>
     #
     def haml_tag(name, *rest, &block)
+      ret = ErrorReturn.new(<<MESSAGE)
+haml_tag outputs directly to the Haml template.
+Disregard its return value and use the - operator.
+MESSAGE
+
       name = name.to_s
       text = rest.shift.to_s unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
       flags = []
@@ -352,7 +377,7 @@ END
 
       if text.nil? && block.nil? && (haml_buffer.options[:autoclose].include?(name) || flags.include?(:/))
         haml_concat "<#{name}#{attributes} />"
-        return nil
+        return ret
       end
 
       if flags.include?(:/)
@@ -364,7 +389,7 @@ END
       if block.nil?
         tag << text.to_s << "</#{name}>"
         haml_concat tag
-        return
+        return ret
       end
 
       if text
@@ -374,7 +399,7 @@ END
       if flags.include?(:<)
         tag << capture_haml(&block).strip << "</#{name}>"
         haml_concat tag
-        return
+        return ret
       end
 
       haml_concat tag
@@ -382,7 +407,8 @@ END
       block.call
       tab_down
       haml_concat "</#{name}>"
-      nil
+
+      ret
     end
 
     # Characters that need to be escaped to HTML entities from user input

data/lib/haml/html.rb

@@ -78,9 +78,7 @@ module Haml
 
     class ::Hpricot::Doc
       def to_haml(tabs = 0)
-        output = ''
-        children.each { |child| output += child.to_haml(0) } if children
-        output
+        (children || []).inject('') {|s, c| s << c.to_haml(0)}
       end
     end
 
@@ -90,6 +88,12 @@ module Haml
       end
     end
 
+    class ::Hpricot::CData
+      def to_haml(tabs = 0)
+        "#{tabulate(tabs)}:cdata\n#{parse_text(self.content, tabs + 1)}"
+      end
+    end
+
     class ::Hpricot::DocType
       def to_haml(tabs = 0)
         attrs = public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0]

data/lib/haml/precompiler.rb

@@ -83,7 +83,7 @@ module Haml
     DOCTYPE_REGEX = /(\d\.\d)?[\s]*([a-z]*)/i
 
     # The Regex that matches a literal string or symbol value
-    LITERAL_VALUE_REGEX = /^\s*(:(\w*)|(('|")([^\\\#'"]*?)\4))\s*$/
+    LITERAL_VALUE_REGEX = /:(\w*)|(["'])([^\\#'"]|\\.)*\2/
 
     private
 
@@ -451,29 +451,18 @@ END
       attributes
     end
 
-    def parse_literal_value(text)
-      return nil unless text
-      text.match(LITERAL_VALUE_REGEX)
-
-      # $2 holds the value matched by a symbol, but is nil for a string match
-      # $5 holds the value matched by a string
-      $2 || $5
-    end
-
     def parse_static_hash(text)
       return {} unless text
 
       attributes = {}
-      text.split(',').each do |attrib|
-        key, value, more = attrib.split('=>')
-
-        # Make sure the key and value and only the key and value exist
-        # Otherwise, it's too complicated or dynamic and we'll defer it to the actual Ruby parser
-        key = parse_literal_value key
-        value = parse_literal_value value
-        return nil if more || key.nil? || value.nil?
-
-        attributes[key] = value
+      scanner = StringScanner.new(text)
+      scanner.scan(/\s+/)
+      until scanner.eos?
+        return unless key = scanner.scan(LITERAL_VALUE_REGEX)
+        return unless scanner.scan(/\s*=>\s*/)
+        return unless value = scanner.scan(LITERAL_VALUE_REGEX)
+        attributes[eval(key).to_s] = eval(value).to_s
+        scanner.scan(/[,\s]*/)
       end
       attributes
     end
@@ -803,7 +792,7 @@ END
       unless @merged_text.empty?
         @merged_text.rstrip!
       else
-        push_silent("_erbout.rstrip!", false)
+        push_silent("_hamlout.rstrip!", false)
         @dont_tab_up_next_text = true
       end
     end

data/lib/sass/engine.rb

@@ -113,7 +113,7 @@ module Sass
       index = 0
       while @lines[index]
         old_index = index
-        child, index = build_tree(index)
+        child, index = build_tree(index, true)
 
         if child.is_a? Tree::Node
           child.line = old_index + 1
@@ -136,6 +136,7 @@ module Sass
     def split_lines
       @line = 0
       old_tabs = nil
+      last_line_was_comment = false
       @template.each_with_index do |line, index|
         @line += 1
 
@@ -143,6 +144,19 @@ module Sass
 
         if line[0] == COMMENT_CHAR && line[1] == SASS_COMMENT_CHAR && tabs == 0
           tabs = old_tabs
+          last_line_was_comment = true
+        elsif last_line_was_comment && tabs
+          if tabs > 0
+            context = "On line #{@line}"
+            context << " of #{@options[:filename]}" if @options[:filename]
+            warn <<ENDENDEND
+DEPRECATION WARNING:
+#{context}
+Silent comments (//) in version 2.2 will comment out the lines indented beneath them.
+Please indent line #{@line - 1} to match the surrounding indentation level
+ENDENDEND
+          end
+          last_line_was_comment = false
         end
 
         if tabs # if line isn't blank
@@ -180,7 +194,8 @@ END
       spaces / 2
     end
 
-    def build_tree(index)
+    def build_tree(index, root = false)
+      @root = root
       line, tabs = @lines[index]
       index += 1
       @line = index
@@ -251,12 +266,7 @@ END
       when :mixin
         raise SyntaxError.new("Mixins may only be defined at the root of a document.", @line)
       when Array
-        child.each do |c|
-          if c.is_a?(Tree::DirectiveNode)
-            raise SyntaxError.new("Import directives may only be used at the root of a document.", @line)
-          end
-          parent << c
-        end
+        child.each {|c| parent << c}
       when Tree::Node
         parent << child
       end
@@ -392,6 +402,10 @@ END
     end
 
     def import(files)
+      unless @root
+        raise SyntaxError.new("Import directives may only be used at the root of a document.", @line)
+      end
+
       nodes = []
 
       files.split(/,\s*/).each do |filename|

data/test/haml/engine_test.rb

@@ -618,6 +618,17 @@ END
     assert_raise(Haml::Error, "Invalid output format :html1") { engine("%br", :format => :html1) }
   end
 
+  def test_static_hashes
+    assert_equal("<a b='a =&gt; b'></a>\n", render("%a{:b => 'a => b'}", :suppress_eval => true))
+    assert_equal("<a b='a, b'></a>\n", render("%a{:b => 'a, b'}", :suppress_eval => true))
+    assert_equal("<a b='a\tb'></a>\n", render('%a{:b => "a\tb"}', :suppress_eval => true))
+    assert_equal("<a b='a\#{foo}b'></a>\n", render('%a{:b => "a\\#{foo}b"}', :suppress_eval => true))
+  end
+
+  def test_dynamic_hashes_with_suppress_eval
+    assert_equal("<a></a>\n", render('%a{:b => "a #{1 + 1} b", :c => "d"}', :suppress_eval => true))
+  end
+
   # HTML 4.0
 
   def test_html_has_no_self_closing_tags

data/test/haml/helper_test.rb

@@ -141,6 +141,10 @@ HAML
     assert_raise(Haml::Error) { render("- haml_tag :p, :/ do\n  foo") }
   end
 
+  def test_haml_tag_error_return
+    assert_raise(Haml::Error) { render("= haml_tag :p") }
+  end
+
   def test_is_haml
     assert(!ActionView::Base.new.is_haml?)
     assert_equal("true\n", render("= is_haml?"))
@@ -220,5 +224,20 @@ HAML
   def test_random_class_includes_tag_helper
     assert_equal "<p>some tag content</p>", ActsLikeTag.new.to_s
   end
+
+  def test_capture_with_nuke_outer
+    assert_equal "<div></div>\n*<div>hi there!</div>\n", render(<<HAML)
+%div
+= precede("*") do
+  %div> hi there!
+HAML
+
+    assert_equal "<div></div>\n*<div>hi there!</div>\n", render(<<HAML)
+%div
+= precede("*") do
+  = "  "
+  %div> hi there!
+HAML
+  end
 end
 

data/test/haml/html2haml_test.rb

@@ -74,6 +74,22 @@ class Html2HamlTest < Test::Unit::TestCase
       render_rhtml(%Q{<%- form_for -%>})
   end
 
+  def test_cdata
+    assert_equal(<<HAML.strip, render(<<HTML))
+%p
+  :cdata
+    <a foo="bar" baz="bang">
+    <div id="foo">flop</div>
+    </a>
+HAML
+<p><![CDATA[
+  <a foo="bar" baz="bang">
+    <div id="foo">flop</div>
+  </a>
+]]></p>
+HTML
+  end
+
   protected
 
   def render(text, options = {})

data/test/haml/results/standard.xhtml

@@ -13,6 +13,126 @@
       20
     </div>
     <div id='body'> Quotes should be loved! Just like people!</div>
+    0
+    1
+    2
+    3
+    4
+    5
+    6
+    7
+    8
+    9
+    10
+    11
+    12
+    13
+    14
+    15
+    16
+    17
+    18
+    19
+    20
+    21
+    22
+    23
+    24
+    25
+    26
+    27
+    28
+    29
+    30
+    31
+    32
+    33
+    34
+    35
+    36
+    37
+    38
+    39
+    40
+    41
+    42
+    43
+    44
+    45
+    46
+    47
+    48
+    49
+    50
+    51
+    52
+    53
+    54
+    55
+    56
+    57
+    58
+    59
+    60
+    61
+    62
+    63
+    64
+    65
+    66
+    67
+    68
+    69
+    70
+    71
+    72
+    73
+    74
+    75
+    76
+    77
+    78
+    79
+    80
+    81
+    82
+    83
+    84
+    85
+    86
+    87
+    88
+    89
+    90
+    91
+    92
+    93
+    94
+    95
+    96
+    97
+    98
+    99
+    100
+    101
+    102
+    103
+    104
+    105
+    106
+    107
+    108
+    109
+    110
+    111
+    112
+    113
+    114
+    115
+    116
+    117
+    118
+    119
     Wow.|
     <p>
       Holy cow        multiline       tags!           A pipe (|) even!

data/test/haml/rhtml/standard.rhtml

@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US'>
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
   <head>
     <title>Hampton Catlin Is Totally Awesome</title>
     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
@@ -38,7 +38,7 @@
     </div>
     <ul class='really cool'>
       <% ('a'..'f').each do |a|%>
-      <li><%= a %>
+      <li><%= a %></li>
       <% end %>
     <div class='of_divs_with_underscore' id='combo'><%= @should_eval = "with this text" %></div>
     <%= "foo".each_line do |line|

data/test/haml/templates/standard.haml

@@ -1,5 +1,5 @@
 !!!
-%html{html_attrs}
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US", "lang" => "en-US"}
   %head
     %title Hampton Catlin Is Totally Awesome
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
@@ -12,7 +12,7 @@
       = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
     #body= " Quotes should be loved! Just like people!"
     - 120.times do |number|
-      - number
+      = number
     Wow.|
     %p
       = "Holy cow        " + |

data/test/haml/templates/standard_ugly.haml

@@ -1,5 +1,5 @@
 !!!
-%html{html_attrs}
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en-US", "lang" => "en-US"}
   %head
     %title Hampton Catlin Is Totally Awesome
     %meta{"http-equiv" => "Content-Type", :content => "text/html; charset=utf-8"}
@@ -12,7 +12,7 @@
       = 1 + 9 + 8 + 2 #numbers should work and this should be ignored
     #body= " Quotes should be loved! Just like people!"
     - 120.times do |number|
-      - number
+      = number
     Wow.|
     %p
       = "Holy cow        " + |

data/test/sass/engine_test.rb

@@ -51,6 +51,7 @@ END
     "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
+    "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",
     "!foo = bar baz !" => "Unterminated constant.",
     "!foo = !(foo)" => "Invalid constant.",
     "=foo\n  :color red\n.bar\n  +bang" => "Undefined mixin 'bang'.",
@@ -98,7 +99,13 @@ END
   end
 
   def test_exception_line
-    to_render = "rule\n  :attr val\n// comment!\n\n  :broken\n"
+    to_render = <<SASS
+rule
+  :attr val
+  // comment!
+
+  :broken
+SASS
     begin
       Sass::Engine.new(to_render).render
     rescue Sass::SyntaxError => err

data/test/sass/templates/complex.sass

@@ -79,7 +79,6 @@ body
         :margin 0 5px
         :padding 5px 5px 0 5px
         :display inline
-// This comment is in the middle of this rule
         :font-size 1.1em
         // This comment is properly indented
         :color #fff

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.9
+  version: 2.0.10
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 -08:00
+date: 2009-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: []