Changeset 68

Timestamp:

08/10/2006 14:50:25 (2 years ago)

Author:

why

Message:

• lib/markaby/builder.rb: the img wrapper now returns a CssProxy? for attaching classes.
  
• lib/markaby/cssproxy.rb: the merge! method for adding attributes to a proxy object.
  

Location:

branches/xhtml-careful

Files:

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

branches/xhtml-careful/lib/markaby/builder.rb

@@ -231 +231 @@
 
     # Builds a image tag.  Assumes <tt>:border => '0', :alt => ''</tt>.
-    def img(opts = {})
-      tag!(:img, @@default[:image_tag_options].merge(opts))
+    def img(*opts, &blk)
+      html_tag(:img, *opts, &blk).merge!(@@default[:image_tag_options])
     end
 

branches/xhtml-careful/lib/markaby/cssproxy.rb

@@ -13 +13 @@
     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
+    end
+
     # Adds attributes to an element.  Bang methods set the :id attribute.
     # Other methods add to the :class attribute.  If a block is supplied,
@@ -34 +43 @@
       end
     end
+
+    def to_str
+      @blk.call([[@opts]]).to_s
+    end
+    alias_method :to_s, :to_str
+
   end
 end

branches/xhtml-careful/test/test_markaby.rb

@@ -80 +80 @@
     assert_equal %{<th colspan="1"></th>}, mab("th(:colspan => 1)")
     assert_equal %{<tbody class="okay"></tbody>}, mab("tbody.okay {}")
+
+    # ticket #19 reported no class attr on img tags
+    assert_equal %{<div><img border="0" class="my_class" alt=""/></div>}, mab("div { img.my_class }")
+    assert_equal %{<div><img border="0" class="my_class" alt="" src="/test.gif"/></div>}, mab("div { img.my_class :src => '/test.gif' }")
   end