railties 3.1.0.rc1 → 3.1.0.rc2

data/guides/source/migrations.textile

@@ -55,6 +55,8 @@ class AddReceiveNewsletterToUsers < ActiveRecord::Migration
 end
 </ruby>
 
+NOTE: Some "caveats":#using-models-in-your-migrations apply to using models in your migrations.
+
 This migration adds a +receive_newsletter+ column to the +users+ table. We want it to default to +false+ for new users, but existing users are considered
 to have already opted in, so we use the User model to set the flag to +true+ for existing users.
 
@@ -73,11 +75,9 @@ class CreateProducts < ActiveRecord::Migration
 end
 </ruby>
 
-NOTE: Some "caveats":#using-models-in-your-migrations apply to using models in your migrations.
-
 h4. Migrations are Classes
 
-A migration is a subclass of <tt>ActiveRecord::Migration</tt> that implements two class methods: +up+ (perform the required transformations) and +down+ (revert them).
+A migration is a subclass of <tt>ActiveRecord::Migration</tt> that implements two methods: +up+ (perform the required transformations) and +down+ (revert them).
 
 Active Record provides methods that perform common data definition tasks in a database independent way (you'll read about them in detail later):
 
@@ -115,7 +115,7 @@ h4. Changing Migrations
 
 Occasionally you will make a mistake when writing a migration. If you have already run the migration then you cannot just edit the migration and run the migration again: Rails thinks it has already run the migration and so will do nothing when you run +rake db:migrate+. You must rollback the migration (for example with +rake db:rollback+), edit your migration and then run +rake db:migrate+ to run the corrected version.
 
-In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless. Just use some common sense.
+In general editing existing migrations is not a good idea: you will be creating extra work for yourself and your co-workers and cause major headaches if the existing version of the migration has already been run on production machines. Instead you should write a new migration that performs the changes you require. Editing a freshly generated migration that has not yet been committed to source control (or more generally which has not been propagated beyond your development machine) is relatively harmless.
 
 h3. Creating a Migration
 

data/guides/source/rails_on_rack.textile

@@ -111,11 +111,11 @@ h5. Adding a Middleware
 
 You can add a new middleware to the middleware stack using any of the following methods:
 
-* +config.middleware.use(new_middleware, args)+ - Adds the new middleware at the bottom of the middleware stack.
+* <tt>config.middleware.use(new_middleware, args)</tt> - Adds the new middleware at the bottom of the middleware stack.
 
-* +config.middleware.insert_before(existing_middleware, new_middleware, args)+ - Adds the new middleware before the specified existing middleware in the middleware stack.
+* <tt>config.middleware.insert_before(existing_middleware, new_middleware, args)</tt> - Adds the new middleware before the specified existing middleware in the middleware stack.
 
-* +config.middleware.insert_after(existing_middleware, new_middleware, args)+ - Adds the new middleware after the specified existing middleware in the middleware stack.
+* <tt>config.middleware.insert_after(existing_middleware, new_middleware, args)</tt> - Adds the new middleware after the specified existing middleware in the middleware stack.
 
 <ruby>
 # config/environment.rb
@@ -154,20 +154,20 @@ h4. Internal Middleware Stack
 Much of Action Controller's functionality is implemented as Middlewares. The following table explains the purpose of each of them:
 
 |_.Middleware|_.Purpose|
-|+Rack::Lock+|Sets +env["rack.multithread"]+ flag to +true+ and wraps the application within a Mutex.|
+|+Rack::Lock+|Sets <tt>env["rack.multithread"]</tt> flag to +true+ and wraps the application within a Mutex.|
 |+ActionController::Failsafe+|Returns HTTP Status +500+ to the client if an exception gets raised while dispatching.|
 |+ActiveRecord::QueryCache+|Enables the Active Record query cache.|
 |+ActionController::Session::CookieStore+|Uses the cookie based session store.|
 |+ActionController::Session::MemCacheStore+|Uses the memcached based session store.|
 |+ActiveRecord::SessionStore+|Uses the database based session store.|
-|+Rack::MethodOverride+|Sets HTTP method based on +_method+ parameter or +env["HTTP_X_HTTP_METHOD_OVERRIDE"]+.|
+|+Rack::MethodOverride+|Sets HTTP method based on +_method+ parameter or <tt>env["HTTP_X_HTTP_METHOD_OVERRIDE"]</tt>.|
 |+Rack::Head+|Discards the response body if the client sends a +HEAD+ request.|
 
 TIP: It's possible to use any of the above middlewares in your custom Rack stack.
 
 h4. Customizing Internal Middleware Stack
 
-It's possible to replace the entire middleware stack with a custom stack using +ActionController::Dispatcher.middleware=+.
+It's possible to replace the entire middleware stack with a custom stack using <tt>ActionController::Dispatcher.middleware=</tt>.
 
 Put the following in an initializer:
 

data/guides/source/routing.textile

@@ -288,7 +288,7 @@ When using +magazine_ad_path+, you can pass in instances of +Magazine+ and +Ad+
 You can also use +url_for+ with a set of objects, and Rails will automatically determine which route you want:
 
 <erb>
-<%= link_to "Ad details", url_for(@magazine, @ad) %>
+<%= link_to "Ad details", url_for([@magazine, @ad]) %>
 </erb>
 
 In this case, Rails will see that +@magazine+ is a +Magazine+ and +@ad+ is an +Ad+ and will therefore use the +magazine_ad_path+ helper. In helpers like +link_to+, you can specify just the object in place of the full +url_for+ call:

data/guides/source/testing.textile

@@ -929,8 +929,8 @@ class UserControllerTest < ActionController::TestCase
     end
     invite_email = ActionMailer::Base.deliveries.first
 
-    assert_equal invite_email.subject, "You have been invited by me@example.com"
-    assert_equal invite_email.to[0], 'friend@example.com'
+    assert_equal "You have been invited by me@example.com", invite_email.subject
+    assert_equal 'friend@example.com', invite_email.to[0]
     assert_match /Hi friend@example.com/, invite_email.body
   end
 end

data/lib/rails/application.rb

@@ -50,7 +50,9 @@ module Rails
       end
     end
 
-    attr_accessor :assets
+    attr_accessor :assets, :sandbox
+    alias_method :sandbox?, :sandbox
+
     delegate :default_url_options, :default_url_options=, :to => :routes
 
     # This method is called just after an application inherits from Rails::Application,
@@ -96,24 +98,25 @@ module Rails
       self
     end
 
-    def load_tasks
+    def load_tasks(app=self)
       initialize_tasks
-      railties.all { |r| r.load_tasks }
+      railties.all { |r| r.load_tasks(app) }
       super
       self
     end
 
-    def load_generators
+    def load_generators(app=self)
       initialize_generators
-      railties.all { |r| r.load_generators }
+      railties.all { |r| r.load_generators(app) }
+
       super
       self
     end
 
-    def load_console(sandbox=false)
-      initialize_console(sandbox)
-      railties.all { |r| r.load_console(sandbox) }
-      super()
+    def load_console(app=self)
+      initialize_console
+      railties.all { |r| r.load_console(app) }
+      super
       self
     end
 
@@ -135,14 +138,16 @@ module Rails
       @config ||= Application::Configuration.new(find_root_with_flag("config.ru", Dir.pwd))
     end
 
+    def to_app
+      self
+    end
+
   protected
 
     alias :build_middleware_stack :app
 
     def default_middleware_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
-        middleware.use ::Rails::Rack::ContentLength, config.action_dispatch.x_sendfile_header
-
         if rack_cache = config.action_controller.perform_caching && config.action_dispatch.rack_cache
           require "action_dispatch/http/rack_cache"
           middleware.use ::Rack::Cache, rack_cache
@@ -198,7 +203,7 @@ module Rails
       require "rails/generators"
     end
 
-    def initialize_console(sandbox=false)
+    def initialize_console
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"

data/lib/rails/commands.rb

@@ -91,7 +91,7 @@ In addition to those, there are:
  benchmarker  See how fast a piece of code runs
  profiler     Get profile information from a piece of code
  plugin       Install a plugin
- runner       Run a piece of code in the application environment
+ runner       Run a piece of code in the application environment (short-cut alias: "r")
 
 All commands can be run with -h for more information.
   EOT

data/lib/rails/commands/benchmarker.rb

@@ -9,7 +9,7 @@ ARGV.pop
 def options
   options = {}
   defaults = ActiveSupport::Testing::Performance::DEFAULTS
-  
+
   OptionParser.new do |opt|
     opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
     opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
@@ -17,13 +17,13 @@ def options
     opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
     opt.parse!(ARGV)
   end
-  
+
   options
 end
 
 class BenchmarkerTest < ActionDispatch::PerformanceTest
   self.profile_options = options
-  
+
   ARGV.each do |expression|
     eval <<-RUBY
       def test_#{expression.parameterize('_')}

data/lib/rails/commands/console.rb

@@ -23,7 +23,8 @@ module Rails
         opt.parse!(ARGV)
       end
 
-      @app.load_console(options[:sandbox])
+      @app.sandbox = options[:sandbox]
+      @app.load_console
 
       if options[:debugger]
         begin

data/lib/rails/commands/profiler.rb

@@ -6,7 +6,7 @@ require 'active_support/testing/performance'
 def options
   options = {}
   defaults = ActiveSupport::Testing::Performance::DEFAULTS
-  
+
   OptionParser.new do |opt|
     opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
     opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
@@ -15,13 +15,13 @@ def options
     opt.on('-f', '--formats x,y,z', Array, 'Formats to output to.', "Default: #{defaults[:formats].join(",")}") { |m| options[:formats] = m.map(&:to_sym) }
     opt.parse!(ARGV)
   end
-  
+
   options
 end
 
 class ProfilerTest < ActionDispatch::PerformanceTest
   self.profile_options = options
-  
+
   ARGV.each do |expression|
     eval <<-RUBY
       def test_#{expression.parameterize('_')}

data/lib/rails/commands/server.rb

@@ -43,7 +43,7 @@ module Rails
     end
 
     def app
-      @app ||= super.instance
+      @app ||= super.respond_to?(:to_app) ? super.to_app : super
     end
 
     def opt_parser
@@ -78,6 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rails::Rack::ContentLength]
       Hash.new(middlewares)
     end
 

