forme 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1 +1,37 @@
-=== HEAD
+=== 0.6.0 (2011-08-01)
+
+* Fix wrapping for :as=>:radio boolean fields to handle them like association :as=>:radio fields (jeremyevans)
+
+* Fix handling of Raw :label option in for association fields with :as=>:radio and :as=>:checkbox in the Sequel plugin (jeremyevans)
+
+* Use label text for :as=>:radio boolean fields in the Sequel plugin (jeremyevans)
+
+* Support overriding the true/false label and values for :as=>:radio boolean fields in the Sequel plugin (jeremyevans)
+
+* Allow overriding the type of input for schema columns and associations in the Sequel plugin (jeremyevans)
+
+* Add the label before the error option, so the error always comes after the label (jeremyevans)
+
+* Always add error class to formatted input tag, regardless of error_handler (jeremyevans)
+
+* Add labels to inputs for fields that the object doesn't respond to in the Sequel plugin (jeremyevans)
+
+* Allow customization for non-schema columns that the object responds to in the Sequel plugin (jeremyevans)
+
+* Handle errors on all inputs in the Sequel plugin, not just those backed by columns (jeremyevans)
+
+* Fix default error_handler if input yields an area of tags (jeremyevans)
+
+* Support :as=>:radio option for boolean fields in the Sequel plugin (jeremyevans)
+
+* Allow specifying label attributes with :label_attr in labelers (jeremyevans)
+
+* Allow Form#inputs to be called with a single options hash argument (jeremyevans)
+
+* Handle unrecognized fields in the Sequel plugin if a :type option is given (jeremyevans)
+
+* Add required * to label even if :label is already specified in the Sequel plugin (jeremyevans)
+
+=== 0.5.0 (2011-07-01)
+
+* Initial Release

data/lib/forme.rb

@@ -355,6 +355,10 @@ module Forme
     # +inputs_wrapper+ supports a <tt>:legend</tt> option that is used to
     # set the legend for the fieldset.
     def inputs(inputs=[], opts={})
+      if inputs.is_a?(Hash)
+        opts = inputs.merge(opts)
+        inputs = []
+      end
       transform(:inputs_wrapper, opts, self, opts) do
         inputs.each do |i|
           emit(input(*i))
@@ -623,8 +627,8 @@ module Forme
       normalize_options
 
       tag = convert_to_tag(input.type)
-      tag = wrap_tag_with_error(tag) if input.opts[:error]
       tag = wrap_tag_with_label(tag) if input.opts[:label]
+      tag = wrap_tag_with_error(tag) if input.opts[:error]
       wrap_tag(tag)
     end
 
@@ -803,6 +807,7 @@ module Forme
       end
 
       Forme.attr_classes(@attr, @opts[:class]) if @opts.has_key?(:class)
+      Forme.attr_classes(@attr, 'error') if @opts[:error]
 
       if data = opts[:data]
         data.each do |k, v|
@@ -907,12 +912,7 @@ module Forme
 
     # Return tag with error message span tag after it.
     def call(tag, input)
-      msg_tag = tag.tag(:span, {:class=>'error_message'}, input.opts[:error])
-      if tag.is_a?(Tag)
-        attr = tag.attr
-        Forme.attr_classes(attr, 'error')
-      end
-      [tag, msg_tag]
+      [tag, input.tag(:span, {:class=>'error_message'}, input.opts[:error])]
     end
   end
 
@@ -933,7 +933,7 @@ module Forme
       else
         [label, ": ", tag]
       end
-      input.tag(:label, {}, t)
+      input.tag(:label, input.opts[:label_attr]||{}, t)
     end
   end
 
@@ -951,7 +951,7 @@ module Forme
     # :label_for option is used, the label created will not be
     # associated with an input.
     def call(tag, input)
-      [input.tag(:label, {:for=>input.opts.fetch(:label_for, input.opts[:id])}, [input.opts[:label]]), tag]
+      [input.tag(:label, {:for=>input.opts.fetch(:label_for, input.opts[:id])}.merge(input.opts[:label_attr]||{}), [input.opts[:label]]), tag]
     end
   end
 
