railties 3.0.0.beta2 → 3.0.0.beta3

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

@@ -1,14 +1,6 @@
-# Use locked gems if present.
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-
-rescue LoadError
-  # Otherwise, use RubyGems.
-  require 'rubygems'
-
-  # And set up the gems listed in the Gemfile.
-  if File.exist?(File.expand_path('../../Gemfile', __FILE__))
-    require 'bundler'
-    Bundler.setup
-  end
+require 'rubygems'
+# Set up gems listed in the Gemfile.
+if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+  require 'bundler'
+  Bundler.setup
 end

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

@@ -14,6 +14,9 @@
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 

data/lib/rails/generators/rails/app/templates/config/initializers/{cookie_verification_secret.rb.tt → secret_token.rb.tt}

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.cookie_secret = '<%= app_secret %>'
+Rails.application.config.secret_token = '<%= app_secret %>'

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

@@ -1,8 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.session_store :cookie_store, {
-  :key => '_<%= app_name %>_session',
-}
+Rails.application.config.session_store :cookie_store, :key => '_<%= app_name %>_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

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

@@ -82,7 +82,8 @@
       #about-content {
         background-color: #ffd;
         border: 1px solid #fc0;
-        margin-left: -11px;
+        margin-left: -55px;
+        margin-right: -10px;
       }
       #about-content table {
         margin-top: 10px;

data/lib/rails/generators/rails/app/templates/public/javascripts/rails.js

