Skip to content

R
rails

张重言 / rails

通知 1
Star 0
Fork 0
R
rails

体验新版 GitCode，发现更多精彩内容 >>

提交 ea2c5fa8 编写于 作者: J José Valim
浏览文件
操作

A new application now comes with a layout and a stylesheet.

上级 4eab983b
隐藏空白更改
内联 并排
Showing with 28 addition and 67 deletion
railties/CHANGELOG
浏览文件 @ ea2c5fa8
* A new application now comes with a layout and a stylesheet. [JV]
* Renamed config.cookie_secret to config.secret_token and pass it as env key. [JV]
*Rails 3.0.0 [beta 2] (April 1st, 2010)*
......
railties/lib/rails/generators.rb
浏览文件 @ ea2c5fa8
......@@ -26,7 +26,6 @@ module Generators
:orm => '-o',
:resource_controller => '-c',
:scaffold_controller => '-c',
:stylesheets => '-y',
:template_engine => '-e',
:test_framework => '-t'
},
......@@ -56,7 +55,6 @@ module Generators
:resource_controller => :controller,
:scaffold_controller => :scaffold_controller,
:singleton => false,
:stylesheets => true,
:test_framework => nil,
:template_engine => :erb
},
......
railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
浏览文件 @ ea2c5fa8
......@@ -25,12 +25,6 @@ def copy_view_files
end
end
def copy_layout_file
return unless options[:layout]
template filename_with_extensions(:layout),
File.join("app/views/layouts", controller_class_path, filename_with_extensions(controller_file_name))
end
protected
def available_views
......
railties/lib/rails/generators/erb/scaffold/templates/layout.html.erb 已删除 100644 → 0
浏览文件 @ 4eab983b
<!DOCTYPE html>
<html>
<head>
<title><%= controller_class_name %>: <%%= controller.action_name %></title>
<%%= stylesheet_link_tag 'scaffold' %>
<%%= javascript_include_tag :defaults %>
<%%= csrf_meta_tag %>
</head>
<body>
<p class="notice"><%%= notice %></p>
<p class="alert"><%%= alert %></p>
<%%= yield %>
</body>
</html>
railties/lib/rails/generators/rails/app/app_generator.rb
浏览文件 @ ea2c5fa8
......@@ -137,7 +137,7 @@ def create_public_image_files
end
def create_public_stylesheets_files
empty_directory_with_gitkeep "public/stylesheets"
directory "public/stylesheets"
end
def create_prototype_files
......
railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
浏览文件 @ ea2c5fa8
class ApplicationController < ActionController::Base
protect_from_forgery
layout 'application'
end
railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb 0 → 100644
浏览文件 @ ea2c5fa8
<!DOCTYPE html>
<html>
<head>
<title><%= controller_name.humanize %>: <%= action_name %></title>
<%= stylesheet_link_tag 'application' %>
<%= javascript_include_tag :defaults %>
<%= csrf_meta_tag %>
</head>
<body>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= yield %>
</body>
</html>
railties/lib/rails/generators/rails/scaffold/scaffold_generator.rb
浏览文件 @ ea2c5fa8
......@@ -7,7 +7,6 @@ class ScaffoldGenerator < ResourceGenerator #metagenerator
remove_class_option :actions
hook_for :scaffold_controller, :required => true
hook_for :stylesheets
end
end
end
railties/lib/rails/generators/rails/stylesheets/USAGE 已删除 100644 → 0
浏览文件 @ 4eab983b
Description:
Copies scaffold stylesheets to public/stylesheets/.
Examples:
`rails generate stylesheets`
railties/lib/rails/generators/rails/stylesheets/stylesheets_generator.rb 已删除 100644 → 0
浏览文件 @ 4eab983b
module Rails
module Generators
class StylesheetsGenerator < Base
def copy_stylesheets_file
template "scaffold.css", "public/stylesheets/scaffold.css" if behavior == :invoke
end
end
end
end
railties/test/generators/app_generator_test.rb
浏览文件 @ ea2c5fa8
......@@ -51,6 +51,13 @@ def test_application_skeleton_is_created
).each{ |path| assert_file path }
end
def test_application_controller_and_layout_files
run_generator
assert_file "app/controllers/application_controller.rb", /layout 'application'/
assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag 'application'/
assert_file "public/stylesheets/application.css"
end
def test_name_collision_raises_an_error
content = capture(:stderr){ run_generator [File.join(destination_root, "generate")] }
assert_equal "Invalid application name generate. Please give a name which does not match one of the reserved rails words.\n", content
......
railties/test/generators/scaffold_controller_generator_test.rb
浏览文件 @ ea2c5fa8
......@@ -66,7 +66,6 @@ def test_views_are_generated
new
show
).each { |view| assert_file "app/views/users/#{view}.html.erb" }
assert_file "app/views/layouts/users.html.erb"
end
def test_functional_tests
......
railties/test/generators/scaffold_generator_test.rb
浏览文件 @ ea2c5fa8
......@@ -70,14 +70,10 @@ def test_scaffold_on_invoke
show
_form
).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
assert_file "app/views/layouts/product_lines.html.erb"
# Helpers
assert_file "app/helpers/product_lines_helper.rb"
assert_file "test/unit/helpers/product_lines_helper_test.rb"
# Stylesheets
assert_file "public/stylesheets/scaffold.css"
end
def test_scaffold_on_revoke
......@@ -101,13 +97,9 @@ def test_scaffold_on_revoke
# Views
assert_no_file "app/views/product_lines"
assert_no_file "app/views/layouts/product_lines.html.erb"
# Helpers
assert_no_file "app/helpers/product_lines_helper.rb"
assert_no_file "test/unit/helpers/product_lines_helper_test.rb"
# Stylesheets (should not be removed)
assert_file "public/stylesheets/scaffold.css"
end
end
railties/test/generators/stylesheets_generator_test.rb 已删除 100644 → 0
浏览文件 @ 4eab983b
require 'generators/generators_test_helper'
require 'rails/generators/rails/stylesheets/stylesheets_generator'
class StylesheetsGeneratorTest < Rails::Generators::TestCase
include GeneratorsTestHelper
def test_copy_stylesheets
run_generator
assert_file "public/stylesheets/scaffold.css"
end
def test_stylesheets_are_not_deleted_on_revoke
run_generator
run_generator [], :behavior => :revoke
assert_file "public/stylesheets/scaffold.css"
end
end
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或