@@ -960,7 +960,7 @@ module Forme
     Forme.register_transformer(:wrapper, x){|tag, input| input.tag(x, input.opts[:wrapper_attr], Array(tag))}
   end
   Forme.register_transformer(:wrapper, :trtd) do |tag, input|
-    a = Array(tag)
+    a = Array(tag).flatten
     input.tag(:tr, input.opts[:wrapper_attr], a.length == 1 ? input.tag(:td, {}, a) : [input.tag(:td, {}, [a.first]), input.tag(:td, {}, a[1..-1])])
   end
 

data/lib/forme/version.rb

@@ -1,6 +1,6 @@
 module Forme
   # Version constant, use <tt>Forme.version</tt> instead.
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 
   # Returns the version as a frozen string (e.g. '0.1.0')
   def self.version

data/lib/sequel/plugins/forme.rb

@@ -151,10 +151,11 @@ module Sequel # :nodoc:
         def input
           opts[:attr] = opts[:attr] ? opts[:attr].dup : {}
           opts[:wrapper_attr] = opts[:wrapper_attr] ? opts[:wrapper_attr].dup : {}
+          handle_errors(field)
+          handle_validations(field)
 
-          if sch = obj.db_schema[field] 
-            handle_errors(field)
-            handle_validations(field)
+          type = opts[:type]
+          if !type && (sch = obj.db_schema[field])
             meth = :"input_#{sch[:type]}"
             opts[:id] = form.namespaced_id(field) unless opts.has_key?(:id)
             opts[:name] = form.namespaced_name(field) unless opts.has_key?(:name)
@@ -169,7 +170,7 @@ module Sequel # :nodoc:
             else
               input_other(sch)
             end
-          elsif ref = obj.model.association_reflection(field)
+          elsif !type && (ref = obj.model.association_reflection(field))
             ::Forme.attr_classes(opts[:wrapper_attr], ref[:type])
             meth = :"association_#{ref[:type]}"
             if respond_to?(meth, true)
@@ -177,13 +178,20 @@ module Sequel # :nodoc:
             else
               raise Error, "Association type #{ref[:type]} not currently handled for association #{ref[:name]}"
             end
-          elsif obj.respond_to?(field)
+          else
+            rt = obj.respond_to?(field)
+            raise(Error, "Unrecognized field used: #{field}") unless rt || type
+            meth = :"input_#{type}"
+            opts[:value] = nil unless rt || opts.has_key?(:value)
             opts[:id] = form.namespaced_id(field) unless opts.has_key?(:id)
-            opts[:name] = form.namespaced_name(field) unless opts.has_key?(:name)
+            opts[:name] = form.namespaced_name(field, opts[:multiple]) unless opts.has_key?(:name)
             handle_label(field)
-            input_other({})
-          else
-            raise Error, "Unrecognized field used: #{field}"
+            if respond_to?(meth, true)
+              opts.delete(:type)
+              send(meth, opts)
+            else
+              input_other(opts)
+            end
           end
         end
 
@@ -205,13 +213,27 @@ module Sequel # :nodoc:
         # Set the label option appropriately, adding a * if the field
         # is required.
         def handle_label(f)
-          unless opts.has_key?(:label)
-            opts[:label] = if opts[:required]
-              [humanize(field), form._tag(:abbr, {:title=>'required'}, '*')]
-            else
-              humanize(field)
-            end
+          opts[:label] = humanize(field) unless opts.has_key?(:label)
+          opts[:label] = [opts[:label], form._tag(:abbr, {:title=>'required'}, '*')] if opts[:required]
+        end
+
+        # Add the label to the start of the array, returning the array.
+        def add_label(label, array)
+          if label
+            array.unshift(": ") unless label.is_a?(::Forme::Raw)
+            array.unshift(label)
           end
