RubyGems - railties - Versions diffs - 3.0.20 → 3.1.0.beta1 - Mend

railties 3.0.20 → 3.1.0.beta1

Files changed (193) hide show

data/lib/rails/generators/rails/app/templates/Gemfile CHANGED

@@ -1,20 +1,16 @@
 source 'http://rubygems.org'
-<%- if options.dev? -%>
-gem 'rails', :path => '<%= Rails::Generators::RAILS_DEV_PATH %>'
-<%- elsif options.edge? -%>
-gem 'rails', :git => 'git://github.com/rails/rails.git'
-<%- else -%>
-gem 'rails', '<%= Rails::VERSION::STRING %>'
-<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-<%- end -%>
-<% unless options[:skip_active_record] -%>
-gem '<%= gem_for_database %>'<%= ", '#{version_constraint_for_database_gem}'" if version_constraint_for_database_gem %>
-<% end -%>
+<%= rails_gemfile_entry -%>
+<%= database_gemfile_entry -%>
+# Asset template engines
+<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
+gem 'sass'
+gem 'coffee-script'
+gem 'uglifier'
+<%= gem_for_javascript %>
 # Use unicorn as the web server
 # gem 'unicorn'
@@ -22,19 +18,7 @@ gem '<%= gem_for_database %>'<%= ", '#{version_constraint_for_database_gem}'" if
 # Deploy with Capistrano
 # gem 'capistrano'
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end
+# To use debugger
+# <%= gem_for_ruby_debugger %>
+<%= gem_for_turn -%>

data/lib/rails/generators/rails/app/templates/README CHANGED

@@ -91,7 +91,7 @@ mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
   class WeblogController < ActionController::Base
     def index
-      @posts = Post.find(:all)
+      @posts = Post.all
       debugger
     end
   end
@@ -139,7 +139,7 @@ To reload your controllers and models after launching the console run
 <tt>reload!</tt>
 More information about irb can be found at:
-link:http://www.rubycentral.com/pickaxe/irb.html
+link:http://www.rubycentral.org/pickaxe/irb.html
 == dbconsole

data/lib/rails/generators/rails/app/templates/Rakefile CHANGED

@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 <%= app_const %>.load_tasks

data/lib/rails/generators/rails/app/templates/{public → app/assets}/images/rails.png RENAMED

File without changes

data/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt ADDED

@@ -0,0 +1,8 @@
+// FIXME: Tell people that this is a manifest file, real code should go into discrete files
+// FIXME: Tell people how Sprockets and CoffeeScript works
+//
+<% unless options[:skip_javascript] -%>
+//= require <%= options[:javascript] %>
+//= require <%= options[:javascript] %>_ujs
+<% end -%>
+//= require_tree .

data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css ADDED

@@ -0,0 +1,5 @@
+/*
+ * FIXME: Introduce SCSS & Sprockets
+ *= require_self
+ *= require_tree .
+*/

data/lib/rails/generators/rails/app/templates/app/mailers/.empty_directory ADDED

File without changes

data/lib/rails/generators/rails/app/templates/app/models/.empty_directory ADDED

File without changes

data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt CHANGED

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= app_const_base %></title>
-  <%%= stylesheet_link_tag :all %>
-  <%%= javascript_include_tag :defaults %>
-  <%%= csrf_meta_tag %>
+  <title><%= camelized %></title>
+  <%%= stylesheet_link_tag    "application" %>
+  <%%= javascript_include_tag "application" %>
+  <%%= csrf_meta_tags %>
 </head>
 <body>

data/lib/rails/generators/rails/app/templates/config/application.rb CHANGED

@@ -39,11 +39,19 @@ module <%= app_const_base %>
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    # Please note that JavaScript expansions are *ignored altogether* if the asset
+    # pipeline is enabled (see config.assets.enabled below). Put your defaults in
+    # app/assets/javascripts/application.js in that case.
+    #
     # JavaScript files you want as :defaults (application.js is always included).
-<% if options[:skip_prototype] -%>
-    config.action_view.javascript_expansions[:defaults] = %w()
+<% if options[:skip_javascript] -%>
+    # config.action_view.javascript_expansions[:defaults] = %w()
 <% else -%>
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+    # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
+<% end -%>
+<% if options[:skip_test_unit] -%>
+    config.generators.test_framework = false
 <% end -%>
     # Configure the default encoding used in templates for Ruby 1.9.
@@ -51,5 +59,13 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+<% unless options[:skip_active_record] -%>
+    # Enable IdentityMap for Active Record, to disable set to false or remove the line below.
+    config.active_record.identity_map = true
+<% end -%>
+    # Enable the asset pipeline
+    config.assets.enabled = true
   end
 end

data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml CHANGED

@@ -6,7 +6,7 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
+  adapter: jdbcmysql
   database: <%= app_name %>_development
   username: root
   password:
@@ -16,15 +16,15 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  adapter: jdbcmysql
   database: <%= app_name %>_test
   username: root
   password:
   host: localhost
 production:
-  adapter: mysql
+  adapter: jdbcmysql
   database: <%= app_name %>_production
   username: root
   password:
-  host: localhost
+  host: localhost

