haml 1.5.0 → 1.5.1

data/README

@@ -47,7 +47,7 @@ a tag without a name defaults to a div. So
 
 becomes
 
-  <div id='foo'>Hello!</foo>
+  <div id='foo'>Hello!</div>
   
 Haml uses indentation
 to bring the individual elements to represent the HTML structure.

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.5.1

data/lib/haml/engine.rb

@@ -129,13 +129,6 @@ END
         }
       }
 
-      unless @options[:suppress_eval]
-        @options[:filters].merge!({
-          'erb' => ERB,
-          'ruby' => Haml::Filters::Ruby
-        })
-      end
-
       if !NOT_LOADED.include? 'redcloth'
         @options[:filters].merge!({
           'redcloth' => RedCloth,
@@ -149,6 +142,14 @@ END
 
       @options.rec_merge! options
 
+      unless @options[:suppress_eval]
+        @options[:filters].merge!({
+          'erb' => ERB,
+          'ruby' => Haml::Filters::Ruby
+        })
+      end
+      @options[:filters].rec_merge! options[:filters] if options[:filters]
+
       @precompiled = @options[:precompiled]
 
       @template = template.strip #String
@@ -309,8 +310,9 @@ END
       when SILENT_SCRIPT
         sub_line = line[1..-1]
         unless sub_line[0] == SILENT_COMMENT
-          push_silent(sub_line, true)
-          if @block_opened && !mid_block_keyword?(line)
+          mbk = mid_block_keyword?(line)
+          push_silent(sub_line, !mbk)
+          if (@block_opened && !mbk) || line[1..-1].split(' ', 2)[0] == "case"
             push_and_tabulate([:script])
           end
         end
@@ -589,7 +591,7 @@ END
         warn(FLAT_WARNING) if flattened && !defined?(Test::Unit)
 
         value_exists = !value.empty?
-        attributes_hash = "nil" unless attributes_hash
+        attributes_hash = "nil" if attributes_hash.nil? || @options[:suppress_eval]
         object_ref = "nil" unless object_ref
 
         if @block_opened 

data/lib/haml/helpers.rb

@@ -8,12 +8,12 @@ module Haml
   module Helpers
     self.extend self
     
-    @@action_view = false
+    @@action_view_defined = defined?(ActionView)
     @@force_no_action_view = false
 
     # Returns whether or not ActionView is installed on the system.
     def self.action_view?
-      @@action_view
+      @@action_view_defined
     end
 
     # Isolates the whitespace-sensitive tags in the string and uses preserve
@@ -186,11 +186,6 @@ module Haml
     end
     
     private
-    
-    # Sets whether or not ActionView is installed on the system.
-    def self.action_view(value) # :nodoc:
-      @@action_view = value
-    end
 
     # Gets a reference to the current Haml::Buffer object.
     def buffer
@@ -226,6 +221,7 @@ module Haml
       end
       result.to_s
     end
+    alias_method :capture_erb_with_buffer, :capture_haml_with_buffer
 
     # Returns whether or not the current template is a Haml template.
     # 
@@ -235,8 +231,6 @@ module Haml
     def is_haml?
       @haml_stack ? @haml_stack.size > 0 : false
     end
-    
-    include ActionViewMods if self.const_defined?  "ActionViewMods"
   end
 end
 

data/lib/haml/helpers/action_view_mods.rb

@@ -9,42 +9,24 @@ rescue LoadError
 end
 
 if action_view_included
-  class ActionView::Base
-    alias_method :old_concat, :concat unless instance_methods.include? "old_concat"
-    alias_method :old_form_tag, :form_tag unless instance_methods.include? "old_form_tag"
-
-    alias_method :old_form_for, :form_for unless instance_methods.include? "old_form_for"
-  end
-  
-  module Haml
+  module ActionView
+    # This overrides various helpers in ActionView
+    # to make them work more effectively with Haml.
     module Helpers
-      # This module overrides various helpers in ActionView
-      # to make them work more effectively with Haml.
-      # It also defines several helper methods,
-      # available from a Haml template,
-      # which are only useful within the context of ActionView.
-      # It's not available unless ActionView is installed.
-      #
-      #--
-      # Methods in this module should be nodoc'd.
-      #++
-      module ActionViewMods
-        def self.included(othermod) # :nodoc:
-          othermod.class_eval do
-            action_view(true)
-            alias_method :capture_erb_with_buffer, :capture_haml_with_buffer
-          end
-        end
-        
-        def concat(string, binding = nil) # :nodoc:
+      # :stopdoc:
+      module TextHelper
+        def concat_with_haml(string, binding = nil)
           if is_haml?
             buffer.buffer.concat(string)
           else
-            old_concat(string, binding)
+            concat_without_haml(string, binding)
           end
         end
-        
-        def form_tag(url_for_options = {}, options = {}, *parameters_for_url, &proc) # :nodoc:
+        alias_method_chain :concat, :haml
+      end
+      
+      module FormTagHelper
+        def form_tag_with_haml(url_for_options = {}, options = {}, *parameters_for_url, &proc)
           if block_given? && is_haml?
             oldproc = proc 
             proc = bind_proc do |*args|
@@ -54,29 +36,33 @@ if action_view_included
               tab_down
             end
           end
-          res = old_form_tag(url_for_options, options, *parameters_for_url, &proc) + "\n"
+          res = form_tag_without_haml(url_for_options, options, *parameters_for_url, &proc) + "\n"
           concat "\n" if block_given? && is_haml?
           res
         end
-
-        def form_for(object_name, *args, &proc) # :nodoc:
+        alias_method_chain :form_tag, :haml
+      end
+      
+      module FormHelper
+        def form_for_with_haml(object_name, *args, &proc)
           if block_given? && is_haml?
             oldproc = proc 
             proc = bind_proc do |*args|
               tab_up
               oldproc.call(*args)
               tab_down
-            end            
+            end
           end
-          old_form_for(object_name, *args, &proc)
+          form_for_without_haml(object_name, *args, &proc)
           concat "\n" if block_given? && is_haml?
         end
-
-        def generate_content_class_names
-          controller.controller_name + " " + controller.action_name
-        end
+        alias_method_chain :form_for, :haml
+      end
+      
+      def generate_content_class_names
+        controller.controller_name + " " + controller.action_name
       end
+      # :startdoc:
     end
   end
 end
-

data/lib/sass.rb

@@ -392,7 +392,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #                               Defaults to false.
 #                               Only has meaning within Ruby on Rails.
 #                               
-# [<tt>:always_update</tt>]     Whether a Sass template should be checked for updates every
+# [<tt>:always_check</tt>]      Whether a Sass template should be checked for updates every
 #                               time a controller is accessed,
 #                               as opposed to only when the Rails server starts.
 #                               If a Sass template has been updated,

data/test/haml/engine_test.rb

@@ -57,6 +57,15 @@ class EngineTest < Test::Unit::TestCase
 
   def test_stop_eval
     assert_equal("", render("= 'Hello'", :suppress_eval => true))
+    assert_equal("<div id='foo' />\n", render("#foo{:yes => 'no'}/", :suppress_eval => true))
+
+    begin
+      assert_equal("", render(":ruby\n  puts 'hello'", :suppress_eval => true))
+    rescue Haml::HamlError => err
+      caught = true
+      assert_equal('Filter "ruby" is not defined!', err.message)
+    end
+    assert(caught, "Rendering a ruby filter without evaluating didn't throw an error!")
   end
 
   def test_attr_wrapper

data/test/haml/helper_test.rb

@@ -62,9 +62,9 @@ class HelperTest < Test::Unit::TestCase
 
     begin
       ActionView::Base.new.render(:inline => "<%= concat('foo') %>")
-    rescue ArgumentError
+    rescue ArgumentError, NameError
       proper_behavior = true
-    end    
+    end
     assert(proper_behavior)
   end
   

data/test/haml/results/just_stuff.xhtml

@@ -41,3 +41,5 @@ stuff followed by whitespace
   Woah a period.
 <![endif]-->
 testtest
+<foo />
+<foo />

data/test/haml/templates/just_stuff.haml

@@ -38,4 +38,14 @@
 /[if gte IE5.2]
   Woah a period.
 = "test" |
-  "test" |
+  "test" |
+- case :foo
+- when :bar
+  %bar/
+- when :foo
+  %foo/
+- case :foo
+  - when :bar
+    %bar/
+  - when :foo
+    %foo/

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
-date: 2007-03-06 00:00:00 -08:00
+  version: 1.5.1
+date: 2007-03-31 00:00:00 -07:00
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 require_paths: 
 - lib