haml 3.0.15 → 3.0.16

data/VERSION

@@ -1 +1 @@
-3.0.15
+3.0.16

data/lib/haml/exec.rb

@@ -388,7 +388,7 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
-        if @args[1] && !colon_path?(@args[0])
+        if !colon_path?(@args[0]) && probably_dest_dir?(@args[1])
           flag = @options[:update] ? "--update" : "--watch"
           err =
             if !File.exist?(@args[1])
@@ -396,7 +396,7 @@ END
             elsif @args[1] =~ /\.css$/
               "is a CSS file"
             end
-          raise <<MSG if err
+          msg = <<MSG if err
 File #{@args[1]} #{err}.
   Did you mean: sass #{flag} #{@args[0]}:#{@args[1]}
 MSG
@@ -452,6 +452,13 @@ MSG
         end
         return one, two
       end
+
+      # Whether path is likely to be meant as the destination
+      # in a source:dest pair.
+      def probably_dest_dir?(path)
+        return false if colon_path?(path)
+        return Dir.glob(File.join(path, "*.s[ca]ss")).empty?
+      end
     end
 
     # The `haml` executable.

data/lib/haml/helpers/action_view_mods.rb

@@ -140,7 +140,8 @@ module ActionView
       module FormTagHelper
         def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
           if is_haml?
-            if block_given?
+            wrap_block = block_given? && block_is_haml?(proc)
+            if wrap_block
               oldproc = proc
               proc = haml_bind_proc do |*args|
                 concat "\n"
@@ -148,7 +149,7 @@ module ActionView
               end
             end
             res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
-            res << "\n" if block_given?
+            res << "\n" if wrap_block
             res
           else
             form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc)
@@ -160,12 +161,13 @@ module ActionView
 
       module FormHelper
         def form_for_with_haml(object_name, *args, &proc)
-          if block_given? && is_haml?
+          wrap_block = block_given? && is_haml? && block_is_haml?(proc)
+          if wrap_block
             oldproc = proc
             proc = proc {|*args| with_tabs(1) {oldproc.call(*args)}}
           end
           res = form_for_without_haml(object_name, *args, &proc)
-          res << "\n" if block_given? && is_haml?
+          res << "\n" if wrap_block
           res
         end
         alias_method :form_for_without_haml, :form_for
@@ -191,7 +193,8 @@ module ActionView
       module FormTagHelper
         def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
           if is_haml?
-            if block_given?
+            wrap_block = block_given? && block_is_haml?(proc)
+            if wrap_block
               oldproc = proc
               proc = haml_bind_proc do |*args|
                 concat "\n"
@@ -218,7 +221,8 @@ module ActionView
 
       module FormHelper
         def form_for_with_haml(object_name, *args, &proc)
-          if block_given? && is_haml?
+          wrap_block = block_given? && is_haml? && block_is_haml?(proc)
+          if wrap_block
             oldproc = proc
             proc = haml_bind_proc do |*args|
               tab_up
@@ -229,7 +233,7 @@ module ActionView
             concat haml_indent
           end
           form_for_without_haml(object_name, *args, &proc)
-          concat "\n" if block_given? && is_haml?
+          concat "\n" if wrap_block
           Haml::Helpers::ErrorReturn.new("form_for") if is_haml?
         end
         alias_method :form_for_without_haml, :form_for

data/lib/haml/html.rb

@@ -100,6 +100,23 @@ end
 
 require 'hpricot'
 
+# @private
+HAML_TAGS = %w[haml:block haml:loud haml:silent]
+
+Hpricot::ElementContent.keys.each do |k|
+  HAML_TAGS.each do |el|
+    val = Hpricot::ElementContent[k]
+    val[el.hash] = true if val.is_a?(Hash)
+  end
+end
+
+HAML_TAGS.each do |t|
+  Hpricot::ElementContent[t] = {}
+  Hpricot::ElementContent.keys.each do |key|
+    Hpricot::ElementContent[t][key.hash] = true
+  end
+end
+
 module Haml
   # Converts HTML documents into Haml templates.
   # Depends on [Hpricot](http://github.com/whymirror/hpricot) for HTML parsing.

