railties 4.0.0 → 4.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d2177fbebef4c17a64787edd360f144c8c08724
-  data.tar.gz: ece2e38537a4cf283322f5485057d633dc0339e0
+  metadata.gz: 86d0f16927c9e7a714ba971266e5c423bd0e919e
+  data.tar.gz: f9df72a0f2e53d92ec4c9b9368cd5feff21e8308
 SHA512:
-  metadata.gz: 8815a209c892c27da09bfc3ac57e54711b60696665673016e6d01fcc02f96667e216790d4ab4b26be6a496c180d8748458926c3b0b7736360252791813b346d1
-  data.tar.gz: c0045223d58b8be243e7e92c162c782fc355f7214927aa15611b4a262497d69002f2fcb73ef65d6abcf35697d3324148c6975483d66d7a189eb718f3abbbf8a9
+  metadata.gz: cbd734689c07ffeb0b2959e4dfa107a2cd372e62f0e3627c5a722aa41faeaec3b8aa7bf5aa2c20b165f7f0de20332f458b60337914029ec12a173c12e24542cf
+  data.tar.gz: e5b7cf09a00ed90aa19b581df4902a45634c07a24c8cd162ae94e5a5329e294cf641efe022e3cd75ad1012c2d3f1e1135f931c63b9aa006a20eff18bbb0ce60c

data/CHANGELOG.md

