railties 3.2.8 → 3.2.9.rc1

data/guides/source/3_1_release_notes.textile

@@ -17,10 +17,132 @@ If you're upgrading an existing application, it's a great idea to have good test
 
 h4. Rails 3.1 requires at least Ruby 1.8.7
 
+If your application is currently on any version of Rails older than 3.0.x, you should upgrade to Rails 3.0 before attempting an update to Rails 3.1.
+
+The following changes are meant for upgrading your application to Rails 3.1.3, the latest 3.1.x version of Rails.
+
+h4. Ruby
+
 Rails 3.1 requires Ruby 1.8.7 or higher. Support for all of the previous Ruby versions has been dropped officially and you should upgrade as early as possible. Rails 3.1 is also compatible with Ruby 1.9.2.
 
 TIP: Note that Ruby 1.8.7 p248 and p249 have marshaling bugs that crash Rails. Ruby Enterprise Edition have these fixed since release 1.8.7-2010.02 though. On the 1.9 front, Ruby 1.9.1 is not usable because it outright segfaults, so if you want to use 1.9.x jump on 1.9.2 for smooth sailing.
 
+h4. Gemfile
+
+Make the following changes to your +Gemfile+.
+
+<ruby>
+gem 'rails', '= 3.1.3'
+gem 'mysql2'
+
+# Needed for the new asset pipeline
+group :assets do
+  gem 'sass-rails',   "~> 3.1.5"
+  gem 'coffee-rails', "~> 3.1.1"
+  gem 'uglifier',     ">= 1.0.3"
+end
+
+# jQuery is the default JavaScript library in Rails 3.1
+gem 'jquery-rails'
+</ruby>
+
+h4. config/application.rb
+
+The asset pipeline requires the following additions:
+
+<ruby>
+config.assets.enabled = true
+config.assets.version = '1.0'
+</ruby>
+
+If your application is using an "/assets" route for a resource you may want change the prefix used for assets to avoid conflicts:
+
+<ruby>
+# Defaults to '/assets'
+config.assets.prefix = '/asset-files'
+</ruby>
+
+h4. config/environments/development.rb
+
+Remove the RJS setting <tt>config.action_view.debug_rjs = true</tt>.
+
+Add these settings if you enable the asset pipeline:
+
+<ruby>
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
+</ruby>
+
+h4. config/environments/production.rb
+
+Again, most of the changes below are for the asset pipeline. You can read more about these in the "Asset Pipeline":asset_pipeline.html guide.
+
+<ruby>
+# Compress JavaScripts and CSS
+config.assets.compress = true
+
+# Don't fallback to assets pipeline if a precompiled asset is missed
+config.assets.compile = false
+
+# Generate digests for assets URLs
+config.assets.digest = true
+
+# Defaults to Rails.root.join("public/assets")
+# config.assets.manifest = YOUR_PATH
+
+# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+# config.assets.precompile += %w( search.js )
+
+# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+# config.force_ssl = true
+</ruby>
+
+h4. config/environments/test.rb
+
+You can help test performance with these additions to your test environment:
+
+<ruby>
+# Configure static asset server for tests with Cache-Control for performance
+config.serve_static_assets = true
+config.static_cache_control = "public, max-age=3600"
+</ruby>
+
+h4. config/initializers/wrap_parameters.rb
+
+Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
+
+<ruby>
+# Be sure to restart your server when you modify this file.
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
+</ruby>
+
+h4. config/initializers/session_store.rb
+
+You need to change your session key to something new, or remove all sessions:
+
+<ruby>
+# in config/initializers/session_store.rb
+AppName::Application.config.session_store :cookie_store, :key => 'SOMETHINGNEW'
+</ruby>
+
+or
+
+<tt>$ rake db:sessions:clear</tt>
+
 h3. Creating a Rails 3.1 application
 
 <shell>

data/guides/source/contributing_to_ruby_on_rails.textile

@@ -318,6 +318,31 @@ Rails follows a simple set of coding style conventions.
 
 The above are guidelines -- please use your best judgment in using them.
 
+h4. Updating the CHANGELOG
+
+The CHANGELOG is an important part of every release. It keeps the list of changes for every Rails version.
+
+You should add an entry to the CHANGELOG of the framework that you modified if you're adding or removing a feature, commiting a bug fix or adding deprecation notices. Refactorings and documentation changes generally should not go to the CHANGELOG.
+
+A CHANGELOG entry should summarize what was changed and should end with author's name. You can use multiple lines if you need more space and you can attach code examples indented with 4 spaces. If a change is related to a specific issue, you should attach issue's number. Here is an example CHANGELOG entry:
+
+<plain>
+*   Summary of a change that briefly describes what was changed. You can use multiple
+    lines and wrap them at around 80 characters. Code examples are ok, too, if needed:
+
+        class Foo
+          def bar
+            puts 'baz'
+          end
+        end
+
+    You can continue after the code example and you can attach issue number. GH#1234
+
+    * Your Name *
+</plain>
+
+Your name can be added directly after the last word if you don't provide any code examples or don't need multiple paragraphs. Otherwise, it's best to make as a new paragraph.
+
 h4. Sanity Check
 
 You should not be the only person who looks at the code before you submit it. You know at least one other Rails developer, right? Show them what you’re doing and ask for feedback. Doing this in private before you push a patch out publicly is the “smoke test” for a patch: if you can’t convince one other developer of the beauty of your code, you’re unlikely to convince the core team either.

data/guides/source/getting_started.textile

@@ -221,7 +221,7 @@ h3. Creating a New Rails Project
 
 The best way to use this guide is to follow each step as it happens, no code or
 step needed to make this example application has been left out, so you can
