lib/ezframe/html.rb in ezframe-0.0.4 vs lib/ezframe/html.rb in ezframe-0.1.0

@@ -2,29 +2,31 @@
 
 module Ezframe
   class Html
     class << self
       def convert(ht_h = {})
+        ht_h = hook_for_convert(ht_h)
         return "" if ht_h.nil? || ht_h.to_s.empty?
         return ht_h.to_html if ht_h.respond_to?(:to_html)
         return ht_h.to_s if ht_h.is_a?(String) || ht_h.is_a?(Symbol) || ht_h.is_a?(Integer) || ht_h.is_a?(Time)
         return ht_h.map { |args| convert(args) }.join if ht_h.is_a?(Array)
 
         tag = ht_h[:tag]
         case tag
         when "input"
           input(ht_h)
         when "select"
-          return select(ht_h) if ht_h[:items]
+          return select(ht_h) if ht_h[:item]
         when "icon"
           tag = "i"
         end
+        tag = ht_h[:tag]
         opt_s, child_s = join_attributes(ht_h)
-        if child_s.length >= 0
+        if !child_s.strip.empty? || %w[div span table tr td th textarea].include?(tag)
           return "<#{ht_h[:tag]} #{opt_s}>\n#{child_s}\n</#{ht_h[:tag]}>\n"
         end
-        "<#{ht_h[:tag]} #{opt_s}/>"
+        "<#{ht_h[:tag]} #{opt_s} />"
       end
 
       def join_attributes(attrs)
         child_s = ""
         opt_a = attrs.map do |k, v|
@@ -54,55 +56,61 @@
         size = ht_h[:size]
         # puts "input: size=#{size.inspect}"
         if size && (size.index("x") || size.index("*"))
           if /(\d+)\s*[x\*]\s*(\d+)/ =~ size
             ht_h[:cols], ht_h[:rows] = $1, $2
+            ht_h.delete(:size)
           end
           ht_h[:tag] = "textarea"
           ht_h[:child] = ht_h[:value]
           ht_h.delete(:value)
-          p ht_h
         end
       end
 
       def select(ht_h = {})
         attr = ht_h.clone
-        items = attr[:items]
-        # puts "Html.select: #{items}"
-        if items.is_a?(Hash)
-          option_a = ht_h[:items].map do |k, v|
+        item = attr[:item]
+        # puts "Html.select: #{item}"
+        if item.is_a?(Hash)
+          option_a = ht_h[:item].map do |k, v|
             h = { tag: "option", value: k }
             if v.is_a?(Array)
               v, selected = v
               h[:selected] = "selected" if selected
             end
             h[:child] = v
-            if ht_h[:default] && ht_h[:default] == v
+            # mylog "select: hash: k=#{k}, v=#{v}, value=#{ht_h[:value]}"
+            if ht_h[:value] && ht_h[:value].to_s == k.to_s
               h[:selected] = "selected"
             end
             h
           end
-        elsif items.is_a?(Array)
-          option_a = items.map do |v|
+        elsif item.is_a?(Array)
+          option_a = item.map do |v|
             h = { tag: "option", value: v[0], child: v[1] }
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
-            if ht_h[:default] && ht_h[:default] == v
+            # mylog "select: array: v=#{v}, value=#{ht_h[:value]}"
+            if ht_h[:value] && ht_h[:value].to_s == v[0].to_s
               h[:selected] = "selected"
             end
             # puts h.inspect
             h
           end
         else
-          warn "unknown items: #{ht_h.inspect}"
+          warn "unknown item: #{ht_h.inspect}"
         end
         attr[:tag] = "select"
         attr[:child] = option_a
         attr[:name] ||= attr[:key]
         attr[:final] = true
-        attr.delete(:items)
+        attr.delete(:item)
         Html.convert(attr)
+      end
+
+      def hook_for_convert(ht_h)
+        return ht_h
       end
     end
   end
 end