RubyGems - railties - Versions diffs - 3.2.22.5 → 4.0.0.beta1 - Mend

railties 3.2.22.5 → 4.0.0.beta1

Files changed (450) hide show

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

@@ -5,22 +5,23 @@ source 'https://rubygems.org'
 <%= database_gemfile_entry -%>
 <%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
-<%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
 <%= assets_gemfile_entry %>
-<%= javascript_gemfile_entry %>
+<%= javascript_gemfile_entry -%>
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 1.0.1'
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
 # Use unicorn as the app server
 # gem 'unicorn'
 # Deploy with Capistrano
-# gem 'capistrano'
+# gem 'capistrano', group: :development
+<% unless defined?(JRUBY_VERSION) -%>
 # To use debugger
-# <%= ruby_debugger_gemfile_entry %>
+# gem 'debugger'
+<% end -%>

data/lib/rails/generators/rails/app/templates/README.rdoc ADDED

@@ -0,0 +1,28 @@
+== README
+This README would normally document whatever steps are necessary to get the
+application up and running.
+Things you may want to cover:
+* Ruby version
+* System dependencies
+* Configuration
+* Database creation
+* Database initialization
+* How to run the test suite
+* Services (job queues, cache servers, search engines, etc.)
+* Deployment instructions
+* ...
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

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

@@ -1,4 +1,3 @@
-#!/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.

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

@@ -5,7 +5,7 @@
 // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
 //
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
@@ -13,5 +13,6 @@
 <% unless options[:skip_javascript] -%>
 //= require <%= options[:javascript] %>
 //= require <%= options[:javascript] %>_ujs
+//= require turbolinks
 <% end -%>
 //= require_tree .

data/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt ADDED

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

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

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "application", :media => "all" %>
-  <%%= javascript_include_tag "application" %>
+  <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
+  <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
   <%%= csrf_meta_tags %>
 </head>
 <body>

data/lib/rails/generators/rails/app/templates/bin/bundle ADDED

	@@ -0,0 +1,2 @@
1	+ ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)
2	+ load Gem.bin_path('bundler', 'bundle')

data/lib/rails/generators/rails/app/templates/bin/rails ADDED

@@ -0,0 +1,3 @@
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/lib/rails/generators/rails/app/templates/bin/rake ADDED

@@ -0,0 +1,3 @@
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

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

@@ -7,17 +7,12 @@ require 'rails/all'
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Assets should be precompiled for production (so we don't need the gems loaded then)
+Bundler.require(*Rails.groups(assets: %w(development test)))
 module <%= app_const_base %>
   class Application < Rails::Application
@@ -25,16 +20,6 @@ module <%= app_const_base %>
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -42,33 +27,10 @@ module <%= app_const_base %>
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+<% if options.skip_sprockets? -%>
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    <%= comment_if :skip_active_record %>config.active_record.whitelist_attributes = true
-<% unless options.skip_sprockets? -%>
-    # Enable the asset pipeline
-    config.assets.enabled = true
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Disable the asset pipeline.
+    config.assets.enabled = false
 <% end -%>
   end
 end

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

@@ -1,5 +1,3 @@
-require 'rubygems'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

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

@@ -22,8 +22,8 @@ development:
   # Minimum log levels, in increasing order:
   #   debug5, debug4, debug3, debug2, debug1,
   #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
+  # Defaults to warning.
+  #min_messages: notice
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

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

@@ -1,5 +1,5 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
-#
+#
 # Install the MYSQL driver
 #   gem install mysql2
 #
@@ -11,7 +11,6 @@
 development:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_development
   pool: 5
   username: root
@@ -28,7 +27,6 @@ development:
 test:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_test
   pool: 5
   username: root
@@ -42,7 +40,6 @@ test:
 production:
   adapter: mysql2
   encoding: utf8
-  reconnect: false
   database: <%= app_name %>_production
   pool: 5
   username: root

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

@@ -2,7 +2,9 @@
 #
 # Install the pg driver:
 #   gem install pg
-# On Mac OS X with macports:
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
 #   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
 # On Windows:
 #   gem install pg
@@ -24,6 +26,9 @@ development:
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
   #host: localhost
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
   #port: 5432
   # Schema search path. The server defaults to $user,public
@@ -32,8 +37,8 @@ development:
   # Minimum log levels, in increasing order:
   #   debug5, debug4, debug3, debug2, debug1,
   #   log, notice, warning, error, fatal, and panic
-  # The server defaults to notice.
-  #min_messages: warning
+  # Defaults to warning.
+  #min_messages: notice
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml ADDED

@@ -0,0 +1,57 @@
+# SQL Server (2005 or higher recommended)
+#
+# Install the adapters and driver
+#   gem install tiny_tds
+#   gem install activerecord-sqlserver-adapter
+#
+# Ensure the activerecord adapter and db driver gems are defined in your Gemfile
+#   gem 'tiny_tds'
+#   gem 'activerecord-sqlserver-adapter'
+#
+# You should make sure freetds is configured correctly first.
+# freetds.conf contains host/port/protocol_versions settings.
+# http://freetds.schemamania.org/userguide/freetdsconf.htm
+#
+# A typical Microsoft server
+#   [mssql]
+#   host = mssqlserver.yourdomain.com
+#   port = 1433
+#   tds version = 7.1
+# If you can connect with "tsql -S servername", your basic FreeTDS installation is working.
+# 'man tsql' for more info
+# Set timeout to a larger number if valid queries against a live db fail
+development:
+  adapter: sqlserver
+  encoding: utf8
+  reconnect: false
+  database: <%= app_name %>_development
+  username: <%= app_name %>
+  password:
+  timeout: 25
+  dataserver: from_freetds.conf
+# 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: sqlserver
+  encoding: utf8
+  reconnect: false
+  database: <%= app_name %>_test
+  username: <%= app_name %>
+  password:
+  timeout: 25
+  dataserver: from_freetds.conf
+production:
+  adapter: sqlserver
+  encoding: utf8
+  reconnect: false
+  database: <%= app_name %>_production
+  username: <%= app_name %>
+  password:
+  timeout: 25
+  dataserver: from_freetds.conf

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

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the rails application.
 require File.expand_path('../application', __FILE__)
-# Initialize the rails application
+# Initialize the rails application.
 <%= app_const %>.initialize!

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

@@ -1,41 +1,31 @@
 <%= app_const %>.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
   # 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 web server when you make code changes.
   config.cache_classes = false
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
   <%- unless options.skip_active_record? -%>
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
   <%- end -%>
   <%- unless options.skip_sprockets? -%>
-  # Do not compress assets
-  config.assets.compress = false
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
   config.assets.debug = true
   <%- end -%>
 end

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

@@ -1,73 +1,84 @@
 <%= app_const %>.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+  # Disable Rails's static asset server (Apache or nginx will already do this).
   config.serve_static_assets = false
   <%- unless options.skip_sprockets? -%>
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor  = :uglifier
+  # config.assets.css_compressor = :sass
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Whether to fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
-  # Generate digests for assets URLs
+  # Generate digests for assets URLs.
   config.assets.digest = true
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
   <%- end -%>
-  # Specifies the header that your server uses for sending files
+  # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
   # 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
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
   <%- unless options.skip_sprockets? -%>
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # config.assets.precompile += %w( search.js )
   <%- end -%>
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
-  # Enable threaded mode
-  # config.threadsafe!
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
-  <%- unless options.skip_active_record? -%>
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
-  <%- end -%>
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end