haml 1.7.0 → 1.7.1

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/lib/haml/buffer.rb

@@ -60,18 +60,18 @@ module Haml
       if flattened
         result = Haml::Helpers.find_and_preserve(result)
       end
-      unless result.nil?
-        result = result.to_s
-        while result[-1] == 10 # \n
-          # String#chomp is slow
-          result = result[0...-1]
-        end
-        
-        result = result.gsub("\n", "\n#{tabs(tabulation)}")
-        push_text result, tabulation
+
+      result = result.to_s
+      while result[-1] == 10 # \n
+        # String#chomp is slow
+        result = result[0...-1]
       end
+      
+      result = result.gsub("\n", "\n#{tabs(tabulation)}")
+      push_text result, tabulation
       nil
     end
+
     
     def open_prerendered_tag(tag, tabulation)
       @buffer << "#{tabs(tabulation)}#{tag}"

data/lib/haml/engine.rb

@@ -100,7 +100,7 @@ module Haml
     TAG_REGEX = /[%]([-:\w]+)([-\w\.\#]*)(\{.*\})?(\[.*\])?([=\/\~]?)?(.*)?/
 
     # The Regex that matches a literal string or symbol value
-    LITERAL_VALUE_REGEX = /^\s*(:(\w*)|(('|")([^\\\#]*?)\4))\s*$/
+    LITERAL_VALUE_REGEX = /^\s*(:(\w*)|(('|")([^\\\#'"]*?)\4))\s*$/
 
     FLAT_WARNING = <<END
 Haml deprecation warning:
@@ -123,7 +123,7 @@ END
         :suppress_eval => false,
         :attr_wrapper => "'",
         :locals => {},
-        :autoclose => ['meta', 'img', 'link', 'script', 'br', 'hr'],
+        :autoclose => ['meta', 'img', 'link', 'br', 'hr'],
         :filters => {
           'sass' => Sass::Engine,
           'plain' => Haml::Filters::Plain,
@@ -334,7 +334,7 @@ END
         end
       when FILTER
         name = line[1..-1].downcase
-        start_filtered(options[:filters][name] || name)
+        start_filtered(options[:filters][name.to_s] || name)
       when DOCTYPE
         if line[0...3] == '!!!'
           render_doctype(line)
@@ -709,7 +709,7 @@ END
         when '=', '~'
           parse = true
 
-          if value.first == '='
+          if value[0] == ?=
             value = value[1..-1].strip.dump.gsub('\\#', '#')
           end
         end

data/lib/sass.rb

@@ -313,7 +313,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #   #main
 #     :background-color = !main_color
 #     p
-#       :background-color = !bg_color + 32
+#       :background-color = !main_color + 32
 #
 # is compiled to:
 #
@@ -481,7 +481,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # Sass allows you to choose between three different output styles
 # by setting the <tt>:style</tt> option.
-# In Rails, this is done by setting <tt>Sass::Template.options[:style]</tt>;
+# In Rails, this is done by setting <tt>Sass::Plugin.options[:style]</tt>;
 # outside Rails, it's done by passing an options hash with </tt>:style</tt> set.
 #
 # === <tt>:nested</tt>

data/lib/sass/constant/literal.rb

@@ -9,7 +9,7 @@ class Sass::Constant::Literal # :nodoc:
   # The regular expression matching numbers.
   NUMBER  = /^(-?\d*?\.?)(\d+)([^\d\s]*)$/
 
-  html_color_matcher = Sass::Constant::Color::HTML4_COLORS.keys.join '|'
+  html_color_matcher = Sass::Constant::Color::HTML4_COLORS.keys.map { |c| "^#{c}$" }.join '|'
 
   # The regular expression matching colors.
   COLOR = /^\# (?: [\da-f]{3} | [\da-f]{6} ) | #{html_color_matcher}/ix

data/lib/sass/engine.rb

@@ -210,7 +210,11 @@ module Sass
     end
 
     def has_children?(index, tabs)
-      next_line = @lines[index]
+      next_line = ['//', 0]
+      while !next_line.nil? && next_line[0] == '//' && next_line[1] = 0
+        next_line = @lines[index]
+        index += 1
+      end
       next_line && next_line[1] > tabs
     end
 

data/test/haml/engine_test.rb

@@ -58,6 +58,14 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p>\n  Hello World\n</p>\n", render("%p\n  == Hello \#{who}", :locals => {:who => 'World'}))
   end
 
+  def test_nil_tag_value_should_render_as_empty
+    assert_equal("<p></p>\n", render("%p= nil"))
+  end
+
+  def test_tag_with_failed_if_should_render_as_empty
+    assert_equal("<p></p>\n", render("%p= 'Hello' if false"))
+  end
+
   # Options tests
 
   def test_stop_eval
@@ -106,6 +114,11 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("NOT RECOMPILED\n", render(template, :locals => { :text => "first time" }))
     assert_equal("<p>first time</p>\n", render(template, :locals => { :text => "first time", :foo => 'bar' }))
   end
+
+  def test_dynamc_attrs_shouldnt_register_as_literal_values
+    assert_equal("<p a='b2c'>\n</p>\n", render('%p{:a => "b#{1 + 1}c"}'))
+    assert_equal("<p a='b2c'>\n</p>\n", render("%p{:a => 'b' + (1 + 1).to_s + 'c'}"))
+  end
     
   def test_comps
     assert_equal(-1, "foo" <=> nil)

data/test/haml/results/just_stuff.xhtml

@@ -44,7 +44,6 @@ testtest
 <br />
 <meta foo='bar' />
 <img />
-<script />
 <hr />
 <link />
 <script>Inline content</script>

data/test/haml/templates/just_stuff.haml

@@ -56,7 +56,6 @@
   - when :foo
     %meta{ :foo => 'bar'}
 %img
-%script
 %hr
 %link
 %script Inline content

data/test/sass/engine_test.rb

@@ -94,7 +94,11 @@ class SassEngineTest < Test::Unit::TestCase
       end
     end
   end
-  
+
+  def test_empty_first_line
+    assert_equal("#a {\n  b: c; }\n", Sass::Engine.new("#a\n\n  b: c").render)
+  end
+    
   private
 
   def renders_correctly(name, options={})

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
-date: 2007-07-07 00:00:00 -07:00
+  version: 1.7.1
+date: 2007-08-22 00:00:00 -07:00
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 require_paths: 
 - lib