data/lib/rails/configuration.rb

@@ -43,6 +43,7 @@ module Rails
 
     class Generators #:nodoc:
       attr_accessor :aliases, :options, :templates, :fallbacks, :colorize_logging
+      attr_reader :hidden_namespaces
 
       def initialize
         @aliases = Hash.new { |h,k| h[k] = {} }
@@ -50,6 +51,7 @@ module Rails
         @fallbacks = {}
         @templates = []
         @colorize_logging = true
+        @hidden_namespaces = []
       end
 
       def initialize_copy(source)
@@ -59,6 +61,10 @@ module Rails
         @templates = @templates.dup
       end
 
+      def hide_namespace(namespace)
+        @hidden_namespaces << namespace
+      end
+
       def method_missing(method, *args)
         method = method.to_s.sub(/=$/, '').to_sym
 

data/lib/rails/engine.rb

@@ -387,7 +387,7 @@ module Rails
     delegate :middleware, :root, :paths, :to => :config
     delegate :engine_name, :isolated?, :to => "self.class"
 
-    def load_tasks
+    def load_tasks(*)
       super
       paths["lib/tasks"].existent.sort.each { |ext| load(ext) }
     end

data/lib/rails/generators.rb

@@ -57,7 +57,7 @@ module Rails
         :resource_controller => :controller,
         :scaffold_controller => :scaffold_controller,
         :stylesheets => true,
