@@ -25,7 +25,7 @@ Mack::ControllerHelpers.constants.each do |cont| end # Find view level Helpers and include them into the Mack::Rendering::ViewTemplate -# Mack::ViewHelpers.constants.each do |cont| -# h = "Mack::ViewHelpers::#{cont}".constantize -# h.include_safely_into(Mack::Rendering::ViewTemplate) -# end \ No newline at end of file +Mack::ViewHelpers.constants.each do |cont| + h = "Mack::ViewHelpers::#{cont}".constantize + Mack::Rendering::ViewTemplate.send(:include, h) +end \ No newline at end of file lib/mack/initialization/helpers.rb @@ -3,7 +3,6 @@ module Mack # This class is used to do all the view level bindings. # It allows for seperation between the Mack::Controller and the view levels. class ViewTemplate - include Mack::ViewHelpers # Allows access to any options passed into the template. attr_accessor :options lib/mack/rendering/view_template.rb @@ -77,7 +77,37 @@ module Mack end def select(name, *args) + var = instance_variable_get("@#{name}") + fe = FormElement.new(*args) + options = {:name => name, :id => name} + unless fe.calling_method == :to_s + options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}") + end + + content = "" + opts = fe.options[:options] + unless opts.nil? + sopts = opts + if opts.is_a?(Array) + elsif opts.is_a?(Hash) + sopts = [] + opts.sort.each do |k,v| + sopts << [k, v] + end + else + raise ArgumentError.new(":options must be either an Array of Arrays or a Hash!") + end + sel_value = var.send(fe.calling_method) if var + sel_value = fe.options[:selected] if fe.options[:selected] + sopts.each do |kv| + content << %{<option value="#{kv[1]}" #{kv[1].to_s == sel_value.to_s ? "selected" : ""}>#{kv[0]}</option>} + end + fe.options.delete(:selected) + fe.options.delete(:options) + end + + return content_tag(:select, options.merge(fe.options), content) end def text_area(name, *args) lib/mack/view_helpers/form_helpers.rb @@ -18,6 +18,7 @@ describe Mack::ViewHelpers::FormHelpers do @cop.bio_file = "~/bio.doc" @simple = "hi" @default_file = "~/resume.doc" + @select_options = [["one", 1], ["two", 2], ["three", 3]] end describe "check_box" do @@ -175,6 +176,30 @@ describe Mack::ViewHelpers::FormHelpers do describe "select" do + it "should create a nested select tag for a model" do + select(:cop, :level).should == %{<select id="cop_level" name="cop[level]"></select>} + end + + it "should create a non-nested select tag for a simple model" do + select(:simple).should == %{<select id="simple" name="simple"></select>} + end + + it "should build the options from a given array of arrays" do + select(:simple, :options => @select_options).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="2" >two</option><option value="3" >three</option></select>} + end + + it "should build the options from a given hash" do + select(:simple, :options => {"one" => 1, "two" => 2, "three" => 3}).should == %{<select id="simple" name="simple"><option value="1" >one</option><option value="3" >three</option><option value="2" >two</option></select>} + end + + it "should mark an option as selected if the model has it seleceted" do + select(:cop, :level, :options => @select_options).should == %{<select id="cop_level" name="cop[level]"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} + end + + it "should mark an option as selected if the selected options is available" do + select(:simple, :options => @select_options, :selected => 1).should == %{<select id="simple" name="simple"><option value="1" selected>one</option><option value="2" >two</option><option value="3" >three</option></select>} + end + end describe "text_area" do test/unit/view_helpers/form_helpers_spec.rb 25aed1978f46fb7a93ba6695563aa9ae4103c20d Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/620bd22da9f75b782db693879b8b654bb4587ab2 620bd22da9f75b782db693879b8b654bb4587ab2 2008-08-14T11:59:41-07:00 2008-08-14T11:59:41-07:00 Almost finished adding html form helpers. [#19] 56023b70e25fc607f6a627e2b28b6ccf61f76648 Mark Bates mark@markbates.com