campo 0.3.4 → 0.9.0

data/lib/campo/plugins.rb

@@ -0,0 +1,41 @@
+# encoding: UTF-8
+
+module Campo
+  module Plugins
+    
+    module Pluggable      
+      def before_output( &block )
+        befores << block
+      end
+      
+      def after_output( &block )
+        afters << block
+      end
+      
+      def on_plugin( &block )
+        @extras = block
+      end
+      
+      def extras
+        @extras ||= proc {}
+      end
+    
+      def plugged_in
+        instance_exec &@extras
+      end
+    end
+    
+    class Plugin
+      include Pluggable   
+      def befores
+        @befores ||= []
+      end   
+      
+      def afters
+        @afters ||= []
+      end
+    end
+  
+  end # Plugins
+  
+end # Campo

data/lib/campo/plugins/aria.rb

@@ -0,0 +1,92 @@
+# encoding: UTF-8
+
+require_relative "../plugins.rb"
+
+module Campo
+  module Plugins
+  
+    # For more accessible forms
+    # http://www.w3.org/WAI/intro/aria
+    module Aria 
+    
+      # @private
+      def self.new( options={} )
+        Klass.new options
+      end
+      
+      module InstanceMethods
+        module Convenience
+          
+          # Adds aria-describedby along with a span.
+          # @overload text(message, opts)
+          #   @param [String] message The text for the aria-describedby attribute.
+          #   @param [optional,Hash] options Any attributes for the span.
+          #   @example
+          #     text("postcode").describe("All in caps", class: "description")
+          #   @return [String] A span with an id (and any options passed in as attributes) as Haml.
+          # @overload text(message-tuples, opts)
+          #   @param [Array<Array<String,Hash>>] message-tuples An array of tuples, each tuple containing the message string and an options hash for attributes.
+          #   @param [optional,Hash] options Any attributes for the span.
+          #   @example
+          #     text("Address").describe([["postcode",{class: "British"}],["zipcode", {class: "American"}]], class: "description")
+          #   @return [String] A span with an id (and any options passed in as attributes) as Haml, wrapped around an unordered list with a list-item for each message, each list-item receiving the attributes passed in the tuple for it.
+          # @overload text(messages,opts)
+          #   @param [Array<Array<String>>] messages An array of single valued arrays containing a string, the message.
+          #   @example
+          #     text("Address").describe([["A valid address"],["Don't forget the postcode!"]])
+          #   @return [String] A span with an id (and any options passed in as attributes) as Haml, wrapped around an unordered list with a list-item for each message.
+          # @see http://www.w3.org/TR/WCAG20-TECHS/ARIA1.html
+          def describe( message, opts={} )
+            label, field = if self.kind_of? Campo::Label
+              [self,self.fields.first]       
+            elsif (parent = self.parent).kind_of? Campo::Label
+              [parent, self]
+            end
+            
+            span_id = "#{label.attributes[:for]}_description"
+            
+            if message.respond_to? :map
+              # array
+              span = Campo::Span.new( span_id, "%ul", opts )
+              message.each do |(x,o)|
+                o ||= {}     
+                li = Campo.literal("%li",o) << Campo.literal(x)
+                span.fields.first << li
+              end
+            else              
+              span = Campo::Span.new( span_id, message, opts )
+            end
+              
+            label.fields.unshift span 
+            
+            field.attributes[:"aria-describedby"] = span_id
+            self
+          end # def
+        end # Convenience 
+      end # InstanceMethods
+    
+      class Klass < Plugin
+    
+        def initialize( opts={} )
+          
+          # adds `describe` to Convenience, it's an easy way to get it where it needs to be
+          # @private
+          on_plugin do
+              Campo::Base.send(:include, Campo::Plugins::Aria::InstanceMethods::Convenience)
+          end
+          
+          # Adds the form role attribute to all fields before output.
+          # @private
+          before_output do |fields,options|
+            fields.find_all{|x| x.kind_of? Campo::Form }.each do |form|
+              form.attributes[:role] = "form" if form.attributes[:role].nil? || form.attributes[:role].empty?
+            end
+          end
+        end
+    
+      end # Klass
+    end # Aria
+  
+  
+  end # Plugins
+end # Campo

data/lib/campo/plugins/jqueryvalidation.rb

@@ -0,0 +1,155 @@
+# encoding: UTF-8
+
+require_relative "../plugins.rb"
+
+module Campo
+  module Plugins
+
+    # using the lib from http://docs.jquery.com/Plugins/Validation
+    module JQueryValidation  
+    
+      def self.new( options={} )
+        Klass.new options
+      end
+      
+      module Rules  
+        def self.render
+          return "" if Rules.rules.empty?
+          output = @jqv_rules.map do |(field,rs)| 
+            "#{field}: { " << 
+            rs.map{|k,v| "#{k}: #{v}" }.join(", ") <<
+            " }"
+          end.join(",\n" + "  " * 4)
+          output = <<STR
+rules: {
+        #{output}
+      }
+STR
+   
+          output.chomp
+        end
+        def self.rules
+          if @jqv_rules.nil?
+              @jqv_rules = {}
+              @jqv_rules.default_proc = proc {|hash, key| hash[key] = {} }
+            end
+          @jqv_rules
+        end
+          
+        def self.[](key)
+          Rules.rules[key]
+        end
+        def self.[]=( key,value )
+          value = {value => true} unless value.kind_of? Hash
+          Rules.rules[key].merge! value
+          Rules.rules
+        end
+        def self.reset
+          @jqv_rules = nil
+        end
+      end 
+        
+      module InstanceMethods
+        # the simplest validation possible
+        module Convenience
+          def validate( *args )
+          
+            # TODO move this to helper
+            label, field = if self.kind_of? Campo::Label
+              [self,self.fields.first] # for the key            
+            elsif self.parent.kind_of? Campo::Label
+              [self.parent, self]  # for the key
+            end
+            
+            key = field.attributes[:id] || field.attributes[:name]
+            
+            # required
+            if args.empty? || args.include?( :required )
+              [label, field].each do |elem|
+                elem.attributes.merge!({ :class => "required" } )
+              end
+              Rules[key] = :required
+            end
+            
+            unless args.empty?
+              hashes = {}
+              singles = []
+              args.each do |x|
+                if x.kind_of? Hash
+                  hashes.merge! x 
+                else
+                  singles << x
+                end
+              end
+              
+              # TODO required letters/symbols/numbers
+              
+              if hashes.include? :minlength
+                Rules[key] = {minlength: hashes[:minlength] }
+              end
+                                
+              if singles.include?( :maxlength )          
+                if field.attributes.include? :size
+                  Rules[key] = {maxlength: field.attributes[:size]}
+                end
+              end
+              
+              if hashes.include? :maxlength
+                Rules[key] = {maxlength: hashes[:maxlength] }
+              end
+              # http://docs.jquery.com/Plugins/Validation/Methods/digits
+              Rules[key] = :digits if singles.include? :digits
+            end
+            
+            self
+          end # def
+        end
+        module Outputter        
+          
+          # holds the names of form(s)
+          attr_accessor :jqv_form_names
+          
+          # builds the declaration for the top of the output
+          def jquery_script_declaration
+            unless jqv_form_names.nil? || jqv_form_names.empty?
+              @jqv_form_names.reduce(":javascript\n") do |mem,name|
+                 mem + <<STR
+  $().ready(function(){
+    $("##{name}").validate({
+      #{JQueryValidation::Rules.render}
+    });
+  });
+STR
+              end
+            else
+              "" # just in case there are no forms for some reason
+            end
+          end
+        end
+      end # instance methods
+      
+      class Klass < Plugin
+        def initialize( opts={} )
+          before_output do |fields,options|
+            #find the form name(s)
+            @jqv_form_names = fields.find_all{|x| x.kind_of? Campo::Form }.map{|x| x.attributes[:name]}
+            @jqv_form_names << opts[:form] unless opts[:form].nil? || opts[:form].empty?
+          end
+          after_output do |output,options|
+            # concat to the current output
+            out = jquery_script_declaration + output
+            Rules.reset
+            out
+          end
+          on_plugin do
+            # adds `validate` to Convenience, it's an easy way to get it where it needs to be
+            Campo::Base.send(:include, Campo::Plugins::JQueryValidation::InstanceMethods::Convenience)
+            # only for the outputter
+            Campo::Outputter.send(:include, Campo::Plugins::JQueryValidation::InstanceMethods::Outputter)
+          end
+        end
+      end # klass
+    end # jqueryvalidation
+  
+  end # Plugins
+end # Campo

data/lib/campo/plugins/partial.rb

@@ -0,0 +1,49 @@
+# encoding: UTF-8
+
+require_relative "../plugins.rb"
+
+module Campo
+  module Plugins
+  
+    module Partial 
+    
+      def self.new( options={} )
+        Klass.new options
+      end
+      
+      module InstanceMethods
+        attr_accessor :partial
+        
+        DECLARATIONS = <<STR
+- atts = {} if atts.nil?
+- atts.default_proc = proc {|hash, key| hash[key] = {} } if atts.default_proc.nil?
+- inners = {} if inners.nil?
+- inners.default = "" if inners.default.nil?
+- @campo_tabindex ||= 0 # for tabindex
+STR
+        def declarations
+          DECLARATIONS
+        end
+      end
+    
+      class Klass < Plugin
+    
+      def initialize( opts={} )
+        after_output do |output,options|
+          options[:partial] ? 
+            output : # partial
+            declarations + output # whole form
+        end
+        on_plugin do
+          Campo::Outputter.send(:include, Campo::Plugins::Partial::InstanceMethods)
+          Campo::Outputter::DEFAULT_OPTIONS.merge!({partial: false})
+        end
+      end
+    
+        DEFAULT_OPTIONS={partial: false}
+      end # Klass
+    end # Partial
+  
+  
+  end # Plugins
+end # Campo

