@@ -17,7 +17,7 @@ module Mack @total_time = @end_time - @start_time @requests_per_second = (1 / @total_time).round if app_config.log.detailed_requests - msg = "\n\t[#{request.request_method.upcase}] '#{request.path_info}'\n" + msg = "\n\t[#{request.params[:method].to_s.upcase}] '#{request.path_info}'\n" msg << "\tSession ID: #{request.session.id}\n" if app_config.mack.use_sessions msg << "\tParameters: #{request.all_params}\n" msg << Mack::Utils::Ansi::Color.wrap(app_config.log.completed_color, "\tCompleted in #{@total_time} (#{@requests_per_second} reqs/sec) | #{response.status} [#{request.full_host}]") lib/mack/runner_helpers/request_logger.rb @@ -36,6 +36,17 @@ module Mack # content_tag(:form, options, &block) end + def delete_button(url, value = "Delete", form_options = {}, button_options = {}) + if button_options[:confirm] + button_options[:onclick] = "if (confirm('#{button_options[:confirm]}')) {submit();}; return false;" + button_options.delete(:confirm) + end + t = "\n" << hidden_field(:_method, :value => :delete) + t << "\n" << submit_button(value, button_options) + t << "\n" + content_tag(:form, {:action => url, :method => :post}.merge(form_options), t) + end + alias_deprecated_method :submit_tag, :submit_button, '0.7.0' # Examples: lib/mack/view_helpers/form_helpers.rb @@ -239,6 +239,18 @@ describe Mack::ViewHelpers::FormHelpers do end + describe "delete_button" do + include CommonHelpers + + it "should create a form and a delete button" do + delete_button("http://www.mackframework.com").should == %{<form action="http://www.mackframework.com" method="post">\n<input id="_method" name="_method" type="hidden" value="delete" />\n<button type="submit">Delete</button>\n</form>} + delete_button("http://www.mackframework.com", "Remove", :target => "_blank").should == %{<form action="http://www.mackframework.com" method="post" target="_blank">\n<input id="_method" name="_method" type="hidden" value="delete" />\n<button type="submit">Remove</button>\n</form>} + delete_button("http://www.mackframework.com", "Remove", {:target => "_blank"}, {:class => "foo"}).should == %{<form action="http://www.mackframework.com" method="post" target="_blank">\n<input id="_method" name="_method" type="hidden" value="delete" />\n<button class="foo" type="submit">Remove</button>\n</form>} + delete_button("http://www.mackframework.com", "Remove", {:target => "_blank"}, {:confirm => "really??"}).should == %{<form action="http://www.mackframework.com" method="post" target="_blank">\n<input id="_method" name="_method" type="hidden" value="delete" />\n<button onclick="if (confirm('really??')) {submit();}; return false;" type="submit">Remove</button>\n</form>} + end + + end + describe "form" do include CommonHelpers test/unit/view_helpers/form_helpers_spec.rb 1f90d323506bcaaecde71ea1bf79fa3e1297ee17 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/89e3fed23f182b925e7ea5c57f114c9e71925907 89e3fed23f182b925e7ea5c57f114c9e71925907 2008-08-15T10:30:34-07:00 2008-08-15T10:30:34-07:00 Added delete_button form helper. [#19] 403bf4dca37fb5512e2b2b01278dfc1f41cf3a4a Mark Bates mark@markbates.com