-        :stylesheet_engine => nil,
+        :stylesheet_engine => :css,
         :test_framework => false,
         :template_engine => :erb
       },
@@ -75,6 +75,7 @@ module Rails
       fallbacks.merge! config.fallbacks
       templates_path.concat config.templates
       templates_path.uniq!
+      hide_namespaces *config.hidden_namespaces
     end
 
     def self.templates_path
@@ -175,6 +176,7 @@ module Rails
         orm      = options[:rails][:orm]
         test     = options[:rails][:test_framework]
         template = options[:rails][:template_engine]
+        css      = options[:rails][:stylesheet_engine]
 
         [
           "rails",
@@ -194,7 +196,11 @@ module Rails
           "#{test}:plugin",
           "#{template}:controller",
           "#{template}:scaffold",
-          "#{template}:mailer"
+          "#{template}:mailer",
+          "#{css}:scaffold",
+          "#{css}:assets",
+          "css:assets",
+          "css:scaffold"
         ]
       end
     end

data/lib/rails/generators/css/assets/assets_generator.rb

@@ -0,0 +1,13 @@
+require "rails/generators/named_base"
+
+module Css
+  module Generators
+    class AssetsGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_stylesheet
+        copy_file "stylesheet.css", File.join('app/assets/stylesheets', class_path, "#{file_name}.css")
+      end
+    end
+  end
+end