data/lib/campo/version.rb

@@ -1,3 +1,3 @@
 module Campo
-  VERSION = "0.3.4"
+  VERSION = "0.9.0"
 end

data/spec/aria_spec.rb

@@ -0,0 +1,67 @@
+# encoding: UTF-8
+
+require_relative "./spec_helper.rb"
+require_relative "../lib/campo/campo.rb"
+require_relative "../lib/campo/plugins/aria.rb"
+require_relative "../lib/campo/plugins/partial.rb"
+
+describe "Aria" do
+
+  before(:all) {
+    Campo.plugins.clear
+    Campo.plugin :partial # this is normally done by lib/campo.rb
+    Campo.plugin :Aria
+  }
+  let(:form) { 
+    Campo.form "example" do
+      text("a").describe("mm/yy")
+      text("b").describe("All in caps", class: "description")
+      text("c").describe([["Must be 8 characters at least.",class: "password validate", id: "password_length"], ["It's better to add some numbers/punctuation.", id: "password_not_email_address", class: "password validate"]], class: "description")
+      text("d").describe([["You"], ["Me"], ["Them"]])
+    end
+  }
+  
+  let(:expected) { <<'STR'
+- atts = {} if atts.nil?
+- atts.default_proc = proc {|hash, key| hash[key] = {} } if atts.default_proc.nil?
+- inners = {} if inners.nil?
+- inners.default = "" if inners.default.nil?
+- @campo_tabindex ||= 0 # for tabindex
+%form{ atts[:example], id: "example", method: "POST", name: "example", role: "form",  }
+  %label{ for: "a",  }
+    A
+    %span{id: "a_description", }
+      mm/yy
+    %input{ atts[:a], tabindex: "#{@campo_tabindex += 1}", id: "a", type: "text", name: "a", :"aria-describedby" => "a_description",  }
+  %label{ for: "b",  }
+    B
+    %span{id: "b_description", class: "description", }
+      All in caps
+    %input{ atts[:b], tabindex: "#{@campo_tabindex += 1}", id: "b", type: "text", name: "b", :"aria-describedby" => "b_description",  }
+  %label{ for: "c",  }
+    C
+    %span{id: "c_description", class: "description", }
+      %ul
+        %li{ id: "password_length", class: "password validate", }
+          Must be 8 characters at least.
+        %li{ id: "password_not_email_address", class: "password validate", }
+          It's better to add some numbers/punctuation.
+    %input{ atts[:c], tabindex: "#{@campo_tabindex += 1}", id: "c", type: "text", name: "c", :"aria-describedby" => "c_description",  }
+  %label{ for: "d",  }
+    D
+    %span{id: "d_description", }
+      %ul
+        %li
+          You
+        %li
+          Me
+        %li
+          Them
+    %input{ atts[:d], tabindex: "#{@campo_tabindex += 1}", id: "d", type: "text", name: "d", :"aria-describedby" => "d_description",  }
+STR
+  }
+
+  subject { Campo.output form }
+  it { should == expected }
+
+end

data/spec/campo_spec.rb

@@ -1,37 +1,35 @@
 # encoding: UTF-8
 
 require 'spec_helper'
-require_relative "../lib/campo.rb"
+require_relative "../lib/campo/campo.rb"
+require_relative "../lib/campo/plugins/partial.rb"
+require_relative "../lib/campo/plugins/aria.rb"
 require "rspec"
-require "logger"
 
 
 module Campo
   describe Campo do
-    
-    let(:logger){
-      require 'logger'
-      logger = Logger.new(STDOUT)
-      logger.level = Logger::DEBUG
-      logger
-    }
+  
+    before(:all) do
+      Campo.plugins.clear
+      Campo.plugin :partial # this is normally done by lib/campo.rb
+      Campo.plugin :Aria
+    end      
 
     let(:top_bit) { s = <<-'STR'
 - atts = {} if atts.nil?
-- atts.default = {} if atts.default.nil?
+- atts.default_proc = proc {|hash, key| hash[key] = {} } if atts.default_proc.nil?
 - inners = {} if inners.nil?
 - inners.default = "" if inners.default.nil?
-- i = 0 # for tabindex
-
+- @campo_tabindex ||= 0 # for tabindex
 STR
-            s
-          }
-          
+      s
+    }
 
     describe :output do
       context "Given a form with no fields" do
         let(:expected) { 
-          expected = top_bit + %q!%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }!.strip + "\n"
+          expected = top_bit + %q!%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }!.strip + "\n"
         }
 
         subject{ Campo.output Campo::Form.new( "myform" ) }
@@ -44,11 +42,11 @@ STR
           let(:expected) { %q!
 %label{ for: "teas",  }
   Favourite tea:
-  %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
-    %option{  value: "", disabled: "disabled", name: "teas",  }Choose one:
-    %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
-    %option{ atts[:teas_breakfast], value: "breakfast", id: "teas_breakfast", name: "teas",  }Breakfast
-    %option{ atts[:teas_earl_grey], value: "earl grey", id: "teas_earl_grey", name: "teas",  }Earl grey
+  %select{ atts[:teas], tabindex: "#{@campo_tabindex += 1}", id: "teas", name: "teas",  }
+    %option{ atts[:teas_default], id: "teas_default", value: "", disabled: "disabled", name: "teas",  }Choose one:
+    %option{ atts[:teas_ceylon], id: "teas_ceylon", value: "ceylon", name: "teas",  }Ceylon
+    %option{ atts[:teas_breakfast], id: "teas_breakfast", value: "breakfast", name: "teas",  }Breakfast
+    %option{ atts[:teas_earl_grey], id: "teas_earl_grey", value: "earl grey", name: "teas",  }Earl grey
 !.strip + "\n"
           }
           let(:tag) {
@@ -56,7 +54,7 @@ STR
             tag = select.with_default.option("ceylon").option("breakfast").option("earl grey").labelled("Favourite tea:") 
             tag
           }
-          subject { Campo.output :partial, tag }
+          subject { Campo.output tag, :partial=>true }
           it { should_not be_nil }
           it { should == expected }
 
@@ -65,54 +63,124 @@ STR
       
       describe "A realish form" do
         context "Given a form" do
