haml 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/haml.rb

@@ -1030,7 +1030,8 @@ module Haml
   # so we can change the initialization behavior
   # without modifying the file itself.
   def self.init_rails(binding)
-    %w[haml/template sass sass/plugin].each(&method(:require))
+    # No &method here for Rails 2.1 compatibility
+    %w[haml/template sass sass/plugin].each {|f| require f}
   end
 end
 

data/lib/haml/filters.rb

@@ -187,13 +187,13 @@ END
       def compile(precompiler, text)
         return if precompiler.options[:suppress_eval]
         precompiler.instance_eval do
-          push_silent <<-END.gsub("\n", ';')
+          push_silent <<-FIRST.gsub("\n", ';') + text + <<-LAST.gsub("\n", ';')
             _haml_old_stdout = $stdout
             $stdout = StringIO.new(_hamlout.buffer, 'a')
-            #{text}
+          FIRST
             _haml_old_stdout, $stdout = $stdout, _haml_old_stdout
             _haml_old_stdout.close
-          END
+          LAST
         end
       end
     end

data/lib/haml/helpers.rb

@@ -311,7 +311,7 @@ module Haml
     #
     def haml_tag(name, *rest, &block)
       name = name.to_s
-      text = rest.shift if rest.first.is_a? String
+      text = rest.shift.to_s unless [Symbol, Hash, NilClass].any? {|t| rest.first.is_a? t}
       flags = []
       flags << rest.shift while rest.first.is_a? Symbol
       attributes = Haml::Precompiler.build_attributes(haml_buffer.html?,

data/lib/haml/html.rb

@@ -169,7 +169,7 @@ module Haml
     end
 
     def self.haml_tag_loud(text)
-      "= #{text.gsub(/\n\s*/, '; ').strip}\n"
+      "= #{text.gsub(/\n\s*/, ' ').strip}\n"
     end
 
     def self.haml_tag_silent(text)

data/lib/haml/precompiler.rb

@@ -197,6 +197,14 @@ END
       when SILENT_SCRIPT
         return start_haml_comment if text[1] == SILENT_COMMENT
 
+        raise SyntaxError.new(<<END.rstrip, index) if text[1..-1].strip == "end"
+You don't need to use "- end" in Haml. Use indentation instead:
+- if foo?
+  %strong Foo!
+- else
+  Not foo.
+END
+
         push_silent(text[1..-1], true)
         newline_now
         if (@block_opened && !mid_block_keyword?(text)) || text[1..-1].split(' ', 2)[0] == "case"
@@ -303,13 +311,9 @@ END
 
     # Adds +text+ to <tt>@buffer</tt> while flattening text.
     def push_flat(line)
-      unless @options[:ugly]
-        tabulation = line.spaces - @flat_spaces
-        tabulation = tabulation > -1 ? tabulation : 0
-        @filter_buffer << "#{' ' * tabulation}#{line.unstripped}\n"
-      else
-        @filter_buffer << "#{line.unstripped}\n"
-      end
+      tabulation = line.spaces - @flat_spaces
+      tabulation = tabulation > -1 ? tabulation : 0
+      @filter_buffer << "#{' ' * tabulation}#{line.unstripped}\n"
     end
 
     # Causes <tt>text</tt> to be evaluated in the context of
@@ -476,7 +480,7 @@ END
           next
         end
 
-        value = Haml::Helpers.escape_once(value.to_s)
+        value = Haml::Helpers.preserve(Haml::Helpers.escape_once(value.to_s))
         # We want to decide whether or not to escape quotes
         value.gsub!('&quot;', '"')
         this_attr_wrapper = attr_wrapper

data/lib/sass/engine.rb

@@ -112,10 +112,11 @@ module Sass
       root = Tree::Node.new(@options[:style])
       index = 0
       while @lines[index]
+        old_index = index
         child, index = build_tree(index)
 
         if child.is_a? Tree::Node
-          child.line = index
+          child.line = old_index + 1
           root << child
         elsif child.is_a? Array
           child.each do |c|

data/test/haml/engine_test.rb

@@ -34,6 +34,13 @@ END
     "%a/ b" => "Self-closing tags can't have content.",
     " %p foo" => "Indenting at the beginning of the document is illegal.",
     "  %p foo" => "Indenting at the beginning of the document is illegal.",
+    "- end" => <<END.rstrip,
+You don't need to use "- end" in Haml. Use indentation instead:
+- if foo?
+  %strong Foo!
+- else
+  Not foo.
+END
     " \n\t\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
 
     # Regression tests
@@ -49,6 +56,7 @@ END
 A tab character was used for indentation. Haml must be indented using two spaces.
 Are you sure you have soft tabs enabled in your editor?
 END
+    "foo\n:ruby\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
   }
 
   User = Struct.new('User', :id)
@@ -192,20 +200,24 @@ SOURCE
   
   def test_static_attributes_should_be_escaped
     assert_equal("<img class='atlantis' style='ugly&amp;stupid' />\n",
-                 render("%img.atlantis{:style => 'ugly&stupid'}", :escape_html => true))
+                 render("%img.atlantis{:style => 'ugly&stupid'}"))
     assert_equal("<div class='atlantis' style='ugly&amp;stupid'>foo</div>\n",
-                 render(".atlantis{:style => 'ugly&stupid'} foo", :escape_html => true))
+                 render(".atlantis{:style => 'ugly&stupid'} foo"))
     assert_equal("<p class='atlantis' style='ugly&amp;stupid'>foo</p>\n",
-                render("%p.atlantis{:style => 'ugly&stupid'}= 'foo'", :escape_html => true))
+                render("%p.atlantis{:style => 'ugly&stupid'}= 'foo'"))
+    assert_equal("<p class='atlantis' style='ugly&#x000A;stupid'></p>\n",
+                render("%p.atlantis{:style => \"ugly\\nstupid\"}"))
   end
 
   def test_dynamic_attributes_should_be_escaped
