Changeset 67

Timestamp:

08/10/2006 14:15:33 (2 years ago)

Author:

why

Message:

• lib/markaby/builder.rb: raise an InvalidXhtmlError? for duplicate IDs, from ticket #12, thankyou jerrett!
  

Location:

branches/xhtml-careful

Files:

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

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

@@ -55 +55 @@
       @streams = [[]]
       @assigns = assigns
+      @elements = {}
 
       @@default.each do |k, v|
@@ -141 +142 @@
     # the arguments are the same as the tags implemented via method_missing.
     def tag!(tag, *args, &block)
+      ele_id = nil
       if @auto_validation and @tagset
           if !@tagset.tagset.has_key?(tag)
@@ -147 +149 @@
               attrs = args.last.to_hash
               attrs.each do |k, v|
-                  unless k =~ /:/ or @tagset.tagset[tag].include? k.to_s.downcase.intern
+                  atname = k.to_s.downcase.intern
+                  unless k =~ /:/ or @tagset.tagset[tag].include? atname
                       raise InvalidXhtmlError, "no attribute `#{k}' on #{tag} elements"
+                  end
+                  if atname == :id
+                      ele_id = v.to_s
+                      if @elements.has_key? ele_id
+                          raise InvalidXhtmlError, "id `#{ele_id}' already used (id's must be unique)."
+                      end
                   end
               end
@@ -157 +166 @@
         block = proc { text(str) }
       end
-      fragment { @builder.method_missing(tag, *args, &block) }
+
+      f = fragment { @builder.method_missing(tag, *args, &block) }
+      @elements[ele_id] = f if ele_id
+      f
     end
 

branches/xhtml-careful/test/test_markaby.rb

@@ -86 +86 @@
     assert_exception %{div(:styl => 'ok') {}}, Markaby::InvalidXhtmlError, "no attribute `styl' on div elements"
   end
+
+  def test_unique_ids 
+    assert_exception %{html { div.one! {}; div.one! {} }}, Markaby::InvalidXhtmlError, "id `one' already used (id's must be unique)."
+    assert_equal "<div id=\"one\"></div>", mab(%{div.one! {}})
+  end 
+
 end