tagz 0.0.1 → 0.0.2

data/a.rb

@@ -1,11 +1,12 @@
-
-require 'lib/tagz'
+require './lib/tagz'
 include Tagz
 
 puts tagz {
   a_ 'a'
   b_ 'b'
   c_ 'c'
+  foo_{}
+  div_{}
 }
 
 

data/lib/tagz.rb

@@ -5,6 +5,49 @@ module Tagz
   class NotOpen < StandardError; end
   class StillOpen < StandardError; end
 
+  class << self
+#--{{{
+    def default_non_container_tag_list
+      %w[
+        br hr input img area base basefont
+      ]
+    end
+
+    def non_container_tag_list *argv 
+#--{{{
+      if argv.first
+        @non_container_tag_list = [argv.first].flatten.uniq.map{|arg| arg.to_s}
+        @non_container_tags = @non_container_tag_list.inject(Hash.new){|h,k| h.update k => true}
+        @non_container_tag_list
+      else
+        if defined?(@non_container_tag_list) and @non_container_tag_list
+          @non_container_tag_list
+        else
+          non_container_tag_list default_non_container_tag_list
+          @non_container_tag_list
+        end
+      end
+#--}}}
+    end
+    def non_container_tags
+#--{{{
+      if defined?(@non_container_tags) and @non_container_tags
+        @non_container_tags
+      else
+        non_container_tag_list
+        @non_container_tags
+      end
+#--}}}
+    end
+    def container? tag
+      not(non_container_tags[tag.to_s] or false)
+    end
+    def emtpy? tag
+      not container?(tag)
+    end
+#--}}}
+  end
+
   module Fragment  #--{{{
     attr_accessor 'tag' 
     attr_accessor 'open' 
@@ -62,6 +105,7 @@ module Tagz
     end  #--}}}
   end  #--}}}
 
+
   module Abilities  #--{{{
     def __tag_stack__  #--{{{
       @__tag_stack__ ||= []
@@ -171,7 +215,7 @@ module Tagz
         end
 =end
         
-        if content
+        if content or Tagz.container?(tag)
           top[pos] = ' >'
           top.add content unless content_was_added
           stop = Fragment( "</#{ tag }>", tag, :open => false )
@@ -312,6 +356,8 @@ module Tagz
     end
   end  #--}}}
 
+
+### OLD CRAP
 =begin
     def concat s  #--{{{
       tagz << s.to_s

data/test/tagz.rb

@@ -26,7 +26,7 @@ class TagzTest < Test::Unit::TestCase
     assert_equal expected, actual
   end  #--}}}
   def test_020  #--{{{
-    expected = '<foo  ><bar /></foo>'
+    expected = '<foo  ><bar  ></bar></foo>'
     actual = (
       foo_
         bar_{}
@@ -35,7 +35,7 @@ class TagzTest < Test::Unit::TestCase
     assert_equal expected, actual
   end  #--}}}
   def test_030  #--{{{
-    expected = '<foo  ><bar /></foo>'
+    expected = '<foo  ><bar  ></bar></foo>'
     actual = (
       foo_{
         bar_{}
@@ -69,7 +69,7 @@ class TagzTest < Test::Unit::TestCase
     assert_equal expected, actual
   end  #--}}}
   def test_070  #--{{{
-    expected = '<foo /><bar />'
+    expected = '<foo  ></foo><bar  ></bar>'
     actual = (
       foo_{} + bar_{}
     )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: tagz
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-07-17 00:00:00 -06:00
+  version: 0.0.2
+date: 2007-07-18 00:00:00 -06:00
 summary: tagz
 require_paths: 
 - lib