+          array
+        end
+
+        # Unset the wrapper and tag_wrapper options and return a
+        # array with the wrapper and tag_wrapper to use.  The tag_wrapper
+        # is for wrapping each individual tag.
+        def get_wrappers
+          tag_wrapper = opts.delete(:tag_wrapper) || :default
+          wrapper = form.transformer(:wrapper, opts)
+          opts.delete(:wrapper)
+          [wrapper, tag_wrapper]
         end
 
         # Update the attributes and options for any recognized validations
@@ -284,11 +306,9 @@ module Sequel # :nodoc:
             handle_label(field)
             label = opts.delete(:label)
             val = opts.delete(:value)
-            tag_wrapper = opts.delete(:tag_wrapper) || :default
-            wrapper = form.transformer(:wrapper, opts)
-            opts.delete(:wrapper)
+            wrapper, tag_wrapper = get_wrappers
             radios = opts.delete(:options).map{|l, pk| _input(:radio, opts.merge(:value=>pk, :wrapper=>tag_wrapper, :label=>l, :checked=>(pk == val)))}
-            radios.unshift("#{label}: ")
+            add_label(label, radios)
             wrapper ? wrapper.call(radios, _input(:radio, opts)) : radios
           else
             opts[:id] = form.namespaced_id(key) unless opts.has_key?(:id)
@@ -317,11 +337,9 @@ module Sequel # :nodoc:
           if opts.delete(:as) == :checkbox
             label = opts.delete(:label)
             val = opts.delete(:value)
-            tag_wrapper = opts.delete(:tag_wrapper) || :default
-            wrapper = form.transformer(:wrapper, opts)
-            opts.delete(:wrapper)
+            wrapper, tag_wrapper = get_wrappers
             cbs = opts.delete(:options).map{|l, pk| _input(:checkbox, opts.merge(:value=>pk, :wrapper=>tag_wrapper, :label=>l, :checked=>val.include?(pk), :no_hidden=>true))}
-            cbs.unshift("#{label}: ")
+            add_label(label, cbs)
             wrapper ? wrapper.call(cbs, _input(:checkbox, opts)) : cbs
           else
             opts[:id] = form.namespaced_id(field) unless opts.has_key?(:id)
@@ -346,7 +364,26 @@ module Sequel # :nodoc:
         # If the column allows +NULL+ values, use a three-valued select
         # input.  If not, use a simple checkbox.
         def input_boolean(sch)
-          if sch[:allow_null]
+          unless opts.has_key?(:as)
+            opts[:as] = sch[:allow_null] ? :select : :checkbox
+          end
+
+          case opts[:as]
+          when :radio
+            wrapper, tag_wrapper = get_wrappers
+            true_opts = opts.merge(:value=>opts[:true_value]||'t', :label=>opts[:true_label]||'Yes', :error=>nil, :wrapper=>tag_wrapper, :wrapper_attr=>{})
+            false_opts = opts.merge(:value=>opts[:false_value]||'f', :label=>opts[:false_label]||'No', :wrapper=>tag_wrapper, :wrapper_attr=>{})
+            if i = opts[:id]
+              true_opts[:id] = "#{i}_yes"
+              false_opts[:id] = "#{i}_no"
+            end
+            v = opts.has_key?(:value) ? opts[:value] : obj.send(field)
+            unless v.nil?
+              (v ? true_opts : false_opts)[:checked] = true
+            end
+            array = add_label(opts[:label], [_input(:radio, true_opts), _input(:radio, false_opts)])
+            wrapper ? wrapper.call(array, _input(:radio, opts)) : array
+          when :select
             v = opts[:value] || obj.send(field)
             opts[:value] = (v ? 't' : 'f') unless v.nil?
             opts[:add_blank] = true

data/spec/forme_spec.rb

@@ -177,10 +177,18 @@ describe "Forme plain forms" do
     @f.input(:text, :label=>'Foo', :value=>'foo').to_s.should == '<label>Foo: <input type="text" value="foo"/></label>'
   end
 
