herbie 0.2.0 → 0.3.1

data/lib/herbie.rb

@@ -3,5 +3,5 @@ require 'herbie/generic_helpers.rb'
 require 'herbie/html_helpers.rb'
 
 module Herbie
-  VERSION = '0.2.0'
+  VERSION = '0.3.1'
 end

data/lib/herbie/html_helpers.rb

@@ -12,7 +12,20 @@ module Herbie
           "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
         end
       else
-        "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
+        case name
+        when :select          
+          option_tags = attrs.delete(:options).collect do |option|
+            if option.key? :label
+              option[:content] = option.delete(:options).collect {|o| tag :option, o}.join
+              tag :optgroup, option
+            else
+              tag :option, option
+            end
+          end.join
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{option_tags}</#{name}>"
+        else
+          "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>"
+        end
       end
     end
 

data/spec/herbie_spec.rb

@@ -46,6 +46,90 @@ describe Herbie::Helpers do
       
       tag(:meta, attrs).should == "<meta name=\"#{attrs[:name]}\" content=\"#{attrs[:content]}\">"
     end
+    
+    it "should output select tags with a supplied list of options" do
+      attrs = {
+        :name => "colour",
+        :options => [
+          {:content => "White",  :value => :common},
+          {:content => "Green",  :value => :uncommon},
+          {:content => "Blue",   :value => :rare},
+          {:content => "Purple", :value => :epic},
+          {:content => "Orange", :value => :legendary}
+        ]
+      }
+      
+      tag(:select, attrs).should == "<select name=\"colour\"><option value=\"common\">White</option><option value=\"uncommon\">Green</option><option value=\"rare\">Blue</option><option value=\"epic\">Purple</option><option value=\"legendary\">Orange</option></select>"
+    end
+    
+    it "should output select tags with a supplied list of optgroups" do
+      attrs = {
+        :name => "vehicles",
+        :options => [
+          {
+            :label => "Cars",
+            :options => [
+              {:content => "Ferrari", :value => :ferrari},
+              {:content => "Volkswagen", :value => :vw},
+              {:content => "Ford", :value => :ford}
+            ]
+          },
+          {
+            :label => "Trucks",
+            :options => [
+              {:content => "Volvo", :value => :volvo},
+              {:content => "Toyota", :value => :toyota},
+              {:content => "General Motors", :value => :gm}
+            ]
+          },
+          {
+            :label => "Bikes",
+            :options => [
+              {:content => "Suzuki", :value => :suzuki},
+              {:content => "Ducati", :value => :ducati},
+              {:content => "Kawasaki", :value => :kawasaki}
+            ]
+          }
+        ]
+      }
+      
+      tag(:select, attrs).should == "<select name=\"vehicles\"><optgroup label=\"Cars\"><option value=\"ferrari\">Ferrari</option><option value=\"vw\">Volkswagen</option><option value=\"ford\">Ford</option></optgroup><optgroup label=\"Trucks\"><option value=\"volvo\">Volvo</option><option value=\"toyota\">Toyota</option><option value=\"gm\">General Motors</option></optgroup><optgroup label=\"Bikes\"><option value=\"suzuki\">Suzuki</option><option value=\"ducati\">Ducati</option><option value=\"kawasaki\">Kawasaki</option></optgroup></select>"
+    end
+    
+    it "should output select tags with a mixed list of optgroups and options" do
+      attrs = {
+        :name => "vehicles",
+        :options => [
+          {:content => "— Choose —"},
+          {
+            :label => "Cars",
+            :options => [
+              {:content => "Ferrari", :value => :ferrari},
+              {:content => "Volkswagen", :value => :vw},
+              {:content => "Ford", :value => :ford}
+            ]
+          },
+          {
+            :label => "Trucks",
+            :options => [
+              {:content => "Volvo", :value => :volvo},
+              {:content => "Toyota", :value => :toyota},
+              {:content => "General Motors", :value => :gm}
+            ]
+          },
+          {
+            :label => "Bikes",
+            :options => [
+              {:content => "Suzuki", :value => :suzuki},
+              {:content => "Ducati", :value => :ducati},
+              {:content => "Kawasaki", :value => :kawasaki}
+            ]
+          }
+        ]
+      }
+      
+      tag(:select, attrs).should == "<select name=\"vehicles\"><option>— Choose —</option><optgroup label=\"Cars\"><option value=\"ferrari\">Ferrari</option><option value=\"vw\">Volkswagen</option><option value=\"ford\">Ford</option></optgroup><optgroup label=\"Trucks\"><option value=\"volvo\">Volvo</option><option value=\"toyota\">Toyota</option><option value=\"gm\">General Motors</option></optgroup><optgroup label=\"Bikes\"><option value=\"suzuki\">Suzuki</option><option value=\"ducati\">Ducati</option><option value=\"kawasaki\">Kawasaki</option></optgroup></select>"
+    end
 
     it "should output tags mixed with ERB" do
       pending "Need a mechanism for capturing erb output within a passed block"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herbie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt