railties 4.0.0.beta1 → 4.0.0.rc1

data/lib/rails/generators/erb/scaffold/templates/_form.html.erb

@@ -13,8 +13,17 @@
 
 <% attributes.each do |attribute| -%>
   <div class="field">
-    <%%= f.label :<%= attribute.name %> %><br />
+<% if attribute.password_digest? -%>
+    <%%= f.label :password %><br>
+    <%%= f.password_field :password %>
+  </div>
+  <div>
+    <%%= f.label :password_confirmation %><br>
+    <%%= f.password_field :password_confirmation %>
+<% else -%>
+    <%%= f.label :<%= attribute.name %> %><br>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+<% end -%>
   </div>
 <% end -%>
   <div class="actions">

data/lib/rails/generators/erb/scaffold/templates/index.html.erb

@@ -3,7 +3,7 @@
 <table>
   <thead>
     <tr>
-<% attributes.each do |attribute| -%>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
       <th><%= attribute.human_name %></th>
 <% end -%>
       <th></th>
@@ -14,18 +14,18 @@
 
   <tbody>
     <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
-    <tr>
-<% attributes.each do |attribute| -%>
-      <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
+      <tr>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+        <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
 <% end -%>
-      <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
-      <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-      <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-    </tr>
+        <td><%%= link_to 'Show', <%= singular_table_name %> %></td>
+        <td><%%= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
+        <td><%%= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
     <%% end %>
   </tbody>
 </table>
 
-<br />
+<br>
 
 <%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>

data/lib/rails/generators/erb/scaffold/templates/show.html.erb

@@ -1,12 +1,11 @@
 <p id="notice"><%%= notice %></p>
 
-<% attributes.each do |attribute| -%>
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
 <p>
   <strong><%= attribute.human_name %>:</strong>
   <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
 </p>
 
 <% end -%>
-
 <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
 <%%= link_to 'Back', <%= index_helper %>_path %>

data/lib/rails/generators/generated_attribute.rb

@@ -130,6 +130,10 @@ module Rails
         @has_uniq_index
       end
 
+      def password_digest?
+        name == 'password' && type == :digest 
+      end
+
       def inject_options
         "".tap { |s| @attr_options.each { |k,v| s << ", #{k}: #{v.inspect}" } }
       end

data/lib/rails/generators/named_base.rb

@@ -40,7 +40,7 @@ module Rails
 
         def indent(content, multiplier = 2)
           spaces = " " * multiplier
-          content = content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
+          content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
         def wrap_with_namespace(content)
@@ -163,6 +163,7 @@ module Rails
         def attributes_names
           @attributes_names ||= attributes.each_with_object([]) do |a, names|
             names << a.column_name
+            names << 'password_confirmation' if a.password_digest?
             names << "#{a.name}_type" if a.polymorphic?
           end
         end

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

@@ -12,16 +12,21 @@ source 'https://rubygems.org'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.0.1'
 
-# To use ActiveModel has_secure_password
+group :doc do
+  # bundle exec rake doc:rails generates the API under doc/api.
+  gem 'sdoc', require: false
+end
+
+# Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 
 # Use unicorn as the app server
 # gem 'unicorn'
 
-# Deploy with Capistrano
+# Use Capistrano for deployment
 # gem 'capistrano', group: :development
 
 <% unless defined?(JRUBY_VERSION) -%>
-# To use debugger
-# gem 'debugger'
+# Use debugger
+# gem 'debugger', group: [:development, :test]
 <% end -%>

data/lib/rails/generators/rails/app/templates/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run <%= app_const %>
+run Rails.application

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

@@ -11,8 +11,9 @@ require "action_mailer/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>
 
-# Assets should be precompiled for production (so we don't need the gems loaded then)
-Bundler.require(*Rails.groups(assets: %w(development test)))
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env)
 
 module <%= app_const_base %>
   class Application < Rails::Application

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

@@ -26,6 +26,8 @@
 
   <%- unless options.skip_sprockets? -%>
   # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
   <%- end -%>
 end

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

@@ -24,10 +24,10 @@
 
   <%- unless options.skip_sprockets? -%>
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor  = :uglifier
+  config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
 
-  # Whether to fallback to assets pipeline if a precompiled asset is missed.
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
   # Generate digests for assets URLs.

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