+  specify "should set label attributes with :label_attr option" do
+    @f.input(:text, :label=>'Foo', :value=>'foo', :label_attr=>{:class=>'bar'}).to_s.should == '<label class="bar">Foo: <input type="text" value="foo"/></label>'
+  end
+
   specify "should automatically note the input has errors if :error option is used" do
     @f.input(:text, :error=>'Bad Stuff!', :value=>'foo').to_s.should == '<input class="error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
   end
 
+  specify "should add an error message after the label" do
+    @f.input(:text, :error=>'Bad Stuff!', :value=>'foo', :label=>"Foo").to_s.should == '<label>Foo: <input class="error" type="text" value="foo"/></label><span class="error_message">Bad Stuff!</span>'
+  end
+
   specify "should add to existing :class option if :error option is used" do
     @f.input(:text, :error=>'Bad Stuff!', :class=>'bar', :value=>'foo').to_s.should == '<input class="bar error" type="text" value="foo"/><span class="error_message">Bad Stuff!</span>'
   end
@@ -279,7 +287,7 @@ describe "Forme plain forms" do
   end
 
   specify "inputs should accept a :error_handler option to use a custom error_handler" do
-    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.should == '<textarea id="foo"></textarea>!!! bar'
+    @f.input(:textarea, :error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}, :error=>'bar', :id=>:foo).to_s.should == '<textarea class="error" id="foo"></textarea>!!! bar'
   end
 
   specify "#inputs should accept a :inputs_wrapper option to use a custom inputs_wrapper" do
@@ -295,13 +303,17 @@ describe "Forme plain forms" do
   end
 
   specify "inputs should accept a :error_handler=>nil option to not use an error_handler" do
-    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.should == '<textarea id="foo"></textarea>'
+    @f.input(:textarea, :error_handler=>nil, :error=>'bar', :id=>:foo).to_s.should == '<textarea class="error" id="foo"></textarea>'
   end
 
   specify "#inputs should accept a :inputs_wrapper=>nil option to not use an inputs_wrapper" do
     @f.form{|f| f.inputs([:textarea], :inputs_wrapper=>nil)}.to_s.should == '<form><textarea></textarea></form>'
   end
 
+  specify "#inputs should treat a single hash argument as an options hash with no default inputs" do
+    @f.inputs(:inputs_wrapper=>:ol){@f.input(:textarea)}.to_s.should == '<ol><textarea></textarea></ol>'
+  end
+
   specify "invalid custom transformers should raise an Error" do
     proc{Forme::Form.new(:wrapper=>Object.new)}.should raise_error(Forme::Error)
     proc{@f.input(:textarea, :wrapper=>Object.new).to_s}.should raise_error(Forme::Error)
@@ -323,7 +335,7 @@ describe "Forme custom" do
   end
 
   specify "error_handlers can be specified as a proc" do
-    Forme::Form.new(:error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}).input(:textarea, :name=>'foo', :error=>'bar').to_s.should == '<textarea name="foo"></textarea>!!! bar'
+    Forme::Form.new(:error_handler=>proc{|t, i| [t, "!!! #{i.opts[:error]}"]}).input(:textarea, :name=>'foo', :error=>'bar').to_s.should == '<textarea class="error" name="foo"></textarea>!!! bar'
   end
 
   specify "wrappers can be specified as a proc" do
@@ -434,18 +446,18 @@ end
 
 describe "Forme registering custom transformers" do
   specify "should have #register_transformer register a transformer object for later use" do
-    Forme.register_transformer(:wrapper, :div, proc{|t, i| t.tag(:div, {}, [t])})
-    Forme::Form.new(:wrapper=>:div).input(:textarea).to_s.should == '<div><textarea></textarea></div>'
+    Forme.register_transformer(:wrapper, :div2, proc{|t, i| i.tag(:div2, {}, [t])})
+    Forme::Form.new(:wrapper=>:div2).input(:textarea).to_s.should == '<div2><textarea></textarea></div2>'
   end
 
   specify "should have #register_transformer register a transformer block for later use" do
