haml 2.2.4 → 2.2.5

data/CONTRIBUTING

@@ -0,0 +1,4 @@
+Contributions are welcomed. Please see the following sites for guidelines:
+
+  http://haml-lang.com/development.html#contributing
+  http://sass-lang.com/development.html#contributing

data/VERSION

@@ -1 +1 @@
-2.2.4
+2.2.5

data/lib/haml/buffer.rb

@@ -245,7 +245,7 @@ RUBY
     # @return [Hash<String, String>] `to`, after being merged
     def self.merge_attrs(to, from)
       if to['id'] && from['id']
-        to['id'] << '_' << from.delete('id')
+        to['id'] << '_' << from.delete('id').to_s
       elsif to['id'] || from['id']
         from['id'] ||= to['id']
       end

data/lib/haml/precompiler.rb

@@ -79,7 +79,7 @@ module Haml
     #
     # The block is ended after <tt>%p no!</tt>, because <tt>else</tt>
     # is a member of this array.
-    MID_BLOCK_KEYWORD_REGEX = /-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
+    MID_BLOCK_KEYWORD_REGEX = /^-\s*(#{%w[else elsif rescue ensure when end].join('|')})\b/
 
     # The Regex that matches a Doctype command.
     DOCTYPE_REGEX = /(\d\.\d)?[\s]*([a-z]*)/i
@@ -109,8 +109,8 @@ END
 
       names.map do |name|
         # Can't use || because someone might explicitly pass in false with a symbol
-        sym_local = "_haml_locals[#{name.to_sym.inspect}]" 
-        str_local = "_haml_locals[#{name.to_s.inspect}]" 
+        sym_local = "_haml_locals[#{name.to_sym.inspect}]"
+        str_local = "_haml_locals[#{name.to_s.inspect}]"
         "#{name} = #{sym_local}.nil? ? #{str_local} : #{sym_local}"
       end.join(';') + ';'
     end
@@ -228,9 +228,9 @@ END
         newline_now
 
         # Handle stuff like - end.join("|")
-        @to_close_stack.first << false if text =~ /-\s*end\b/ && !block_opened?
+        @to_close_stack.first << false if text =~ /^-\s*end\b/ && !block_opened?
 
-        case_stmt = text =~ /-\s*case\b/
+        case_stmt = text =~ /^-\s*case\b/
         block = block_opened? && !mid_block_keyword?(text)
         push_and_tabulate([:script]) if block || case_stmt
         push_and_tabulate(:nil)      if block && case_stmt
@@ -719,7 +719,7 @@ END
         else
           open_tag << "\n" unless parse || nuke_inner_whitespace || (self_closing && nuke_outer_whitespace)
         end
-        
+
         push_merged_text(open_tag, tag_closed || self_closing || nuke_inner_whitespace ? 0 : 1,
                          !nuke_outer_whitespace)
 
@@ -775,11 +775,11 @@ END
         raise SyntaxError.new('Illegal nesting: nesting within a tag that already has content is illegal.', @next_line.index)
       end
 
-      open = "<!--#{conditional} "
+      open = "<!--#{conditional}"
 
       # Render it statically if possible
       unless line.empty?
-        return push_text("#{open}#{line} #{conditional ? "<![endif]-->" : "-->"}")
+        return push_text("#{open} #{line} #{conditional ? "<![endif]-->" : "-->"}")
       end
 
       push_text(open, 1)

data/test/haml/engine_test.rb

@@ -107,6 +107,11 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<div class='atlantis' style='ugly'></div>", render(".atlantis{:style => 'ugly'}").chomp)
   end
 
+  def test_css_id_as_attribute_should_be_appended_with_underscore
+    assert_equal("<div id='my_id_1'></div>", render("#my_id{:id => '1'}").chomp)
+    assert_equal("<div id='my_id_1'></div>", render("#my_id{:id => 1}").chomp)
+  end
+
   def test_ruby_code_should_work_inside_attributes
     author = 'hcatlin'
     assert_equal("<p class='3'>foo</p>", render("%p{:class => 1+2} foo").chomp)
@@ -463,6 +468,24 @@ HTML
 HAML
   end
 
+  def test_silent_script_with_hyphen_case
+    assert_equal("", render("- 'foo-case-bar-case'"))
+  end
+
+  def test_silent_script_with_hyphen_end
+    assert_equal("", render("- 'foo-end-bar-end'"))
+  end
+
+  def test_silent_script_with_hyphen_end_and_block
+    assert_equal(<<HTML, render(<<HAML))
+<p>foo-end</p>
+<p>bar-end</p>
+HTML
+- "foo-end-bar-end".gsub(/\\w+-end/) do |s|
+  %p= s
+HAML
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/haml/results/just_stuff.xhtml

@@ -26,7 +26,7 @@ stuff followed by whitespace
   yee\ha
 </p>
 <!-- Short comment -->
-<!-- 
+<!--
   This is a block comment
   cool, huh?
   <strong>there can even be sub-tags!</strong>
@@ -35,13 +35,13 @@ stuff followed by whitespace
 <p class=''>class attribute should appear!</p>
 <p>this attribute shouldn't appear</p>
 <!--[if lte IE6]> conditional comment! <![endif]-->
-<!--[if gte IE7]> 
+<!--[if gte IE7]>
   <p>Block conditional comment</p>
   <div>
     <h1>Cool, eh?</h1>
   </div>
 <![endif]-->
-<!--[if gte IE5.2]> 
+<!--[if gte IE5.2]>
   Woah a period.
 <![endif]-->
 testtest

data/test/haml/spec/README.md

@@ -0,0 +1,53 @@
+# Haml Spec #
+
+Haml Spec provides a basic suite of tests for Haml interpreters.
+
+It is intented for developers who are creating or maintaining an
+implementation of the [Haml](http://haml-lang.com) markup language.
+
+At the moment, there are test runners for the [original Haml](http://github.com/nex3/haml)
+in Ruby, and for [Lua Haml](http://github.com/norman/lua-haml). Support for
+other versions of Haml will be added if their developers/maintainers
+are interested in using it.
+
+## The Tests ##
+
+The tests are kept in JSON format for portability across languages.
+Each test is a simple key/value pair of input and expected output.
+The test suite only provides tests for features which are portable,
+therefore no tests for script are provided, nor for external filters
+such as :markdown or :textile.
+
+## Running the Tests ##
+
+### Ruby ###
+
+The Ruby test uses RSpec, so just install the gem and run `spec ruby_haml_spec.rb`.
+I have only tested it against Ruby 1.9; if you want to run it on an older Ruby
+you'll need to install the "json" gem.
+
+### Lua ###
+
+The Lua test depends on [Telescope](http://telescope.luaforge.net/),
+[jason4lua](http://json.luaforge.net/), and
+[Lua Haml](http://github.com/norman/lua-haml). Install and
+run `tsc lua_haml_spec.lua`.
+
+## Contributing ##
+
+You can access the Git repo at:
+
+    http://github.com/norman/haml-spec
+
+As long as any test you add run against Ruby's Haml and are not redundant,
+I'll be very happy to add them.
+
+## License ##
+
+This project is released under the [WTFPL](http://sam.zoy.org/wtfpl/)
+in order to be as usable as possible in any project, commercial or free.
+
+
+## Author ##
+
+[Norman Clarke](mailto:norman@njclarke.com)

data/test/haml/spec/lua_haml_spec.lua

@@ -0,0 +1,37 @@
+require 'luarocks.require'
+require 'json'
+require 'telescope'
+require 'haml'
+
+local function get_tests(filename)
+  local self = debug.getinfo(1).short_src
+  if self:match("/") then return "./" .. self:gsub("[^/]*%.lua$", "/" .. filename)
+  elseif self:match("\\") then return self:gsub("[^\\]*%.lua$", "\\" .. filename)
+  else return filename
+  end
+end
+
+local fh = assert(io.open(get_tests("tests.json")))
+local input = fh:read '*a'
+fh:close()
+
+local contexts = json.decode(input)
+
+local locals = {
+  var   = "value",
+  first = "a",
+  last  = "z"
+}
+
+describe("The LuaHaml Renderer", function()
+  for context, expectations in pairs(contexts) do
+    describe("When handling " .. context, function()
+      for input, expectation in pairs(expectations) do
+        it(string.format("should render '%s' as '%s'", string.gsub(input, "\n", "\\n"),
+            string.gsub(expectation, "\n", "\\n")), function()
+            assert_equal(haml.render(input, {}, locals), expectation)
+        end)
+      end
+    end)
+  end
+end)

data/test/haml/spec/ruby_haml_spec.rb

@@ -0,0 +1,24 @@
+require "json"
+require "haml"
+contexts = JSON.parse(File.read(File.dirname(__FILE__) + "/tests.json"))
+
+locals = {
+  :var   => "value",
+  :first => "a",
+  :last  => "z"
+}
+
+contexts.each do |context|
+  name = context[0]
+  expectations = context[1]
+  describe "When handling #{name}," do
+    expectations.each do |input, expected|
+      it "should render \"#{input}\" as \"#{expected}\"" do
+        engine = Haml::Engine.new(input)
+        engine.render(Object.new, locals).chomp.should == expected
+      end
+    end
+  end
+end
+
+

data/test/haml/spec/tests.json

@@ -0,0 +1,105 @@
+{
+  "headers": {
+    "!!! XML":      "<?xml version='1.0' encoding='utf-8' ?>",
+    "!!!":          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">",
+    "!!! 1.1":      "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">",
+    "!!! frameset": "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">",
+    "!!! mobile":   "<!DOCTYPE html PUBLIC \"-//WAPFORUM//DTD XHTML Mobile 1.2//EN\" \"http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd\">",
+    "!!! basic":    "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML Basic 1.1//EN\" \"http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd\">"
+  },
+
+  "basic Haml tags and CSS": {
+    "%p":               "<p></p>",
+    "%meta":            "<meta />",
+    "#id1":             "<div id='id1'></div>",
+    ".class1":          "<div class='class1'></div>",
+    "%p.class1":        "<p class='class1'></p>",
+    "%p.class1.class2": "<p class='class1 class2'></p>",
+    "%p#id1":           "<p id='id1'></p>",
+    "%p#id1#id2":       "<p id='id2'></p>",
+    "%p.class1#id1":    "<p class='class1' id='id1'></p>",
+    "%p#id1.class1":    "<p class='class1' id='id1'></p>"
+  },
+
+  "tags with unusual HTML characters": {
+    "%ns:tag":     "<ns:tag></ns:tag>",
+    "%snake_case": "<snake_case></snake_case>",
+    "%dashed-tag": "<dashed-tag></dashed-tag>",
+    "%camelCase":  "<camelCase></camelCase>",
+    "%PascalCase": "<PascalCase></PascalCase>"
+  },
+
+  "tags with unusual CSS identifiers": {
+    ".123": "<div class='123'></div>",
+    ".__":  "<div class='__'></div>",
+    ".--":  "<div class='--'></div>"
+  },
+
+  "tags with inline content": {
+    "%p hello":        "<p>hello</p>",
+    "%p.class1 hello": "<p class='class1'>hello</p>"
+  },
+
+  "tags with nested content": {
+    "%p\n  hello": "<p>\n  hello\n</p>"
+  },
+
+  "tags with portable-style attributes": {
+    "%p(a='b')":                 "<p a='b'></p>",
+    "%p(a='b' c='d')":           "<p a='b' c='d'></p>",
+    "%p(a='b'\n  c='d')":        "<p a='b' c='d'></p>",
+    "%p(class='class1')":        "<p class='class1'></p>",
+    "%p.class2(class='class1')": "<p class='class1 class2'></p>",
+    "%p#id(id='1')":             "<p id='id_1'></p>",
+    ".hello(class=var)":         "<div class='hello value'></div>",
+    ".b(class=last)":            "<div class='b z'></div>",
+    ".b(class=first)":           "<div class='a b'></div>"
+  },
+
+  "tags with Ruby-style attributes": {
+    "%p{:a => 'b'}":                  "<p a='b'></p>",
+    "%p{ :a => 'b' }":                "<p a='b'></p>",
+    "%p{ :a => 'b', 'c' => 'd' }":    "<p a='b' c='d'></p>",
+    "%p{ :a => 'b',\n  'c' => 'd' }": "<p a='b' c='d'></p>",
+    "%p{ :a => var}":                 "<p a='value'></p>",
+    "%p#id{ :id => '1' }":            "<p id='id_1'></p>",
+    "%p#id{ :id => 1 }":              "<p id='id_1'></p>",
+    "%p{ :a => \"#{var}\"}":          "<p a='value'></p>",
+    ".b{ :class => last }":           "<div class='b z'></div>",
+    ".b{ :class => first }":          "<div class='a b'></div>"
+  },
+
+  "inline comments": {
+    "-# hello\n%p": "<p></p>"
+  },
+
+  "silent comments": {
+    "-# nothing\n%p":           "<p></p>",
+    "-# nothing\n  nested\n%p": "<p></p>"
+  },
+
+  "markup comments": {
+    "/ comment":                "<!-- comment -->",
+    "/\n  comment\n  comment2": "<!--\n  comment\n  comment2\n-->"
+  },
+
+  "conditional comments": {
+    "/[if IE]\n  %p a": "<!--[if IE]>\n  <p>a</p>\n<![endif]-->"
+  },
+
+  "internal filters": {
+    ":escaped\n  <&\">":        "&lt;&amp;&quot;&gt;",
+    ":preserve\n  hello\n\n%p": "hello&#x000A;\n<p></p>",
+    ":plain\n  hello\n\n%p":    "hello\n<p></p>",
+    ":javascript\n  a();\n%p":  "<script type='text/javascript'>\n  //<![CDATA[\n    a();\n  //]]>\n</script>\n<p></p>"
+  },
+
+  "interpolation": {
+    "%p= \"#{var}\"":                        "<p>value</p>",
+    "%p #{var}":                             "<p>value</p>",
+    "%p \\#{var}":                           "<p>#{var}</p>",
+    "%p \\\\#{var}":                         "<p>\\value</p>",
+    ":plain\n  #{var} interpolated: #{var}": "value interpolated: value"
+  }
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ extra_rdoc_files:
 - README.md
 - VERSION_NAME
 - REVISION
+- CONTRIBUTING
 files: 
 - rails/init.rb
 - lib/sass.rb
@@ -196,6 +197,10 @@ files:
 - test/haml/templates/original_engine.haml
 - test/haml/templates/breakage.haml
 - test/haml/templates/action_view.haml
+- test/haml/spec/tests.json
+- test/haml/spec/lua_haml_spec.lua
+- test/haml/spec/ruby_haml_spec.rb
+- test/haml/spec/README.md
 - test/haml/results/content_for_layout.xhtml
 - test/haml/results/just_stuff.xhtml
 - test/haml/results/whitespace_handling.xhtml
@@ -230,6 +235,7 @@ files:
 - README.md
 - VERSION_NAME
 - REVISION
+- CONTRIBUTING
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/
 licenses: []