data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml CHANGED

@@ -1,10 +1,15 @@
 # PostgreSQL. Versions 7.4 and 8.x are supported.
 #
- # Configure Using Gemfile
- # gem 'activerecord-jdbcpostgresql-adapter'development:
+# Install the pg driver:
+#   gem install pg
+# On Mac OS X with macports:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
 development:
-  adapter: postgresql
+  adapter: jdbcpostgresql
   encoding: unicode
   database: <%= app_name %>_development
   username: <%= app_name %>
@@ -29,14 +34,14 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: postgresql
+  adapter: jdbcpostgresql
   encoding: unicode
   database: <%= app_name %>_test
   username: <%= app_name %>
   password:
 production:
-  adapter: postgresql
+  adapter: jdbcpostgresql
   encoding: unicode
   database: <%= app_name %>_production
   username: <%= app_name %>

data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml CHANGED

@@ -2,16 +2,16 @@
 #   gem 'activerecord-jdbcsqlite3-adapter'
 development:
-  adapter: sqlite3
+  adapter: jdbcsqlite3
   database: db/development.sqlite3
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
+  adapter: jdbcsqlite3
   database: db/test.sqlite3
 production:
-  adapter: sqlite3
+  adapter: jdbcsqlite3
   database: db/production.sqlite3

data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml CHANGED

@@ -10,7 +10,7 @@
 #
 # By default prefetch_rows (OCI_ATTR_PREFETCH_ROWS) is set to 100. And
 # until true bind variables are supported, cursor_sharing is set by default
-# to 'similar'. Both can be changed in the configation below; the defaults
+# to 'similar'. Both can be changed in the configuration below; the defaults
 # are equivalent to specifying:
 #
 #  prefetch_rows: 100

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt CHANGED

@@ -3,7 +3,7 @@
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
   # Don't care if the mailer can't send

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt CHANGED

@@ -1,7 +1,6 @@
 <%= app_const %>.configure do
   # Settings specified here will take precedence over those in config/application.rb
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
@@ -9,14 +8,19 @@
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Compress both stylesheets and JavaScripts
+  config.assets.js_compressor  = :uglifier
+  config.assets.css_compressor = :scss
+  # Specifies the header that your server uses for sending files
+  # (comment out if your front-end server doesn't support this)
+  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +31,12 @@
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt CHANGED

@@ -7,7 +7,11 @@
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
   # Show full error reports and disable caching

data/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt CHANGED

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
-<%= app_const %>.config.session_store :cookie_store, :key => '_<%= app_name %>_session'
+<%= app_const %>.config.session_store :cookie_store, <%= key_value :key, "'_#{app_name}_session'" %>
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt ADDED

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains the settings for ActionController::ParametersWrapper
+# which will be enabled by default in the upcoming version of Ruby on Rails.
+# Enable parameter wrapping for JSON. You can disable this by set :format to empty array.
+ActionController::Base.wrap_parameters :format => [:json]
+# Disable root element in JSON by default.
+if defined?(ActiveRecord)
+  ActiveRecord::Base.include_root_in_json = false
+end

data/lib/rails/generators/rails/app/templates/config/locales/en.yml CHANGED

@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
   hello: "Hello world"

data/lib/rails/generators/rails/app/templates/config/routes.rb CHANGED

@@ -48,7 +48,7 @@
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  # root :to => "welcome#index"
+  # root :to => 'welcome#index'
   # See how all your routes lay out with "rake routes"

data/lib/rails/generators/rails/app/templates/db/{seeds.rb → seeds.rb.tt} RENAMED

@@ -3,5 +3,5 @@
 #
 # Examples:
 #
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)
+#   cities = City.create([{ <%= key_value :name, "'Chicago'" %> }, { <%= key_value :name, "'Copenhagen'" %> }])
+#   Mayor.create(<%= key_value :name, "'Daley'" %>, <%= key_value :city, "cities.first" %>)

data/lib/rails/generators/rails/app/templates/public/index.html CHANGED

@@ -52,7 +52,6 @@
         clear: both;
       }
       #header, #about, #getting-started {
         padding-left: 75px;
         padding-right: 30px;
@@ -60,7 +59,7 @@
       #header {
-        background-image: url("images/rails.png");
+        background-image: url("/assets/rails.png");
         background-repeat: no-repeat;
         background-position: top left;
         height: 64px;
@@ -168,6 +167,9 @@
         margin-bottom: 5px;
       }
+      .filename {
+        font-style: italic;
+      }
     </style>
     <script type="text/javascript">
       function about() {
@@ -190,10 +192,10 @@
           <li>
             <h3>Browse the documentation</h3>
             <ul class="links">
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
-              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
               <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
+              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
             </ul>
           </li>
         </ul>
@@ -221,13 +223,13 @@
             </li>
             <li>
-              <h2>Set up a default route and remove or rename this file</h2>
-              <p>Routes are set up in config/routes.rb.</p>
+              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
+              <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
             </li>
             <li>
               <h2>Create your database</h2>
-              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
+              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
             </li>
           </ol>
         </div>

data/lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory ADDED

File without changes

data/lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory ADDED

File without changes