-literally follow along step by step. You can get the complete code "here":https://github.com/lifo/docrails/tree/master/railties/guides/code/getting_started.
+literally follow along step by step. You can get the complete code "here":https://github.com/rails/rails/tree/3-2-stable/railties/guides/code/getting_started.
 
 By following along with this guide, you'll create a Rails project called <tt>blog</tt>, a
 (very) simple weblog. Before you can start building the application, you need to

data/lib/rails/application.rb

@@ -232,6 +232,8 @@ module Rails
     end
 
     def default_middleware_stack
+      require 'action_controller/railtie'
+
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
         if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
           require "action_dispatch/http/rack_cache"

data/lib/rails/generators/app_base.rb

@@ -138,13 +138,13 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable'
             gem 'arel',      :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git', :branch => '3-2-stable'
-            gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git', :branch => '1-0-stable'
             gem 'arel',      :git => 'git://github.com/rails/arel.git', :branch => '3-0-stable'
           GEMFILE
         else

data/lib/rails/generators/rails/resource_route/resource_route_generator.rb

@@ -1,13 +1,50 @@
 module Rails
   module Generators
     class ResourceRouteGenerator < NamedBase
+
+      # Properly nests namespaces passed into a generator
+      #
+      #   $ rails generate resource admin/users/products
+      #
+      # should give you
+      #
+      #   namespace :admin do
+      #     namespace :users
+      #       resources :products
+      #     end
+      #   end
       def add_resource_route
         return if options[:actions].present?
-        route_config =  regular_class_path.collect{ |namespace| "namespace :#{namespace} do " }.join(" ")
-        route_config << "resources :#{file_name.pluralize}"
-        route_config << " end" * regular_class_path.size
-        route route_config
+
+        # iterates over all namespaces and opens up blocks
+        regular_class_path.each_with_index do |namespace, index|
+          write("namespace :#{namespace} do", index + 1)
+        end
+
+        # inserts the primary resource
+        write("resources :#{file_name.pluralize}", route_length + 1)
+
+        # ends blocks
+        regular_class_path.each_index do |index|
+          write("end", route_length - index)
+        end
+
+        # route prepends two spaces onto the front of the string that is passed, this corrects that
+        route route_string[2..-1]
       end
+      
+      private
+        def route_string
+          @route_string ||= ""
+        end
+
+        def write(str, indent)
+          route_string << "#{"  " * indent}#{str}\n"
+        end
+
+        def route_length
+          regular_class_path.length
+        end
     end
   end
 end

data/lib/rails/paths.rb

@@ -87,14 +87,15 @@ module Rails
     protected
 
       def filter_by(constraint)
-        all = []
+        yes = []
+        no  = []
+
         all_paths.each do |path|
-          if path.send(constraint)
-            paths  = path.existent
-            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
-            all.concat(paths)
-          end
+          paths = path.existent + path.existent_base_paths
+          path.send(constraint) ? yes.concat(paths) : no.concat(paths)
         end
+
+        all = yes - no
         all.uniq!
         all
       end
@@ -194,6 +195,10 @@ module Rails
         expanded.select { |d| File.directory?(d) }
       end
 
+      def existent_base_paths
+        map { |p| File.expand_path(p, @root.path) }.select{ |f| File.exist? f }
+      end
+
       alias to_a expanded
 
       private

data/lib/rails/rack/logger.rb

@@ -3,35 +3,48 @@ require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
-    # Log the request started and flush all loggers after it.
+    # Sets log tags, logs the request, calls the app, and flushes the logs.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app, tags=nil)
-        @app, @tags = app, tags.presence
+      def initialize(app, taggers = nil)
+        @app, @taggers = app, taggers || []
       end
 
       def call(env)
-        if @tags
-          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        request = ActionDispatch::Request.new(env)
+
+        if Rails.logger.respond_to?(:tagged)
+          Rails.logger.tagged(compute_tags(request)) { call_app(request, env) }
         else
-          call_app(env)
+          call_app(request, env)
         end
       end
 
     protected
 
-      def call_app(env)
-        request = ActionDispatch::Request.new(env)
-        path = request.filtered_path
-        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+      def call_app(request, env)
+        # Put some space between requests in development logs.
+        if Rails.env.development?
+          Rails.logger.info ''
+          Rails.logger.info ''
+        end
+
+        Rails.logger.info started_request_message(request)
         @app.call(env)
       ensure
         ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def compute_tags(env)
-        request = ActionDispatch::Request.new(env)
+      # Started GET "/session/new" for 127.0.0.1 at 2012-09-26 14:51:42 -0700
+      def started_request_message(request)
+        'Started %s "%s" for %s at %s' % [
+          request.request_method,
+          request.filtered_path,
+          request.ip,
+          Time.now.to_default_s ]
+      end
 
-        @tags.collect do |tag|
+      def compute_tags(request)
+        @taggers.collect do |tag|
           case tag
           when Proc
             tag.call(request)

data/lib/rails/ruby_version_check.rb

@@ -2,7 +2,7 @@ if RUBY_VERSION < '1.8.7'
   desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails 3 requires Ruby 1.8.7 or 1.9.2.
+    Rails 3 requires Ruby 1.8.7 or >= 1.9.2.
 
     You're running
       #{desc}
@@ -14,7 +14,7 @@ elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2'
   $stderr.puts <<-end_message
 
     Rails 3 doesn't officially support Ruby 1.9.1 since recent stable
-    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2.
+    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2 or later.
 
     You're running
       #{RUBY_DESCRIPTION}

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 8
-    PRE   = nil
+    TINY  = 9
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 3.2.8
-  prerelease: 
+  version: 3.2.9.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.9.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.9.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.9.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.9.rc1
 description: ! 'Rails internals: application bootup, plugins, generators, and rake
   tasks.'
 email: david@loudthinking.com
@@ -631,12 +631,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3497070782119272411
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24