campo 0.3.1 → 0.3.2

data/CHANGES

@@ -1,3 +1,5 @@
+v0.3.2 Blocks are now passed on for .literal and .bit_of_ruby
+
 v0.3.1 Fixed possible bit of dodgy interpolation in Haml_Ruby_Insert
 
 v0.3.0 Improved passing of hash arguments for options to select tags. More specs.

data/README.markdown

@@ -387,7 +387,7 @@ Note: I'm considering making this an instance variable so that it can be passed
 Most fields will accept a block, so you can nest whatever you like. Generally I just use this for forms, fieldsets and selects (and those have specs) but if you want to try something new, do it! Let me know if it breaks.
 
     form = Campo.literal "%div" do |div| 
-      div.form "nested" do |form|
+      div << Campo.form( "nested" ) do |form|
         form.fieldset do |f|
           f.select "blurg" do |s|
             s.option "oopsie"

data/lib/campo.rb

@@ -37,8 +37,8 @@ module Campo
     
     # @example Add a bit of code to the markup
     #   form.bit_of_ruby( "= 5 + 1" ) }
-    def bit_of_ruby( *args )
-      tag = Campo::Haml_Ruby_Insert.new( *args )
+    def bit_of_ruby( *args, &block  )
+      tag = Campo::Haml_Ruby_Insert.new( *args, &block  )
       self << tag
       tag
     end
@@ -47,8 +47,8 @@ module Campo
 
     # @example Output a literal string
     #   form.literal %Q!%p= "This is a paragraph "!
-    def literal( *args )
-      tag = Campo::Literal.new( *args )
+    def literal( *args, &block  )
+      tag = Campo::Literal.new( *args, &block  )
       self << tag
       tag
     end
@@ -83,8 +83,8 @@ module Campo
     #     f.text "dob", "Date of birth: ", size: 8
     # @return [Input] 
     #   With the attribute `type=text`
-    def text( name, label=nil, attributes={} )
-      input( name, :text, label, attributes )
+    def text( name, label=nil, attributes={}  )
+      input( name, :text, label, attributes  )
     end
     
     # @param (see #text)
@@ -120,7 +120,7 @@ module Campo
     end
     
     
-    def textarea( *args )
+    def textarea( *args, &block  )
       textarea = Campo::Textarea.new( *args )
       self << textarea
       textarea
@@ -278,6 +278,7 @@ STR
     #       #... more fields follow
     #     end
     def initialize(name,  attributes={} )
+      attributes[:id] = name.gsub(/\W/, "_") if attributes[:id].nil?
       super( name, DEFAULT.merge( attributes ) )
       self.on_output do |n=0, tab=2|
         %Q!#{" " * n * tab}%form{ atts[:#{name.gsub(/\W/, "_").downcase}], #{Base.unhash( @attributes )} }!

data/lib/campo/version.rb

@@ -1,3 +1,3 @@
 module Campo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/campo_spec.rb

@@ -31,7 +31,7 @@ STR
     describe :output do
       context "Given a form with no fields" do
         let(:expected) { 
-          expected = top_bit + %q!%form{ atts[:myform], method: "POST", name: "myform",  }!.strip + "\n"
+          expected = top_bit + %q!%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }!.strip + "\n"
         }
 
         subject{ Campo.output Campo::Form.new( "myform" ) }
@@ -92,7 +92,7 @@ STR
 
             
           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/"), 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!
+          %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!
           } # let expected
   
           subject{ Campo.output form }
@@ -106,7 +106,7 @@ STR
               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/"), 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!
+          %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 }
@@ -131,7 +131,7 @@ let(:expected) {
           context "of text" do
             context "with a label" do
               let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "blah_blahdeblah",  }
     Blahd
     %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "text", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
@@ -152,7 +152,7 @@ let(:expected) {
             end
             context "without a label" do
               let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "blah_blahdeblah",  }
     Blah
     %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "text", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
@@ -176,7 +176,7 @@ let(:expected) {
           end # text
           context "of checkbox" do
             let(:expected) { top_bit +  %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "blah_blahdeblah",  }
     Blahd
     %input{ atts[:blah_blahdeblah], tabindex: "#{i += 1}", type: "checkbox", id: "blah_blahdeblah", value: "blahdeblah", name: "blah",  }!.strip + "\n" }
@@ -413,7 +413,7 @@ s.chomp
             
           
           context "simple output" do
-            let(:expected) { %q!%form{ atts[:myform], method: "POST", name: "myform",  }! }
+            let(:expected) { %q!%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }! }
             subject { form.output }
             it { should == expected }
           end
@@ -425,7 +425,7 @@ s.chomp
           it { should be_a_kind_of(Form) }
           
           context "simple output" do
-            let(:expected) { %q!%form{ atts[:myform], method: "POST", action: "/", name: "myform",  }! }
+            let(:expected) { %q!%form{ atts[:myform], method: "POST", action: "/", id: "myform", name: "myform",  }! }
             subject { form.output }
             it { should == expected }
           end