@@ -1,9 +1,37 @@
+## Rails 4.0.1.rc1 (October 17, 2013) ##
+
+*   Fix the event name of action_dispatch requests.
+
+    *Rafael Mendonça França*
+
+*   Make `config.log_level` work with custom loggers.
+
+    *Max Shytikov*
+
+*   Fix `rake environment` to do not eager load modules
+
+    *Paul Nikitochkin*
+
+*   Fix `rails plugin --help` command.
+
+    *Richard Schneeman*
+
+*   Omit turbolinks configuration completely on skip_javascript generator option.
+
+    *Nikita Fedyashev*
+
+
 ## Rails 4.0.0 (June 25, 2013) ##
 
 *   Clearing autoloaded constants triggers routes reloading [Fixes #10685].
 
     *Xavier Noria*
 
+*   Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
+    Fixes #9525.
+
+    *Arun Agrawal*
+
 *   Move rails.png into a data-uri. One less file to get generated into a new
     application. This is also consistent with the removal of index.html.
 

data/RDOC_MAIN.rdoc

@@ -18,7 +18,7 @@ you to present the data from database rows as objects and embellish these data o
 with business logic methods. Although most \Rails models are backed by a database, models
 can also be ordinary Ruby classes, or Ruby classes that implement a set of interfaces as
 provided by the ActiveModel module. You can read more about Active Record in its
-{README}[link:/activerecord/README.rdoc].
+{README}[link:files/activerecord/README_rdoc.html].
 
 The Controller layer is responsible for handling incoming HTTP requests and providing a
 suitable response. Usually this means returning \HTML, but \Rails controllers can also
@@ -29,7 +29,7 @@ In \Rails, the Controller and View layers are handled together by Action Pack.
 These two layers are bundled in a single package due to their heavy interdependence.
 This is unlike the relationship between Active Record and Action Pack, which are
 independent. Each of these packages can be used independently outside of \Rails. You
-can read more about Action Pack in its {README}[link:/actionpack/README.rdoc].
+can read more about Action Pack in its {README}[link:files/actionpack/README_rdoc.html].
 
 == Getting Started
 
@@ -55,7 +55,7 @@ can read more about Action Pack in its {README}[link:/actionpack/README.rdoc].
 
 5. Follow the guidelines to start developing your application. You may find the following resources handy:
 
-* The README file created within your application.
+* The \README file created within your application.
 * {Getting Started with \Rails}[http://guides.rubyonrails.org/getting_started.html].
 * {Ruby on \Rails Tutorial}[http://ruby.railstutorial.org/ruby-on-rails-tutorial-book].
 * {Ruby on \Rails Guides}[http://guides.rubyonrails.org].

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/railties
+* https://github.com/rails/rails/tree/4-0-stable/railties
 
 == License
 

data/lib/rails/api/task.rb

@@ -135,12 +135,20 @@ module Rails
       def api_dir
         'doc/rdoc'
       end
+    end
 
+    class EdgeTask < RepoTask
       def rails_version
         "master@#{`git rev-parse HEAD`[0, 7]}"
       end
     end
 
+    class StableTask < RepoTask
+      def rails_version
+        File.read('RAILS_VERSION').strip
+      end
+    end
+
     class AppTask < Task
       def component_root_dir(gem_name)
         $:.grep(%r{#{gem_name}[\w.-]*/lib\z}).first[0..-5]

data/lib/rails/application.rb

@@ -245,7 +245,8 @@ module Rails
       require "rails/tasks"
       config = self.config
       task :environment do
-        config.eager_load = false
+        ActiveSupport.on_load(:before_initialize) { config.eager_load = false }
+
         require_environment!
       end
     end
@@ -317,9 +318,7 @@ module Rails
           middleware.use ::ActionDispatch::SSL, config.ssl_options
         end
 
-        if config.action_dispatch.x_sendfile_header.present?
-          middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
-        end
+        middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
 
         if config.serve_static_assets
           middleware.use ::ActionDispatch::Static, paths["public"].first, config.static_cache_control

data/lib/rails/application/bootstrap.rb

@@ -42,7 +42,6 @@ INFO
           logger = ActiveSupport::Logger.new f
           logger.formatter = config.log_formatter
           logger = ActiveSupport::TaggedLogging.new(logger)
-          logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
           logger
         rescue StandardError
           logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDERR))
@@ -53,6 +52,8 @@ INFO
           )
           logger
         end
+
+        Rails.logger.level = ActiveSupport::Logger.const_get(config.log_level.to_s.upcase)
       end
 
       # Initialize cache early in the stack so railties can make use of it.

data/lib/rails/commands.rb

@@ -35,19 +35,17 @@ command = ARGV.shift
 command = aliases[command] || command
 
 case command
-when 'generate', 'destroy', 'plugin'
+when 'plugin'
+  require "rails/commands/plugin_new"
+when 'generate', 'destroy'
   require 'rails/generators'
 
-  if command == 'plugin' && ARGV.first == 'new'
-    require "rails/commands/plugin_new"
-  else
-    require APP_PATH
-    Rails.application.require_environment!
+  require APP_PATH
+  Rails.application.require_environment!
 
-    Rails.application.load_generators
+  Rails.application.load_generators
 
-    require "rails/commands/#{command}"
-  end
+  require "rails/commands/#{command}"
 
 when 'console'
   require 'rails/commands/console'
@@ -64,7 +62,7 @@ when 'console'
   Rails::Console.start(Rails.application, options)
 
 when 'server'
-  # Change to the application's path if there is no config.ru file in current dir.
+  # Change to the application's path if there is no config.ru file in current directory.
   # This allows us to run `rails server` from other directories, but still get
   # the main config.ru and properly set the tmp directory.
   Dir.chdir(File.expand_path('../../', APP_PATH)) unless File.exists?(File.expand_path("config.ru"))

data/lib/rails/engine.rb

@@ -102,7 +102,7 @@ module Rails
   #     paths["config"]              # => ["config"]
   #     paths["config/initializers"] # => ["config/initializers"]
   #     paths["config/locales"]      # => ["config/locales"]
-  #     paths["config/routes"]       # => ["config/routes.rb"]
+  #     paths["config/routes.rb"]    # => ["config/routes.rb"]
   #   end
   #
   # The <tt>Application</tt> class adds a couple more paths to this set. And as in your

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

@@ -21,8 +21,13 @@
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>
+  <%- if attribute.reference? -%>
+    <%%= f.label :<%= attribute.column_name %> %><br>
+    <%%= f.<%= attribute.field_type %> :<%= attribute.column_name %> %>
+  <%- else -%>
     <%%= f.label :<%= attribute.name %> %><br>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  <%- end -%>
 <% end -%>
   </div>
 <% end -%>

data/lib/rails/generators/rails/app/app_generator.rb

@@ -68,7 +68,7 @@ module Rails
       directory "bin" do |content|
         "#{shebang}\n" + content
       end
-      chmod "bin", 0755, verbose: false
+      chmod "bin", 0755 & ~File.umask, verbose: false
     end
 
     def config

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

@@ -16,7 +16,7 @@ group :doc do
 end
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+# gem 'bcrypt-ruby', '~> 3.1.2'
 
 # Use unicorn as the app server
 # gem 'unicorn'

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

@@ -2,8 +2,13 @@
 <html>
 <head>
   <title><%= camelized %></title>
+  <%- if options[:skip_javascript] -%>
+  <%%= stylesheet_link_tag    "application", media: "all" %>
+  <%%= javascript_include_tag "application" %>
+  <%- else -%>
   <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+  <%- end -%>
   <%%= csrf_meta_tags %>
 </head>
 <body>

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

@@ -39,7 +39,7 @@
   #       get 'recent', on: :collection
   #     end
   #   end
-  
+
   # Example resource route with concerns:
   #   concern :toggleable do
   #     post 'toggle'

data/lib/rails/generators/rails/app/templates/gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:

data/lib/rails/generators/rails/scaffold/scaffold_generator.rb

@@ -8,6 +8,8 @@ module Rails
 
       class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
       class_option :stylesheet_engine, desc: "Engine for Stylesheets"
+      class_option :assets, type: :boolean
+      class_option :resource_route, type: :boolean
 
       def handle_skip
         @options = @options.merge(stylesheets: false) unless options[:assets]

data/lib/rails/generators/test_unit/model/templates/fixtures.yml

@@ -1,4 +1,4 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 <% unless attributes.empty? -%>
 <% %w(one two).each do |name| %>
 <%= name %>:

data/lib/rails/rack/logger.rb

@@ -11,7 +11,6 @@ module Rails
       def initialize(app, taggers = nil)
         @app          = app
         @taggers      = taggers || []
-        @instrumenter = ActiveSupport::Notifications.instrumenter
       end
 
       def call(env)
@@ -33,7 +32,8 @@ module Rails
           logger.debug ''
         end
 
-        @instrumenter.start 'action_dispatch.request', request: request
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.start 'request.action_dispatch', request: request
         logger.info started_request_message(request)
         resp = @app.call(env)
         resp[2] = ::Rack::BodyProxy.new(resp[2]) { finish(request) }
@@ -70,7 +70,8 @@ module Rails
       private
 
       def finish(request)
-        @instrumenter.finish 'action_dispatch.request', request: request
+        instrumenter = ActiveSupport::Notifications.instrumenter
+        instrumenter.finish 'request.action_dispatch', request: request
       end
 
       def development?

data/lib/rails/tasks.rb

@@ -1,6 +1,6 @@
 $VERBOSE = nil
 
-# Load Rails rakefile extensions
+# Load Rails Rakefile extensions
 %w(
   annotations
   documentation

data/lib/rails/tasks/documentation.rake

@@ -68,8 +68,8 @@ end
 
 namespace :doc do
   task :guides do
-    # FIXME: Reaching outside lib directory is a bad idea
-    require File.expand_path('../../../../../guides/rails_guides', __FILE__)
+    rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir
+    require File.expand_path(File.join(rails_gem_dir, "/guides/rails_guides"))
     RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate
   end
 end

data/lib/rails/templates/rails/welcome/index.html.erb

@@ -232,8 +232,8 @@
             </li>
 
             <li>
-              <h2>Create your database</h2>
-              <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>
+              <h2>Configure your database</h2>
+              <p>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/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION
     MAJOR = 4
     MINOR = 0
-    TINY  = 0
-    PRE   = nil
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -320,12 +320,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.