dohweb 0.1.8 → 0.1.9

data/lib/doh/web/html_tags.rb

@@ -9,9 +9,13 @@ module HtmlTags
       valstr = options[:value].to_s.strip
       options[:value] = valstr.to_d.to_dig(num_digits) unless valstr.empty?
     end
-    options_str = options.collect {|key, value| %(#{key}="#{value}") }.join(' ')
+    if options.empty?
+      options_str = ''
+    else
+      options_str = ' ' + options.collect {|key, value| %(#{key}="#{value}") }.join(' ')
+    end
     open_str = open ? '' : ' /'
-    "<#{tag} #{options_str}#{open_str}>"
+    "<#{tag}#{options_str}#{open_str}>"
   end
 
   def full_tag(tag, body, options = {})
@@ -29,13 +33,14 @@ module HtmlTags
     options[:name] = name
     lines = [start_tag('select', true, options)]
     items.each do |elem|
+      subopts = {}
       if elem.is_a?(Array)
-        text, value = elem
+        text = elem.first
+        subopts[:value] = elem.last
       else
         text = value = elem
       end
-      subopts = {:value => value}
-      subopts[:selected] = 'selected' if value.to_s == selected_value
+      subopts[:selected] = 'selected' if (selected_value.size > 0) && (value.to_s == selected_value)
       lines.push("#{start_tag(:option, true, subopts)}#{text}</option>")
     end
     lines.push('</select>')

data/test/html_tags.dt.rb

@@ -0,0 +1,15 @@
+require 'doh/web/html_tags'
+
+module DohWeb
+
+class Test_html_tags < DohTest::TestGroup
+  include DohWeb::HtmlTags
+
+  def test_stuff
+    assert_equal(%%<select name="tinker">\n<option>1</option>\n<option>2</option>\n</select>%, select_tag('tinker', [1,2]))
+    assert_equal(%%<select name="tinker">\n<option></option>\n<option>blah</option>\n</select>%, select_tag('tinker', ['','blah']))
+    assert_equal(%%<select name="tinker">\n<option value="">blee</option>\n<option>blah</option>\n</select>%, select_tag('tinker', [['blee',''],'blah']))
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohweb
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohtest
@@ -41,6 +41,7 @@ files:
 - lib/doh/web/html_tags.rb
 - lib/doh/web/util.rb
 - test/group_params.dt.rb
+- test/html_tags.dt.rb
 - test/util.dt.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohweb
@@ -70,5 +71,6 @@ specification_version: 3
 summary: utilities for building web apps
 test_files:
 - test/group_params.dt.rb
+- test/html_tags.dt.rb
 - test/util.dt.rb
 has_rdoc: