diff options
| -rw-r--r-- | railties/configs/initializers/mime_types.rb | 2 | ||||
| -rw-r--r-- | railties/configs/routes.rb | 18 | ||||
| -rw-r--r-- | railties/html/robots.txt | 6 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/migration/migration_generator.rb | 20 |
4 files changed, 29 insertions, 17 deletions
diff --git a/railties/configs/initializers/mime_types.rb b/railties/configs/initializers/mime_types.rb index af12e9d449..aad0ba5183 100644 --- a/railties/configs/initializers/mime_types.rb +++ b/railties/configs/initializers/mime_types.rb @@ -1,3 +1,3 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf -# Mime::Type.register "application/x-mobile", :mobile +# Mime::Type.register_alias "text/html", :iphone diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb index ef0c8e8d2a..d94afa1b9d 100644 --- a/railties/configs/routes.rb +++ b/railties/configs/routes.rb @@ -2,25 +2,33 @@ ActionController::Routing::Routes.draw do |map| # The priority is based upon order of creation: first created -> highest priority. # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' + # map.connect 'products/:id', :controller => 'catalog', :action => 'view' # Keep in mind you can assign values other than :controller and :action # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' + # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' # This route can be invoked with purchase_url(:id => product.id) # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products + # map.resources :products # Sample resource route with options: - # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } + # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } # Sample resource route with sub-resources: - # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller + # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller + + # Sample resource route within a namespace: + # map.namespace :admin do |admin| + # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) + # admin.resources :products + # end # You can have the root of your site routed with map.root -- just remember to delete public/index.html. # map.root :controller => "welcome" + # See how all your routes lay out with "rake routes" + # Install the default routes as the lowest priority. map.connect ':controller/:action/:id' map.connect ':controller/:action/:id.:format' diff --git a/railties/html/robots.txt b/railties/html/robots.txt index 4ab9e89fe1..085187fa58 100644 --- a/railties/html/robots.txt +++ b/railties/html/robots.txt @@ -1 +1,5 @@ -# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
\ No newline at end of file +# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-Agent: * +# Disallow: / diff --git a/railties/lib/rails_generator/generators/components/migration/migration_generator.rb b/railties/lib/rails_generator/generators/components/migration/migration_generator.rb index 446a421210..acf41e07df 100644 --- a/railties/lib/rails_generator/generators/components/migration/migration_generator.rb +++ b/railties/lib/rails_generator/generators/components/migration/migration_generator.rb @@ -4,17 +4,17 @@ class MigrationGenerator < Rails::Generator::NamedBase m.migration_template 'migration.rb', 'db/migrate', :assigns => get_local_assigns end end + - private - - def get_local_assigns - returning(assigns = {}) do - if class_name.underscore =~ /^(add|remove)_.*_(?:to|from)_(.*)/ - assigns[:migration_action] = $1 - assigns[:table_name] = $2.pluralize - else - assigns[:attributes] = [] + private + def get_local_assigns + returning(assigns = {}) do + if class_name.underscore =~ /^(add|remove)_.*_(?:to|from)_(.*)/ + assigns[:migration_action] = $1 + assigns[:table_name] = $2.pluralize + else + assigns[:attributes] = [] + end end end - end end |