-    assert_equal("<img alt='' src='/foo.png' />\n",
-                 render("%img{:width => nil, :src => '/foo.png', :alt => String.new}", :escape_html => true))
-    assert_equal("<p alt='' src='/foo.png'>foo</p>\n",
-                 render("%p{:width => nil, :src => '/foo.png', :alt => String.new} foo", :escape_html => true))
-    assert_equal("<div alt='' src='/foo.png'>foo</div>\n",
-                 render("%div{:width => nil, :src => '/foo.png', :alt => String.new}= 'foo'", :escape_html => true))
+    assert_equal("<img alt='' src='&amp;foo.png' />\n",
+                 render("%img{:width => nil, :src => '&foo.png', :alt => String.new}"))
+    assert_equal("<p alt='' src='&amp;foo.png'>foo</p>\n",
+                 render("%p{:width => nil, :src => '&foo.png', :alt => String.new} foo"))
+    assert_equal("<div alt='' src='&amp;foo.png'>foo</div>\n",
+                 render("%div{:width => nil, :src => '&foo.png', :alt => String.new}= 'foo'"))
+    assert_equal("<img alt='' src='foo&#x000A;.png' />\n",
+                 render("%img{:width => nil, :src => \"foo\\n.png\", :alt => String.new}"))
   end
   
   def test_string_interpolation_should_be_esaped
@@ -285,7 +297,7 @@ SOURCE
   def test_attrs_parsed_correctly
     assert_equal("<p boom=>biddly='bar =&gt; baz'></p>\n", render("%p{'boom=>biddly' => 'bar => baz'}"))
     assert_equal("<p foo,bar='baz, qux'></p>\n", render("%p{'foo,bar' => 'baz, qux'}"))
-    assert_equal("<p escaped='quo\nte'></p>\n", render("%p{ :escaped => \"quo\\nte\"}"))
+    assert_equal("<p escaped='quo&#x000A;te'></p>\n", render("%p{ :escaped => \"quo\\nte\"}"))
     assert_equal("<p escaped='quo4te'></p>\n", render("%p{ :escaped => \"quo\#{2 + 2}te\"}"))
   end
   
@@ -477,6 +489,13 @@ SOURCE
 END
   end
 
+  def test_ugly_filter
+    assert_equal(<<END, render(":sass\n  #foo\n    bar: baz", :ugly => true))
+#foo {
+  bar: baz; }
+END
+  end
+
   def test_local_assigns_dont_modify_class
     assert_equal("bar\n", render("= foo", :locals => {:foo => 'bar'}))
     assert_equal(nil, defined?(foo))

data/test/haml/template_test.rb

@@ -25,7 +25,16 @@ class TemplateTest < Test::Unit::TestCase
     filters               nuke_outer_whitespace         nuke_inner_whitespace }
 
   def setup
-    @base = ActionView::Base.new(TEMPLATE_PATH, 'article' => Article.new, 'foo' => 'value one')
+    vars = { 'article' => Article.new, 'foo' => 'value one' }
+    
+    unless ActionView::Base.instance_methods.include? 'finder'
+      @base = ActionView::Base.new(TEMPLATE_PATH, vars)
+    else
+      # Rails 2.1.0
+      @base = ActionView::Base.new([], vars)
+      @base.finder.append_view_path(TEMPLATE_PATH)
+    end
+    
     @base.send(:evaluate_assigns)
 
     # This is used by form_for.

data/test/sass/engine_test.rb

@@ -42,7 +42,7 @@ END
     "a\n    :b c" => "4 spaces were used for indentation. Sass must be indented using two spaces.",
     "a\n  :b c\n  !d = 3" => "Constants may only be declared at the root of a document.",
     "!a = 1b + 2c" => "Incompatible units: b and c.",
-    "& a\n  :b c" => "Base-level rules cannot contain the parent-selector-referencing character '&'.",
+    "& a\n  :b c" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
     "a\n  :b\n    c" => "Illegal nesting: Only attributes may be nested beneath attributes.",
     "a,\n  :b c" => "Rules can\'t end in commas.",
     "a," => "Rules can\'t end in commas.",
@@ -60,7 +60,9 @@ END
     " \n   \n\t\n  a\n  b: c" => ["Indenting at the beginning of the document is illegal.", 4],
 
     # Regression tests
-    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3]
+    "a\n  b:\n    c\n    d" => ["Illegal nesting: Only attributes may be nested beneath attributes.", 3],
+    "& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 1],
+    "a\n  b: c\n& foo\n  bar: baz\n  blat: bang" => ["Base-level rules cannot contain the parent-selector-referencing character '&'.", 3],
   }
   
   def test_basic_render

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-28 00:00:00 -04:00
+date: 2008-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -173,6 +173,7 @@ files:
 - test/haml/templates/_text_area.haml
 - test/haml/engine_test.rb
 - test/test_helper.rb
+- test/rails
 - Rakefile
 - init.rb
 - FAQ