campo 0.2.0 → 0.3.0

data/CHANGES

@@ -1,3 +1,5 @@
+v0.3.0 Improved passing of hash arguments for options to select tags. More specs.
+
 v0.2.0 All Base fields can now take a block and the convenience methodsl, allowing them to nest other elements regardless of whether the parent is a form or a select. This basically makes it a lot easier to use a literal as the root of the document.
 
 v0.1.1 Label naming a bit better... possibly! It breaks on _ and capitalises when trying for a default.

data/README.markdown

@@ -1,10 +1,15 @@
 # Campo #
 
-A static dynamic form builder into haml. Yep, static _and_ dynamic. Use it to statically create a form into haml, but you may notice it's taken advantage of haml's "add a hash to the front of the attributes and it'll get merged" property. http://haml-lang.com/docs/yardoc/file.HAML\_REFERENCE.html#attribute_methods. More on that below.
+A static dynamic form builder into haml. Yep, static _and_ dynamic. Use it to statically create a form into haml, but you may notice it's taken advantage of haml's "add a hash to the front of the attributes and it'll get merged" property. [See Haml docs for more](http://haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html#attribute_methods). More on that below.
 
 Btw, I'll be using this with Sinatra, if you're using Rails you'll need to work out how that's done as I don't know.
 
-## Why though? ##
+## Note! ##
+
+As always, keep in mind this is an open source project (licence below) and you can contribute! If you find a problem or would like a feature changed or added, let me know, or even better, fork the project and send me a pull request.
+
+
+## Why write this? ##
 
 However nice Haml is, it's still a lot of effort to build a form. If you've got lots of forms it's worse. The long term plan is to link this in to Sequel.
 
@@ -136,19 +141,25 @@ and that outputs:
       </fieldset>
     </form>
 
+## Haml attributes ##
 
 Back to the dynamic attributes mentioned earlier. What does this mean? You can pass in a local to dynamically alter the form based on server side logic.
 
-These get added to the top, to provide sane defaults:
+These get added to the top when calling `Campo.output`, to provide sane defaults:
 
     - atts = {} if atts.nil?
     - atts.default = {} if atts.default.nil?
     - inners = {} if inners.nil?
     - inners.default = "" if inners.default.nil?
 
+Note: if you don't want these added, you can do:
+
+    Campo.output :partial, your_tag
+    
+
 In the select tag (below), notice how each tag gets a local variable added to the front. You can either fill that variable with a hash pair, or an empty hash gets passed and nothing happens.
 
-Here's the Campo code:
+Here's some Campo code for a select tag with options:
 
     form = Campo.form "best_bands", action: "/best/bands/" do |form|
       form.select("bands").option("Suede").option("Blur").option("Oasis").option("Echobelly").option("Pulp").option("Supergrass").with_default.labelled("Favourite band:")
@@ -166,11 +177,25 @@ or
       s.option("Pulp")
       s.option("Supergrass")
     end.labelled("Favourite band:")
- 
-(or mix and match blocks, .new, arrays and hashes)   
     
-    Campo.output form # generate the haml
+or an array of arrays:
 
+    form = Campo.form "best_bands", action: "/best/bands/"
+    form.select( "bands", opts: [ 
+      ["Suede"],
+      ["Blur"],
+      ["Oasis"],
+      ["Echobelly"],
+      ["Pulp"],
+      ["Supergrass"],
+    ] ).with_default.labelled("Favourite band:")
+
+(or mix and match blocks, .new, arrays and hashes)  
+
+ 
+Generate the haml:
+    
+    Campo.output form #
 
 And the Haml generated:
 
@@ -203,6 +228,78 @@ You can do this with any kind of attribute you wish to add. For example:
 
 
     atts[:bands_blur] = {not_worth_listening_to: "selected"}
+    
+## Be selective ##
+    
+    opts = [
+      ["ceylon"], 
+      ["english_breakfast", :selected], 
+      ["earl_grey"]
+    ]
+    
+    form = Campo.form "selective_example"
+    form.select "teas", opts: opts
+    
+    Campo.output form
+
+Output:
+    
+    - atts = {} if atts.nil?
+    - atts.default = {} if atts.default.nil?
+    - inners = {} if inners.nil?
+    - inners.default = "" if inners.default.nil?
+    - i = 0 # for tabindex
+    
+    %form{ atts[:selective_example], method: "POST", name: "selective_example",  }
+      %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
+        %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
+        %option{ atts[:teas_english_breakfast], value: "english_breakfast", selected: "selected", id: "teas_english_breakfast", name: "teas",  }English breakfast
+        %option{ atts[:teas_earl_grey], value: "earl_grey", id: "teas_earl_grey", name: "teas",  }Earl grey
+        
+## Pass a hash ##
+
+    opts = {
+      "ceylon"=>"Ceylon",
+      "english_breakfast"=>"English Breakfast",
+      "earl_grey"=>"Earl Grey"
+    }
+    # the keys can be symbols too, it makes no difference to the output
+    
+    form = Campo.form "simple_hash_example"
+    form.select "teas", opts: opts
+    
+    Campo.output :partial, form
+    
+Output:
+    
+    %form{ atts[:simple_hash_example], method: "POST", name: "simple_hash_example",  }
+      %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
+        %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
+        %option{ atts[:teas_english_breakfast], value: "english_breakfast", id: "teas_english_breakfast", name: "teas",  }English Breakfast
+        %option{ atts[:teas_earl_grey], value: "earl_grey", id: "teas_earl_grey", name: "teas",  }Earl Grey
+
+With an array for the value:
+
+    opts = {
+      "ceylon"=>["Ceylon"], 
+      "english_breakfast"=>["English Breakfast", :selected], 
+      "earl_grey"=>["Earl Grey"]
+    }
+    
+    form = Campo.form "hash_with_array_example"
+    form.select "teas", opts: opts
+    
+    Campo.output :partial, form
+
+Output:
+    
+    %form{ atts[:hash_with_array_example], method: "POST", name: "hash_with_array_example",  }
+      %select{ atts[:teas], tabindex: "#{i += 1}", name: "teas",  }
+        %option{ atts[:teas_ceylon], value: "ceylon", id: "teas_ceylon", name: "teas",  }Ceylon
+        %option{ atts[:teas_english_breakfast], value: "english_breakfast", selected: "selected", id: "teas_english_breakfast", name: "teas",  }English Breakfast
+        %option{ atts[:teas_earl_grey], value: "earl_grey", id: "teas_earl_grey", name: "teas",  }Earl Grey
+
+## Adding in helpers ##
 
 If you want to use helpers in the attributes, like sinatra's `uri` helper, then add a quote to the front:
 
@@ -221,6 +318,8 @@ outputs:
     %form{ atts[:best_bands], method: "POST", action: uri("/best/bands/"), name: "best_bands",  }
       = 5 + 1
 
+## And literals ##
+
 It's really just a literal:
 
 
@@ -273,4 +372,41 @@ You can use literals to wrap forms in divs too:
             %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
-        %p= "I like tea!"
+        %p= "I like tea!"
+        
+## tabindex ##
+
+Each field gets `tabindex: "#{i += 1}"` added to its attributes. This will generate a tabindex easily for you.
+
+Note: I'm considering making this an instance variable so that it can be passed through easily to nested partials, but I need to test it first.
+
+## Blocks ##
+
+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|
+        form.fieldset do |f|
+          f.select "blurg" do |s|
+            s.option "oopsie"
+            s.option "daisies"
+          end.labelled "splat"
+          f.text "blah"
+        end
+      end
+    end
+    
+## Licence ##
+
+This is under the MIT Licence.
+
+Copyright (c) 2011 Iain Barnett
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+In other words, be good.    
+

data/lib/campo/version.rb

@@ -1,3 +1,3 @@
 module Campo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/campo.rb

@@ -128,18 +128,23 @@ module Campo
   end # Convenience
   
   module Helpers
+  
+  
     # [ [id, lookup, selected || false], ... ]
     def self.options_builder( name, opts )
       return [] if opts.nil? || opts.empty?
-
-      opts.map do |opt|
-        id, lookup, selected, atts = opt
-        selected = selected ? true : false
-        atts = atts.nil? ? { } : atts
-
-        Campo::Option.new( name, id, lookup, selected, atts )
+      
+      if opts.respond_to? :each_pair
+        opts.map do |id, (inner, selected, atts)|
+          Campo::Option.new( name, id, inner, selected, atts )
+        end
+      else
+        opts.map do |id, inner, selected, atts|
+          Campo::Option.new( name, id, inner, selected, atts )
+        end
       end
-    end
+    end # def
+    
     
     def self.options_outputter( opts=[] )
       return "" if opts.nil? || opts.empty?
@@ -382,21 +387,29 @@ STR
   
   
   class Option < Base
-    attr_accessor :value, :checked
     
+    # @param [String] name
+    # @param [String] value
     def initialize( name, value, inner=nil, selected=nil, attributes={} )
-      attributes ||= {}
-      if inner.kind_of? TrueClass
-        selected = attributes
+      unless inner.nil? || inner.kind_of?( String )
+        attributes = selected
+        selected = inner
         inner = nil
       end
       
-      @inner = inner || value
+      unless selected.nil? || selected.kind_of?( TrueClass )
+        if selected.respond_to? :each_pair
+          attributes = selected
+          selected = nil   
+        else
+          selected = true  
+          @selected = true   
+        end
+      end
+      
+      attributes ||= {}
       
-      if selected.kind_of? Hash
-        attributes = selected 
-        selected = {}
-      end 
+      @inner = (inner || value.gsub("_"," ").capitalize)
       
       attributes = { id: "#{(name.gsub(/\W/, "_") + id_tag(value).gsub(/\W/, "_")).downcase}" }.merge(attributes) unless value.nil? || value.to_s.empty?
       

data/spec/campo_spec.rb

@@ -201,7 +201,176 @@ let(:expected) {
       end # describe input
         
     end # Convenience
-    
+
+    describe Helpers do
+      describe "self.options_builder" do
+        context "Given a name" do
+          let(:name) { "teas" }
+          context "and not given an options argument" do
+            it "raises error because not given any options" do
+              expect { Campo::Helpers.options_builder name }.to raise_error
+            end
+          end         
+          context "and given a nil for the options" do
+            let(:opts) { nil }
+            subject { Campo::Helpers.options_builder name, opts }
+            it { should_not be_nil }
+            it { should be_a_kind_of Array }
+          end 
+          context "and given a hash" do
+            context "that is empty" do
+              subject { Campo::Helpers.options_builder name, Hash.new }
+              it { should_not be_nil }
+              it { should be_a_kind_of Array }
+              it { should be_empty }
+            end
+            context "with keys" do
+              context "only" do
+                let(:opts) {
+                  Hash[ ["ceylon", "english_breakfast", "earl_grey"].zip( Array.new(3, nil ) ) ]
+                }
+                subject { Campo::Helpers.options_builder name, opts }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+              end
+              context "and a single string value" do
+                let(:opts) {
+                  Hash[ [ 
+                    ["ceylon", "Ceylon"],
+                    ["english_breakfast", "English Breakfast"],
+                    ["earl_grey", "Earl Grey"],
+                  ] ]
+                }
+                subject { Campo::Helpers.options_builder name, opts }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+              end
+              context "and an array value" do
+                let(:opts) {
+                  {
+                    "ceylon"=>["Ceylon"], 
+                    "english_breakfast"=>["English Breakfast", :selected], 
+                    "earl_grey"=>["Earl Grey"]
+                  }
+                }
+                subject { Campo::Helpers.options_builder name, opts }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+                it { should satisfy {|ys|
+                    y = ys.find do |y| 
+                      y.attributes[:selected]
+                    end
+                    y.attributes[:value] == "english_breakfast" 
+                  }
+                }
+              end
+            end
+          end
+          
+          context "and given an array" do
+            context "that is empty" do
+              let(:opts) { [] }
+              subject { Campo::Helpers.options_builder name, opts }
+              it { should_not be_nil }
+              it { should be_a_kind_of Array }
+              it { should be_empty }
+            end
+            context "that contain [String,String]" do
+              let(:opts) {
+                [ 
+                  ["ceylon", "Ceylon"],
+                  ["english_breakfast", "English Breakfast"],
+                  ["earl_grey", "Earl Grey"],
+                ] 
+              }
+              subject { Campo::Helpers.options_builder name, opts }
+              it { should_not be_nil }
+              it { should be_a_kind_of Array }
+              it { should be_full_of Campo::Option }
+              context "with a selected option" do
+                let(:opts_selected) {
+                  [["ceylon", "Ceylon"], ["english_breakfast", "English Breakfast", :selected], ["earl_grey", "Earl Grey"]]
+                }
+                subject { Campo::Helpers.options_builder name, opts_selected }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+                it { should satisfy {|ys|
+                    ys.find do |y| 
+                      y.attributes[:selected]
+                    end.attributes[:value] == "english_breakfast" 
+                  }
+                }
+                
+              end
+            end
+            context "that contain [String]" do
+              context "formatted for the name attribute (underscores for spaces, lowercase)" do
+                let(:opts) {
+                  [ 
+                    ["ceylon"],
+                    ["english_breakfast"],
+                    ["earl_grey"],
+                  ] 
+                }
+                subject { Campo::Helpers.options_builder name, opts }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+                context "with a selected option" do
+                  let(:opts_selected) {
+                    [["ceylon"], ["english_breakfast", :selected], ["earl_grey"]]
+                  }
+                  subject { Campo::Helpers.options_builder name, opts_selected }
+                  it { should_not be_nil }
+                  it { should be_a_kind_of Array }
+                  it { should be_full_of Campo::Option }
+                  it { should satisfy {|ys|
+                      ys.find do |y| 
+                        y.attributes[:selected]
+                      end.attributes[:value] == "english_breakfast" 
+                    }
+                  }
+                  
+                end
+              end
+              context "formatted for display" do
+                let(:opts) {
+                  [ 
+                    ["Ceylon"],
+                    ["English Breakfast"],
+                    ["Earl Grey"],
+                  ] 
+                }
+                subject { Campo::Helpers.options_builder name, opts }
+                it { should_not be_nil }
+                it { should be_a_kind_of Array }
+                it { should be_full_of Campo::Option }
+                context "with a selected option" do
+                  let(:opts_selected) {
+                    [["Ceylon"], ["English Breakfast", :selected], ["Earl Grey"]]
+                  }
+                  subject { Campo::Helpers.options_builder name, opts_selected }
+                  it { should_not be_nil }
+                  it { should be_a_kind_of Array }
+                  it { should be_full_of Campo::Option }
+                  it { should satisfy {|ys|
+                      ys.find do |y| 
+                        y.attributes[:selected]
+                      end.attributes[:value] == "English Breakfast" 
+                    }
+                  }
+                  
+                end
+              end
+            end
+          end
+        end
+      end
+    end    
     
     describe Label do
       let(:tag) { Label.new( "abc", "A, B, or C?" ) }
@@ -564,50 +733,94 @@ s.chomp
           end
 
           context "and an array" 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",  }! }
-
-            context "with a block with options" do
-              let(:opts) { [["ford", "Ford"], ["bmw", "BMW"], ["ferrari", "Ferrari", "checked"]] }
-              let(:tag){ 
-                Campo::Select.new( "pqr", {opts: opts} ) do |s|
-                  s.option "volvo", "Volvo"
-                  s.option "saab", "Saab"
-                  s.option "audi", "Audi"
-                end
-              }
-              subject { tag }
-
+            # 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, 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",  }! }
-              
-              context "Campo.output" do
-                let(:expected) { %q!%select{ atts[:pqr], tabindex: "#{i += 1}", name: "pqr",  }
+  
+              context "with a block with options" do
+                let(:opts) { [["ford", "Ford"], ["bmw", "BMW"], ["ferrari", "Ferrari", "checked"]] }
+                let(:tag){ 
+                  Campo::Select.new( "pqr", {opts: opts} ) do |s|
+                    s.option "volvo", "Volvo"
+                    s.option "saab", "Saab"
+                    s.option "audi", "Audi"
+                  end
+                }
+                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",  }! }
+                
+                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 }
-                it { should_not be_nil }
-                it { should == expected }
-              end
-            
-              context "and a default" 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",  }
+                  subject { Campo.output :partial, tag }
+                  it { should_not be_nil }
+                  it { should == expected }
+                  
+                  context "and some attributes" do
+                    let(:opts) { [["ford", "Ford",{class: "blue"}], ["bmw", "BMW"], ["ferrari", "Ferrari", "checked", {class: "green"}]] }
+                    let(:tag){ 
+                      Campo::Select.new( "pqr", {opts: opts} ) do |s|
+                        s.option "volvo", "Volvo"
+                        s.option "saab", "Saab"
+                        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 }
+                    it { should_not be_nil }
+                    it { should == expected }
+                  end
+                end
+              
+                context "and a default" 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:
   %option{ atts[:pqr_volvo], value: "volvo", id: "pqr_volvo", name: "pqr",  }Volvo
   %option{ atts[:pqr_saab], value: "saab", id: "pqr_saab", name: "pqr",  }Saab
@@ -615,14 +828,66 @@ s.chomp
   %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 }
-                  it { should == expected }
+                    subject { Campo.output :partial, tag.with_default }
+                    it { should == expected }
+                  end
                 end
+                
               end
-              
             end
           end
 
+          context "and a hash" do
+            context "with keys" do
+              context "only" do
+                let(:opts) {
+                  Hash[ ["ceylon", "english_breakfast", "earl_grey"].zip( Array.new(3, nil ) ) ]
+                }
+                let(:tag){ 
+                  Campo::Select.new( "tea", {opts: opts} )
+                }
+                subject { tag }
+  
+                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! }
+              end
+              context "and a single string value" do
+                let(:opts) {
+                  Hash[ [ 
+                    ["ceylon", "Ceylon"],
+                    ["english_breakfast", "English Breakfast"],
+                    ["earl_grey", "Earl Grey"],
+                  ] ]
+                }
+                let(:tag){ 
+                  Campo::Select.new( "tea", {opts: opts} )
+                }
+                subject { tag }
+  
+                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! }
+              end
+              context "and an array value" do
+                let(:opts) {
+                  {
+                    "ceylon"=>["Ceylon"], 
+                    "english_breakfast"=>["English Breakfast", :selected], 
+                    "earl_grey"=>["Earl Grey"]
+                  }
+                }
+                let(:tag){ 
+                  Campo::Select.new( "tea", {opts: opts} )
+                }
+                subject { tag }
+  
+                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! }
+              end
+            end
+          end
         end
 
       end # initialisation

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 # encoding: UTF-8
 
 require 'rspec'
+Spec_dir = File.expand_path( File.dirname __FILE__ )
 
 # code coverage
 require 'simplecov'
 SimpleCov.start
 
 
+Dir[ File.join( Spec_dir, "/support/**/*.rb")].each do |f| 
+  puts "requiring #{f}"
+  require f
+end

data/spec/support/matchers/items.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+
+RSpec::Matchers.define :be_full_of do |klass|
+  match do |items|
+    items.all?{|x| x.kind_of? klass }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: campo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -50,12 +50,12 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-11-27 00:00:00.000000000 +00:00
+date: 2011-11-29 00:00:00.000000000 +00:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153204860 !ruby/object:Gem::Requirement
+  requirement: &2164742080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,7 +63,7 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153204860
+  version_requirements: *2164742080
 description: ! '    Form builder for Haml
 
 '
@@ -81,6 +81,7 @@ files:
 - lib/campo/version.rb
 - spec/campo_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/items.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -109,3 +110,4 @@ summary: Form builder for Haml
 test_files:
 - spec/campo_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/items.rb