haml-edge 2.3.43 → 2.3.44

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.43
+2.3.44

data/Rakefile

@@ -90,6 +90,11 @@ task :release_elpa do
   next if haml_unchanged && sass_unchanged
   raise "haml-mode.el and sass-mode.el are out of sync." if haml_unchanged ^ sass_unchanged
 
+  if sass_unchanged && File.read("extra/sass-mode.el").
+      include?(";; Package-Requires: ((haml-mode #{sass_unchanged.inspect}))")
+    raise "sass-mode.el doesn't require the same version of haml-mode."
+  end
+
   rev = File.read('.git/HEAD').strip
   if rev =~ /^ref: (.*)$/
     rev = File.read(".git/#{$1}").strip
@@ -151,10 +156,11 @@ end
 #
 # @param mode [String, Symbol] The name of the mode
 # @param version [String] The version number
+# @return [String, nil] The version number if the version has changed
 def mode_unchanged?(mode, version)
   mode_version = File.read("extra/#{mode}-mode.el").scan(/^;; Version: (.*)$/).first.first
   return false if mode_version == version
-  return true unless changed_since?(mode_version, "extra/#{mode}-mode.el")
+  return mode_version unless changed_since?(mode_version, "extra/#{mode}-mode.el")
   raise "#{mode}-mode.el version is #{version.inspect}, but it has changed as of #{version.inspect}"
   return false
 end
