kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

r2495@sedna: jeremy | 2005-05-27 22:07:18 -0700

Browse source 
Branch to have scaffold use new render methods
 r2496@sedna:  jeremy | 2005-05-28 10:50:51 -0700
 axe unused process_request method
 r2497@sedna:  jeremy | 2005-05-28 10:51:58 -0700
 sanity assertions in process method check that @controller, @request, @response are set
 r2498@sedna:  jeremy | 2005-05-28 10:53:42 -0700
 clean up escaping.  use instance_variable_get instead of instance_eval.  put id in form action instead of hidden input (like the generated scaffolding)
 r2499@sedna:  jeremy | 2005-05-28 10:54:46 -0700
 clean up interpolation, remove tabs from stylesheet
 r2500@sedna:  jeremy | 2005-05-28 10:56:40 -0700
 modernize dynamic scaffolding.  use params[:id] instead of @params[id].  use consolidated render method instead of render_action, render_file, etc.  use builtin inflections rather than module methods.
 r2501@sedna:  jeremy | 2005-05-28 11:00:26 -0700
 modernize generated scaffolding.  use new-style assertions; use params[:id] instead of @params[id]; use consolidated render method instead of render_*
 r2542@sedna:  jeremy | 2005-06-12 02:24:06 -0700
 use :id => model instead of :id => model.id.  clean up the form helper method.  use flash[:notice] instead of flash['notice'].
 r2543@sedna:  jeremy | 2005-06-12 02:33:22 -0700
 whitespace
 r2544@sedna:  jeremy | 2005-06-12 02:56:57 -0700
 update changelogs
 r2545@sedna:  jeremy | 2005-06-12 03:26:23 -0700
 test dynamic form help when @post is not a new record
 r2546@sedna:  jeremy | 2005-06-12 03:44:14 -0700
 touch up TestCase#process sanity assertions


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2005-06-12 05:33:23 +00:00
parent dedb9c8483
commit 3cb26e9cb3
12 changed files with 142 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
actionpack/CHANGELOG
View file

@ -1,5 +1,11 @@
*SVN*
* Modernize scaffolding to match the generator: use the new render method and change style from the warty @params["id"] to the sleek params[:id]. #1367
* Include :id in the action generated by the form helper method. Then, for example, the controller can do Model.find(params[:id]) for both edit and update actions. Updated scaffolding to take advantage. #1367
* Add assertions with friendly messages to TestCase#process to ensure that @controller, @request, and @response are set. #1367
* Arrays sent via multipart posts are converted to strings #1032 [dj@omelia.org]
* render(:layout => true) is a synonym for render(:layout => nil)

53
actionpack/lib/action_controller/scaffolding.rb
View file