-    Forme.register_transformer(:wrapper, :div1){|t, i| t.tag(:div1, {}, [t])}
+    Forme.register_transformer(:wrapper, :div1){|t, i| i.tag(:div1, {}, [t])}
     Forme::Form.new(:wrapper=>:div1).input(:textarea).to_s.should == '<div1><textarea></textarea></div1>'
   end
 
   specify "should have #register_transformer raise an error if given a block and an object" do
     proc do
-      Forme.register_transformer(:wrapper, :div1, proc{|t, i| t}){|t| t.tag(:div1, {}, [t])}
+      Forme.register_transformer(:wrapper, :div1, proc{|t, i| t}){|t, i| i.tag(:div1, {}, [t])}
     end.should raise_error(Forme::Error)
   end
 end

data/spec/sequel_plugin_spec.rb

@@ -124,6 +124,10 @@ describe "Forme Sequel::Model forms" do
     @b.input(:name, :required=>true).to_s.should == '<label>Name<abbr title="required">*</abbr>: <input id="album_name" name="album[name]" required="required" type="text" value="b"/></label>'
   end
   
+  specify "should add required to label even if :label option specified" do
+    @b.input(:name, :required=>true, :label=>'Foo').to_s.should == '<label>Foo<abbr title="required">*</abbr>: <input id="album_name" name="album[name]" required="required" type="text" value="b"/></label>'
+  end
+  
   specify "should include required wrapper class if required" do
     f = Forme::Form.new(@ab, :wrapper=>:li)
     f.input(:name, :required=>true).to_s.should == '<li class="string required"><label>Name<abbr title="required">*</abbr>: <input id="album_name" name="album[name]" required="required" type="text" value="b"/></label></li>'
@@ -139,11 +143,44 @@ describe "Forme Sequel::Model forms" do
     @c.input(:platinum).to_s.should == '<label><input id="album_platinum_hidden" name="album[platinum]" type="hidden" value="f"/><input checked="checked" id="album_platinum" name="album[platinum]" type="checkbox" value="t"/> Platinum</label>'
   end
   
+  specify "should use radio buttons for boolean fields if :as=>:radio is used" do
+    @b.input(:platinum, :as=>:radio).to_s.should == 'Platinum: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label>'
+    @c.input(:platinum, :as=>:radio).to_s.should == 'Platinum: <label><input checked="checked" id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label>'
+  end
+  
+  specify "should wrap both inputs if :as=>:radio is used" do
+    @b = Forme::Form.new(@ab, :wrapper=>:li)
+    @b.input(:platinum, :as=>:radio).to_s.should == '<li class="boolean">Platinum: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label></li>'
+    @b.input(:platinum, :as=>:radio, :wrapper=>:div, :tag_wrapper=>:span).to_s.should == '<div class="boolean">Platinum: <span><label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label></span><span><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label></span></div>'
+  end
+  
+  specify "should handle errors on radio buttons for boolean fields if :as=>:radio is used" do
+    @ab.errors.add(:platinum, 'foo')
+    @b.input(:platinum, :as=>:radio).to_s.should == 'Platinum: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input checked="checked" class="error" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label><span class="error_message">foo</span>'
+  end
+  
+  specify "should handle Raw :label options if :as=>:radio is used" do
+    @b.input(:platinum, :as=>:radio, :label=>'Foo:<br />'.extend(Forme::Raw)).to_s.should == 'Foo:<br /><label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label>'
+    @b.input(:platinum, :as=>:radio, :label=>'Foo:<br />').to_s.should == 'Foo:&lt;br /&gt;: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label>'
+  end
+  
+  specify "should respect :true_label and :false_label options for boolean fields if :as=>:radio is used" do
+    @b.input(:platinum, :as=>:radio, :true_label=>"Foo", :false_label=>"Bar").to_s.should == 'Platinum: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Foo</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> Bar</label>'
+  end
+  
+  specify "should respect :true_value and :false_value options for boolean fields if :as=>:radio is used" do
+    @b.input(:platinum, :as=>:radio, :true_value=>"Foo", :false_value=>"Bar").to_s.should == 'Platinum: <label><input id="album_platinum_yes" name="album[platinum]" type="radio" value="Foo"/> Yes</label><label><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="Bar"/> No</label>'
+  end
+  
   specify "should use a select box for many_to_one associations" do
     @b.input(:artist).to_s.should == '<label>Artist: <select id="album_artist_id" name="album[artist_id]"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label>'
     @c.input(:artist).to_s.should == '<label>Artist: <select id="album_artist_id" name="album[artist_id]"><option value=""></option><option value="1">a</option><option selected="selected" value="2">d</option></select></label>'
   end
 
