Changeset 48

Timestamp:

05/21/2006 13:12:23 (3 years ago)

Author:

tec

Message:

• lib/markaby/builder.rb: undo [47]. give preference to helper methods
  
• test/test_markaby.rb: test case for instance variables
  

Location:

trunk

Files:

• lib/markaby/builder.rb (modified) (2 diffs)
• test/test_markaby.rb (modified) (1 diff)

trunk/lib/markaby/builder.rb

@@ -162 +162 @@
     # * Otherwise, +sym+ and its arguments are passed to tag!
     def method_missing(sym, *args, &block)
-      if TAGS.include?(sym) or (FORM_TAGS.include?(sym) and args.empty?)
+      if @helpers.respond_to?(sym)
+        r = @helpers.send(sym, *args, &block)
+        @builder << r if @output_helpers
+        r
+      elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s)
+        @builder.__send__(sym, *args, &block)
+      elsif TAGS.include?(sym) or (FORM_TAGS.include?(sym) and args.empty?)
         if args.empty? and block.nil?
           return CssProxy.new do |args, block|
@@ -171 +177 @@
           end
         end
-        if args.first.respond_to? :to_hash
-          block ||= proc{}
-        end
         tag!(sym, *args, &block)
       elsif SELF_CLOSING_TAGS.include?(sym)
         tag!(sym, *args)
-      elsif @helpers.respond_to?(sym, true)
-        r = @helpers.send(sym, *args, &block)
-        @builder << r if @output_helpers
-        r
-      elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s)
-        @builder.__send__(sym, *args, &block)
-      elsif instance_variable_get("@#{sym}")
-        instance_variable_get("@#{sym}")
+      elsif value = instance_variable_get("@#{sym}")
+        value
       else
         tag!(sym, *args, &block)

trunk/test/test_markaby.rb

@@ -55 +55 @@
   end
 
+  def test_ivars_without_at_symbol
+    assert_equal "<h1>Hello World</h1>\n", mab("@message = 'Hello World'; h1 message")
+  end
+  
   def test_output_helpers
     assert_equal %{<a href="">edit</a>}, mab("link_to('edit')", {}, MarkabyTestHelpers)