@ -27,12 +27,12 @@ module ActionController
# end
#
# def show
# @entry = Entry.find(@params["id"])
# @entry = Entry.find(params[:id])
# render_scaffold
# end
#
# def destroy
# Entry.find(@params["id"]).destroy
# Entry.find(params[:id]).destroy
# redirect_to :action => "list"
# end
#
@ -42,9 +42,9 @@ module ActionController
# end
#
# def create
# @entry = Entry.new(@params["entry"])
# @entry = Entry.new(params[:entry])
# if @entry.save
# flash["notice"] = "Entry was successfully created"
# flash[:notice] = "Entry was successfully created"
# redirect_to :action => "list"
# else
# render_scaffold('new')
@ -52,17 +52,17 @@ module ActionController
# end
#
# def edit
# @entry = Entry.find(@params["id"])
# @entry = Entry.find(params[:id])
# render_scaffold
# end
#
# def update
# @entry = Entry.find(@params["entry"]["id"])
# @entry.attributes = @params["entry"]
# @entry = Entry.find(params[:id])
# @entry.attributes = params[:entry]
#
# if @entry.save
# flash["notice"] = "Entry was successfully updated"
# redirect_to :action => "show/" + @entry.id.to_s
# flash[:notice] = "Entry was successfully updated"
# redirect_to :action => "show", :id => @entry
# else
# render_scaffold('edit')
# end
@ -84,9 +84,9 @@ module ActionController
def scaffold(model_id, options = {})
validate_options([ :class_name, :suffix ], options.keys)
singular_name = model_id.id2name
class_name = options[:class_name] || Inflector.camelize(singular_name)
plural_name = Inflector.pluralize(singular_name)
singular_name = model_id.to_s
class_name = options[:class_name] || singular_name.camelize
plural_name = singular_name.pluralize
suffix = options[:suffix] ? "_#{singular_name}" : ""
unless options[:suffix]
@ -104,12 +104,12 @@ module ActionController
end
def show#{suffix}
@#{singular_name} = #{class_name}.find(@params["id"])
@#{singular_name} = #{class_name}.find(params[:id])
render#{suffix}_scaffold
end
def destroy#{suffix}
#{class_name}.find(@params["id"]).destroy
#{class_name}.find(params[:id]).destroy
redirect_to :action => "list#{suffix}"
end
@ -119,9 +119,9 @@ module ActionController
end
def create#{suffix}
@#{singular_name} = #{class_name}.new(@params["#{singular_name}"])
@#{singular_name} = #{class_name}.new(params[:#{singular_name}])
if @#{singular_name}.save
flash["notice"] = "#{class_name} was successfully created"
flash[:notice] = "#{class_name} was successfully created"
redirect_to :action => "list#{suffix}"
else
render#{suffix}_scaffold('new')
@ -129,17 +129,17 @@ module ActionController
end
def edit#{suffix}
@#{singular_name} = #{class_name}.find(@params["id"])
@#{singular_name} = #{class_name}.find(params[:id])
render#{suffix}_scaffold
end
def update#{suffix}
@#{singular_name} = #{class_name}.find(@params["#{singular_name}"]["id"])
@#{singular_name}.attributes = @params["#{singular_name}"]
@#{singular_name} = #{class_name}.find(params[:id])
@#{singular_name}.attributes = params[:#{singular_name}]
if @#{singular_name}.save
flash["notice"] = "#{class_name} was successfully updated"
redirect_to :action => "show#{suffix}", :id => @#{singular_name}.id.to_s
flash[:notice] = "#{class_name} was successfully updated"
redirect_to :action => "show#{suffix}", :id => @#{singular_name}
else
render#{suffix}_scaffold('edit')
end
@ -148,7 +148,7 @@ module ActionController
private
def render#{suffix}_scaffold(action = caller_method_name(caller))
if template_exists?("\#{self.class.controller_path}/\#{action}")
render_action(action)
render(:action => action)
else
@scaffold_class = #{class_name}
@scaffold_singular_name, @scaffold_plural_name = "#{singular_name}", "#{plural_name}"
@ -156,10 +156,15 @@ module ActionController
add_instance_variables_to_assigns
@content_for_layout = @template.render_file(scaffold_path(action.sub(/#{suffix}$/, "")), false)
self.active_layout ? render_file(self.active_layout, "200 OK", true) : render_file(scaffold_path("layout"))
if active_layout?
render :file => active_layout, :use_full_path => true
else
render :file => scaffold_path("layout")
end
end
end
def scaffold_path(template_name)
File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".rhtml"
end

4
actionpack/lib/action_controller/templates/scaffolds/edit.rhtml
View file

@ -1,7 +1,7 @@
<h1>Editing <%= @scaffold_singular_name %></h1>
<%= error_messages_for(@scaffold_singular_name) %>
<%= form(@scaffold_singular_name, :action => "update" + @scaffold_suffix) %>
<%= form(@scaffold_singular_name, :action => "update#{@scaffold_suffix}") %>
<%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}").id %> |
<%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> |
<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>

38
actionpack/lib/action_controller/templates/scaffolds/layout.rhtml
View file

@ -28,40 +28,40 @@
#ErrorExplanation {
width: 400px;
border: 2px solid 'red';
padding: 7px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #f0f0f0;
border: 2px solid 'red';
padding: 7px;
padding-bottom: 12px;
margin-bottom: 20px;
background-color: #f0f0f0;
}
#ErrorExplanation h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
background-color: #c00;
color: #fff;
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
background-color: #c00;
color: #fff;
}
#ErrorExplanation p {
color: #333;
margin-bottom: 0;
padding: 5px;
color: #333;
margin-bottom: 0;
padding: 5px;
}
#ErrorExplanation ul li {
font-size: 12px;
list-style: square;
font-size: 12px;
list-style: square;
}
</style>
</head>
<body>
<p style="color: green"><%= flash['notice'] %></p>
<p style="color: green"><%= flash[:notice] %></p>
<%= @content_for_layout %>
</body>
</html>
</html>

6
actionpack/lib/action_controller/templates/scaffolds/list.rhtml
View file

@ -12,9 +12,9 @@
<% for column in @scaffold_class.content_columns %>
<td><%= entry.send(column.name) %></td>
<% end %>
<td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry.id %></td>
<td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry.id %></td>
<td><%= link_to "Destroy", :action => "destroy#{@scaffold_suffix}", :id => entry.id, :confirm => "Are you sure?" %></td>
<td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry %></td>
<td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry %></td>
<td><%= link_to "Destroy", :action => "destroy#{@scaffold_suffix}", :id => entry, :confirm => "Are you sure?" %></td>
</tr>
<% end %>
</table>

4
actionpack/lib/action_controller/templates/scaffolds/new.rhtml
View file

@ -1,6 +1,6 @@
<h1>New <%= @scaffold_singular_name %></h1>
<%= error_messages_for(@scaffold_singular_name) %>
<%= form(@scaffold_singular_name, :action => "create" + @scaffold_suffix) %>
<%= form(@scaffold_singular_name, :action => "create#{@scaffold_suffix}") %>
<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>
<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>

2
actionpack/lib/action_controller/templates/scaffolds/show.rhtml
View file

@ -5,5 +5,5 @@
</p>
<% end %>
<%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}").id %> |
<%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> |
<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>

5
actionpack/lib/action_controller/test_process.rb
View file

@ -247,6 +247,11 @@ module Test
private
# execute the request and set/volley the response
def process(action, parameters = nil, session = nil, flash = nil)
# Sanity check for required instance variables so we can give an understandable error message.
%w(controller request response).each do |iv_name|
assert_not_nil instance_variable_get("@#{iv_name}"), "@#{iv_name} is nil: make sure you set it in your test's setup method."
end
@html_document = nil
@request.env['REQUEST_METHOD'] ||= "GET"
@request.action = action.to_s

26
actionpack/lib/action_view/helpers/active_record_helper.rb
View file

@ -56,20 +56,22 @@ module ActionView
# form << content_tag("b", "Department")
# form << collection_select("department", "id", @departments, "id", "name")
# end
def form(record_name, options = nil)
options = (options || {}).symbolize_keys
record = instance_eval("@#{record_name}")
def form(record_name, options = {})
record = instance_variable_get("@#{record_name}")
options = options.symbolize_keys
options[:action] ||= record.new_record? ? "create" : "update"
action = url_for(:action => options[:action])
action = url_for(:action => options[:action], :id => record)
submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden")
contents = ''
contents << hidden_field(record_name, :id) unless record.new_record?
contents << all_input_tags(record, record_name, options)
yield contents if block_given?
contents << submit_tag(submit_value)
formtag = %(<form action="#{action}" method="post">#{id_field}) + all_input_tags(record, record_name, options)
yield formtag if block_given?
formtag + %(<input type="submit" value="#{submit_value}" /></form>)
content_tag('form', contents, :action => action, :method => 'post')
end
# Returns a string containing the error message attached to the +method+ on the +object+, if one exists.
@ -83,8 +85,8 @@ module ActionView
# <%= error_message_on "post", "title", "Title simply ", " (or it won't work)", "inputError" %> =>
# <div class="inputError">Title simply can't be empty (or it won't work)</div>
def error_message_on(object, method, prepend_text = "", append_text = "", css_class = "formError")
if errors = instance_eval("@#{object}").errors.on(method)
"<div class=\"#{css_class}\">#{prepend_text + (errors.is_a?(Array) ? errors.first : errors) + append_text}</div>"
if errors = instance_variable_get("@#{object}").errors.on(method)
content_tag("div", "#{prepend_text}#{errors.is_a?(Array) ? errors.first : errors}#{append_text}", :class => css_class)
end
end
@ -96,7 +98,7 @@ module ActionView
# * <tt>class</tt> - The class of the error div (default: errorExplanation)
def error_messages_for(object_name, options = {})
options = options.symbolize_keys
object = instance_eval "@#{object_name}"
object = instance_variable_get("@#{object_name}")
unless object.errors.empty?
content_tag("div",
content_tag(
@ -117,7 +119,7 @@ module ActionView
end
def default_input_block
Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br />#{input(record, column.name)}</p>" }
Proc.new { |record, column| %(<p><label for="#{record}_#{column.name}">#{column.human_name}</label><br />#{input(record, column.name)}</p>) }
end
end

29
actionpack/test/template/active_record_helper_test.rb
View file

File diff suppressed because one or more lines are too long

2
railties/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN*
* Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id]. #1367
* Added graceful exit from pressing CTRL-C during the run of the rails command #1150 [Caleb Tennis]
* Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]

58
railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
View file

@ -16,65 +16,83 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
<% for action in unscaffolded_actions -%>
def test_<%= action %>
get :<%= action %>
assert_rendered_file '<%= action %>'
assert_response :success
assert_template '<%= action %>'
end
<% end -%>
<% unless suffix -%>
def test_index
get :index
assert_rendered_file 'list'
assert_response :success
assert_template 'list'
end
<% end -%>
def test_list<%= suffix %>
get :list<%= suffix %>
assert_rendered_file 'list<%= suffix %>'
assert_template_has '<%= plural_name %>'
assert_response :success
assert_template 'list<%= suffix %>'
assert_not_nil assigns(:<%= plural_name %>)
end
def test_show<%= suffix %>
get :show<%= suffix %>, 'id' => 1
assert_rendered_file 'show'
assert_template_has '<%= singular_name %>'
assert_valid_record '<%= singular_name %>'
get :show<%= suffix %>, :id => 1
assert_response :success
assert_template 'show'
assert_not_nil assigns(:<%= singular_name %>)
assert assigns(:<%= singular_name %>).valid?
end
def test_new<%= suffix %>
get :new<%= suffix %>
assert_rendered_file 'new<%= suffix %>'
assert_template_has '<%= singular_name %>'
assert_response :success
assert_template 'new<%= suffix %>'
assert_not_nil assigns(:<%= singular_name %>)
end
def test_create
num_<%= plural_name %> = <%= model_name %>.find_all.size
num_<%= plural_name %> = <%= model_name %>.count
post :create<%= suffix %>, '<%= singular_name %>' => { }
post :create<%= suffix %>, :<%= singular_name %> => {}
assert_response :redirect
assert_redirected_to :action => 'list<%= suffix %>'
assert_equal num_<%= plural_name %> + 1, <%= model_name %>.find_all.size
assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
end
def test_edit<%= suffix %>
get :edit<%= suffix %>, 'id' => 1
assert_rendered_file 'edit<%= suffix %>'
assert_template_has '<%= singular_name %>'
assert_valid_record '<%= singular_name %>'
get :edit<%= suffix %>, :id => 1
assert_response :success
assert_template 'edit<%= suffix %>'
assert_not_nil assigns(:<%= singular_name %>)
assert assigns(:<%= singular_name %>).valid?
end
def test_update<%= suffix %>
post :update<%= suffix %>, 'id' => 1
post :update<%= suffix %>, :id => 1
assert_response :redirect
assert_redirected_to :action => 'show<%= suffix %>', :id => 1
end
def test_destroy<%= suffix %>
assert_not_nil <%= model_name %>.find(1)
post :destroy, 'id' => 1
post :destroy, :id => 1
assert_response :redirect
assert_redirected_to :action => 'list<%= suffix %>'
assert_raise(ActiveRecord::RecordNotFound) {
<%= singular_name %> = <%= model_name %>.find(1)
<%= model_name %>.find(1)
}
end
end