@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets = true
+  config.serve_static_assets  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

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

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
 
 # Make sure the secret is at least 30 characters and all random,

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

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-<%= app_const %>.config.session_store :encrypted_cookie_store, key: <%= "'_#{app_name}_session'" %>
+<%= app_const %>.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>

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

@@ -3,7 +3,7 @@
   # See how all your routes lay out with "rake routes".
 
   # You can have the root of your site routed with "root"
-  # root to: 'welcome#index'
+  # root 'welcome#index'
 
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'

data/lib/rails/generators/rails/app/templates/public/404.html

@@ -3,16 +3,47 @@
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
   <style>
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 

data/lib/rails/generators/rails/app/templates/public/422.html

@@ -3,16 +3,47 @@
 <head>
   <title>The change you wanted was rejected (422)</title>
   <style>
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -22,5 +53,6 @@
     <h1>The change you wanted was rejected.</h1>
     <p>Maybe you tried to change something you didn't have access to.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/lib/rails/generators/rails/app/templates/public/500.html

@@ -3,16 +3,47 @@
 <head>
   <title>We're sorry, but something went wrong (500)</title>
   <style>
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 

data/lib/rails/generators/rails/app/templates/test/test_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 

data/lib/rails/generators/rails/model/USAGE

@@ -52,20 +52,26 @@ Available field types:
 
         `rails generate model product supplier:references{polymorphic}`
 
-    You can also specify some options just after the field type. You can use the
-    following options:
+    For integer, string, text and binary fields an integer in curly braces will
+    be set as the limit:
 
-        limit        Set the maximum size of the field giving a number between curly braces
-        default      Set a default value for the field
-        precision    Defines the precision for the decimal fields
-        scale        Defines the scale for the decimal fields
-        uniq         Defines the field values as unique
-        index        Will add an index on the field
+        `rails generate model user pseudo:string{30}`
 
-    Examples:
+    For decimal two integers separated by a comma in curly braces will be used
+    for precision and scale:
+
+        `rails generate model product price:decimal{10,2}`
+
+    You can add a `:uniq` or `:index` suffix for unique or standard indexes
+    respectively:
 
-        `rails generate model user pseudo:string{30}`
         `rails generate model user pseudo:string:uniq`
+        `rails generate model user pseudo:string:index`
+
+    You can combine any single curly brace option with the index options:
+
+        `rails generate model user username:string{30}:uniq`
+        `rails generate model product supplier:references{polymorphic}:index`
 
 
 Examples:

data/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

@@ -94,6 +94,11 @@ task default: :test
       end
     end
 
+    def test_dummy_assets
+      template "rails/javascripts.js",  "#{dummy_path}/app/assets/javascripts/application.js", force: true
+      template "rails/stylesheets.css", "#{dummy_path}/app/assets/stylesheets/application.css", force: true
+    end
+
     def test_dummy_clean
       inside dummy_path do
         remove_file ".gitignore"
@@ -101,8 +106,6 @@ task default: :test
         remove_file "doc"
         remove_file "Gemfile"
         remove_file "lib/tasks"
-        remove_file "app/assets/images/rails.png"
-        remove_file "public/index.html"
         remove_file "public/robots.txt"
         remove_file "README"
         remove_file "test"
@@ -112,7 +115,7 @@ task default: :test
 
     def stylesheets
       if mountable?
-        copy_file "#{app_templates_dir}/app/assets/stylesheets/application.css",
+        copy_file "rails/stylesheets.css",
                   "app/assets/stylesheets/#{name}/application.css"
       elsif full?
         empty_directory_with_keep_file "app/assets/stylesheets/#{name}"
@@ -123,8 +126,8 @@ task default: :test
       return if options.skip_javascript?
 
       if mountable?
-        template "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
-                  "app/assets/javascripts/#{name}/application.js"
+        template "rails/javascripts.js",
+                 "app/assets/javascripts/#{name}/application.js"
       elsif full?
         empty_directory_with_keep_file "app/assets/javascripts/#{name}"
       end
@@ -263,6 +266,7 @@ task default: :test
           build(:generate_test_dummy)
           store_application_definition!
           build(:test_dummy_config)
+          build(:test_dummy_assets)
           build(:test_dummy_clean)
           # ensure that bin/rails has proper dummy_path
           build(:bin, true)