-          let(:form) do
-            form = Campo::Form.new( "personal_details", action: %Q!"uri("/my/personal_details/update/")! )
-            
-            form.fieldset("Your details") do |f|
-              
-              f.text( "full_name", "Full name: ", size: 60 )
-              f.text( "dob", "Date of birth: ", size: 10 ) #TODO change this
-              f.fieldset( "Gender: " ) do |genders|
-                genders.radio( "gender", "Male", value: 1 )
-                genders.radio( "gender", "Female", value: 2 )
-              end
-              f.select( "ethnicorigin_id", {opts: [[1, "White"],[2,"Asian"],[3,"Black"],[4,"Chinese and Other"], [5,"Mixed"] ] }).with_default.labelled( "Ethnic-origin: " )
-              f.text( "occupation", "Occupation: ", size: 60 )
-              f.text( "phone_landline", "Phone (landline): ", size: 20 )
-              f.text( "phone_mobile", "Phone (mobile): ", size: 20 )
-              f.fieldset( "May we contact you..." ) do |c|
-                c.checkbox( "contactable", "In the day?", value: "day" )
-                c.checkbox( "contactable",  "In the evening?", value: "evening" )
-              end
-              f.submit("Save")
-        
-            end # form
-            form
-          end # let
-
-            
           let(:expected) {
-          %Q!- atts = {} if atts.nil?\n- atts.default = {} if atts.default.nil?\n- inners = {} if inners.nil?\n- inners.default = "" if inners.default.nil?\n- i = 0 # for tabindex\n\n%form{ atts[:personal_details], method: "POST", action: uri("/my/personal_details/update/"), id: "personal_details", name: "personal_details",  }\n  %fieldset{  }\n    %legend{  }Your details\n    %label{ for: "full_name",  }\n      Full name: \n      %input{ atts[:full_name], tabindex: "\#{i += 1}", type: "text", id: "full_name", size: "60", name: "full_name",  }\n    %label{ for: "dob",  }\n      Date of birth: \n      %input{ atts[:dob], tabindex: "\#{i += 1}", type: "text", id: "dob", size: "10", name: "dob",  }\n    %fieldset{  }\n      %legend{  }Gender: \n      %label{ for: "gender_1",  }\n        Male\n        %input{ atts[:gender_1], tabindex: "\#{i += 1}", type: "radio", id: "gender_1", value: "1", name: "gender",  }\n      %label{ for: "gender_2",  }\n        Female\n        %input{ atts[:gender_2], tabindex: "\#{i += 1}", type: "radio", id: "gender_2", value: "2", name: "gender",  }\n    %label{ for: "ethnicorigin_id",  }\n      Ethnic-origin: \n      %select{ atts[:ethnicorigin_id], tabindex: "\#{i += 1}", name: "ethnicorigin_id",  }\n        %option{  value: "", disabled: "disabled", name: "ethnicorigin_id",  }Choose one:\n        %option{ atts[:ethnicorigin_id_1], value: "1", id: "ethnicorigin_id_1", name: "ethnicorigin_id",  }White\n        %option{ atts[:ethnicorigin_id_2], value: "2", id: "ethnicorigin_id_2", name: "ethnicorigin_id",  }Asian\n        %option{ atts[:ethnicorigin_id_3], value: "3", id: "ethnicorigin_id_3", name: "ethnicorigin_id",  }Black\n        %option{ atts[:ethnicorigin_id_4], value: "4", id: "ethnicorigin_id_4", name: "ethnicorigin_id",  }Chinese and Other\n        %option{ atts[:ethnicorigin_id_5], value: "5", id: "ethnicorigin_id_5", name: "ethnicorigin_id",  }Mixed\n    %label{ for: "occupation",  }\n      Occupation: \n      %input{ atts[:occupation], tabindex: "\#{i += 1}", type: "text", id: "occupation", size: "60", name: "occupation",  }\n    %label{ for: "phone_landline",  }\n      Phone (landline): \n      %input{ atts[:phone_landline], tabindex: "\#{i += 1}", type: "text", id: "phone_landline", size: "20", name: "phone_landline",  }\n    %label{ for: "phone_mobile",  }\n      Phone (mobile): \n      %input{ atts[:phone_mobile], tabindex: "\#{i += 1}", type: "text", id: "phone_mobile", size: "20", name: "phone_mobile",  }\n    %fieldset{  }\n      %legend{  }May we contact you...\n      %label{ for: "contactable_day",  }\n        In the day?\n        %input{ atts[:contactable_day], tabindex: "\#{i += 1}", type: "checkbox", id: "contactable_day", value: "day", name: "contactable",  }\n      %label{ for: "contactable_evening",  }\n        In the evening?\n        %input{ atts[:contactable_evening], tabindex: "\#{i += 1}", type: "checkbox", id: "contactable_evening", value: "evening", name: "contactable",  }\n    %input{ atts[:Save_Save], tabindex: "\#{i += 1}", type: "submit", id: "Save_Save", value: "Save",  }\n!
+top_bit + %Q!%form{ atts[:personal_details], id: "personal_details", method: "POST", action: uri("/my/personal_details/update/"), name: "personal_details", role: "form",  }\n  %fieldset{  }\n    %legend{  }Your details\n    %label{ for: "full_name",  }\n      Full name: \n      %input{ atts[:full_name], tabindex: "\#{@campo_tabindex += 1}", id: "full_name", type: "text", size: "60", name: "full_name",  }\n    %label{ for: "dob",  }\n      Date of birth: \n      %input{ atts[:dob], tabindex: "\#{@campo_tabindex += 1}", id: "dob", type: "text", size: "10", name: "dob",  }\n    %fieldset{  }\n      %legend{  }Gender: \n      %label{ for: "gender_1",  }\n        Male\n        %input{ atts[:gender_1], tabindex: "\#{@campo_tabindex += 1}", id: "gender_1", type: "radio", value: "1", name: "gender",  }\n      %label{ for: "gender_2",  }\n        Female\n        %input{ atts[:gender_2], tabindex: "\#{@campo_tabindex += 1}", id: "gender_2", type: "radio", value: "2", name: "gender",  }\n    %label{ for: "ethnicorigin_id",  }\n      Ethnic-origin: \n      %select{ atts[:ethnicorigin_id], tabindex: "\#{@campo_tabindex += 1}", id: "ethnicorigin_id", name: "ethnicorigin_id",  }\n        %option{ atts[:ethnicorigin_id_default], id: "ethnicorigin_id_default", value: "", disabled: "disabled", name: "ethnicorigin_id",  }Choose one:\n        %option{ atts[:ethnicorigin_id_1], id: "ethnicorigin_id_1", value: "1", name: "ethnicorigin_id",  }White\n        %option{ atts[:ethnicorigin_id_2], id: "ethnicorigin_id_2", value: "2", name: "ethnicorigin_id",  }Asian\n        %option{ atts[:ethnicorigin_id_3], id: "ethnicorigin_id_3", value: "3", name: "ethnicorigin_id",  }Black\n        %option{ atts[:ethnicorigin_id_4], id: "ethnicorigin_id_4", value: "4", name: "ethnicorigin_id",  }Chinese and Other\n        %option{ atts[:ethnicorigin_id_5], id: "ethnicorigin_id_5", value: "5", name: "ethnicorigin_id",  }Mixed\n    %label{ for: "occupation",  }\n      Occupation: \n      %input{ atts[:occupation], tabindex: "\#{@campo_tabindex += 1}", id: "occupation", type: "text", size: "60", name: "occupation",  }\n    %label{ for: "phone_landline",  }\n      Phone (landline): \n      %input{ atts[:phone_landline], tabindex: "\#{@campo_tabindex += 1}", id: "phone_landline", type: "text", size: "20", name: "phone_landline",  }\n    %label{ for: "phone_mobile",  }\n      Phone (mobile): \n      %input{ atts[:phone_mobile], tabindex: "\#{@campo_tabindex += 1}", id: "phone_mobile", type: "text", size: "20", name: "phone_mobile",  }\n    %fieldset{  }\n      %legend{  }May we contact you...\n      %label{ for: "contactable_day",  }\n        In the day?\n        %input{ atts[:contactable_day], tabindex: "\#{@campo_tabindex += 1}", id: "contactable_day", type: "checkbox", value: "day", name: "contactable",  }\n      %label{ for: "contactable_evening",  }\n        In the evening?\n        %input{ atts[:contactable_evening], tabindex: "\#{@campo_tabindex += 1}", id: "contactable_evening", type: "checkbox", value: "evening", name: "contactable",  }\n    %input{ atts[:method], id: "method", type: "hidden", value: "put", name: "method",  }\n    %input{ atts[:Save], tabindex: "\#{@campo_tabindex += 1}", id: "Save", type: "submit", value: "Save",  }\n!
           } # let expected
-  
-          subject{ Campo.output form }
-          it { should == expected }
+          context "block with var style" do
+            let(:form) do
+              form = Campo::Form.new( "personal_details", action: %Q!"uri("/my/personal_details/update/")! )
+              
+              form.fieldset("Your details") do |f|
+                
+                f.text( "full_name", "Full name: ", size: 60 )
+                f.text( "dob", "Date of birth: ", size: 10 ) #TODO change this
+                f.fieldset( "Gender: " ) do |genders|
+                  genders.radio( "gender", "Male", value: 1 )
+                  genders.radio( "gender", "Female", value: 2 )
+                end
+                f.select( "ethnicorigin_id", {opts: [[1, "White"],[2,"Asian"],[3,"Black"],[4,"Chinese and Other"], [5,"Mixed"] ] }).with_default.labelled( "Ethnic-origin: " )
+                f.text( "occupation", "Occupation: ", size: 60 )
+                f.text( "phone_landline", "Phone (landline): ", size: 20 )
+                f.text( "phone_mobile", "Phone (mobile): ", size: 20 )
+                f.fieldset( "May we contact you..." ) do |c|
+                  c.checkbox( "contactable", "In the day?", value: "day" )
+                  c.checkbox( "contactable",  "In the evening?", value: "evening" )
+                end
+                f.hidden "method", value: "put"
+                f.submit("Save")
           
+              end # form
+              form
+            end # let
       
-          context "With a div to wrap it in" do
-            let(:doc) {
-              doc = Campo.literal ".centred.form" do |wrapper|
-                wrapper << form
-              end
-            }
-let(:expected) {
-          %Q!- atts = {} if atts.nil?\n- atts.default = {} if atts.default.nil?\n- inners = {} if inners.nil?\n- inners.default = "" if inners.default.nil?\n- i = 0 # for tabindex\n\n.centred.form\n  %form{ atts[:personal_details], method: "POST", action: uri("/my/personal_details/update/"), id: "personal_details", name: "personal_details",  }\n    %fieldset{  }\n      %legend{  }Your details\n      %label{ for: "full_name",  }\n        Full name: \n        %input{ atts[:full_name], tabindex: "\#{i += 1}", type: "text", id: "full_name", size: "60", name: "full_name",  }\n      %label{ for: "dob",  }\n        Date of birth: \n        %input{ atts[:dob], tabindex: "\#{i += 1}", type: "text", id: "dob", size: "10", name: "dob",  }\n      %fieldset{  }\n        %legend{  }Gender: \n        %label{ for: "gender_1",  }\n          Male\n          %input{ atts[:gender_1], tabindex: "\#{i += 1}", type: "radio", id: "gender_1", value: "1", name: "gender",  }\n        %label{ for: "gender_2",  }\n          Female\n          %input{ atts[:gender_2], tabindex: "\#{i += 1}", type: "radio", id: "gender_2", value: "2", name: "gender",  }\n      %label{ for: "ethnicorigin_id",  }\n        Ethnic-origin: \n        %select{ atts[:ethnicorigin_id], tabindex: "\#{i += 1}", name: "ethnicorigin_id",  }\n          %option{  value: "", disabled: "disabled", name: "ethnicorigin_id",  }Choose one:\n          %option{ atts[:ethnicorigin_id_1], value: "1", id: "ethnicorigin_id_1", name: "ethnicorigin_id",  }White\n          %option{ atts[:ethnicorigin_id_2], value: "2", id: "ethnicorigin_id_2", name: "ethnicorigin_id",  }Asian\n          %option{ atts[:ethnicorigin_id_3], value: "3", id: "ethnicorigin_id_3", name: "ethnicorigin_id",  }Black\n          %option{ atts[:ethnicorigin_id_4], value: "4", id: "ethnicorigin_id_4", name: "ethnicorigin_id",  }Chinese and Other\n          %option{ atts[:ethnicorigin_id_5], value: "5", id: "ethnicorigin_id_5", name: "ethnicorigin_id",  }Mixed\n      %label{ for: "occupation",  }\n        Occupation: \n        %input{ atts[:occupation], tabindex: "\#{i += 1}", type: "text", id: "occupation", size: "60", name: "occupation",  }\n      %label{ for: "phone_landline",  }\n        Phone (landline): \n        %input{ atts[:phone_landline], tabindex: "\#{i += 1}", type: "text", id: "phone_landline", size: "20", name: "phone_landline",  }\n      %label{ for: "phone_mobile",  }\n        Phone (mobile): \n        %input{ atts[:phone_mobile], tabindex: "\#{i += 1}", type: "text", id: "phone_mobile", size: "20", name: "phone_mobile",  }\n      %fieldset{  }\n        %legend{  }May we contact you...\n        %label{ for: "contactable_day",  }\n          In the day?\n          %input{ atts[:contactable_day], tabindex: "\#{i += 1}", type: "checkbox", id: "contactable_day", value: "day", name: "contactable",  }\n        %label{ for: "contactable_evening",  }\n          In the evening?\n          %input{ atts[:contactable_evening], tabindex: "\#{i += 1}", type: "checkbox", id: "contactable_evening", value: "evening", name: "contactable",  }\n      %input{ atts[:Save_Save], tabindex: "\#{i += 1}", type: "submit", id: "Save_Save", value: "Save",  }\n!
-          } # let expected
-  
-            subject{ Campo.output doc }
+            subject{ Campo.output form }
             it { should == expected }
+                 
+            context "With a div to wrap it in" do
+              let(:doc) {
+                doc = Campo.literal( ".centred.form" ) << form
+              }
+  let(:expected) {
+    top_bit + %Q!.centred.form
+  %form{ atts[:personal_details], id: "personal_details", method: "POST", action: uri("/my/personal_details/update/"), name: "personal_details", role: "form",  }
+    %fieldset{  }
+      %legend{  }Your details
+      %label{ for: "full_name",  }
+        Full name: 
+        %input{ atts[:full_name], tabindex: "\#{@campo_tabindex += 1}", id: "full_name", type: "text", size: "60", name: "full_name",  }
+      %label{ for: "dob",  }
+        Date of birth: 
+        %input{ atts[:dob], tabindex: "\#{@campo_tabindex += 1}", id: "dob", type: "text", size: "10", name: "dob",  }
+      %fieldset{  }
+        %legend{  }Gender: 
+        %label{ for: "gender_1",  }
+          Male
+          %input{ atts[:gender_1], tabindex: "\#{@campo_tabindex += 1}", id: "gender_1", type: "radio", value: "1", name: "gender",  }
+        %label{ for: "gender_2",  }
+          Female
+          %input{ atts[:gender_2], tabindex: "\#{@campo_tabindex += 1}", id: "gender_2", type: "radio", value: "2", name: "gender",  }
+      %label{ for: "ethnicorigin_id",  }
+        Ethnic-origin: 
+        %select{ atts[:ethnicorigin_id], tabindex: "\#{@campo_tabindex += 1}", id: "ethnicorigin_id", name: "ethnicorigin_id",  }
+          %option{ atts[:ethnicorigin_id_default], id: "ethnicorigin_id_default", value: "", disabled: "disabled", name: "ethnicorigin_id",  }Choose one:
+          %option{ atts[:ethnicorigin_id_1], id: "ethnicorigin_id_1", value: "1", name: "ethnicorigin_id",  }White
+          %option{ atts[:ethnicorigin_id_2], id: "ethnicorigin_id_2", value: "2", name: "ethnicorigin_id",  }Asian
+          %option{ atts[:ethnicorigin_id_3], id: "ethnicorigin_id_3", value: "3", name: "ethnicorigin_id",  }Black
+          %option{ atts[:ethnicorigin_id_4], id: "ethnicorigin_id_4", value: "4", name: "ethnicorigin_id",  }Chinese and Other
+          %option{ atts[:ethnicorigin_id_5], id: "ethnicorigin_id_5", value: "5", name: "ethnicorigin_id",  }Mixed
+      %label{ for: "occupation",  }
+        Occupation: 
+        %input{ atts[:occupation], tabindex: "\#{@campo_tabindex += 1}", id: "occupation", type: "text", size: "60", name: "occupation",  }
+      %label{ for: "phone_landline",  }
+        Phone (landline): 
+        %input{ atts[:phone_landline], tabindex: "\#{@campo_tabindex += 1}", id: "phone_landline", type: "text", size: "20", name: "phone_landline",  }
+      %label{ for: "phone_mobile",  }
+        Phone (mobile): 
+        %input{ atts[:phone_mobile], tabindex: "\#{@campo_tabindex += 1}", id: "phone_mobile", type: "text", size: "20", name: "phone_mobile",  }
+      %fieldset{  }
+        %legend{  }May we contact you...
+        %label{ for: "contactable_day",  }
+          In the day?
+          %input{ atts[:contactable_day], tabindex: "\#{@campo_tabindex += 1}", id: "contactable_day", type: "checkbox", value: "day", name: "contactable",  }
+        %label{ for: "contactable_evening",  }
+          In the evening?
+          %input{ atts[:contactable_evening], tabindex: "\#{@campo_tabindex += 1}", id: "contactable_evening", type: "checkbox", value: "evening", name: "contactable",  }
+      %input{ atts[:method], id: "method", type: "hidden", value: "put", name: "method",  }
+      %input{ atts[:Save], tabindex: "\#{@campo_tabindex += 1}", id: "Save", type: "submit", value: "Save",  }
+!
+            } # let expected
+    
+              subject{ Campo.output doc }
+              it { should == expected }
+            end # context
           end # context
-        end # context
+          context "with no var for block" do           
+            let(:form) do
+              form = Campo.form "personal_details", action: %Q!"uri("/my/personal_details/update/")!  do
+                fieldset("Your details") do              
+                  text( "full_name", "Full name: ", size: 60 )
+                  text( "dob", "Date of birth: ", size: 10 ) #TODO change this
+                  fieldset( "Gender: " ) do
+                    radio( "gender", "Male", value: 1 )
+                    radio( "gender", "Female", value: 2 )
+                  end
+                  select( "ethnicorigin_id", {opts: [[1, "White"],[2,"Asian"],[3,"Black"],[4,"Chinese and Other"], [5,"Mixed"] ] }).with_default.labelled( "Ethnic-origin: " )
+                  text( "occupation", "Occupation: ", size: 60 )
+                  text( "phone_landline", "Phone (landline): ", size: 20 )
+                  text( "phone_mobile", "Phone (mobile): ", size: 20 )
+                  fieldset( "May we contact you..." ) do
+                    checkbox( "contactable", "In the day?", value: "day" )
+                    checkbox( "contactable",  "In the evening?", value: "evening" )
+                  end
+                  hidden "method", value: "put"
+                  submit("Save")
+                end
+              end
+            end # let      
+            subject{ Campo.output form }
+            it { should == expected }
+          end
+        end
       end # describe a form
     end
     
@@ -131,10 +199,10 @@ let(:expected) {
           context "of text" do
             context "with a label" do
               let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %label{ for: "blah_blahdeblah",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %label{ for: "blah",  }
     Blahd
-    %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "text", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
+    %input{ atts[:blah], tabindex: "#{@campo_tabindex += 1}", id: "blah", type: "text", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
               subject { 
                 form.input( "blah", :text, "Blahd", value: "blahdeblah" )
                 Campo.output form   
@@ -152,10 +220,10 @@ let(:expected) {
             end
             context "without a label" do
               let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %label{ for: "blah_blahdeblah",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %label{ for: "blah",  }
     Blah
-    %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "text", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
+    %input{ atts[:blah], tabindex: "#{@campo_tabindex += 1}", id: "blah", type: "text", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
               
               subject { 
                 form.input( "blah", :text, value: "blahdeblah" )
@@ -176,10 +244,10 @@ let(:expected) {
           end # text
           context "of checkbox" do
             let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %label{ for: "blah_blahdeblah",  }
     Blahd
-    %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "checkbox", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
+    %input{ atts[:blah_blahdeblah], tabindex: "#{@campo_tabindex += 1}", id: "blah_blahdeblah", type: "checkbox", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
             
             subject { 
               form.input( "blah", :checkbox, "Blahd", value: "blahdeblah" )
@@ -413,7 +481,7 @@ s.chomp
             
           
           context "simple output" do
-            let(:expected) { %q!%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }! }
+            let(:expected) { %q!%form{ atts[:myform], id: "myform", method: "POST", name: "myform",  }! }
             subject { form.output }
             it { should == expected }
           end
@@ -425,7 +493,7 @@ s.chomp
           it { should be_a_kind_of(Form) }
           
           context "simple output" do
-            let(:expected) { %q!%form{ atts[:myform], method: "POST", action: "/", id: "myform", name: "myform",  }! }
+            let(:expected) { %q!%form{ atts[:myform], id: "myform", method: "POST", action: "/", name: "myform",  }! }
             subject { form.output }
             it { should == expected }
           end
@@ -436,14 +504,14 @@ s.chomp
       
       describe :fieldset do
         context "When given a form with only a name" do
-          let(:form) { Campo::Form.new( "myform" ) }
+          let(:form) { Campo::Form.new( "myform" ).fieldset("Do you like these colours? Tick for yes:") }
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %fieldset{  }
     %legend{  }Do you like these colours? Tick for yes:
                 
 !.strip + "\n" }
-          subject { form.fieldset("Do you like these colours? Tick for yes:") 
+          subject { 
             Campo.output form
           }
           it { should_not be_nil }
@@ -458,14 +526,14 @@ s.chomp
         let(:form) { Campo::Form.new( "myform" ) }
         context "Given one select tag" do
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %label{ for: "teas",  }
     Favourite tea:
-    %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
-      %option{  value: "", disabled: "disabled", name: "teas",  }Choose one:
-      %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
-      %option{ atts[:teas_breakfast], value: "breakfast", id: "teas_breakfast", name: "teas",  }Breakfast
-      %option{ atts[:teas_earl_grey], value: "earl grey", id: "teas_earl_grey", name: "teas",  }Earl grey
+    %select{ atts[:teas], tabindex: "#{@campo_tabindex += 1}", id: "teas", name: "teas",  }
+      %option{ atts[:teas_default], id: "teas_default", value: "", disabled: "disabled", name: "teas",  }Choose one:
+      %option{ atts[:teas_ceylon], id: "teas_ceylon", value: "ceylon", name: "teas",  }Ceylon
+      %option{ atts[:teas_breakfast], id: "teas_breakfast", value: "breakfast", name: "teas",  }Breakfast
+      %option{ atts[:teas_earl_grey], id: "teas_earl_grey", value: "earl grey", name: "teas",  }Earl grey
 
 !.strip + "\n"
           }
@@ -479,22 +547,22 @@ s.chomp
         end
         context "Given several select tags" do
           let(:expected) {  top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %label{ for: "teas",  }
     Favourite tea:
-    %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
-      %option{  value: "", disabled: "disabled", name: "teas",  }Choose one:
-      %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
-      %option{ atts[:teas_breakfast], value: "breakfast", id: "teas_breakfast", name: "teas",  }Breakfast
-      %option{ atts[:teas_earl_grey], value: "earl grey", id: "teas_earl_grey", name: "teas",  }Earl grey
+    %select{ atts[:teas], tabindex: "#{@campo_tabindex += 1}", id: "teas", name: "teas",  }
+      %option{ atts[:teas_default], id: "teas_default", value: "", disabled: "disabled", name: "teas",  }Choose one:
+      %option{ atts[:teas_ceylon], id: "teas_ceylon", value: "ceylon", name: "teas",  }Ceylon
+      %option{ atts[:teas_breakfast], id: "teas_breakfast", value: "breakfast", name: "teas",  }Breakfast
+      %option{ atts[:teas_earl_grey], id: "teas_earl_grey", value: "earl grey", name: "teas",  }Earl grey
   %label{ for: "coffees",  }
     Favourite coffee:
-    %select{ atts[:coffees], tabindex: "#{i += 1}", name: "coffees",  }
-      %option{  value: "", disabled: "disabled", name: "coffees",  }Choose one:
-      %option{ atts[:coffees_blue_mountain], value: "blue mountain", id: "coffees_blue_mountain", name: "coffees",  }Blue mountain
-      %option{ atts[:coffees_kenyan_peaberry], value: "kenyan peaberry", id: "coffees_kenyan_peaberry", name: "coffees",  }Kenyan peaberry
-      %option{ atts[:coffees_colombian], value: "colombian", id: "coffees_colombian", name: "coffees",  }Colombian
-      %option{ atts[:coffees_java], value: "java", id: "coffees_java", name: "coffees",  }Java
+    %select{ atts[:coffees], tabindex: "#{@campo_tabindex += 1}", id: "coffees", name: "coffees",  }
+      %option{ atts[:coffees_default], id: "coffees_default", value: "", disabled: "disabled", name: "coffees",  }Choose one:
+      %option{ atts[:coffees_blue_mountain], id: "coffees_blue_mountain", value: "blue mountain", name: "coffees",  }Blue mountain
+      %option{ atts[:coffees_kenyan_peaberry], id: "coffees_kenyan_peaberry", value: "kenyan peaberry", name: "coffees",  }Kenyan peaberry
+      %option{ atts[:coffees_colombian], id: "coffees_colombian", value: "colombian", name: "coffees",  }Colombian
+      %option{ atts[:coffees_java], id: "coffees_java", value: "java", name: "coffees",  }Java
 
 !.strip + "\n" }
           before {
@@ -513,8 +581,8 @@ s.chomp
         context "Given a submit button" do
           context "With no arguments" do
             let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %input{ atts[:Submit_Submit], tabindex: "#{i += 1}", type: "submit", id: "Submit_Submit", value: "Submit",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %input{ atts[:Submit], tabindex: "#{@campo_tabindex += 1}", id: "Submit", type: "submit", value: "Submit",  }
 
 !.strip + "\n" }
             
@@ -528,13 +596,13 @@ s.chomp
           end
           context "With a name" do
             let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %input{ atts[:Save_Save], tabindex: "#{i += 1}", type: "submit", id: "Save_Save", value: "Save",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %input{ atts[:save], tabindex: "#{@campo_tabindex += 1}", id: "save", type: "submit", value: "Save",  }
 
 !.strip + "\n" }
             
             subject { 
-              form.submit( "Save" )
+              form.submit( "save", value: "Save" )
               Campo.output form
             }
             
@@ -545,6 +613,25 @@ s.chomp
       end
     end
 
+    describe Span do
+      let(:tag) { Span.new "my_id", "anything at all at all" }
+      subject { tag }
+      it { should_not be_nil }
+      it { should be_a_kind_of( Span ) }
+
+      describe :output do
+        let(:expected) { %Q!%span{id: "my_id", }! }
+        subject { tag.output }
+        it { should == expected }
+      end
+
+      describe "Campo.output" do
+        let(:expected) { %Q!%span{id: "my_id", }\n  anything at all at all\n! }
+        subject { Campo.output tag, :partial=>true }
+        it { should == expected }
+      end
+      
+    end
 
     describe Literal do
       let(:tag) { Literal.new "anything at all at all" }
@@ -560,7 +647,7 @@ s.chomp
 
       describe "Campo.output" do
         let(:expected) { "anything at all at all\n" }
-        subject { Campo.output :partial, tag }
+        subject { Campo.output tag, :partial=>true }
         it { should == expected }
       end
 
@@ -572,7 +659,7 @@ s.chomp
 
         describe "the full output" do
           let(:expected) { top_bit + %q$
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   Hello, World!$.strip + "\n"}
           let(:form){ 
             form = Campo::Form.new( "myform" )
@@ -598,7 +685,7 @@ s.chomp
             end
             Campo.output form
           }
-          let(:expected) {  top_bit + %q$%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+          let(:expected) {  top_bit + %q$%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %p
     Whatever
     %br
@@ -631,7 +718,7 @@ $.strip + "\n" }
       
       describe "Campo.output" do
         let(:expected) { %Q!= sel_opts\n! }
-        subject { Campo.output :partial, tag }
+        subject { Campo.output tag,:partial=>true }
         it { should == expected }
       end
 
@@ -643,7 +730,7 @@ $.strip + "\n" }
 
         describe "the full output" do
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   = 5 + 1!.strip + "\n"}
           let(:form){ 
             form = Campo::Form.new( "myform" )
@@ -668,7 +755,7 @@ $.strip + "\n" }
               end
               Campo.output form
             }
-            let(:expected) {  top_bit + %q$%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+            let(:expected) {  top_bit + %q$%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   = 5 + 1
   ="%p"
     Whatever
@@ -707,27 +794,71 @@ $.strip + "\n" }
             subject { tag  }
             it { should_not be_nil }
             it { should be_a_kind_of(Select) }
-            specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+            specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
 
             context "Campo.output" do
-              let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }!.strip + "\n" }
-              subject { Campo.output :partial, tag }
+              let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }!.strip + "\n" }
+              subject { Campo.output tag,:partial=>true }
               it { should_not be_nil }
               it { should == expected }
             end
             
             context "and a default" do
+              context "With no arguments" do
               
-              subject { tag.with_default }
-              it { should_not be_nil }
-              it { should be_a_kind_of(Select) }
-              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
-              
-              context "Campo.output" do
-                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{  value: "", disabled: "disabled", name: "pqr",  }Choose one:!.strip + "\n"  }
-                subject { Campo.output :partial, tag.with_default }
-                it { should == expected }
+                subject { tag.with_default }
+                it { should_not be_nil }
+                it { should be_a_kind_of(Select) }
+                specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
+                
+                context "Campo.output" do
+                  let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", disabled: "disabled", name: "pqr",  }Choose one:!.strip + "\n"  }
+                  subject { Campo.output tag.with_default, :partial=>true }
+                  it { should == expected }
+                end
+              end
+              context "Given an inner text" do
+                context "And no other args" do
+                  subject { tag.with_default("Choose wisely!") }
+                  it { should_not be_nil }
+                  it { should be_a_kind_of(Select) }
+                  specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
+                  
+                  context "Campo.output" do
+                    let(:expected) { %q<%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", disabled: "disabled", name: "pqr",  }Choose wisely!>.strip + "\n"  }
+                    subject { Campo.output tag.with_default("Choose wisely!"), :partial=>true }
+                    it { should == expected }
+                  end
+                end
+                context "And an empty hash" do
+                  subject { tag.with_default("Choose wisely!",{}) }
+                  it { should_not be_nil }
+                  it { should be_a_kind_of(Select) }
+                  specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
+                  
+                  context "Campo.output" do
+                    let(:expected) { %q<%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", name: "pqr",  }Choose wisely!>.strip + "\n"  }
+                    subject { Campo.output tag.with_default("Choose wisely!",{}), :partial=>true }
+                    it { should == expected }
+                  end
+                end
+                context "And an empty hash" do
+                  subject { tag.with_default("Choose wisely!",{class: "default"}) }
+                  it { should_not be_nil }
+                  it { should be_a_kind_of(Select) }
+                  specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
+                  
+                  context "Campo.output" do
+                    let(:expected) { %q<%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", class: "default", name: "pqr",  }Choose wisely!>.strip + "\n"  }
+                    subject { Campo.output tag.with_default("Choose wisely!",{class: "default"}), :partial=>true }
+                    it { should == expected }
+                  end
+                end
+
               end
             end
           end
@@ -745,15 +876,15 @@ $.strip + "\n" }
 
             it { should_not be_nil }
             it { should be_a_kind_of(Select) }
-            specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+            specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
             
             context "Campo.output" do
-              let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
+              let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
 !.strip + "\n" }
-              subject { Campo.output :partial, tag }
+              subject { Campo.output tag, :partial=>true }
               it { should_not be_nil }
               it { should == expected }
             end
@@ -764,16 +895,16 @@ $.strip + "\n" }
               subject { tag.with_default }
               it { should_not be_nil }
               it { should be_a_kind_of(Select) }
-              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
 
               context "Campo.output" do
-                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{  value: "", disabled: "disabled", name: "pqr",  }Choose one:
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
+                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", disabled: "disabled", name: "pqr",  }Choose one:
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
 !.strip + "\n"  }
-                subject { Campo.output :partial, tag.with_default }
+                subject { Campo.output tag.with_default, :partial=>true }
                 it { should == expected }
               end
             end
@@ -788,16 +919,16 @@ $.strip + "\n" }
                 end
               }
               subject { tag }
-              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
               
               context "Campo.output" do
-                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
+                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
   = opts!.strip + "\n" }
                 subject { 
-                  Campo.output :partial, tag 
+                  Campo.output tag, :partial=>true 
                 }
                 it { should_not be_nil }
                 it { should == expected }
@@ -806,35 +937,35 @@ $.strip + "\n" }
           end
 
           context "and an array" do
-            # context "of type [String]" do
-#               let(:opts) { [["ford"], ["bmw"], ["ferrari", "checked"]] }
-#               subject { Campo::Select.new( "pqr", {opts: opts} ) }
-#   
-#               it { should_not be_nil }
-#               it { should be_a_kind_of(Select) }
-#               specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
-#               context "Campo.output" do
-#                 let(:tag){ 
-#                   Campo::Select.new( "pqr", {opts: opts} )
-#                 }
-#                 let(:expected) { 
-# %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-#   %option{ atts[:pqr_ford], value: "ford", id: "pqr_ford", name: "pqr",  }Ford
-#   %option{ atts[:pqr_bmw], value: "bmw", id: "pqr_bmw", name: "pqr",  }BMW
-#   %option{ atts[:pqr_ferrari], value: "ferrari", selected: "selected", id: "pqr_ferrari", name: "pqr",  }Ferrari!.strip + "\n" }
-#                 subject { Campo.output :partial, tag }
-#                 it { should_not be_nil }
-#                 it { should == expected }
-#               end
-#             
-#             end
+            context "of type [String]" do
+              let(:opts) { [["ford"], ["bmw"], ["ferrari", :selected]] }
+              subject { Campo::Select.new( "pqr", {opts: opts} ) }
+  
+              it { should_not be_nil }
+              it { should be_a_kind_of(Select) }
+              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
+              context "Campo.output" do
+                let(:tag){ 
+                  Campo::Select.new( "pqr", {opts: opts} )
+                }
+                let(:expected) { 
+%q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_ford], id: "pqr_ford", value: "ford", name: "pqr",  }Ford
+  %option{ atts[:pqr_bmw], id: "pqr_bmw", value: "bmw", name: "pqr",  }Bmw
+  %option{ atts[:pqr_ferrari], id: "pqr_ferrari", value: "ferrari", selected: "selected", name: "pqr",  }Ferrari!.strip + "\n" }
+                subject { Campo.output tag, :partial=>true }
+                it { should_not be_nil }
+                it { should == expected }
+              end
+            
+            end
             context "of type [String, String]" do
               let(:opts) { [["ford", "ford"], ["bmw", "BMW"], ["ferrari", "Ferrari", "checked"]] }
               subject { Campo::Select.new( "pqr", {opts: opts} ) }
   
               it { should_not be_nil }
               it { should be_a_kind_of(Select) }