+  specify "should allow overriding default input type using a :type option" do
+    @b.input(:artist, :type=>:string, :value=>nil).to_s.should == '<label>Artist: <input id="album_artist" name="album[artist]" type="text"/></label>'
+  end
+
   specify "should use a required wrapper tag for many_to_one required associations" do
     @b.input(:artist, :required=>true, :wrapper=>:li).to_s.should == '<li class="many_to_one required"><label>Artist<abbr title="required">*</abbr>: <select id="album_artist_id" name="album[artist_id]" required="required"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label></li>'
   end
@@ -153,6 +190,11 @@ describe "Forme Sequel::Model forms" do
     @c.input(:artist, :as=>:radio).to_s.should == 'Artist: <label><input name="album[artist_id]" type="radio" value="1"/> a</label><label><input checked="checked" name="album[artist_id]" type="radio" value="2"/> d</label>'
   end
   
+  specify "should handle Raw label for many_to_one associations with :as=>:radio option" do
+    @b.input(:artist, :as=>:radio, :label=>'Foo:<br />'.extend(Forme::Raw)).to_s.should == 'Foo:<br /><label><input checked="checked" name="album[artist_id]" type="radio" value="1"/> a</label><label><input name="album[artist_id]" type="radio" value="2"/> d</label>'
+    @b.input(:artist, :as=>:radio, :label=>'Foo<br />').to_s.should == 'Foo&lt;br /&gt;: <label><input checked="checked" name="album[artist_id]" type="radio" value="1"/> a</label><label><input name="album[artist_id]" type="radio" value="2"/> d</label>'
+  end
+  
   specify "should correctly use the forms wrapper for wrapping radio buttons for many_to_one associations with :as=>:radio option" do
     @b = Forme::Form.new(@ab, :wrapper=>:li)
     @b.input(:artist, :as=>:radio).to_s.should == '<li class="many_to_one">Artist: <label><input checked="checked" name="album[artist_id]" type="radio" value="1"/> a</label><label><input name="album[artist_id]" type="radio" value="2"/> d</label></li>'
@@ -221,6 +263,11 @@ describe "Forme Sequel::Model forms" do
     @c.input(:tags, :as=>:checkbox).to_s.should == 'Tags: <label><input name="album[tag_pks][]" type="checkbox" value="1"/> s</label><label><input checked="checked" name="album[tag_pks][]" type="checkbox" value="2"/> t</label><label><input name="album[tag_pks][]" type="checkbox" value="3"/> u</label>'
   end
 
+  specify "should handle Raw label for associations with :as=>:checkbox" do
+    @b.input(:tracks, :as=>:checkbox, :label=>'Foo<br />:'.extend(Forme::Raw)).to_s.should == 'Foo<br />:<label><input checked="checked" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label><input name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
+    @b.input(:tracks, :as=>:checkbox, :label=>'Foo<br />').to_s.should == 'Foo&lt;br /&gt;: <label><input checked="checked" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label><input name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
+  end
+  
   specify "should correctly use the forms wrapper for wrapping radio buttons for one_to_many associations with :as=>:checkbox option" do
     @b = Forme::Form.new(@ab, :wrapper=>:li)
     @b.input(:tracks, :as=>:checkbox).to_s.should == '<li class="one_to_many">Tracks: <label><input checked="checked" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label><input name="album[track_pks][]" type="checkbox" value="3"/> o</label></li>'