data/lib/haml/precompiler.rb

@@ -248,12 +248,20 @@ END
         # 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]
+          # Whether a script block has already been opened immediately above this line
+          was_opened = @to_close_stack.last && @to_close_stack.last.first == :script
+          if was_opened
+            @dont_indent_next_line, @dont_tab_up_next_text = @to_close_stack.last[1..2]
+          end
 
           # 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])
+          # or the case won't have created its own indentation.
+          # Also, if no block has been opened yet, we need to make sure we add an end
+          # once we de-indent.
+          if !was_opened || keyword == "when"
+            push_and_tabulate([
+                :script, @dont_indent_next_line, @dont_tab_up_next_text,
+                !was_opened])
           end
         elsif block || text =~ /^-\s*(case|if)\b/
           push_and_tabulate([:script, @dont_indent_next_line, @dont_tab_up_next_text])

data/lib/sass/engine.rb

@@ -667,13 +667,14 @@ WARNING
       end
 
       return silent ? "//" : "/* */" if content.empty?
+      content.last.gsub!(%r{ ?\*/ *$}, '')
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
-      content.last.gsub!(%r{ ?\*/ *$}, '')
       if silent
         "//" + content.join("\n//")
       else
-        "/*" + content.join("\n *") + " */"
+        # The #gsub fixes the case of a trailing */
+        "/*" + content.join("\n *").gsub(/ \*\Z/, '') + " */"
       end
     end
 

data/lib/sass/scss/rx.rb

@@ -63,7 +63,7 @@ module Sass
 
       IDENT    = /-?#{NMSTART}#{NMCHAR}*/
       NAME     = /#{NMCHAR}+/
-      NUM      = /[0-9]+|[0-9]*.[0-9]+/
+      NUM      = /[0-9]+|[0-9]*\.[0-9]+/
       STRING   = /#{STRING1}|#{STRING2}/
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/

data/lib/sass/tree/comment_node.rb

@@ -98,7 +98,7 @@ module Sass::Tree
       spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
 
       content = value.gsub(/^/, spaces)
-      content.gsub!(/\n +(\* *)?/, ' ') if style == :compact
+      content.gsub!(/\n +(\* *(?!\/))?/, ' ') if style == :compact
       content
     end
 

data/test/haml/engine_test.rb

@@ -697,6 +697,72 @@ HTML
 HAML
   end
 
+  def test_case_assigned_to_var
+    assert_equal(<<HTML, render(<<HAML))
+bar
+HTML
+- var = case 12
+- when 1; "foo"
+- when 12; "bar"
+= var
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+bar
+HTML
+- var = case 12
+- when 1
+  - "foo"
+- when 12
+  - "bar"
+= var
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+bar
+HTML
+- var = case 12
+  - when 1
+    - "foo"
+  - when 12
+    - "bar"
+= var
+HAML
+  end
+
+  def test_if_assigned_to_var
+    assert_equal(<<HTML, render(<<HAML))
+foo
+HTML
+- var = if false
+- else
+  - "foo"
+= var
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+foo
+HTML
+- var = if false
+- elsif 12
+  - "foo"
+- elsif 14; "bar"
+- else
+  - "baz"
+= var
+HAML
+
+    assert_equal(<<HTML, render(<<HAML))
+foo
+HTML
+- var = if false
+  - "bar"
+- else
+  - "foo"
+= var
+HAML
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/haml/helper_test.rb

@@ -5,6 +5,10 @@ class ActionView::Base
   def nested_tag
     content_tag(:span) {content_tag(:div) {"something"}}
   end
+
+  def wacky_form
+    form_tag("/foo") {"bar"}
+  end
 end
 
 module Haml::Helpers
@@ -176,6 +180,15 @@ HTML
 HAML
   end
 
+  def test_form_tag_in_helper_with_string_block
+    def @base.protect_against_forgery?; false; end
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form #{rails_form_attr}action="/foo" method="post">#{rails_form_opener}bar</form>
+HTML
+#{rails_block_helper_char} wacky_form
+HAML
+  end
+
   def test_haml_tag_name_attribute_with_id
     assert_equal("<p id='some_id'></p>\n", render("- haml_tag 'p#some_id'"))
   end