@@ -438,7 +438,7 @@ s.chomp
         context "When given a form with only a name" do
           let(:form) { Campo::Form.new( "myform" ) }
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %fieldset{  }
     %legend{  }Do you like these colours? Tick for yes:
                 
@@ -458,7 +458,7 @@ s.chomp
         let(:form) { Campo::Form.new( "myform" ) }
         context "Given one select tag" do
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "teas",  }
     Favourite tea:
     %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
@@ -479,7 +479,7 @@ s.chomp
         end
         context "Given several select tags" do
           let(:expected) {  top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "teas",  }
     Favourite tea:
     %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
@@ -513,7 +513,7 @@ s.chomp
         context "Given a submit button" do
           context "With no arguments" do
             let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %input{ atts[:Submit_Submit], tabindex: "#{i += 1}", type: "submit", id: "Submit_Submit", value: "Submit",  }
 
 !.strip + "\n" }
@@ -528,7 +528,7 @@ s.chomp
           end
           context "With a name" do
             let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %input{ atts[:Save_Save], tabindex: "#{i += 1}", type: "submit", id: "Save_Save", value: "Save",  }
 
 !.strip + "\n" }
@@ -572,7 +572,7 @@ s.chomp
 
         describe "the full output" do
           let(:expected) { top_bit + %q$
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   Hello, World!$.strip + "\n"}
           let(:form){ 
             form = Campo::Form.new( "myform" )
@@ -582,6 +582,37 @@ s.chomp
           subject { Campo.output form }
           it { should == expected } 
         end
+        
+        context "With a block" do
+          subject {
+            form.literal "%p" do |para|
+              para.literal "Whatever"
+              para.literal "%br"
+              para.literal "you"
+              para.literal "%br"
+              para.literal "think"
+              para.literal "%br"
+              para.literal "challenge"
+              para.literal "%br"
+              para.literal "it"
+            end
+            Campo.output form
+          }
+          let(:expected) {  top_bit + %q$%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+  %p
+    Whatever
+    %br
+    you
+    %br
+    think
+    %br
+    challenge
+    %br
+    it
+$.strip + "\n" }
+          it { should_not be_nil }
+          it { should == expected } 
+        end
       end
     end
 
@@ -612,7 +643,7 @@ s.chomp
 
         describe "the full output" do
           let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   = 5 + 1!.strip + "\n"}
           let(:form){ 
             form = Campo::Form.new( "myform" )
@@ -621,6 +652,38 @@ s.chomp
           }
           subject { Campo.output form }
           it { should == expected } 
+          
+          context "With a block" do
+            subject {
+              form.bit_of_ruby %q!="%p"! do |para|
+                para.literal "Whatever"
+                para.literal "%br"
+                para.literal "you"
+                para.literal "%br"
+                para.literal "think"
+                para.literal "%br"
+                para.literal "challenge"
+                para.literal "%br"
+                para.literal "it"
+              end
+              Campo.output form
+            }
+            let(:expected) {  top_bit + %q$%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
+  = 5 + 1
+  ="%p"
+    Whatever
+    %br
+    you
+    %br
+    think
+    %br
+    challenge
+    %br
+    it
+  $.strip + "\n" }
+            it { should_not be_nil }
+            it { should == expected } 
+          end
         end
       end
       
@@ -1000,7 +1063,7 @@ s.chomp
       context "Labelling" do
         let(:expected) { 
           top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %label{ for: "abc",  }
     abc
     %input{ atts[:abc], tabindex: "#{i += 1}", type: "text", id: "abc", name: "abc",  }
@@ -1027,7 +1090,7 @@ s.chomp
         context "Within a fieldset" do
           let(:expected) { 
             top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %fieldset{  }
     %legend{  }Alphabetty spaghetti
     %label{ for: "abc",  }
@@ -1061,7 +1124,7 @@ s.chomp
       describe "A form with a group of radio buttons" do
         let(:expected) { 
           top_bit +  %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %fieldset{  }
     %legend{  }Select the colour you like most:
     %label{ for: "radio1_green",  }
@@ -1118,7 +1181,7 @@ s.chomp
           
           describe "the full output" do
             let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%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" )
@@ -1143,7 +1206,7 @@ s.chomp
 
             describe "the full output" do
               let(:expected) { top_bit + %q!
-%form{ atts[:myform], method: "POST", name: "myform",  }
+%form{ atts[:myform], method: "POST", id: "myform", name: "myform",  }
   %textarea{ atts[:textie], tabindex: "#{i += 1}", cols: "60", rows: "10", name: "textie",  }= inners[:textie] 
   !.strip + " \n"}
               let(:form){ 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: campo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -50,12 +50,12 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-11-29 00:00:00.000000000 +00:00
+date: 2011-12-10 00:00:00.000000000 +00:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153137700 !ruby/object:Gem::Requirement
+  requirement: &2153759240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,7 +63,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153137700
+  version_requirements: *2153759240
 description: ! '    Form builder for Haml
 
 '