forme 0.6.0 → 0.7.0

data/lib/forme/version.rb

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

data/lib/sequel/plugins/forme.rb

@@ -84,7 +84,7 @@ module Sequel # :nodoc:
                     options[:legend] = humanize(association)
                   end
                 end
-                inputs(ins, options, &block)  
+                _inputs(ins, options, &block)  
               else
                 yield
               end
@@ -219,10 +219,7 @@ module Sequel # :nodoc:
 
         # 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.unshift(form._tag(:span, {:class=>:label}, label)) if label
           array
         end
 
@@ -307,7 +304,7 @@ module Sequel # :nodoc:
             label = opts.delete(:label)
             val = opts.delete(:value)
             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 = opts.delete(:options).map{|l, pk| _input(:radio, opts.merge(:value=>pk, :id=>"#{form.namespaced_id(key)}_#{pk}", :wrapper=>tag_wrapper, :label=>l, :label_attr=>{:class=>:option}, :checked=>(pk == val)))}
             add_label(label, radios)
             wrapper ? wrapper.call(radios, _input(:radio, opts)) : radios
           else
@@ -338,7 +335,7 @@ module Sequel # :nodoc:
             label = opts.delete(:label)
             val = opts.delete(:value)
             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 = opts.delete(:options).map{|l, pk| _input(:checkbox, opts.merge(:value=>pk, :id=>"#{form.namespaced_id(field)}_#{pk}", :wrapper=>tag_wrapper, :label=>l, :label_attr=>{:class=>:option}, :checked=>val.include?(pk), :no_hidden=>true))}
             add_label(label, cbs)
             wrapper ? wrapper.call(cbs, _input(:checkbox, opts)) : cbs
           else
@@ -371,8 +368,8 @@ module Sequel # :nodoc:
           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=>{})
+            true_opts = opts.merge(:value=>opts[:true_value]||'t', :label=>opts[:true_label]||'Yes', :label_attr=>{:class=>:option}, :error=>nil, :wrapper=>tag_wrapper, :wrapper_attr=>{})
+            false_opts = opts.merge(:value=>opts[:false_value]||'f', :label=>opts[:false_label]||'No', :label_attr=>{:class=>:option}, :wrapper=>tag_wrapper, :wrapper_attr=>{})
             if i = opts[:id]
               true_opts[:id] = "#{i}_yes"
               false_opts[:id] = "#{i}_no"
@@ -387,7 +384,7 @@ module Sequel # :nodoc:
             v = opts[:value] || obj.send(field)
             opts[:value] = (v ? 't' : 'f') unless v.nil?
             opts[:add_blank] = true
-            opts[:options] = [['True', 't'], ['False', 'f']]
+            opts[:options] = [[opts[:true_label]||'True', opts[:true_value]||'t'], [opts[:false_label]||'False', opts[:false_value]||'f']]
             _input(:select, opts)
           else
             opts[:checked] = obj.send(field)
@@ -453,6 +450,20 @@ module Sequel # :nodoc:
         end
       end
 
+      # Helper module used for Sequel/Sinatra forms.  Necessary for
+      # proper subform handling when using such forms with partials.
+      module SinatraSequelForm
+        # Capture the inside of the inputs, injecting it into the template
+        # if a block is given, or returning it as a string if not.
+        def subform(*, &block)
+          if block
+            capture(block){super}
+          else
+            capture{super}
+          end
+        end
+      end
+
       module InstanceMethods
         # Configure the +form+ with support for <tt>Sequel::Model</tt>
         # specific code, such as support for nested attributes.
@@ -460,6 +471,7 @@ module Sequel # :nodoc:
           form.extend(SequelForm)
           form.nested_associations = []
           form.namespaces = [model.send(:underscore, model.name)]
+          form.extend(SinatraSequelForm) if defined?(::Forme::Sinatra::Form) && form.is_a?(::Forme::Sinatra::Form)
         end
 
         # Return <tt>Forme::Input</tt> instance based on the given arguments.

data/spec/forme_spec.rb

@@ -42,6 +42,10 @@ describe "Forme plain forms" do
     @f.input(:text, :placeholder=>"foo").to_s.should == '<input placeholder="foo" type="text"/>'
   end
 