data/lib/rails/generators/{rails/assets/templates/stylesheet.css.scss → css/assets/templates/stylesheet.css}

@@ -1,5 +1,4 @@
-/* 
+/*
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
-  You can use Sass (SCSS) here: http://sass-lang.com/
 */

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

@@ -0,0 +1,16 @@
+require "rails/generators/named_base"
+
+module Css
+  module Generators
+    class ScaffoldGenerator < Rails::Generators::NamedBase
+      # In order to allow the Sass generators to pick up the default Rails CSS and
+      # transform it, we leave it in a standard location for the CSS stylesheet
+      # generators to handle. For the simple, default case, just copy it over.
+      def copy_stylesheet
+        dir = Rails::Generators::ScaffoldGenerator.source_root
+        file = File.join(dir, "scaffold.css")
+        create_file "app/assets/stylesheets/scaffold.css", File.read(file)
+      end
+    end
+  end
+end

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

@@ -272,7 +272,7 @@ module Rails
       end
 
       def app_secret
-        ActiveSupport::SecureRandom.hex(64)
+        SecureRandom.hex(64)
       end
 
       def mysql_socket

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

@@ -4,10 +4,10 @@ source 'http://rubygems.org'
 
 <%= database_gemfile_entry -%>
 
-<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%>
+<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
 # Asset template engines
 <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
-gem 'sass'
+gem 'sass-rails', "~> 3.1.0.rc"
 gem 'coffee-script'
 gem 'uglifier'
 

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

@@ -39,17 +39,6 @@ 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_javascript] -%>
-    # config.action_view.javascript_expansions[:defaults] = %w()
-<% else -%>
-    # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
-<% end -%>
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 

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

@@ -21,4 +21,7 @@
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  # Do not compress assets
+  config.assets.compress = false
 end

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

@@ -11,9 +11,11 @@
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
-  # Compress both stylesheets and JavaScripts
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Specify the default JavaScript compressor
   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)

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

@@ -1,7 +1,7 @@
 # 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.
+# 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.
 ActionController::Base.wrap_parameters <%= key_value :format, "[:json]" %>

data/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb

@@ -5,7 +5,7 @@ class BrowsingTest < ActionDispatch::PerformanceTest
   # Refer to the documentation for all available options
   # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
   #                          :output => 'tmp/performance', :formats => [:flat] }
-  
+
   def test_homepage
     get '/'
   end