15 files changed, 58 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index d2ba052c8d..f0c29825ba 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -4,7 +4,6 @@ require "action_dispatch/railtie"
 require "action_view/railtie"
 require "abstract_controller/railties/routes_helpers"
 require "action_controller/railties/paths"
-require "sprockets/railtie"
 
 module ActionController
   class Railtie < Rails::Railtie
diff --git a/railties/lib/rails/tasks/assets.rake b/actionpack/lib/sprockets/assets.rake
index 0236350576..0236350576 100644
--- a/railties/lib/rails/tasks/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index ab5101f6fc..1535716fb9 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -1,6 +1,7 @@
 module Sprockets
   autoload :Helpers, "sprockets/helpers"
 
+  # TODO: Get rid of config.assets.enabled
   class Railtie < ::Rails::Railtie
     def self.using_coffee?
       require 'coffee-script'
@@ -11,6 +12,10 @@ module Sprockets
 
     config.app_generators.javascript_engine :coffee if using_coffee?
 
+    rake_tasks do
+      load "sprockets/assets.rake"
+    end
+
     # Configure ActionController to use sprockets.
     initializer "sprockets.set_configs", :after => "action_controller.set_configs" do |app|
       ActiveSupport.on_load(:action_controller) do
diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index 3b412d3dd7..166cccf161 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -156,7 +156,7 @@ module ActiveModel
         rescue TypeError, NoMethodError
         end
 
-        changed_attributes[attr] = value
+        changed_attributes[attr] = value unless changed_attributes.include?(attr)
       end
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb
index 858ae9cb69..98244a6290 100644
--- a/activemodel/test/cases/dirty_test.rb
+++ b/activemodel/test/cases/dirty_test.rb
@@ -106,4 +106,13 @@ class DirtyTest < ActiveModel::TestCase
     assert_equal [nil, "Jericho Cane"], @model.previous_changes['name']
   end
 
+  test "changing the same attribute multiple times retains the correct original value" do
+    @model.name = "Otto"
+    @model.save
+    @model.name = "DudeFella ManGuy"
+    @model.name = "Mr. Manfredgensonton"
+    assert_equal ["Otto", "Mr. Manfredgensonton"], @model.name_change
+    assert_equal @model.name_was, "Otto"
+  end
+
 end
diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
index a94446acde..a2d2719de7 100644
--- a/activesupport/lib/active_support/configurable.rb
+++ b/activesupport/lib/active_support/configurable.rb
@@ -12,12 +12,12 @@ module ActiveSupport
 
     class Configuration < ActiveSupport::InheritableOptions
       def compile_methods!
-        self.class.compile_methods!(keys.reject {|key| respond_to?(key)})
+        self.class.compile_methods!(keys)
       end
 
       # compiles reader methods so we don't have to go through method_missing
       def self.compile_methods!(keys)
-        keys.each do |key|
+        keys.reject { |m| method_defined?(m) }.each do |key|
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{key}; _get(#{key.inspect}); end
           RUBY
diff --git a/activesupport/test/configurable_test.rb b/activesupport/test/configurable_test.rb
index c6d8191298..2e5ea2c360 100644
--- a/activesupport/test/configurable_test.rb
+++ b/activesupport/test/configurable_test.rb
@@ -58,16 +58,26 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
     child  = Class.new(parent)
 
     parent.config.bar = :foo
-    assert !parent.config.respond_to?(:bar)
-    assert !child.config.respond_to?(:bar)
-    assert !child.new.config.respond_to?(:bar)
+    assert_method_not_defined parent.config, :bar
+    assert_method_not_defined child.config, :bar
+    assert_method_not_defined child.new.config, :bar
 
     parent.config.compile_methods!
     assert_equal :foo, parent.config.bar
     assert_equal :foo, child.new.config.bar
 
-    assert_respond_to parent.config, :bar
-    assert_respond_to child.config, :bar
-    assert_respond_to child.new.config, :bar
+    assert_method_defined parent.config, :bar
+    assert_method_defined child.config, :bar
+    assert_method_defined child.new.config, :bar
+  end
+
+  def assert_method_defined(object, method)
+    methods = object.public_methods.map(&:to_s)
+    assert methods.include?(method.to_s), "Expected #{methods.inspect} to include #{method.to_s.inspect}"
+  end
+
+  def assert_method_not_defined(object, method)
+    methods = object.public_methods.map(&:to_s)
+    assert !methods.include?(method.to_s), "Expected #{methods.inspect} to not include #{method.to_s.inspect}"
   end
 end
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index e8b4a32056..a9b4deb551 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -8,6 +8,8 @@
 
 *Rails 3.1.0 (unreleased)*
 
+* Make sprockets/railtie require explicit and add --skip-sprockets to app generator [José Valim]
+
 * Added Rails.groups that automatically handles Rails.env and ENV["RAILS_GROUPS"] [José Valim]
 
 * The new rake task assets:clean removes precompiled assets. [fxn]
diff --git a/railties/bin/rails b/railties/bin/rails
index a7d6938e0d..a7d6938e0d 100644..100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb
index 82775b7e3b..01ceb80972 100644
--- a/railties/lib/rails/all.rb
+++ b/railties/lib/rails/all.rb
@@ -6,6 +6,7 @@ require "rails"
   action_mailer
   active_resource
   rails/test_unit
+  sprockets
 ).each do |framework|
   begin
     require "#{framework}/railtie"
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 378eceb4c3..c8847f0159 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -37,6 +37,9 @@ module Rails
         class_option :skip_active_record, :type => :boolean, :aliases => "-O", :default => false,
                                           :desc => "Skip Active Record files"
 
