haml 1.5.1 → 1.5.2

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/haml/engine.rb

@@ -202,6 +202,7 @@ END
     def do_precompile
       push_silent <<-END
         def _haml_render
+        @haml_is_haml = true
         _hamlout = @haml_stack[-1]
         _erbout = _hamlout.buffer
       END
@@ -265,6 +266,7 @@ END
       # Close all the open tags
       @template_tabs.times { close }
 
+      push_silent "@haml_is_haml = false"
       push_silent "end"
     end
     
@@ -311,7 +313,7 @@ END
         sub_line = line[1..-1]
         unless sub_line[0] == SILENT_COMMENT
           mbk = mid_block_keyword?(line)
-          push_silent(sub_line, !mbk)
+          push_silent(sub_line, !mbk, true)
           if (@block_opened && !mbk) || line[1..-1].split(' ', 2)[0] == "case"
             push_and_tabulate([:script])
           end
@@ -423,12 +425,14 @@ END
 
     # Evaluates <tt>text</tt> in the context of <tt>@scope_object</tt>, but
     # does not output the result.
-    def push_silent(text, add_index = false)
-      if add_index
-        @precompiled << "@haml_lineno = #{@index}\n#{text}\n"
-      else
-        # Not really DRY, but probably faster
-        @precompiled << "#{text}\n"
+    def push_silent(text, add_index = false, can_suppress = false)
+      unless can_suppress && @options[:suppress_eval]
+        if add_index
+          @precompiled << "@haml_lineno = #{@index}\n#{text}\n"
+        else
+          # Not really DRY, but probably faster
+          @precompiled << "#{text}\n"
+        end
       end
     end
 
@@ -517,7 +521,7 @@ END
 
     # Closes a Ruby block.
     def close_block
-      push_silent "end"
+      push_silent "end", false, true
       @template_tabs -= 1
     end
 
@@ -541,7 +545,7 @@ END
     
     # Closes a loud Ruby block.
     def close_loud(command)
-      push_silent 'end'
+      push_silent 'end', false, true
       @precompiled << command
       @template_tabs -= 1
     end
@@ -592,7 +596,7 @@ END
 
         value_exists = !value.empty?
         attributes_hash = "nil" if attributes_hash.nil? || @options[:suppress_eval]
-        object_ref = "nil" unless object_ref
+        object_ref = "nil" if object_ref.nil? || @options[:suppress_eval]
 
         if @block_opened 
           if atomic

data/lib/haml/helpers.rb

@@ -229,7 +229,7 @@ module Haml
     # also works in other ActionView templates,
     # where it will always return false.
     def is_haml?
-      @haml_stack ? @haml_stack.size > 0 : false
+      @haml_is_haml
     end
   end
 end

data/lib/haml/helpers/action_view_mods.rb

@@ -10,6 +10,18 @@ end
 
 if action_view_included
   module ActionView
+    class Base # :nodoc:
+      def render_with_haml(*args)        
+        was_haml = is_haml?
+        @haml_is_haml = false
+        res = render_without_haml(*args)
+        @haml_is_haml = was_haml
+        res
+      end
+      alias_method :render_without_haml, :render
+      alias_method :render, :render_with_haml
+    end
+
     # This overrides various helpers in ActionView
     # to make them work more effectively with Haml.
     module Helpers
@@ -22,7 +34,8 @@ if action_view_included
             concat_without_haml(string, binding)
           end
         end
-        alias_method_chain :concat, :haml
+        alias_method :concat_without_haml, :concat
+        alias_method :concat, :concat_with_haml
       end
       
       module FormTagHelper
@@ -40,7 +53,8 @@ if action_view_included
           concat "\n" if block_given? && is_haml?
           res
         end
-        alias_method_chain :form_tag, :haml
+        alias_method :form_tag_without_haml, :form_tag
+        alias_method :form_tag, :form_tag_with_haml
       end
       
       module FormHelper
@@ -56,7 +70,8 @@ if action_view_included
           form_for_without_haml(object_name, *args, &proc)
           concat "\n" if block_given? && is_haml?
         end
-        alias_method_chain :form_for, :haml
+        alias_method :form_for_without_haml, :form_for
+        alias_method :form_for, :form_for_with_haml
       end
       
       def generate_content_class_names

data/lib/sass.rb

@@ -283,15 +283,15 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 # they're simply joined with a space.
 # For example:
 #
-#   !font_family = sans-serif
+#   !font_family = "sans-serif"
 #   !main_font_size = 1em
 #
 #   #main
 #     :font
-#       :family = !font-family
+#       :family = !font_family
 #       :size = !main_font_size
 #     h6
-#       :font = italic small-caps bold (!main_font_size + 0.1em) !font-family
+#       :font = italic "small-caps" bold (!main_font_size + 0.1em) !font_family
 #
 # is compiled to:
 #

data/test/haml/engine_test.rb

@@ -57,7 +57,9 @@ class EngineTest < Test::Unit::TestCase
 
   def test_stop_eval
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
+    assert_equal("", render("- _hamlout << 'foo'", :suppress_eval => true))
     assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
+    assert_equal("<div />\n", render("%div[1]/", :suppress_eval => true))
 
     begin
       assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))

data/test/haml/helper_test.rb

@@ -101,6 +101,10 @@ class HelperTest < Test::Unit::TestCase
 
   def test_is_haml
     assert(!ActionView::Base.new.is_haml?)
+    assert_equal("true\n", render("= is_haml?"))
+    assert_equal("true\n", render("= is_haml?", :action_view))
+    assert_equal("false", @base.render(:inline => '<%= is_haml? %>'))
+    assert_equal("false\n", render("= render :inline => '<%= is_haml? %>'", :action_view))
   end
 end
 

data/test/haml/results/semantic.cache

@@ -0,0 +1,15 @@
+;; Object results/
+;; SEMANTICDB Tags save file
+(semanticdb-project-database-file "results/"
+  :tables (list 
+   (semanticdb-table "helpers.xhtml"
+    :major-mode 'html-mode
+    :tags '(("Big!" section nil nil [566 682]) ("bar" section (:members (("here" section nil nil [801 1277]) ("google" section nil nil [1277 1280]))) nil [682 685]))
+    :file "helpers.xhtml"
+    :pointmax 1325
+    )
+   )
+  :file "semantic.cache"
+  :semantic-tag-version "2.0pre3"
+  :semanticdb-version "2.0pre3"
+  )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
-date: 2007-03-31 00:00:00 -07:00
+  version: 1.5.2
+date: 2007-04-09 00:00:00 -07:00
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 require_paths: 
 - lib
@@ -86,6 +86,7 @@ files:
 - test/haml/results/silent_script.xhtml
 - test/haml/results/helpers.xhtml
 - test/haml/results/filters.xhtml
+- test/haml/results/semantic.cache
 - test/haml/rhtml/standard.rhtml
 - test/haml/mocks/article.rb
 - test/haml/templates/standard.haml