@@ -1,15 +1,8 @@
 document.observe("dom:loaded", function() {
-  var authToken = $$('meta[name=csrf-token]').first().readAttribute('content'),
-    authParam = $$('meta[name=csrf-param]').first().readAttribute('content'),
-    formTemplate = '<form method="#{method}" action="#{action}">\
-      #{realmethod}<input name="#{param}" value="#{token}" type="hidden">\
-      </form>',
-    realmethodTemplate = '<input name="_method" value="#{method}" type="hidden">';
-
   function handleRemote(element) {
     var method, url, params;
 
-    if (element.tagName.toLowerCase() == 'form') {
+    if (element.tagName.toLowerCase() === 'form') {
       method = element.readAttribute('method') || 'post';
       url    = element.readAttribute('action');
       params = element.serialize(true);
@@ -39,65 +32,81 @@ document.observe("dom:loaded", function() {
     element.fire("ajax:after");
   }
 
+  function handleMethod(element) {
+    var method, url, token_name, token;
+
+    method     = element.readAttribute('data-method');
+    url        = element.readAttribute('href');
+    csrf_param = $$('meta[name=csrf-param]').first();
+    csrf_token = $$('meta[name=csrf-token]').first();
+
+    var form = new Element('form', { method: "POST", action: url, style: "display: none;" });
+    element.parentNode.appendChild(form);
+
+    if (method != 'post') {
+      var field = new Element('input', { type: 'hidden', name: '_method', value: method });
+      form.appendChild(field);
+    }
+
+    if (csrf_param) {
+      var param = csrf_param.readAttribute('content');
+      var token = csrf_token.readAttribute('content');
+      var field = new Element('input', { type: 'hidden', name: param, value: token });
+      form.appendChild(field);
+    }
+
+    form.submit();
+  }
+
   $(document.body).observe("click", function(event) {
-    var message = event.element().readAttribute('data-confirm');
+    var message = event.findElement().readAttribute('data-confirm');
     if (message && !confirm(message)) {
       event.stop();
       return false;
     }
 
-    var element = event.findElement("a[data-remote=true]");
+    var element = event.findElement("a[data-remote]");
     if (element) {
       handleRemote(element);
       event.stop();
+      return true;
     }
 
     var element = event.findElement("a[data-method]");
-    if (element && element.readAttribute('data-remote') != 'true') {
-      var method = element.readAttribute('data-method'),
-        piggyback = method.toLowerCase() != 'post',
-        formHTML = formTemplate.interpolate({
-          method: 'POST',
-          realmethod: piggyback ? realmethodTemplate.interpolate({ method: method }) : '',
-          action: element.readAttribute('href'),
-          token: authToken,
-          param: authParam
-        });
-
-      var form = new Element('div').update(formHTML).down().hide();
-      this.insert({ bottom: form });
-
-      form.submit();
+    if (element) {
+      handleMethod(element);
       event.stop();
+      return true;
     }
   });
 
   // TODO: I don't think submit bubbles in IE
   $(document.body).observe("submit", function(event) {
-    var message = event.element().readAttribute('data-confirm');
+    var element = event.findElement(),
+        message = element.readAttribute('data-confirm');
     if (message && !confirm(message)) {
       event.stop();
       return false;
     }
 
-    var inputs = event.element().select("input[type=submit][data-disable-with]");
+    var inputs = element.select("input[type=submit][data-disable-with]");
     inputs.each(function(input) {
       input.disabled = true;
       input.writeAttribute('data-original-value', input.value);
       input.value = input.readAttribute('data-disable-with');
     });
 
-    var element = event.findElement("form[data-remote=true]");
+    var element = event.findElement("form[data-remote]");
     if (element) {
       handleRemote(element);
       event.stop();
     }
   });
 
-  $(document.body).observe("ajax:complete", function(event) {
-    var element = event.element();
+  $(document.body).observe("ajax:after", function(event) {
+    var element = event.findElement();
 
-    if (element.tagName.toLowerCase() == 'form') {
+    if (element.tagName.toLowerCase() === 'form') {
       var inputs = element.select("input[type=submit][disabled=true][data-disable-with]");
       inputs.each(function(input) {
         input.value = input.readAttribute('data-original-value');
@@ -106,4 +115,4 @@ document.observe("dom:loaded", function() {
       });
     }
   });
-});
+});

data/lib/rails/generators/rails/app/templates/test/{test_helper.rb → test_helper.rb.tt}

@@ -3,11 +3,13 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
 class ActiveSupport::TestCase
+<% unless options[:skip_activerecord] -%>
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
   fixtures :all
 
+<% end -%>
   # Add more helper methods to be used by all tests here...
 end

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

@@ -15,6 +15,10 @@ Description:
     Finally, if --parent option is given, it's used as superclass of the
     created model. This allows you create Single Table Inheritance models.
 
+    If you pass a namespaced model name (e.g. admin/account or Admin::Account)
+    then the generator will create a module with a table_name_prefix method
+    to prefix the model's table name with the module name (e.g. admin_account)
+
 Examples:
     `rails generate model account`
 
@@ -28,3 +32,14 @@ Examples:
     `rails generate model post title:string body:text published:boolean`
 
         Creates a Post model with a string title, text body, and published flag.
+
+    `rails generate model admin/account`
+
+        For ActiveRecord and TestUnit it creates:
+
+            Module:     app/models/admin.rb
+            Model:      app/models/admin/account.rb
+            Test:       test/unit/admin/account_test.rb
+            Fixtures:   test/fixtures/admin_accounts.yml
+            Migration:  db/migrate/XXX_add_admin_accounts.rb
+

data/lib/rails/generators/rails/stylesheets/templates/scaffold.css

@@ -35,10 +35,10 @@ div.field, div.actions {
 }
 
 #errorExplanation {
-  width: 400px;
+  width: 450px;
   border: 2px solid red;
   padding: 7px;
-  padding-bottom: 12px;
+  padding-bottom: 0;
   margin-bottom: 20px;
   background-color: #f0f0f0;
 }
@@ -49,16 +49,11 @@ div.field, div.actions {
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
+  margin-bottom: 0px;
   background-color: #c00;
   color: #fff;
 }
 
-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
 #errorExplanation ul li {
   font-size: 12px;
   list-style: square;

data/lib/rails/paths.rb

@@ -3,6 +3,8 @@ require 'set'
 module Rails
   module Paths
     module PathParent
+      attr_reader :children
+
       def method_missing(id, *args)
         name = id.to_s
 
@@ -37,15 +39,15 @@ module Rails
       end
 
       def load_once
-        filter { |path| path.paths if path.load_once? }
+        filter_by(:load_once?)
       end
 
       def eager_load
-        filter { |path| path.paths if path.eager_load? }
+        filter_by(:eager_load?)
       end
 
       def load_paths
-        filter { |path| path.paths if path.load_path? }
+        filter_by(:load_path?)
       end
 
       def push(*)
@@ -58,8 +60,16 @@ module Rails
 
     protected
 
-      def filter(&block)
-        all_paths.map(&block).compact.flatten.uniq.select { |p| File.exists?(p) }
+      def filter_by(constraint)
+        all_paths.map do |path|
+          if path.send(constraint)
+            paths  = path.paths
+            paths -= path.children.values.map { |p| p.send(constraint) ? [] : p.paths }.flatten
+            paths
+          else
+            []
+          end
+        end.flatten.uniq.select { |p| File.exists?(p) }
       end
     end
 
@@ -129,10 +139,12 @@ module Rails
 
       def paths
         raise "You need to set a path root" unless @root.path
+
         result = @paths.map do |p|
           path = File.expand_path(p, @root.path)
           @glob ? Dir[File.join(path, @glob)] : path
         end
+
         result.flatten!
         result.uniq!
         result

data/lib/rails/plugin.rb

@@ -61,7 +61,7 @@ module Rails
       @config ||= Engine::Configuration.new
     end
 
-    initializer :load_init_rb, :before => :load_application_initializers do |app|
+    initializer :load_init_rb, :before => :load_config_initializers do |app|
       files = %w(rails/init.rb init.rb).map { |path| File.expand_path path, root }
       if initrb = files.find { |path| File.file? path }
         if initrb == files.first

data/lib/rails/railtie.rb

@@ -39,7 +39,6 @@ module Rails
   #   # lib/my_gem/railtie.rb
   #   module MyGem
   #     class Railtie < Rails::Railtie
-  #       railtie_name :mygem
   #     end
   #   end
   # 
@@ -51,24 +50,8 @@ module Rails
   # 
   #   module MyGem
   #     class Railtie < Rails::Railtie
-  #       railtie_name :mygem
   #     end
   #   end
-  #   
-  # * Make sure your Gem loads the railtie.rb file if Rails is loaded first, an easy
-  #   way to check is by checking for the Rails constant which will exist if Rails
-  #   has started:
-  # 
-  #   # lib/my_gem.rb
-  #   module MyGem
-  #     require 'lib/my_gem/railtie' if defined?(Rails)
-  #   end
-  # 
-  # * Or instead of doing the require automatically, you can ask your users to require
-  #   it for you in their Gemfile:
-  # 
-  #   # #{USER_RAILS_ROOT}/Gemfile
-  #   gem "my_gem", :require_as => ["my_gem", "my_gem/railtie"]
   #
   # == Initializers
   #
@@ -82,13 +65,11 @@ module Rails
   #   end
   #
   # If specified, the block can also receive the application object, in case you 
-  # need to access some application specific configuration:
+  # need to access some application specific configuration, like middleware:
   #
   #   class MyRailtie < Rails::Railtie
   #     initializer "my_railtie.configure_rails_initialization" do |app|
-  #       if app.config.cache_classes
-  #         # some initialization behavior
-  #       end
+  #       app.middlewares.use MyRailtie::Middleware
   #     end
   #   end
   #
@@ -104,9 +85,6 @@ module Rails
   #     # Customize the ORM
   #     config.generators.orm :my_railtie_orm
   #
-  #     # Add a middleware
-  #     config.middlewares.use MyRailtie::Middleware
-  #
   #     # Add a to_prepare block which is executed once in production
   #     # and before which request in development
   #     config.to_prepare do
@@ -160,7 +138,7 @@ module Rails
   # By registering it:
   #
   #   class MyRailtie < Railtie
-  #     subscriber MyRailtie::Subscriber.new
+  #     subscriber :my_gem, MyRailtie::Subscriber.new
   #   end
   #
   # Take a look in Rails::Subscriber docs for more information.

data/lib/rails/test_unit/testing.rake

@@ -52,7 +52,11 @@ task :test do
 end
 
 namespace :test do
-  Rake::TestTask.new(:recent => "db:test:prepare") do |t|
+  task :prepare do
+    # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
+  end
+
+  Rake::TestTask.new(:recent => "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
       recent_tests('app/models/**/*.rb', 'test/unit', since) +
@@ -63,7 +67,7 @@ namespace :test do
   end
   Rake::Task['test:recent'].comment = "Test recent changes"
 
-  Rake::TestTask.new(:uncommitted => "db:test:prepare") do |t|
+  Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
         changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
@@ -86,32 +90,32 @@ namespace :test do
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(:units => "db:test:prepare") do |t|
+  Rake::TestTask.new(:units => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
   end
   Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
 
-  Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
+  Rake::TestTask.new(:functionals => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/functional/**/*_test.rb'
   end
   Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
 
-  Rake::TestTask.new(:integration => "db:test:prepare") do |t|
+  Rake::TestTask.new(:integration => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
   end
   Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
 
-  Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
+  Rake::TestTask.new(:benchmark => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
     t.options = '-- --benchmark'
   end
   Rake::Task['test:benchmark'].comment = 'Benchmark the performance tests'
 
-  Rake::TestTask.new(:profile => 'db:test:prepare') do |t|
+  Rake::TestTask.new(:profile => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
   end