+  specify "should use :style option as attribute" do
+    @f.input(:text, :style=>"foo").to_s.should == '<input style="foo" type="text"/>'
+  end
+
   specify "should allow arbitrary attributes using the :attr option" do
     @f.input(:text, :attr=>{:bar=>"foo"}).to_s.should == '<input bar="foo" type="text"/>'
   end
@@ -62,6 +66,11 @@ describe "Forme plain forms" do
     @f.input(:text, :data=>{:bar=>"baz"}, :attr=>{:"data-bar"=>"foo"}).to_s.should == '<input data-bar="foo" type="text"/>'
   end
 
+  specify "should use :size and :maxlength options as attributes for text inputs" do
+    @f.input(:text, :size=>5, :maxlength=>10).to_s.should == '<input maxlength="10" size="5" type="text"/>'
+    @f.input(:textarea, :size=>5, :maxlength=>10).to_s.should == '<textarea></textarea>'
+  end
+
   specify "should create hidden input with value 0 for each checkbox with a name" do
     @f.input(:checkbox, :name=>"foo").to_s.should == '<input name="foo" type="hidden" value="0"/><input name="foo" type="checkbox"/>'
   end
@@ -89,6 +98,12 @@ describe "Forme plain forms" do
 
   specify "should create textarea tag" do
     @f.input(:textarea).to_s.should == '<textarea></textarea>'
+    @f.input(:textarea, :value=>'a').to_s.should == '<textarea>a</textarea>'
+  end
+
+  specify "should use :cols and :rows options as attributes for textarea inputs" do
+    @f.input(:text, :cols=>5, :rows=>10).to_s.should == '<input type="text"/>'
+    @f.input(:textarea, :cols=>5, :rows=>10).to_s.should == '<textarea cols="5" rows="10"></textarea>'
   end
 
   specify "should create select tag" do
@@ -181,6 +196,18 @@ describe "Forme plain forms" 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 handle implicit labels with checkboxes" do
+    @f.input(:checkbox, :label=>'Foo', :value=>'foo', :name=>'a').to_s.should == '<input name="a" type="hidden" value="0"/><label><input name="a" type="checkbox" value="foo"/> Foo</label>'
+  end
+
+  specify "should handle implicit labels with :label_position=>:after" do
+    @f.input(:text, :label=>'Foo', :value=>'foo', :label_position=>:after).to_s.should == '<label><input type="text" value="foo"/> Foo</label>'
+  end
+
+  specify "should handle implicit labels with checkboxes with :label_position=>:before" do
+    @f.input(:checkbox, :label=>'Foo', :value=>'foo', :name=>'a', :label_position=>:before).to_s.should == '<input name="a" type="hidden" value="0"/><label>Foo <input name="a" type="checkbox" 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
@@ -286,6 +313,18 @@ describe "Forme plain forms" do
     @f.input(:textarea, :labeler=>:explicit, :label=>'bar', :id=>:foo).to_s.should == '<label for="foo">bar</label><textarea id="foo"></textarea>'
   end
 
+  specify "inputs handle explicit labels with :label_position=>:after" do
+    @f.input(:textarea, :labeler=>:explicit, :label=>'bar', :id=>:foo, :label_position=>:after).to_s.should == '<textarea id="foo"></textarea><label for="foo">bar</label>'
+  end
+
+  specify "should handle explicit labels with checkboxes" do
+    @f.input(:checkbox, :labeler=>:explicit, :label=>'Foo', :value=>'foo', :name=>'a', :id=>'bar').to_s.should == '<input id="bar_hidden" name="a" type="hidden" value="0"/><input id="bar" name="a" type="checkbox" value="foo"/><label for="bar">Foo</label>'
+  end
+
+  specify "should handle explicit labels with checkboxes with :label_position=>:before" do
+    @f.input(:checkbox, :labeler=>:explicit, :label=>'Foo', :value=>'foo', :name=>'a', :id=>'bar', :label_position=>:before).to_s.should == '<label for="bar">Foo</label><input id="bar_hidden" name="a" type="hidden" value="0"/><input id="bar" name="a" type="checkbox" value="foo"/>'
+  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 class="error" id="foo"></textarea>!!! bar'
   end
@@ -547,6 +586,11 @@ describe "Forme.form DSL" do
     Forme.form{|f| f.should be_a_kind_of(Forme::Form)}
   end
 
