@@ -1,69 +1,43 @@ class Symbol def check_box(*args) - puts caller.inspect - fe = FormElement.new(*args) + Thread.current[:view_template].check_box(self, *args) end def file_field(*args) - + Thread.current[:view_template].file_field(self, *args) end def hidden_field(*args) - + Thread.current[:view_template].hidden_field(self, *args) end def image_submit(*args) - + Thread.current[:view_template].image_submit(self, *args) end def label(*args) - + Thread.current[:view_template].label(self, *args) end def radio_button(*args) - + Thread.current[:view_template].radio_button(self, *args) end def select(*args) - + Thread.current[:view_template].select(self, *args) end def submit(*args) - + Thread.current[:view_template].submit(self, *args) end def text_area(*args) - + Thread.current[:view_template].text_area(self, *args) end def text_field(*args) - - end - - private - class FormElement - attr_accessor :calling_method - attr_accessor :options - - def initialize(*args) - args = args.parse_splat_args - case args - when Symbol, String - self.calling_method = args - when Hash - self.options = args - when Array - self.calling_method = args[0] - self.options = args[1] - when nil - self.calling_method = :to_s - self.options = {} - else - raise ArgumentError.new("You must provide either a Symbol, a String, a Hash, or a combination thereof.") - end - end - + Thread.current[:view_template].text_field(self, *args) end end \ No newline at end of file lib/mack/core_extensions/symbol.rb @@ -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 +# h.include_safely_into(Mack::Rendering::ViewTemplate) +# end \ No newline at end of file lib/mack/initialization/helpers.rb @@ -3,6 +3,7 @@ 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 @@ -14,6 +15,7 @@ module Mack self.render_value = render_value self.options = options @_yield_to_cache = {} + Thread.current[:view_template] = self end # Allows access to the current Mack::Controller object. lib/mack/rendering/view_template.rb @@ -23,11 +23,136 @@ module Mack # content_tag(:form, options, &block) end + def submit_tag(value = "Submit", options = {}, *original_args) + Mack.logger.warn("DEPRECATED: 'submit_tag'. Please use 'submit' instead") + submit(value, options, *original_args) + end + # Builds an HTML submit tag - def submit_tag(value = "Submit", options = {}) + def submit(value = "Submit", options = {}, *original_args) non_content_tag(:input, {:type => :submit, :value => value}.merge(options)) end + def check_box(name, *args) + build_form_element(name, {:type => :checkbox}, *args) do |var, fe, options| + if options[:value] + options.merge!(:checked => "checked") + end + options.delete(:value) + end + end + + def file_field(name, *args) + build_form_element(name, {:type => :file}, *args) + end + + def hidden_field(name, *args) + build_form_element(name, {:type => :hidden}, *args) + end + + def image_submit(src, options = {}) + non_content_tag(:input, {:type => :image, :src => "/images/#{src}"}.merge(options)) + end + + def label(name, *args) + fe = FormElement.new(*args) + unless fe.options[:for] + fe.options[:for] = (fe.calling_method == :to_s ? name.to_s : "#{name}_#{fe.calling_method}") + end + unless fe.options[:value] + fe.options[:value] = (fe.calling_method == :to_s ? name.to_s.humanize : fe.calling_method.to_s.humanize) + end + content = fe.options[:value] + fe.options.delete(:value) + content_tag(:label, fe.options, content) + end + + def radio_button(name, *args) + build_form_element(name, {:type => :radio}, *args) do |var, fe, options| + if options[:value] + options.merge!(:checked => "checked") + end + options.delete(:value) + end + end + + def select(name, *args) + + end + + def text_area(name, *args) + var = instance_variable_get("@#{name}") + fe = FormElement.new(*args) + options = {:name => name, :id => name} + if var.nil? + return content_tag(:textarea, options.merge(fe.options)) + else + unless fe.calling_method == :to_s + options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}") + end + options[:value] = var.send(fe.calling_method) + + yield var, fe, options if block_given? + + content = options[:value] + options.delete(:value) + + return content_tag(:textarea, options.merge(fe.options), content) + end + end + + def text_field(name, *args) + build_form_element(name, {:type => :text}, *args) + end + + def password_field(name, *args) + build_form_element(name, {:type => :password}, *args) + end + + private + def build_form_element(name, options, *original_args) + var = instance_variable_get("@#{name}") + options = {:name => name, :id => name}.merge(options) + if var.nil? + return non_content_tag(:input, options) + else + fe = FormElement.new(*original_args) + unless fe.calling_method == :to_s + options.merge!(:name => "#{name}[#{fe.calling_method}]", :id => "#{name}_#{fe.calling_method}") + end + options[:value] = var.send(fe.calling_method) + + yield var, fe, options if block_given? + + return non_content_tag(:input, options.merge(fe.options)) + end + end + + class FormElement + + attr_accessor :calling_method + attr_accessor :options + + def initialize(*args) + args = args.parse_splat_args + self.calling_method = :to_s + self.options = {} + case args + when Symbol, String + self.calling_method = args + when Hash + self.options = args + when Array + self.calling_method = args[0] + self.options = args[1] + when nil + else + raise ArgumentError.new("You must provide either a Symbol, a String, a Hash, or a combination thereof.") + end + end + + end + end # FormHelpers end # ViewHelpers lib/mack/view_helpers/form_helpers.rb @@ -39,6 +39,9 @@ module Mack private def build_options(options) + if options[:disabled] + options[:disabled] = :disabled + end opts = "" unless options.empty? opts = " " << options.join("%s=\"%s\"", " ") lib/mack/view_helpers/html_helpers.rb @@ -4,6 +4,222 @@ require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' describe Mack::ViewHelpers::FormHelpers do include Mack::ViewHelpers + class Cop + attr_accessor :full_name + attr_accessor :level + attr_accessor :tos + attr_accessor :bio_file + end + + before(:each) do + @cop = Cop.new + @cop.full_name = "ness" + @cop.level = 1 + @cop.bio_file = "~/bio.doc" + @simple = "hi" + @default_file = "~/resume.doc" + end + + describe "check_box" do + + it "should create a nested checkbox for a model" do + check_box(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="checkbox" />} + end + + it "should create a non-nested checkbox for a simple object" do + check_box(:simple).should == %{<input checked="checked" id="simple" name="simple" type="checkbox" />} + end + + it "should create a non-nested checkbox for just a symbol" do + check_box(:unknown).should == %{<input id="unknown" name="unknown" type="checkbox" />} + end + + it "should be checked if the value is true" do + @cop.tos = true + check_box(:cop, :tos).should == %{<input checked="checked" id="cop_tos" name="cop[tos]" type="checkbox" />} + end + + it "should be unchecked if the value is false" do + @cop.tos = false + check_box(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="checkbox" />} + end + + end + + describe "file_field" do + + it "should create a nested file_field for a model" do + file_field(:cop, :bio_file).should == %{<input id="cop_bio_file" name="cop[bio_file]" type="file" value="~/bio.doc" />} + end + + it "should create a non-nested file_field for a simple object" do + file_field(:default_file).should == %{<input id="default_file" name="default_file" type="file" value="~/resume.doc" />} + end + + it "should create a non-nested file_field for just a symbol" do + file_field(:unknown).should == %{<input id="unknown" name="unknown" type="file" />} + end + + it "should create a nested file_field for a model with an empty value if value is false" do + @cop.bio_file = nil + file_field(:cop, :bio_file).should == %{<input id="cop_bio_file" name="cop[bio_file]" type="file" value="" />} + end + + end + + describe "hidden_field" do + + it "should create a nested hidden_field for a model" do + hidden_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="hidden" value="ness" />} + end + + it "should create a non-nested hidden_field for a simple object" do + hidden_field(:simple).should == %{<input id="simple" name="simple" type="hidden" value="hi" />} + end + + it "should create a non-nested hidden_field for just a symbol" do + hidden_field(:unknown).should == %{<input id="unknown" name="unknown" type="hidden" />} + end + + it "should create a nested hidden_field for a model with an empty value if value is false" do + @cop.full_name = nil + hidden_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="hidden" value="" />} + end + + end + + describe "password_field" do + + it "should create a nested password_field for a model" do + password_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="password" value="ness" />} + end + + it "should create a non-nested password_field for a simple object" do + password_field(:simple).should == %{<input id="simple" name="simple" type="password" value="hi" />} + end + + it "should create a non-nested password_field for just a symbol" do + password_field(:unknown).should == %{<input id="unknown" name="unknown" type="password" />} + end + + it "should create a nested password_field for a model with an empty value if value is false" do + @cop.full_name = nil + password_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="password" value="" />} + end + + end + + describe "image_submit" do + + it "should create an image submit tag" do + image_submit("login.png").should == %{<input src="/images/login.png" type="image" />} + image_submit("purchase.png", :disabled => true).should == %{<input disabled="disabled" src="/images/purchase.png" type="image" />} + image_submit("search.png", :class => 'search-button').should == %{<input class="search-button" src="/images/search.png" type="image" />} + end + + end + + describe "label" do + + it "should create a nested label for a model" do + label(:cop, :full_name).should == %{<label for="cop_full_name">Full name</label>} + end + + it "should create a non-nested label for a simple object" do + label(:simple).should == %{<label for="simple">Simple</label>} + end + + it "should create a non-nested label for just a symbol" do + label(:unknown).should == %{<label for="unknown">Unknown</label>} + end + + it "should create a non-nested label for just a symbol" do + label(:unknown).should == %{<label for="unknown">Unknown</label>} + end + + it "should create a non-nested label and use :value for it's content" do + label(:unknown, :value => "My Label").should == %{<label for="unknown">My Label</label>} + end + + it "should create a non-nested label and use :for for it's for" do + label(:unknown, :for => "my_label").should == %{<label for="my_label">Unknown</label>} + end + + end + + describe "radio_button" do + + it "should create a nested radio_button for a model" do + radio_button(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="radio" />} + end + + it "should create a non-nested radio_button for a simple object" do + radio_button(:simple).should == %{<input checked="checked" id="simple" name="simple" type="radio" />} + end + + it "should create a non-nested radio_button for just a symbol" do + radio_button(:unknown).should == %{<input id="unknown" name="unknown" type="radio" />} + end + + it "should be checked if the value is true" do + @cop.tos = true + radio_button(:cop, :tos).should == %{<input checked="checked" id="cop_tos" name="cop[tos]" type="radio" />} + end + + it "should be unchecked if the value is false" do + @cop.tos = false + radio_button(:cop, :tos).should == %{<input id="cop_tos" name="cop[tos]" type="radio" />} + end + + end + + describe "select" do + + end + + describe "text_area" do + + it "should create a nested text_area for a model" do + text_area(:cop, :full_name).should == %{<textarea id="cop_full_name" name="cop[full_name]">ness</textarea>} + end + + it "should create a non-nested text_area for a simple object" do + text_area(:simple).should == %{<textarea id="simple" name="simple">hi</textarea>} + end + + it "should create a non-nested text_area for just a symbol" do + text_area(:unknown).should == %{<textarea id="unknown" name="unknown"></textarea>} + end + + it "should create a nested text_area for a model with an empty value if value is false" do + @cop.full_name = nil + text_area(:cop, :full_name).should == %{<textarea id="cop_full_name" name="cop[full_name]"></textarea>} + end + + end + + describe "text_field" do + + it "should create a nested text_field for a model" do + text_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="text" value="ness" />} + end + + it "should create a non-nested text_field for a simple object" do + text_field(:simple).should == %{<input id="simple" name="simple" type="text" value="hi" />} + end + + it "should create a non-nested text_field for just a symbol" do + text_field(:unknown).should == %{<input id="unknown" name="unknown" type="text" />} + end + + it "should create a nested text_field for a model with an empty value if value is false" do + @cop.full_name = nil + text_field(:cop, :full_name).should == %{<input id="cop_full_name" name="cop[full_name]" type="text" value="" />} + end + + end + + describe "form" do include CommonHelpers @@ -43,18 +259,18 @@ Hello end - describe "submit_tag" do + describe "submit" do it "should build a simple submit tag" do - submit_tag.should == %{<input type="submit" value="Submit" />} + submit.should == %{<input type="submit" value="Submit" />} end it "should allow you to change the value" do - submit_tag("Login").should == %{<input type="submit" value="Login" />} + submit("Login").should == %{<input type="submit" value="Login" />} end it "should take options" do - submit_tag("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />} + submit("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />} end end test/unit/view_helpers/form_helpers_spec.rb test/unit/core_extensions/symbol_spec.rb 484cb93a90cc2900b73737e03f0d85e362610f86 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/25aed1978f46fb7a93ba6695563aa9ae4103c20d 25aed1978f46fb7a93ba6695563aa9ae4103c20d 2008-08-14T11:24:01-07:00 2008-08-14T11:24:01-07:00 More work on adding html form helpers. [#19] 9a1b167645538c9ddab92de092649c35a0518e77 Mark Bates mark@markbates.com