Changeset 103

Timestamp:

02/04/2007 11:22:54 (22 months ago)

Author:

tec

Message:

• lib/markaby/builder.rb: allow root attributes to be changed (ticket:53)
  
• test/test_markaby.rb: test it worked
  

Location:

trunk

Files:

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

trunk/lib/markaby/builder.rb

@@ -27 +27 @@
       :output_meta_tag => true,
       :auto_validation => true,
-      :tagset => Markaby::XHTMLTransitional
+      :tagset => Markaby::XHTMLTransitional,
+      :root_attributes => {
+        :xmlns => 'http://www.w3.org/1999/xhtml', :'xml:lang' => 'en', :lang => 'en'
+      }
     }
 
@@ -224 +227 @@
     # are prepended.  Also assumes <tt>:xmlns => "http://www.w3.org/1999/xhtml",
     # :lang => "en"</tt>.
-    def xhtml_transitional(&block)
+    def xhtml_transitional(attrs = {}, &block)
       self.tagset = Markaby::XHTMLTransitional
-      xhtml_html(&block)
+      xhtml_html(attrs, &block)
     end
 
     # Builds an html tag with XHTML 1.0 Strict doctype instead.
-    def xhtml_strict(&block)
+    def xhtml_strict(attrs = {}, &block)
       self.tagset = Markaby::XHTMLStrict
-      xhtml_html(&block)
+      xhtml_html(attrs, &block)
     end
 
     private
 
-    def xhtml_html(&block)
+    def xhtml_html(attrs = {}, &block)
       instruct! if @output_xml_instruction
       declare!(:DOCTYPE, :html, :PUBLIC, *tagset.doctype)
-      tag!(:html, :xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en", &block)
+      tag!(:html, @root_attributes.merge(attrs), &block)
     end
 

trunk/test/test_markaby.rb

@@ -97 +97 @@
 
   def test_full_doc_transitional
-    doc = mab { instruct!; xhtml_transitional { head { title 'OKay' } } }    
+    doc = mab { xhtml_transitional { head { title 'OKay' } } }    
     assert doc =~ /^<\?xml version="1.0" encoding="UTF-8"\?>/
     assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">})
@@ -109 +109 @@
     assert doc.include?(%{<title>OKay</title>})
   end
+  
+  def test_root_attributes_can_be_changed
+    doc = mab { xhtml_strict(:lang => 'fr') { head { title { 'Salut!' } } } }
+    assert doc.include?(%{"-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">})
+    assert doc.include?(%{<title>Salut!</title>})
+    assert doc.include?(%{ lang="fr"})
+  end
 
 end