-              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+              specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
   
               context "with a block with options" do
                 let(:opts) { [["ford", "Ford"], ["bmw", "BMW"], ["ferrari", "Ferrari", "checked"]] }
@@ -849,17 +980,17 @@ $.strip + "\n" }
   
                 it { should_not be_nil }
                 it { should be_a_kind_of(Select) }
-                specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+                specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
                 
                 context "Campo.output" do
-                  let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
-  %option{ atts[:pqr_ford], value: "ford", id: "pqr_ford", name: "pqr",  }Ford
-  %option{ atts[:pqr_bmw], value: "bmw", id: "pqr_bmw", name: "pqr",  }BMW
-  %option{ atts[:pqr_ferrari], value: "ferrari", selected: "selected", id: "pqr_ferrari", name: "pqr",  }Ferrari!.strip + "\n" }
-                  subject { Campo.output :partial, tag }
+                  let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
+  %option{ atts[:pqr_ford], id: "pqr_ford", value: "ford", name: "pqr",  }Ford
+  %option{ atts[:pqr_bmw], id: "pqr_bmw", value: "bmw", name: "pqr",  }BMW
+  %option{ atts[:pqr_ferrari], id: "pqr_ferrari", value: "ferrari", selected: "selected", name: "pqr",  }Ferrari!.strip + "\n" }
+                  subject { Campo.output tag, :partial=>true }
                   it { should_not be_nil }
                   it { should == expected }
                   