@@ -242,8 +248,12 @@ task :pages do
     sh %{git checkout #{proj}-pages}
     sh %{git reset --hard origin/#{proj}-pages}
 
+    Dir.chdir("/var/www/#{proj}-pages")
+    sh %{git fetch origin}
+    sh %{git reset --hard origin/#{proj}-pages}
     sh %{rake build --trace}
-    sh %{rsync -av --delete site/ /var/www/#{proj}-pages}
+    sh %{mkdir -p tmp}
+    sh %{touch tmp/restart.txt}
   end
 end
 

data/VERSION

@@ -1 +1 @@
-2.3.43
+2.3.44

data/extra/haml-mode.el

@@ -4,7 +4,7 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.6
+;; Version: 2.2.7
 ;; Created: 2007-03-08
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, html

data/extra/sass-mode.el

@@ -4,10 +4,11 @@
 
 ;; Author: Nathan Weizenbaum
 ;; URL: http://github.com/nex3/haml/tree/master
-;; Version: 2.2.6
+;; Version: 2.2.7
 ;; Created: 2007-03-15
 ;; By: Nathan Weizenbaum
 ;; Keywords: markup, language, css
+;; Package-Requires: ((haml-mode "2.2.7"))
 
 ;;; Commentary:
 

data/lib/haml/engine.rb

@@ -72,9 +72,10 @@ module Haml
         :suppress_eval => false,
         :attr_wrapper => "'",
 
-        # Don't forget to update the docs in lib/haml.rb if you update these
+        # Don't forget to update the docs in doc-src/HAML_REFERENCE.md
+        # if you update these
         :autoclose => %w[meta img link br hr input area param col base],
-        :preserve => %w[textarea pre],
+        :preserve => %w[textarea pre code],
 
         :filename => '(haml)',
         :line => 1,

data/lib/haml/html.rb

@@ -25,6 +25,7 @@ module Haml
 
       def parse_text(text, tabs)
         text.strip!
+        text.gsub!('#{', '\#{') #'
         if text.empty?
           String.new
         else
@@ -202,7 +203,7 @@ module Haml
             full_match = nil
             ruby_value = value.gsub(%r{<haml:loud>\s*(.+?)\s*</haml:loud>}) do
               full_match = $`.empty? && $'.empty?
-              full_match ? $1: "\#{#{$1}}"
+              CGI.unescapeHTML(full_match ? $1: "\#{#{$1}}")
             end
             next if ruby_value == value
             [name, full_match ? ruby_value : %("#{ruby_value}")]

data/lib/haml/precompiler.rb

@@ -186,7 +186,7 @@ END
       return unless line.tabs <= @template_tabs && @template_tabs > 0
 
       to_close = @template_tabs - line.tabs
-      to_close.times { |i| close unless to_close - 1 - i == 0 && mid_block_keyword?(line.text) }
+      to_close.times {|i| close unless to_close - 1 - i == 0 && mid_block_keyword?(line.text)}
     end
 
     # Processes a single line of Haml.
@@ -228,12 +228,27 @@ END
         newline_now
 
         # Handle stuff like - end.join("|")
-        @to_close_stack.first << false if text =~ /^-\s*end\b/ && !block_opened?
+        @to_close_stack.last << false if text =~ /^-\s*end\b/ && !block_opened?
 
         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
+        keyword = mid_block_keyword?(text)
+        block = block_opened? && !keyword
+
+        # It's important to preserve tabulation modification for keywords
+        # that involve choosing between posible blocks of code.
+        if %w[else elsif when].include?(keyword)
+          @dont_indent_next_line, @dont_tab_up_next_text = @to_close_stack.last[1..2]
+
+          # when is unusual in that either it will be indented twice,
+          # or the case won't have created its own indentation
+          if keyword == "when"
+            push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text, false])
+          end
+        elsif block || case_stmt
+          push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
+        elsif block && case_stmt
+          push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])
+        end
       when FILTER; start_filtered(text[1..-1].downcase)
       when DOCTYPE
         return render_doctype(text) if text[0...3] == '!!!'
@@ -247,10 +262,11 @@ END
       end
     end
 
-    # Returns whether or not the text is a silent script text with one
-    # of Ruby's mid-block keywords.
+    # If the text is a silent script text with one of Ruby's mid-block keywords,
+    # returns the name of that keyword.
+    # Otherwise, returns nil.
     def mid_block_keyword?(text)
-      MID_BLOCK_KEYWORD_REGEX =~ text
+      text[MID_BLOCK_KEYWORD_REGEX, 1]
     end
 
     # Evaluates <tt>text</tt> in the context of the scope object, but
@@ -398,7 +414,7 @@ END
     end
 
     # Closes a Ruby block.
-    def close_script(push_end = true)
+    def close_script(_1, _2, push_end = true)
       push_silent("end", true) if push_end
       @template_tabs -= 1
     end
@@ -433,7 +449,7 @@ END
       @template_tabs -= 1
     end
 
-    def close_nil
+    def close_nil(*args)
       @template_tabs -= 1
     end
 

data/test/haml/engine_test.rb

@@ -232,6 +232,19 @@ HAML
 SOURCE
   end
 
+  def test_pre_code
+    assert_equal(<<HTML, render(<<HAML))
+<pre><code>Foo&#x000A;  bar&#x000A;    baz</code></pre>
+HTML
+%pre
+  %code
+    :preserve
+      Foo
+        bar
+          baz
+HAML
+  end
+
   def test_boolean_attributes
     assert_equal("<p bar baz='true' foo='bar'></p>\n",
                  render("%p{:foo => 'bar', :bar => true, :baz => 'true'}", :format => :html4))
@@ -268,6 +281,36 @@ HTML
 HAML
   end
 
+  def test_whitespace_nuke_with_tags_and_else
+    assert_equal(<<HTML, render(<<HAML))
+<a>
+  <b>foo</b>
+</a>
+HTML
+%a
+  %b<
+    - if false
+      = "foo"
+    - else
+      foo
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+<a>
+  <b>
+    foo
+  </b>
+</a>
+HTML
+%a
+  %b
+    - if false
+      = "foo"
+    - else
+      foo
+HAML
+  end
+
   def test_both_case_indentation_work_with_deeply_nested_code
     result = <<RESULT
 <h2>
@@ -334,6 +377,24 @@ HTML
 HAML
   end
 
+  def test_nested_end_with_method_call
+    assert_equal(<<HTML, render(<<HAML))
+<p>
+  2|3|4
+  b-a-r
+</p>
+HTML
+%p
+  = [1, 2, 3].map do |i|
+    - i + 1
+  - end.join("|")
+  = "bar".gsub(/./) do |s|
+    - s + "-"
+  - end.gsub(/-$/) do |s|
+    - ''
+HAML
+  end
+
   def test_silent_end_with_stuff
     assert_equal(<<HTML, render(<<HAML))
 e

data/test/haml/html2haml_test.rb

@@ -32,6 +32,14 @@ class Html2HamlTest < Test::Unit::TestCase
     assert_equal "/\n  IE sucks", render('<!-- IE sucks -->')
   end
 
+  def test_interpolation
+    assert_equal('Foo \#{bar} baz', render('Foo #{bar} baz'))
+  end
+
+  def test_interpolation_in_attrs
+    assert_equal('%p{ :foo => "\#{bar} baz" }', render('<p foo="#{bar} baz"></p>'))
+  end
+
   def test_rhtml
     assert_equal '- foo = bar', render_rhtml('<% foo = bar %>')
     assert_equal '- foo = bar', render_rhtml('<% foo = bar -%>')
@@ -64,6 +72,11 @@ class Html2HamlTest < Test::Unit::TestCase
       render_rhtml(%Q{<div class="<%= 12 %>!">Bang!</div>})
   end
   
+  def test_rhtml_in_html_escaped_attribute
+    assert_equal %(%div{ :class => "foo" }\n  Bang!),
+      render_rhtml(%Q{<div class="<%= "foo" %>">Bang!</div>})
+  end
+  
   def test_rhtml_in_attribute_to_multiple_interpolations
     assert_equal %(%div{ :class => "\#{12} + \#{13}" }\n  Math is super),
       render_rhtml(%Q{<div class="<%= 12 %> + <%= 13 %>">Math is super</div>})
@@ -90,6 +103,15 @@ HAML
 HTML
   end
 
+  def test_interpolation_in_rhtml
+    assert_equal('= "Foo #{bar} baz"', render_rhtml('<%= "Foo #{bar} baz" %>'))
+  end
+
+  def test_interpolation_in_rhtml_attrs
+    assert_equal('%p{ :foo => "#{bar} baz" }',
+      render_rhtml('<p foo="<%= "#{bar} baz" %>"></p>'))
+  end
+
   # Encodings
 
   unless Haml::Util.ruby1_8?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.43
+  version: 2.3.44
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -04:00
+date: 2009-10-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,11 +44,11 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- REVISION
 - VERSION
+- VERSION_NAME
 - CONTRIBUTING
 - MIT-LICENSE
-- VERSION_NAME
-- REVISION
 - EDGE_GEM_VERSION
 files: 
 - rails/init.rb
@@ -257,11 +257,11 @@ files:
 - init.rb
 - .yardopts
 - README.md
+- REVISION
 - VERSION
+- VERSION_NAME
 - CONTRIBUTING
 - MIT-LICENSE
-- VERSION_NAME
-- REVISION
 - EDGE_GEM_VERSION
 has_rdoc: true
 homepage: http://haml.hamptoncatlin.com/