+  specify "should respect an array of classes" do
+    Forme.form(:class=>[:foo, :bar]).to_s.should ==  '<form class="foo bar"></form>'
+    Forme.form(:class=>[:foo, [:bar, :baz]]).to_s.should ==  '<form class="foo bar baz"></form>'
+  end
+
   specify "should have inputs called instead the block be added to the existing form" do
     Forme.form{|f| f.input(:text)}.to_s.should ==  '<form><input type="text"/></form>'
   end

data/spec/rails_integration_spec.rb

@@ -0,0 +1,195 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
+
+require 'rubygems'
+require 'action_controller/railtie'
+require 'forme/rails'
+
+class FormeRails < Rails::Application
+  config.secret_token = routes.append { match ':action' , :controller=>'forme' }.inspect
+  config.active_support.deprecation = :stderr
+  config.middleware.delete(ActionDispatch::ShowExceptions)
+  config.threadsafe!
+  initialize!
+end
+
+class FormeController < ActionController::Base
+  helper Forme::Rails::ERB
+
+  def index
+    render :inline => <<END
+<%= forme([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:first) %>
+  <%= f.input(:last) %>
+  <%= f.button('Save') %>
+<% end %>
+END
+  end
+
+  def inputs_block
+    render :inline => <<END
+<%= forme([:foo, :bar], :action=>'/baz') do |f| %>
+  <%= f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %>
+<% end %>
+END
+  end
+
+  def inputs_block_wrapper
+    render :inline => <<END
+<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs_wrapper=>:fieldset_ol) do |f| %>
+  <%= f.inputs(:legend=>'FBB') do %>
+    <%= f.input(:last) %>
+  <% end %>
+<% end %>
+END
+  end
+
+  def nest
+    render :inline => <<END
+<%= forme([:foo, :bar], :action=>'/baz') do |f| %>
+  <%= f.tag(:p, {}, 'FBB') %>
+  <%= f.tag(:div) do %>
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+  <% end %>
+
+<% end %>
+END
+  end
+
+  def nest_sep
+    @nest = <<END
+  n1
+  <%= f.tag(:div) do %>
+    n2
+    <%= f.input(:first) %>
+    <%= f.input(:last) %>
+    n3
+  <% end %>
+  n4
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  n5
+END
+    render :inline => <<END
+0
+<%= forme([:foo, :bar], :action=>'/baz') do |f| %>
+  1
+  <%= f.tag(:p, {}, 'FBB') %>
+  2
+  <%= render(:inline =>@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
+  def nest_seq
+    @album = Album.load(:name=>'N', :copies_sold=>2, :id=>1)
+    @album.associations[:artist] = Artist.load(:name=>'A', :id=>2)
+    @nest = <<END
+  n1
+  <%= f.subform(:artist) do %>
+    n2
+    <%= f.input(:name2) %>
+    n3
+  <% end %>
+  n4
+  <%= f.subform(:artist, :inputs=>[:name3], :legend=>'Bar') %>
+  n5
+END
+    render :inline => <<END
+0
+<%= forme(@album, :action=>'/baz') do |f| %>
+  1
+  <%= f.subform(:artist, :inputs=>[:name], :legend=>'Foo') %>
+  2
+  <%= render(:inline=>@nest, :locals=>{:f=>f}) %>
+  3
+<% end %>
+4
+END
+  end
+
+  def hash
+    render :inline => "<%= forme({:action=>'/baz'}, :obj=>[:foo]) do |f| %> <%= f.input(:first) %> <% end %>"
+  end
+
+  def legend
+    render :inline => <<END
+<%= forme([:foo, :bar], :action=>'/baz') do |f| %>
+  <p>FBB</p>
+  <%= f.inputs([:first, :last], :legend=>'Foo') %>
+  <p>FBB2</p>
+<% end %>
+END
+  end
+
+  def combined
+    render :inline => <<END
+<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') do |f| %>
+  <p>FBB</p>
+  <%= f.input(:last) %>
+<% end %>
+END
+  end
+
+  def noblock
+    render :inline => "<%= forme([:foo, :bar], {:action=>'/baz'}, :inputs=>[:first], :button=>'xyz', :legend=>'123') %>"
+  end
+end
+
+describe "Forme Rails integration" do
+  def sin_get(path)
+    res = FormeRails.call(@rack.merge('PATH_INFO'=>path))
+    p res unless res[0] == 200
+    res[2].join.gsub(/\s+/, ' ').strip
+  end
+  before do
+    o = Object.new
+    def o.puts(*) end
+    @rack = {'rack.input'=>'', 'REQUEST_METHOD'=>'GET', 'rack.errors'=>o}
+  end
+
+  specify "#form should add start and end tags and yield Forme::Form instance" do
+    sin_get('/index').should == '<form action="/baz"> <p>FBB</p> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> <input type="submit" value="Save"/> </form>'
+  end
+
+  specify "#form should have inputs work with a block" do
+    sin_get('/inputs_block').should == '<form action="/baz"> <fieldset class="inputs"><legend>FBB</legend> <input id="last" name="last" type="text" value="bar"/> </fieldset></form>'
+  end
+
+  specify "#form should have inputs with fieldset_ol wrapper work with block" do
+    sin_get('/inputs_block_wrapper').should == '<form action="/baz"> <fieldset class="inputs"><legend>FBB</legend><ol> <input id="last" name="last" type="text" value="bar"/> </ol></fieldset></form>'
+  end
+
+  specify "#form should add start and end tags and yield Forme::Form instance" do
+    sin_get('/nest').should == '<form action="/baz"> <p>FBB</p> <div> <input id="first" name="first" type="text" value="foo"/> <input id="last" name="last" type="text" value="bar"/> </div> </form>'
+  end
+
+  specify "#form should correctly handle situation where multiple templates are used with same form object" do
+    sin_get('/nest_sep').should == "0 <form action=\"/baz\"> 1 <p>FBB</p> 2 n1 <div> n2 <input id=\"first\" name=\"first\" type=\"text\" value=\"foo\"/> <input id=\"last\" name=\"last\" type=\"text\" value=\"bar\"/> n3 </div> n4 <fieldset class=\"inputs\"><legend>Foo</legend><input id=\"first\" name=\"first\" type=\"text\" value=\"foo\"/><input id=\"last\" name=\"last\" type=\"text\" value=\"bar\"/></fieldset> n5 3 </form>4"
+  end
+
+  specify "#form should correctly handle situation Sequel integration with subforms where multiple templates are used with same form object" do
+    sin_get('/nest_seq').should == "0 <form action=\"/baz\" class=\"forme album\" method=\"post\"> 1 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/><fieldset class=\"inputs\"><legend>Foo</legend><label>Name: <input id=\"album_artist_attributes_name\" name=\"album[artist_attributes][name]\" type=\"text\" value=\"A\"/></label></fieldset> 2 n1 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/> n2 <label>Name2: <input id=\"album_artist_attributes_name2\" name=\"album[artist_attributes][name2]\" type=\"text\" value=\"A2\"/></label> n3 n4 <input id=\"album_artist_attributes_id\" name=\"album[artist_attributes][id]\" type=\"hidden\" value=\"2\"/><fieldset class=\"inputs\"><legend>Bar</legend><label>Name3: <input id=\"album_artist_attributes_name3\" name=\"album[artist_attributes][name3]\" type=\"text\" value=\"A3\"/></label></fieldset> n5 3 </form>4"
+  end
+
+  specify "#form should accept two hashes instead of requiring obj as first argument" do
+    sin_get('/hash').should == '<form action="/baz"> <input id="first" name="first" type="text" value="foo"/> </form>'
+  end
+
+  specify "#form should deal with emitted code" do
+    sin_get('/legend').should == '<form action="/baz"> <p>FBB</p> <fieldset class="inputs"><legend>Foo</legend><input id="first" name="first" type="text" value="foo"/><input id="last" name="last" type="text" value="bar"/></fieldset> <p>FBB2</p> </form>'
+  end
+
+  specify "#form should work with :inputs, :button, and :legend options" do
+    sin_get('/combined').should == '<form action="/baz"><fieldset class="inputs"><legend>123</legend><input id="first" name="first" type="text" value="foo"/></fieldset> <p>FBB</p> <input id="last" name="last" type="text" value="bar"/> <input type="submit" value="xyz"/></form>'
+  end
+
+  specify "#form should work without a block" do
+    sin_get('/noblock').should == '<form action="/baz"><fieldset class="inputs"><legend>123</legend><input id="first" name="first" type="text" value="foo"/></fieldset><input type="submit" value="xyz"/></form>'
+  end
+end

data/spec/sequel_helper.rb

@@ -0,0 +1,71 @@
+require 'rubygems'
+require 'sequel/no_core_ext'
+
+DB = Sequel.sqlite
+Sequel.default_timezone = :utc
+DB.create_table(:artists) do
+  primary_key :id
+  String :name
+end
+DB.create_table(:albums) do
+  primary_key :id
+  foreign_key :artist_id, :artists
+  String :name
+  TrueClass :gold
+  TrueClass :platinum, :null=>false, :default=>false
+  Date :release_date
+  DateTime :created_at
+  Integer :copies_sold
+end
+DB.create_table(:album_infos) do
+  primary_key :id
+  foreign_key :album_id, :albums
+  String :info
+end
+DB.create_table(:tracks) do
+  primary_key :id
+  foreign_key :album_id, :albums
+  String :name
+end
+DB.create_table(:tags) do
+  primary_key :id
+  String :name
+end
+DB.create_table(:albums_tags) do
+  foreign_key :album_id, :albums
+  foreign_key :tag_id, :tags
+end
+
+a = DB[:artists].insert(:name=>'a')
+d = DB[:artists].insert(:name=>'d')
+b = DB[:albums].insert(:name=>'b', :artist_id=>a, :gold=>false, :release_date=>Date.new(2011, 6, 5), :created_at=>Date.new(2011, 6, 5), :copies_sold=>10)
+DB[:tracks].insert(:name=>'m', :album_id=>b)
+DB[:tracks].insert(:name=>'n', :album_id=>b)
+c = DB[:albums].insert(:name=>'c', :artist_id=>d, :gold=>true, :platinum=>true)
+DB[:tracks].insert(:name=>'o', :album_id=>c)
+s = DB[:tags].insert(:name=>'s')
+t = DB[:tags].insert(:name=>'t')
+u = DB[:tags].insert(:name=>'u')
+[[b, s], [b, t], [c, t]].each{|k, v| DB[:albums_tags].insert(k, v)}
+
+Sequel::Model.plugin :forme
+class Album < Sequel::Model
+  many_to_one :artist, :order=>:name
+  one_to_one :album_info
+  one_to_many :tracks
+  many_to_many :tags
+
+  def artist_name
+    artist.name if artist
+  end
+end
+class Artist < Sequel::Model
+  one_to_many :albums
+  def idname() "#{id}#{name}" end
+  def name2() "#{name}2" end
+  def name3() "#{name}3" end
+end
+class Track < Sequel::Model; end
+class Tag < Sequel::Model; end
+class AlbumInfo < Sequel::Model; end
+

data/spec/sequel_plugin_spec.rb

@@ -1,79 +1,11 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
-
-require 'rubygems'
-require 'sequel'
-
-DB = Sequel.sqlite
-Sequel.default_timezone = :utc
-DB.create_table(:artists) do
-  primary_key :id
-  String :name
-end
-DB.create_table(:albums) do
-  primary_key :id
-  foreign_key :artist_id, :artists
-  String :name
-  TrueClass :gold
-  TrueClass :platinum, :null=>false, :default=>false
-  Date :release_date
-  DateTime :created_at
-  Integer :copies_sold
-end
-DB.create_table(:album_infos) do
-  primary_key :id
-  foreign_key :album_id, :albums
-  String :info
-end
-DB.create_table(:tracks) do
-  primary_key :id
-  foreign_key :album_id, :albums
-  String :name
-end
-DB.create_table(:tags) do
-  primary_key :id
-  String :name
-end
-DB.create_table(:albums_tags) do
-  foreign_key :album_id, :albums
-  foreign_key :tag_id, :tags
-end
-
-a = DB[:artists].insert(:name=>'a')
-d = DB[:artists].insert(:name=>'d')
-b = DB[:albums].insert(:name=>'b', :artist_id=>a, :gold=>false, :release_date=>Date.new(2011, 6, 5), :created_at=>Date.new(2011, 6, 5), :copies_sold=>10)
-DB[:tracks].insert(:name=>'m', :album_id=>b)
-DB[:tracks].insert(:name=>'n', :album_id=>b)
-c = DB[:albums].insert(:name=>'c', :artist_id=>d, :gold=>true, :platinum=>true)
-DB[:tracks].insert(:name=>'o', :album_id=>c)
-s = DB[:tags].insert(:name=>'s')
-t = DB[:tags].insert(:name=>'t')
-u = DB[:tags].insert(:name=>'u')
-[[b, s], [b, t], [c, t]].each{|k, v| DB[:albums_tags].insert(k, v)}
-
-Sequel::Model.plugin :forme
-class Album < Sequel::Model
-  many_to_one :artist, :order=>:name
-  one_to_one :album_info
-  one_to_many :tracks
-  many_to_many :tags
-
-  def artist_name
-    artist.name if artist
-  end
-end
-class Artist < Sequel::Model
-  one_to_many :albums
-  def idname() "#{id}#{name}" end
-end
-class Track < Sequel::Model; end
-class Tag < Sequel::Model; end
-class AlbumInfo < Sequel::Model; end
+require File.join(File.dirname(File.expand_path(__FILE__)), 'sequel_helper.rb')
 
 describe "Forme Sequel::Model forms" do
   before do
-    @ab = Album[b]
+    @ab = Album[1]
     @b = Forme::Form.new(@ab)
-    @ac = Album[c]
+    @ac = Album[2]
     @c = Forme::Form.new(@ac)
   end
   
@@ -85,6 +17,11 @@ describe "Forme Sequel::Model forms" do
     @b.form(:class=>:foo, :method=>:get).to_s.should == '<form class="foo forme album" method="get"></form>'
   end
 
+  specify "should allow an array of classes" do
+    @b.form(:class=>[:foo, :bar]).to_s.should == '<form class="foo bar forme album" method="post"></form>'
+    @b.form(:class=>[:foo, [:bar, :baz]]).to_s.should == '<form class="foo bar baz forme album" method="post"></form>'
+  end
+
   specify "should use a text field for strings" do
     @b.input(:name).to_s.should == '<label>Name: <input id="album_name" name="album[name]" type="text" value="b"/></label>'
     @c.input(:name).to_s.should == '<label>Name: <input id="album_name" name="album[name]" type="text" value="c"/></label>'
@@ -138,38 +75,46 @@ describe "Forme Sequel::Model forms" do
     @c.input(:gold).to_s.should == '<label>Gold: <select id="album_gold" name="album[gold]"><option value=""></option><option selected="selected" value="t">True</option><option value="f">False</option></select></label>'
   end
   
+  specify "should respect :true_label and :false_label options for tri-valued boolean fields" do
+    @b.input(:gold, :true_label=>"Foo", :false_label=>"Bar").to_s.should == '<label>Gold: <select id="album_gold" name="album[gold]"><option value=""></option><option value="t">Foo</option><option selected="selected" value="f">Bar</option></select></label>'
+  end
+  
+  specify "should respect :true_value and :false_value options for tri-valued boolean fields" do
+    @b.input(:gold, :true_value=>"Foo", :false_value=>"Bar").to_s.should == '<label>Gold: <select id="album_gold" name="album[gold]"><option value=""></option><option value="Foo">True</option><option value="Bar">False</option></select></label>'
+  end
+  
   specify "should use a checkbox for dual-valued boolean fields" do
-    @b.input(:platinum).to_s.should == '<label><input id="album_platinum_hidden" name="album[platinum]" type="hidden" value="f"/><input id="album_platinum" name="album[platinum]" type="checkbox" value="t"/> Platinum</label>'
-    @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>'
+    @b.input(:platinum).to_s.should == '<input id="album_platinum_hidden" name="album[platinum]" type="hidden" value="f"/><label><input id="album_platinum" name="album[platinum]" type="checkbox" value="t"/> Platinum</label>'
+    @c.input(:platinum).to_s.should == '<input id="album_platinum_hidden" name="album[platinum]" type="hidden" value="f"/><label><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>'
+    @b.input(:platinum, :as=>:radio).to_s.should == '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><input checked="checked" id="album_platinum_no" name="album[platinum]" type="radio" value="f"/> No</label>'
+    @c.input(:platinum, :as=>:radio).to_s.should == '<span class="label">Platinum</span><label class="option"><input checked="checked" id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><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>'
+    @b.input(:platinum, :as=>:radio).to_s.should == '<li class="boolean"><span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><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"><span class="label">Platinum</span><span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label></span><span><label class="option"><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>'
+    @b.input(:platinum, :as=>:radio).to_s.should == '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><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>'
+    @b.input(:platinum, :as=>:radio, :label=>'Foo:<br />'.extend(Forme::Raw)).to_s.should == '<span class="label">Foo:<br /></span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><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 == '<span class="label">Foo:&lt;br /&gt;</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Yes</label><label class="option"><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>'
+    @b.input(:platinum, :as=>:radio, :true_label=>"Foo", :false_label=>"Bar").to_s.should == '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="t"/> Foo</label><label class="option"><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>'
+    @b.input(:platinum, :as=>:radio, :true_value=>"Foo", :false_value=>"Bar").to_s.should == '<span class="label">Platinum</span><label class="option"><input id="album_platinum_yes" name="album[platinum]" type="radio" value="Foo"/> Yes</label><label class="option"><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
@@ -186,23 +131,23 @@ describe "Forme Sequel::Model forms" do
   end
 
   specify "should use a set of radio buttons for many_to_one associations with :as=>:radio option" do
-    @b.input(:artist, :as=>:radio).to_s.should == '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>'
-    @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>'
+    @b.input(:artist, :as=>:radio).to_s.should == '<span class="label">Artist</span><label class="option"><input checked="checked" id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label><label class="option"><input id="album_artist_id_2" name="album[artist_id]" type="radio" value="2"/> d</label>'
+    @c.input(:artist, :as=>:radio).to_s.should == '<span class="label">Artist</span><label class="option"><input id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label><label class="option"><input checked="checked" id="album_artist_id_2" 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>'
+    @b.input(:artist, :as=>:radio, :label=>'Foo:<br />'.extend(Forme::Raw)).to_s.should == '<span class="label">Foo:<br /></span><label class="option"><input checked="checked" id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label><label class="option"><input id="album_artist_id_2" name="album[artist_id]" type="radio" value="2"/> d</label>'
+    @b.input(:artist, :as=>:radio, :label=>'Foo<br />').to_s.should == '<span class="label">Foo&lt;br /&gt;</span><label class="option"><input checked="checked" id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label><label class="option"><input id="album_artist_id_2" 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>'
+    @b.input(:artist, :as=>:radio).to_s.should == '<li class="many_to_one"><span class="label">Artist</span><label class="option"><input checked="checked" id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label><label class="option"><input id="album_artist_id_2" name="album[artist_id]" type="radio" value="2"/> d</label></li>'
   end
   
   specify "should support custom wrappers for many_to_one associations with :as=>:radio via :tag_wrapper option" do
     @b = Forme::Form.new(@ab, :wrapper=>:li)
-    @b.input(:artist, :as=>:radio, :wrapper=>proc{|t, i| i.tag(:div, {}, [t])}, :tag_wrapper=>proc{|t, i| i.tag(:span, {}, [t])}).to_s.should == '<div>Artist: <span><label><input checked="checked" name="album[artist_id]" type="radio" value="1"/> a</label></span><span><label><input name="album[artist_id]" type="radio" value="2"/> d</label></span></div>'
+    @b.input(:artist, :as=>:radio, :wrapper=>proc{|t, i| i.tag(:div, {}, [t])}, :tag_wrapper=>proc{|t, i| i.tag(:span, {}, [t])}).to_s.should == '<div><span class="label">Artist</span><span><label class="option"><input checked="checked" id="album_artist_id_1" name="album[artist_id]" type="radio" value="1"/> a</label></span><span><label class="option"><input id="album_artist_id_2" name="album[artist_id]" type="radio" value="2"/> d</label></span></div>'
   end
   
   specify "should respect an :options entry" do
@@ -254,28 +199,28 @@ describe "Forme Sequel::Model forms" do
   end
 
   specify "should use multiple checkboxes for one_to_many associations if :as=>:checkbox" do
-    @b.input(:tracks, :as=>:checkbox).to_s.should == '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>'
-    @c.input(:tracks, :as=>:checkbox).to_s.should == 'Tracks: <label><input name="album[track_pks][]" type="checkbox" value="1"/> m</label><label><input name="album[track_pks][]" type="checkbox" value="2"/> n</label><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
+    @b.input(:tracks, :as=>:checkbox).to_s.should == '<span class="label">Tracks</span><label class="option"><input checked="checked" id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label class="option"><input checked="checked" id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label class="option"><input id="album_track_pks_3" name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
+    @c.input(:tracks, :as=>:checkbox).to_s.should == '<span class="label">Tracks</span><label class="option"><input id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label class="option"><input id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label class="option"><input checked="checked" id="album_track_pks_3" name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
   end
   
   specify "should use multiple checkboxes for many_to_many associations if :as=>:checkbox" do
-    @b.input(:tags, :as=>:checkbox).to_s.should == 'Tags: <label><input checked="checked" 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>'
-    @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>'
+    @b.input(:tags, :as=>:checkbox).to_s.should == '<span class="label">Tags</span><label class="option"><input checked="checked" id="album_tag_pks_1" name="album[tag_pks][]" type="checkbox" value="1"/> s</label><label class="option"><input checked="checked" id="album_tag_pks_2" name="album[tag_pks][]" type="checkbox" value="2"/> t</label><label class="option"><input id="album_tag_pks_3" name="album[tag_pks][]" type="checkbox" value="3"/> u</label>'
+    @c.input(:tags, :as=>:checkbox).to_s.should == '<span class="label">Tags</span><label class="option"><input id="album_tag_pks_1" name="album[tag_pks][]" type="checkbox" value="1"/> s</label><label class="option"><input checked="checked" id="album_tag_pks_2" name="album[tag_pks][]" type="checkbox" value="2"/> t</label><label class="option"><input id="album_tag_pks_3" 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>'
+    @b.input(:tracks, :as=>:checkbox, :label=>'Foo<br />:'.extend(Forme::Raw)).to_s.should == '<span class="label">Foo<br />:</span><label class="option"><input checked="checked" id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label class="option"><input checked="checked" id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label class="option"><input id="album_track_pks_3" name="album[track_pks][]" type="checkbox" value="3"/> o</label>'
+    @b.input(:tracks, :as=>:checkbox, :label=>'Foo<br />').to_s.should == '<span class="label">Foo&lt;br /&gt;</span><label class="option"><input checked="checked" id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label class="option"><input checked="checked" id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label class="option"><input id="album_track_pks_3" 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>'
+    @b.input(:tracks, :as=>:checkbox).to_s.should == '<li class="one_to_many"><span class="label">Tracks</span><label class="option"><input checked="checked" id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label><label class="option"><input checked="checked" id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label><label class="option"><input id="album_track_pks_3" name="album[track_pks][]" type="checkbox" value="3"/> o</label></li>'
   end
   
   specify "should support custom wrappers for one_to_many associations with :as=>:checkbox via :tag_wrapper option" do
     @b = Forme::Form.new(@ab, :wrapper=>:li)
-    @b.input(:tracks, :as=>:checkbox, :wrapper=>proc{|t, i| i.tag(:div, i.opts[:wrapper_attr], [t])}, :tag_wrapper=>proc{|t, i| i.tag(:span, {}, [t])}).to_s.should == '<div class="one_to_many">Tracks: <span><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="1"/> m</label></span><span><label><input checked="checked" name="album[track_pks][]" type="checkbox" value="2"/> n</label></span><span><label><input name="album[track_pks][]" type="checkbox" value="3"/> o</label></span></div>'
+    @b.input(:tracks, :as=>:checkbox, :wrapper=>proc{|t, i| i.tag(:div, i.opts[:wrapper_attr], [t])}, :tag_wrapper=>proc{|t, i| i.tag(:span, {}, [t])}).to_s.should == '<div class="one_to_many"><span class="label">Tracks</span><span><label class="option"><input checked="checked" id="album_track_pks_1" name="album[track_pks][]" type="checkbox" value="1"/> m</label></span><span><label class="option"><input checked="checked" id="album_track_pks_2" name="album[track_pks][]" type="checkbox" value="2"/> n</label></span><span><label class="option"><input id="album_track_pks_3" name="album[track_pks][]" type="checkbox" value="3"/> o</label></span></div>'
   end
   
   specify "should use a text field methods not backed by columns" do