Changeset 102

Timestamp:

02/04/2007 11:00:55 (22 months ago)

Author:

tec

Message:

• lib/markaby/builder.rb: moved Auto-Form-Tag-Naming outside of CssProxy?
  
• lib/markaby/cssproxy.rb: allow tags with no attributes or child content (see ticket:54)
  
• test/test_markaby.rb: tests for the above changes
  

Location:

trunk

Files:

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

trunk/lib/markaby/builder.rb

@@ -117 +117 @@
           elsif args.last.respond_to?(:to_hash)
               attrs = args.last.to_hash
+              
+              if @tagset.forms.include?(tag) and attrs[:id]
+                attrs[:name] ||= attrs[:id]
+              end
+              
               attrs.each do |k, v|
                   atname = k.to_s.downcase.intern
@@ -190 +195 @@
       if @auto_validation and @tagset.self_closing.include?(sym) and block
         raise InvalidXhtmlError, "the `#{sym}' element is self-closing, please remove the block"
-      end
-      if args.empty? and block.nil?
-        return CssProxy.new do |args, block|
-          if @tagset.forms.include?(sym) and args.last.respond_to?(:to_hash) and args.last[:id]
-            args.last[:name] ||= args.last[:id]
-          end
-          tag!(sym, *args, &block)
-        end
-      end
-      tag!(sym, *args, &block)
+      elsif args.empty? and block.nil?
+        CssProxy.new(self, @streams.last, sym)
+      else
+        tag!(sym, *args, &block)
+      end
     end
 

trunk/lib/markaby/cssproxy.rb

@@ -6 +6 @@
   class CssProxy
 
-    # Creates a CssProxy object.  The +opts+ and +block+ passed in are
-    # stored until the element is created by Builder.tag!
-    def initialize(opts = {}, &blk)
-      @opts = opts
-      @blk = blk
+    # Creates a CssProxy object.
+    def initialize(builder, stream, sym)
+      @builder, @stream, @sym, @attrs = builder, stream, sym, {}
+      
+      @original_stream_length = @stream.length
+      
+      @builder.tag! @sym
     end
-  
-    # Adds attributes to an element, for internal use only.  For example, if you
-    # want to write a wrapper which sets a bunch of default attributes for a certain
-    # tag.  Like the default `img' method included with Markaby automatically sets an
-    # empty alt attribute.
-    def merge!(opts)
-      @opts.merge! opts
-      self
+    
+    # Adds attributes to an element.  Bang methods set the :id attribute.
+    # Other methods add to the :class attribute.
+    def method_missing(id_or_class, *args, &block)
+      if (idc = id_or_class.to_s) =~ /!$/
+        @attrs[:id] = $`
+      else
+        @attrs[:class] = @attrs[:class].nil? ? idc : "#{@attrs[:class]} #{idc}".strip
+      end
+
+      unless args.empty?
+        if args.last.respond_to? :to_hash
+          @attrs.merge! args.pop.to_hash
+        end
+      end
+      
+      args.push(@attrs)
+      
+      while @stream.length > @original_stream_length
+        @stream.pop
+      end
+      
+      if block
+        @builder.tag! @sym, *args, &block
+      else
+        @builder.tag! @sym, *args
+      end
+      
+      return self
     end
-
-    # Adds attributes to an element.  Bang methods set the :id attribute.
-    # Other methods add to the :class attribute.  If a block is supplied,
-    # it is executed with a merged hash (@opts + args).
-    def method_missing(id_or_class, *args, &blk)
-      idc = id_or_class.to_s
-      case idc
-      when "pass"
-      when /!$/
-        @opts[:id] = $`
-      else 
-        @opts[:class] = "#{@opts[:class]} #{idc}".strip
-      end
-      if args.empty? and blk.nil?
-        self
-      else
-        if args.last.respond_to? :to_hash
-          @opts.merge!(args.pop.to_hash)
-        end
-        args.push @opts
-        @blk.call(args, blk)
-      end
-    end
-
-    def to_str
-      @blk.call([[@opts]]).to_s
-    end
-    alias_method :to_s, :to_str
 
   end

trunk/test/test_markaby.rb

@@ -29 +29 @@
   def test_simple
     assert_equal "<hr/>", mab { hr }
+    assert_equal "<hr/><br/>", mab { hr; br }
     assert_equal "<p>foo</p>", mab { p 'foo' }
     assert_equal "<p>foo</p>", mab { p { 'foo' } }
@@ -38 +39 @@
     assert_equal %{<div id="three"></div>}, mab { div.three! '' }
     assert_equal %{<hr class="hidden"/>}, mab { hr.hidden }
+    assert_equal %{<input class="foo" name="bar" id="bar"/>}, mab { input.foo :id => 'bar' }
   end