@@ -397,7 +410,7 @@ MESSAGE
     render("- something_that_uses_haml_concat")
     assert false, "Expected Haml::Error"
   rescue Haml::Error => e
-    assert_equal 12, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
+    assert_equal 16, e.backtrace[0].scan(/:(\d+)/).first.first.to_i
   end
 
   class ActsLikeTag

data/test/haml/html2haml/erb_tests.rb

@@ -405,6 +405,22 @@ HAML
 <% ensure %>
   <p>c</p>
 <% end %>
+ERB
+  end
+
+  # Regression
+
+  def test_tag_inside_block
+    assert_equal(<<HAML.rstrip, render_erb(<<ERB))
+%table
+  - foo.each do
+    %tr
+HAML
+<table>
+  <% foo.each do %>
+    <tr></tr>
+  <% end %>
+</table>
 ERB
   end
 end

data/test/sass/engine_test.rb

@@ -490,17 +490,6 @@ CSS
     assert_equal("@import url(./fonts.css);\n", render("@import \"./fonts.css\""))
   end
 
-  def test_media_import
-    assert_equal("@import \"./fonts.sass\" all;\n",
-      render("@import \"./fonts.sass\" all"))
-    assert_equal(<<CSS, render(<<SASS))
-@import "./fonts.sass" all;
-@import url(./fonts.scss);
-CSS
-@import "./fonts.sass" all, url(./fonts.scss)
-SASS
-  end
-
   def test_http_import
     assert_equal("@import url(http://fonts.googleapis.com/css?family=Droid+Sans);\n",
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
@@ -1484,6 +1473,32 @@ foo
 SASS
   end
 
+  def test_loud_comment_with_close
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  /* foo
+   * bar */ }
+CSS
+foo
+  /* foo
+     bar */
+SASS
+  end
+
+  def test_loud_comment_with_separate_line_close
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  /* foo
+   * bar
+   */ }
+CSS
+foo
+  /* foo
+   * bar
+   */
+SASS
+  end
+
   def test_attribute_selector_with_spaces
     assert_equal(<<CSS, render(<<SASS))
 a b[foo=bar] {

data/test/sass/scss/css_test.rb

@@ -393,7 +393,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: +0.5em;
+  b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS
@@ -866,6 +866,20 @@ SCSS
     assert_equal 1, e.sass_line
   end
 
+  ## Regressions
+
+  def test_closing_line_comment_end_with_compact_output
+    assert_equal(<<CSS, render(<<SCSS, :style => :compact))
+/* foo */
+bar { baz: bang; }
+CSS
+/*
+ * foo
+ */
+bar {baz: bang}
+SCSS
+  end
+
   private
 
   def assert_selector_parses(selector)

data/test/sass/scss/scss_test.rb

@@ -1039,6 +1039,16 @@ MESSAGE
 .bar {
   @include foo(bar, );
 }
+SCSS
+  end
+
+  def test_interpolation
+    assert_equal <<CSS, render(<<SCSS)
+ul li#foo a span.label {
+  foo: bar; }
+CSS
+$bar : "#foo";
+ul li\#{$bar} a span.label { foo: bar; }
 SCSS
   end
 end

data/test/sass/templates/basic.sass

@@ -0,0 +1,23 @@
+
+
+body
+  :font Arial
+  :background blue
+
+#page
+  :width 700px
+  :height 100
+  #header
+    :height 300px
+    h1
+      :font-size 50px
+      :color     blue
+
+#content.user.show
+  #container.top
+    #column.left
+      :width 100px
+    #column.right
+      :width 600px
+  #container.bottom
+    :background brown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.0.15
+  version: 3.0.16
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -07:00
+date: 2010-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -192,6 +192,7 @@ files:
 - test/sass/templates/subdir/subdir.sass
 - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
 - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/basic.sass
 - test/sass/templates/_partial.sass
 - test/sass/templates/options.sass
 - test/sass/templates/units.sass