@@ -23,7 +23,7 @@ module ActionView if name.to_s.downcase =~ /^input$/ type, css = options[:type], options[:class] type = 'text' if type == 'password' - options[:class] = "#{css.to_s} #{type.to_s}".gsub!(/^ /, '') unless css && css.split.include?(type) + options[:class] = "#{css.to_s} #{type.to_s}".gsub!(/^\s*/, '') unless css && css.split.include?(type) end options end lib/input_css.rb @@ -51,7 +51,7 @@ describe "InputCSS" do text_field_tag('query', 'Enter your search query here'). should eql("<input class=\"text\" id=\"query\" name=\"query\" type=\"text\" value=\"Enter your search query here\" />") text_field_tag('request', nil, :class => 'special_input'). - should eql("<input id=\"request\" name=\"request\" type=\"text\" />") + should eql("<input class=\"special_input text\" id=\"request\" name=\"request\" type=\"text\" />") text_field_tag('address', '', :size => 75). should eql("<input class=\"text\" id=\"address\" name=\"address\" size=\"75\" type=\"text\" value=\"\" />") text_field_tag('zip', nil, :maxlength => 5). @@ -59,7 +59,7 @@ describe "InputCSS" do text_field_tag('payment_amount', '$0.00', :disabled => true). should eql("<input class=\"text\" disabled=\"disabled\" id=\"payment_amount\" name=\"payment_amount\" type=\"text\" value=\"$0.00\" />") text_field_tag('ip', '0.0.0.0', :maxlength => 15, :size => 20, :class => 'ip-input'). - should eql("<input id=\"ip\" maxlength=\"15\" name=\"ip\" size=\"20\" type=\"text\" value=\"0.0.0.0\" />") + should eql("<input class=\"ip-input text\" id=\"ip\" maxlength=\"15\" name=\"ip\" size=\"20\" type=\"text\" value=\"0.0.0.0\" />") end end @@ -83,6 +83,11 @@ describe "InputCSS" do should eql("<input class=\"text\" id=\"project_title\" name=\"project[title]\" size=\"30\" type=\"text\" value=\"RPH\" />") end + it "should append css to existing css" do + text_field(:project, :title, :object => @project, :class => 'project'). + should eql("<input class=\"project text\" id=\"project_title\" name=\"project[title]\" size=\"30\" type=\"text\" value=\"RPH\" />") + end + # FormHelper#hidden_field it "should not add css to hidden_field" do hidden_field(:project, :title, :object => @project). @@ -95,6 +100,11 @@ describe "InputCSS" do should eql("<input class=\"text\" id=\"project_title\" name=\"project[title]\" size=\"30\" type=\"password\" value=\"RPH\" />") end + it "should add default css of 'text' to password_field" do + password_field(:project, :title, :object => @project, :class => 'project'). + should eql("<input class=\"project text\" id=\"project_title\" name=\"project[title]\" size=\"30\" type=\"password\" value=\"RPH\" />") + end + # FormHelper#check_box it "should add default css to check_box" do check_box(:project, :is_complete, :object => @project). @@ -104,12 +114,25 @@ describe "InputCSS" do ) end + it "should add default css to check_box" do + check_box(:project, :is_complete, :object => @project, :class => 'project'). + should eql( + "<input checked=\"checked\" class=\"project checkbox\" id=\"project_is_complete\" name=\"project[is_complete]\" type=\"checkbox\" value=\"1\" />" + + "<input name=\"project[is_complete]\" type=\"hidden\" value=\"0\" />" + ) + end + # FormHelper#radio_button it "should add default css to radio_button" do radio_button(:project, :is_complete, 'yes'). should eql("<input class=\"radio\" id=\"project_is_complete_yes\" name=\"project[is_complete]\" type=\"radio\" value=\"yes\" />") end + it "should add default css to radio_button" do + radio_button(:project, :is_complete, 'yes', :class => 'project'). + should eql("<input class=\"project radio\" id=\"project_is_complete_yes\" name=\"project[is_complete]\" type=\"radio\" value=\"yes\" />") + end + # FormHelper#file_field it "should add default css to file_field" do file_field(:project, :chart). spec/input_css_spec.rb 51c16c88650543b5ee936937290420eadde1ff51 rpheath rpheath@gmail.com http://github.com/rpheath/input_css/commit/ff6cb5d68aeb13db841229884e1319c7e23fee01 ff6cb5d68aeb13db841229884e1319c7e23fee01 2008-10-29T06:42:29-07:00 2008-10-29T06:42:29-07:00 fixed bug with existing css getting eaten dc3d4cfc65b1e5fed62803127ef1e5590624a013 rpheath rpheath@gmail.com