@@ -872,14 +1003,14 @@ $.strip + "\n" }
                         s.option "audi", "Audi"
                       end
                     }
-                    let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
-  %option{ atts[:pqr_ford], value: "ford", id: "pqr_ford", class: "blue", name: "pqr",  }Ford
-  %option{ atts[:pqr_bmw], value: "bmw", id: "pqr_bmw", name: "pqr",  }BMW
-  %option{ atts[:pqr_ferrari], value: "ferrari", selected: "selected", id: "pqr_ferrari", class: "green", name: "pqr",  }Ferrari!.strip + "\n" }
-                    subject { Campo.output :partial, tag }
+                    let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
+  %option{ atts[:pqr_ford], id: "pqr_ford", value: "ford", class: "blue", name: "pqr",  }Ford
+  %option{ atts[:pqr_bmw], id: "pqr_bmw", value: "bmw", name: "pqr",  }BMW
+  %option{ atts[:pqr_ferrari], id: "pqr_ferrari", value: "ferrari", selected: "selected", class: "green", name: "pqr",  }Ferrari!.strip + "\n" }
+                    subject { Campo.output tag, :partial=>true }
                     it { should_not be_nil }
                     it { should == expected }
                   end
@@ -890,18 +1021,18 @@ $.strip + "\n" }
                   subject { tag.with_default }
                   it { should_not be_nil }
                   it { should be_a_kind_of(Select) }
-                  specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }! }
+                  specify { subject.output.should == %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }! }
   
                   context "Campo.output" do
-                    let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
-  %option{  value: "", disabled: "disabled", name: "pqr",  }Choose one:
-  %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
-  %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
-  %option{ atts[:pqr_audi], value: "audi", id: "pqr_audi", name: "pqr",  }Audi
-  %option{ atts[:pqr_ford], value: "ford", id: "pqr_ford", name: "pqr",  }Ford
-  %option{ atts[:pqr_bmw], value: "bmw", id: "pqr_bmw", name: "pqr",  }BMW
-  %option{ atts[:pqr_ferrari], value: "ferrari", selected: "selected", id: "pqr_ferrari", name: "pqr",  }Ferrari!.strip + "\n"  }
-                    subject { Campo.output :partial, tag.with_default }
+                    let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{@campo_tabindex += 1}", id: "pqr", name: "pqr",  }
+  %option{ atts[:pqr_default], id: "pqr_default", value: "", disabled: "disabled", name: "pqr",  }Choose one:
+  %option{ atts[:pqr_volvo], id: "pqr_volvo", value: "volvo", name: "pqr",  }Volvo
+  %option{ atts[:pqr_saab], id: "pqr_saab", value: "saab", name: "pqr",  }Saab
+  %option{ atts[:pqr_audi], id: "pqr_audi", value: "audi", name: "pqr",  }Audi
+  %option{ atts[:pqr_ford], id: "pqr_ford", value: "ford", name: "pqr",  }Ford
+  %option{ atts[:pqr_bmw], id: "pqr_bmw", value: "bmw", name: "pqr",  }BMW
+  %option{ atts[:pqr_ferrari], id: "pqr_ferrari", value: "ferrari", selected: "selected", name: "pqr",  }Ferrari!.strip + "\n"  }
+                    subject { Campo.output tag.with_default, :partial=>true }
                     it { should == expected }
                   end
                 end
@@ -923,7 +1054,7 @@ $.strip + "\n" }
   
                 it { should_not be_nil }
                 it { should be_a_kind_of(Select) }