+        class_option :skip_sprockets,     :type => :boolean, :aliases => "-S", :default => false,
+                                          :desc => "Skip Sprockets files"
+
         class_option :database,           :type => :string, :aliases => "-d", :default => "sqlite3",
                                           :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
@@ -124,7 +127,7 @@ module Rails
       end
 
       def include_all_railties?
-        !options[:skip_active_record] && !options[:skip_test_unit]
+        !options[:skip_active_record] && !options[:skip_test_unit] && !options[:skip_sprockets]
       end
 
       def comment_if(value)
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 7f623a7af9..eaa31e7386 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -8,6 +8,7 @@ require 'rails/all'
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
+<%= comment_if :skip_sprockets %> require "sprockets/railtie"
 <%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
 <% end -%>
 
@@ -46,7 +47,9 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    <% unless options.skip_sprockets? %>
     # Enable the asset pipeline
     config.assets.enabled = true
+    <% end %>
   end
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
index 8b68280a5e..4864ead960 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -1,13 +1,15 @@
 require File.expand_path('../boot', __FILE__)
 
-<% unless options[:skip_active_record] -%>
+<% if include_all_railties? -%>
 require 'rails/all'
 <% else -%>
-# require "active_record/railtie"
+# Pick the frameworks you want:
+<%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
-require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %> require "sprockets/railtie"
+<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
 <% end -%>
 
 Bundler.require
diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb
index 166d518f7c..9807000578 100644
--- a/railties/lib/rails/tasks.rb
+++ b/railties/lib/rails/tasks.rb
@@ -3,7 +3,6 @@ $VERBOSE = nil
 # Load Rails rakefile extensions
 %w(
   annotations
-  assets
   documentation
   framework
   log
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index eb60674a03..81f0bf5e82 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -48,11 +48,12 @@ class AppGeneratorTest < Rails::Generators::TestCase
     ::DEFAULT_APP_FILES
   end
 
-  def test_application_controller_and_layout_files
+  def test_assets
     run_generator
     assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag\s+"application"/
     assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/
     assert_file "app/assets/stylesheets/application.css"
+    assert_file "config/application.rb", /config\.assets\.enabled = true/
   end
 
   def test_invalid_application_name_raises_an_error
@@ -180,15 +181,20 @@ class AppGeneratorTest < Rails::Generators::TestCase
   def test_generator_if_skip_active_record_is_given
     run_generator [destination_root, "--skip-active-record"]
     assert_no_file "config/database.yml"
+    assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
     assert_file "test/performance/browsing_test.rb"
   end
 
-  def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
-    run_generator [destination_root, "--skip-active-record"]
-    assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
+  def test_generator_if_skip_active_record_is_given
+    run_generator [destination_root, "--skip-sprockets"]
+    assert_file "config/application.rb" do |content|
+      assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
+      assert_no_match(/config\.assets\.enabled = true/, content)
+    end
+    assert_file "test/performance/browsing_test.rb"
   end
 
   def test_creation_of_a_test_directory