@@ -236,14 +283,29 @@ describe "Forme Sequel::Model forms" do
     @c.input(:artist_name).to_s.should == '<label>Artist name: <input id="album_artist_name" name="album[artist_name]" type="text" value="d"/></label>'
   end
 
+  specify "should handle errors on methods not backed by columns" do
+    @ab.errors.add(:artist_name, 'foo')
+    @b.input(:artist_name).to_s.should == '<label>Artist name: <input class="error" id="album_artist_name" name="album[artist_name]" type="text" value="a"/></label><span class="error_message">foo</span>'
+  end
+
+  specify "should respect a :type option with a schema type as the input type for methods not backed by columns" do
+    def @ab.foo; false end
+    @b.input(:foo, :type=>:boolean, :as=>:select).to_s.should == '<label>Foo: <select id="album_foo" name="album[foo]"><option value=""></option><option value="t">True</option><option selected="selected" value="f">False</option></select></label>'
+  end
+
+  specify "should respect a :type option with an input type as the input type for methods not backed by columns" do
+    def @ab.foo; "bar" end
+    @b.input(:foo, :type=>:phone).to_s.should == '<label>Foo: <input id="album_foo" name="album[foo]" type="phone" value="bar"/></label>'
+  end
+
   specify "should correctly show an error message if there is one" do
     @ab.errors.add(:name, 'tis not valid')
-    @b.input(:name).to_s.should == '<label>Name: <input class="error" id="album_name" name="album[name]" type="text" value="b"/><span class="error_message">tis not valid</span></label>'
+    @b.input(:name).to_s.should == '<label>Name: <input class="error" id="album_name" name="album[name]" type="text" value="b"/></label><span class="error_message">tis not valid</span>'
   end
   
   specify "should correctly show an error message for many_to_one associations if there is one" do
     @ab.errors.add(:artist_id, 'tis not valid')
-    @b.input(:artist).to_s.should == '<label>Artist: <select class="error" id="album_artist_id" name="album[artist_id]"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select><span class="error_message">tis not valid</span></label>'
+    @b.input(:artist).to_s.should == '<label>Artist: <select class="error" id="album_artist_id" name="album[artist_id]"><option value=""></option><option selected="selected" value="1">a</option><option value="2">d</option></select></label><span class="error_message">tis not valid</span>'
   end
   
   specify "should raise an error for unhandled associations" do
@@ -252,10 +314,23 @@ describe "Forme Sequel::Model forms" do
     proc{Forme::Form.new(al.new).input(:tags)}.should raise_error(Forme::Error)
   end
   
-  specify "should raise an error for unhandled fields" do
+  specify "should raise an error for unhandled fields with no :type option" do
     proc{@b.input(:foo)}.should raise_error(Forme::Error)
   end
 
+  specify "should respect a :type option with a schema type as the input type for unhandled fields" do
+    @b.input(:foo, :type=>:string).to_s.should == '<label>Foo: <input id="album_foo" name="album[foo]" type="text"/></label>'
+    @b.input(:password, :type=>:string).to_s.should == '<label>Password: <input id="album_password" name="album[password]" type="password"/></label>'
+  end
+
+  specify "should respect a :type option with an input type as the input type for unhandled fields" do
+    @b.input(:foo, :type=>:phone).to_s.should == '<label>Foo: <input id="album_foo" name="album[foo]" type="phone"/></label>'
+  end
+
+  specify "should respect a :multiple option for the name attribute for unhandled fields" do
+    @b.input(:foo, :type=>:phone, :multiple=>true).to_s.should == '<label>Foo: <input id="album_foo" name="album[foo][]" type="phone"/></label>'
+  end
+
   specify "should add required attribute if the column doesn't support nil values" do
     def @ab.db_schema; h = super.dup; h[:name] = h[:name].merge(:allow_null=>false); h end
     @b.input(:name).to_s.should == '<label>Name<abbr title="required">*</abbr>: <input id="album_name" name="album[name]" required="required" type="text" value="b"/></label>'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: forme
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: []