-                specify { Campo.output( :partial, subject ).should == %Q!%select{ atts[:tea], tabindex: "\#{i += 1}", name: "tea",  }\n  %option{ atts[:tea_ceylon], value: "ceylon", id: "tea_ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], value: "english_breakfast", id: "tea_english_breakfast", name: "tea",  }English breakfast\n  %option{ atts[:tea_earl_grey], value: "earl_grey", id: "tea_earl_grey", name: "tea",  }Earl grey\n! }
+                specify { Campo.output( subject, :partial=>true ).should == %Q!%select{ atts[:tea], tabindex: "\#{@campo_tabindex += 1}", id: "tea", name: "tea",  }\n  %option{ atts[:tea_ceylon], id: "tea_ceylon", value: "ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], id: "tea_english_breakfast", value: "english_breakfast", name: "tea",  }English breakfast\n  %option{ atts[:tea_earl_grey], id: "tea_earl_grey", value: "earl_grey", name: "tea",  }Earl grey\n! }
               end
               context "and a single string value" do
                 let(:opts) {
@@ -940,7 +1071,7 @@ $.strip + "\n" }
   
                 it { should_not be_nil }
                 it { should be_a_kind_of(Select) }
-                specify { Campo.output( :partial, subject ).should == %Q!%select{ atts[:tea], tabindex: "\#{i += 1}", name: "tea",  }\n  %option{ atts[:tea_ceylon], value: "ceylon", id: "tea_ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], value: "english_breakfast", id: "tea_english_breakfast", name: "tea",  }English Breakfast\n  %option{ atts[:tea_earl_grey], value: "earl_grey", id: "tea_earl_grey", name: "tea",  }Earl Grey\n! }
+                specify { Campo.output( subject, :partial=>true ).should == %Q!%select{ atts[:tea], tabindex: "\#{@campo_tabindex += 1}", id: "tea", name: "tea",  }\n  %option{ atts[:tea_ceylon], id: "tea_ceylon", value: "ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], id: "tea_english_breakfast", value: "english_breakfast", name: "tea",  }English Breakfast\n  %option{ atts[:tea_earl_grey], id: "tea_earl_grey", value: "earl_grey", name: "tea",  }Earl Grey\n! }
               end
               context "and an array value" do
                 let(:opts) {
@@ -957,7 +1088,7 @@ $.strip + "\n" }
   
                 it { should_not be_nil }
                 it { should be_a_kind_of(Select) }
-                specify { Campo.output( :partial, subject ).should == %Q!%select{ atts[:tea], tabindex: "\#{i += 1}", name: "tea",  }\n  %option{ atts[:tea_ceylon], value: "ceylon", id: "tea_ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], value: "english_breakfast", selected: "selected", id: "tea_english_breakfast", name: "tea",  }English Breakfast\n  %option{ atts[:tea_earl_grey], value: "earl_grey", id: "tea_earl_grey", name: "tea",  }Earl Grey\n! }
+                specify { Campo.output( subject, :partial=>true ).should == %Q!%select{ atts[:tea], tabindex: "\#{@campo_tabindex += 1}", id: "tea", name: "tea",  }\n  %option{ atts[:tea_ceylon], id: "tea_ceylon", value: "ceylon", name: "tea",  }Ceylon\n  %option{ atts[:tea_english_breakfast], id: "tea_english_breakfast", value: "english_breakfast", selected: "selected", name: "tea",  }English Breakfast\n  %option{ atts[:tea_earl_grey], id: "tea_earl_grey", value: "earl_grey", name: "tea",  }Earl Grey\n! }
               end
             end
           end
@@ -976,7 +1107,7 @@ $.strip + "\n" }
         context "Given a name" do
           context "and nothing else" do
             let(:tag) { Campo::Input.new( "abc" ) }
-            let(:output) { %q!%input{ atts[:abc], tabindex: "#{i += 1}", type: "text", id: "abc", name: "abc",  }! }
+            let(:output) { %q!%input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "text", name: "abc",  }! }
             subject { tag }
             it { should_not be_nil }
             it { should be_a_kind_of(Input) }
@@ -984,16 +1115,16 @@ $.strip + "\n" }
             specify { subject.output.should == output }
             context "Campo.output" do
               let(:expected) { output + "\n" }
-              subject { Campo.output :partial, tag }
+              subject { Campo.output tag, :partial=>true }
               it { should_not be_nil }
               it { should == expected }
             end
           end
-
+          
           context "and a type" do
             context "of text" do
               let(:tag) { Campo::Input.new( "abc", :text ) }
-              let(:output) { %q!%input{ atts[:abc], tabindex: "#{i += 1}", type: "text", id: "abc", name: "abc",  }! }
+              let(:output) { %q!%input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "text", name: "abc",  }! }
               subject { tag }
               it { should_not be_nil }
               it { should be_a_kind_of(Input) }
@@ -1001,14 +1132,14 @@ $.strip + "\n" }
               specify { subject.output.should == output }
               context "Campo.output" do
                 let(:expected) { output + "\n" }
-                subject { Campo.output :partial, tag }
+                subject { Campo.output tag, :partial=>true }
                 it { should_not be_nil }
                 it { should == expected }
               end
             end
             context "of password" do
               let(:tag) { Campo::Input.new( "abc", :password ) }
-              let(:output) { %q!%input{ atts[:abc], tabindex: "#{i += 1}", type: "password", id: "abc", name: "abc",  }! }
+              let(:output) { %q!%input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "password", name: "abc",  }! }
               subject { tag }
               it { should_not be_nil }
               it { should be_a_kind_of(Input) }
@@ -1017,7 +1148,7 @@ $.strip + "\n" }
               
               context "Campo.output" do
                 let(:expected) { output + "\n" }
-                subject { Campo.output :partial, tag }
+                subject { Campo.output tag, :partial=>true }
                 it { should_not be_nil }
                 it { should == expected }
               end
@@ -1025,7 +1156,7 @@ $.strip + "\n" }
           end  
           context "of checkbox" do
             let(:tag) { Campo::Input.new( "abc", :checkbox ) }
-            let(:output) { %q!%input{ atts[:abc], tabindex: "#{i += 1}", type: "checkbox", id: "abc", name: "abc",  }! }
+            let(:output) { %q!%input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "checkbox", name: "abc",  }! }
             subject { tag }
             it { should_not be_nil }
             it { should be_a_kind_of(Input) }
@@ -1034,15 +1165,86 @@ $.strip + "\n" }
             
             context "Campo.output" do
               let(:expected) { output + "\n" }
-              subject { Campo.output :partial, tag }
+              subject { Campo.output tag, :partial=>true }
               it { should_not be_nil }
               it { should == expected }
             end
             
           end  
+
+          context "Given an input with a [] to notify it's an array" do
+            let(:tag) { Campo::Input.new( "abc[]", :checkbox, value: "many" ) }
+            let(:output) { %q!%input{ atts[:abc_many], tabindex: "#{@campo_tabindex += 1}", id: "abc_many", type: "checkbox", value: "many", name: "abc[]",  }! }
+            subject { tag }
+            it { should_not be_nil }
+            it { should be_a_kind_of(Input) }
+            specify { subject.attributes[:type].should == "checkbox" }
+            specify { subject.output.should == output }
+            
+            context "Campo.output" do
+              let(:expected) { output + "\n" }
+              subject { Campo.output tag, :partial=>true }
+              it { should_not be_nil }
+              it { should == expected }
+            end
+            context "Given several inputs, some grouped, some not" do
+              let(:expected) { %q!- atts = {} if atts.nil?
+- atts.default_proc = proc {|hash, key| hash[key] = {} } if atts.default_proc.nil?
+- inners = {} if inners.nil?
+- inners.default = "" if inners.default.nil?
+- @campo_tabindex ||= 0 # for tabindex
+%form{ atts[:example], id: "example", method: "POST", name: "example", role: "form",  }
+  %label{ for: "a",  }
+    A
+    %input{ atts[:a], tabindex: "#{@campo_tabindex += 1}", id: "a", type: "text", name: "a",  }
+  %label{ for: "b",  }
+    B
+    %input{ atts[:b], tabindex: "#{@campo_tabindex += 1}", id: "b", type: "text", name: "b",  }
+  %fieldset{  }
+    %legend{  }Which C?
+    %label{ for: "c_grouped",  }
+      Grouped
+      %input{ atts[:c_grouped], tabindex: "#{@campo_tabindex += 1}", id: "c_grouped", type: "checkbox", value: "grouped", name: "c",  }
+    %label{ for: "c",  }
+      Also grouped
+      %input{ atts[:c], tabindex: "#{@campo_tabindex += 1}", id: "c", type: "checkbox", valued: "also grouped", name: "c",  }
+  %fieldset{  }
+    %legend{  }Which D?
+    %label{ for: "d_grouped",  }
+      Grouped
+      %input{ atts[:d_grouped], tabindex: "#{@campo_tabindex += 1}", id: "d_grouped", type: "checkbox", value: "grouped", name: "d[]",  }
+    %label{ for: "d_also_grouped",  }
+      Also grouped
+      %input{ atts[:d_also_grouped], tabindex: "#{@campo_tabindex += 1}", id: "d_also_grouped", type: "checkbox", value: "also grouped", name: "d[]",  }
+  %input{ atts[:Submit], tabindex: "#{@campo_tabindex += 1}", id: "Submit", type: "submit", value: "Submit",  }
+!
+              }
+              let(:form) {  
+                form = Campo.form "example" do
+                  text "a"
+                  text "b"
+                  fieldset "Which C?" do
+                    checkbox "c", "Grouped", value: "grouped"
+                    checkbox "c", "Also grouped", valued: "also grouped"
+                  end
+                  fieldset "Which D?" do
+                    checkbox "d[]", "Grouped", value: "grouped"
+                    checkbox "d[]", "Also grouped", value: "also grouped"
+                  end
+                  submit
+                end
+                form
+              }
+                            
+              subject { Campo.output form }
+              it { should_not be_nil }
+              it { should == expected }
+            end
+          end
+          
           context "of radio" do
             let(:tag) { Campo::Input.new( "abc", :radio ) }
-            let(:output) { %q!%input{ atts[:abc], tabindex: "#{i += 1}", type: "radio", id: "abc", name: "abc",  }! }
+            let(:output) { %q!%input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "radio", name: "abc",  }! }
             subject { tag }
             it { should_not be_nil }
             it { should be_a_kind_of(Input) }
@@ -1051,7 +1253,7 @@ $.strip + "\n" }
             
             context "Campo.output" do
               let(:expected) { output + "\n" }
-              subject { Campo.output :partial, tag }
+              subject { Campo.output tag, :partial=>true }
               it { should_not be_nil }
               it { should == expected }
             end
@@ -1063,16 +1265,16 @@ $.strip + "\n" }
       context "Labelling" do
         let(:expected) { 
           top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %label{ for: "abc",  }
     abc
-    %input{ atts[:abc], tabindex: "#{i += 1}", type: "text", id: "abc", name: "abc",  }
+    %input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "text", name: "abc",  }
   %label{ for: "deff",  }
     deff
-    %input{ atts[:deff], tabindex: "#{i += 1}", type: "text", id: "deff", name: "deff",  }
+    %input{ atts[:deff], tabindex: "#{@campo_tabindex += 1}", id: "deff", type: "text", name: "deff",  }
   %label{ for: "ghi",  }
     ghi
-    %input{ atts[:ghi], tabindex: "#{i += 1}", type: "text", id: "ghi", name: "ghi",  }
+    %input{ atts[:ghi], tabindex: "#{@campo_tabindex += 1}", id: "ghi", type: "text", name: "ghi",  }
 
 !.strip + "\n"
         }
@@ -1090,27 +1292,28 @@ $.strip + "\n" }
         context "Within a fieldset" do
           let(:expected) { 
             top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %fieldset{  }
     %legend{  }Alphabetty spaghetti
     %label{ for: "abc",  }
-      abc
-      %input{ atts[:abc], tabindex: "#{i += 1}", type: "text", id: "abc", name: "abc",  }
+      Abc
+      %input{ atts[:abc], tabindex: "#{@campo_tabindex += 1}", id: "abc", type: "text", name: "abc",  }
     %label{ for: "def",  }
-      def
-      %input{ atts[:def], tabindex: "#{i += 1}", type: "text", id: "def", name: "def",  }
+      Def
+      %input{ atts[:def], tabindex: "#{@campo_tabindex += 1}", id: "def", type: "text", name: "def",  }
     %label{ for: "ghi",  }
-      ghi
-      %input{ atts[:ghi], tabindex: "#{i += 1}", type: "text", id: "ghi", name: "ghi",  }
+      Ghi
+      %input{ atts[:ghi], tabindex: "#{@campo_tabindex += 1}", id: "ghi", type: "text", name: "ghi",  }
 
 !.strip + "\n"
           }
           let(:form) {
-            form = Campo::Form.new( "myform" )
-              myfieldset = form.fieldset( "Alphabetty spaghetti" ) do |f|
-              f << Campo::Input.new( "abc", :text ).labelled("abc")
-              f << Campo::Input.new( "def", :text ).labelled("def")
-              f << Campo::Input.new( "ghi", :text ).labelled("ghi")
+            form = Campo::Form.new( "myform" ) do
+              fieldset( "Alphabetty spaghetti" ) do
+                text( "abc" )
+                text( "def" )
+                text( "ghi" )
+              end
             end
             form
           }
@@ -1124,24 +1327,24 @@ $.strip + "\n" }
       describe "A form with a group of radio buttons" do
         let(:expected) { 
           top_bit +  %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
   %fieldset{  }
     %legend{  }Select the colour you like most:
     %label{ for: "radio1_green",  }
       green
-      %input{ atts[:radio1_green], tabindex: "#{i += 1}", type: "radio", id: "radio1_green", value: "green", name: "radio1",  }
+      %input{ atts[:radio1_green], tabindex: "#{@campo_tabindex += 1}", id: "radio1_green", type: "radio", value: "green", name: "radio1",  }
     %label{ for: "radio1_yellow",  }
       yellow
-      %input{ atts[:radio1_yellow], tabindex: "#{i += 1}", type: "radio", id: "radio1_yellow", value: "yellow", name: "radio1",  }
+      %input{ atts[:radio1_yellow], tabindex: "#{@campo_tabindex += 1}", id: "radio1_yellow", type: "radio", value: "yellow", name: "radio1",  }
     %label{ for: "radio1_red",  }
       red
-      %input{ atts[:radio1_red], tabindex: "#{i += 1}", type: "radio", id: "radio1_red", value: "red", name: "radio1",  }
+      %input{ atts[:radio1_red], tabindex: "#{@campo_tabindex += 1}", id: "radio1_red", type: "radio", value: "red", name: "radio1",  }
     %label{ for: "radio1_blue",  }
       blue
-      %input{ atts[:radio1_blue], tabindex: "#{i += 1}", type: "radio", id: "radio1_blue", value: "blue", name: "radio1",  }
+      %input{ atts[:radio1_blue], tabindex: "#{@campo_tabindex += 1}", id: "radio1_blue", type: "radio", value: "blue", name: "radio1",  }
     %label{ for: "radio1_purple",  }
       purple
-      %input{ atts[:radio1_purple], tabindex: "#{i += 1}", type: "radio", id: "radio1_purple", value: "purple", name: "radio1",  }
+      %input{ atts[:radio1_purple], tabindex: "#{@campo_tabindex += 1}", id: "radio1_purple", type: "radio", value: "purple", name: "radio1",  }
 
 !.strip + "\n"
         }
@@ -1175,22 +1378,48 @@ $.strip + "\n" }
         
         context "and using convenience method" do
           let(:form) { Campo::Form.new( "myform" ) }
-          subject { form.textarea( "textie" ) }
-          it { should_not be_nil }
-          it { should be_a_kind_of(Textarea) }
-          
-          describe "the full output" do
-            let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %textarea{ atts[:textie], tabindex: "#{i += 1}", cols: "40", rows: "10", name: "textie",  }= inners[:textie] !.strip + " \n"}
-            let(:form){ 
-              form = Campo::Form.new( "myform" )
-              form.textarea( "textie" ) 
-              form
-            }
-            subject { Campo.output form }
-            it { should == expected }
-          end    
+          context "Without an explicit label parameter" do
+            subject { form.textarea( "textie" ) }
+            it { should_not be_nil }
+            it { should be_a_kind_of(Label) }
+            it { should contain_a_kind_of(Textarea) }
+            
+            describe "the full output" do
+              let(:expected) { top_bit + %q!
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %label{ for: "textie",  }
+    Textie
+    %textarea{ atts[:textie], tabindex: "#{@campo_tabindex += 1}", id: "textie", cols: "40", rows: "10", name: "textie",  }= inners[:textie] !.strip + " \n"}
+              let(:form){ 
+                form = Campo::Form.new( "myform" )
+                form.textarea( "textie" ) 
+                form
+              }
+              subject { Campo.output form }
+              it { should == expected }
+            end    
+          end
+          context "With an explicit label parameter" do
+            subject { form.textarea( "textie", label: "Textie labelled" ) }
+            it { should_not be_nil }
+            it { should be_a_kind_of(Label) }
+            it { should contain_a_kind_of(Textarea) }
+            
+            describe "the full output" do
+              let(:expected) { top_bit + %q!
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %label{ for: "textie",  }
+    Textie labelled
+    %textarea{ atts[:textie], tabindex: "#{@campo_tabindex += 1}", id: "textie", cols: "40", rows: "10", name: "textie",  }= inners[:textie] !.strip + " \n"}
+              let(:form){ 
+                form = Campo::Form.new( "myform" )
+                form.textarea( "textie", labelled: "Textie labelled") 
+                form
+              }
+              subject { Campo.output form }
+              it { should == expected }
+            end 
+          end
         end      
       
         context "and an attribute" do
@@ -1202,12 +1431,15 @@ $.strip + "\n" }
             let(:form) { Campo::Form.new( "myform" ) }
             subject { form.textarea( "textie" ) }
             it { should_not be_nil }
-            it { should be_a_kind_of(Textarea) }
+            it { should be_a_kind_of(Label) }
+            it { should contain_a_kind_of(Textarea) }
 
             describe "the full output" do
               let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
-  %textarea{ atts[:textie], tabindex: "#{i += 1}", cols: "60", rows: "10", name: "textie",  }= inners[:textie] 
+%form{ atts[:myform], id: "myform", method: "POST", name: "myform", role: "form",  }
+  %label{ for: "textie",  }
+    Textie
+    %textarea{ atts[:textie], tabindex: "#{@campo_tabindex += 1}", id: "textie", cols: "60", rows: "10", name: "textie",  }= inners[:textie] 
   !.strip + " \n"}
               let(:form){ 
                 form = Campo::Form.new( "myform" )