Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

6 files changed, 35 insertions, 16 deletions

diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb
index 923ed8b31d..1605429e8b 100644
--- a/railties/lib/rails/backtrace_cleaner.rb
+++ b/railties/lib/rails/backtrace_cleaner.rb
@@ -1,3 +1,6 @@
+require 'active_support/backtrace_cleaner'
+require 'rails/gem_dependency'
+
 module Rails
   class BacktraceCleaner < ActiveSupport::BacktraceCleaner
     ERB_METHOD_SIG = /:in `_run_erb_.*/
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3062a77104..ee3d0d81ba 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -29,6 +29,15 @@ module Rails
       end
     end
 
+    def self.from_directory_name(directory_name)
+      directory_name_parts = File.basename(directory_name).split('-')
+      name    = directory_name_parts[0..-2].join('-')
+      version = directory_name_parts.last
+      self.new(name, :version => version)
+    rescue ArgumentError => e
+      raise "Unable to determine gem name and version from '#{directory_name}'"
+    end
+
     def initialize(name, options = {})
       require 'rubygems' unless Object.const_defined?(:Gem)
 
@@ -101,8 +110,12 @@ module Rails
     end
 
     def built?
-      # TODO: If Rubygems ever gives us a way to detect this, we should use it
-      false
+      return false unless frozen?
+      specification.extensions.each do |ext|
+        makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+        return false unless File.exists?(makefile)
+      end
+      true
     end
 
     def framework_gem?
@@ -155,9 +168,9 @@ module Rails
       specification && File.exists?(unpacked_gem_directory)
     end
 
-    def build
+    def build(options={})
       require 'rails/gem_builder'
-      unless built?
+      if options[:force] || !built?
         return unless File.exists?(unpacked_specification_filename)
         spec = YAML::load_file(unpacked_specification_filename)
         Rails::GemBuilder.new(spec, unpacked_gem_directory).build_extensions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 80deb73bbb..49ec5c7fba 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -35,10 +35,10 @@ module Rails
     def load_paths
       report_nonexistant_or_empty_plugin! unless valid?
       
-      returning [] do |load_paths|
-        load_paths << lib_path  if has_lib_directory?
-        load_paths << app_paths if has_app_directory?
-      end.flatten
+      load_paths = []
+      load_paths << lib_path  if has_lib_directory?
+      load_paths << app_paths if has_app_directory?
+      load_paths.flatten
     end
     
     # Evaluates a plugin's init.rb file.
@@ -139,6 +139,7 @@ module Rails
 
       def evaluate_init_rb(initializer)
         if has_init_file?
+          require 'active_support/core_ext/kernel/reporting'
           silence_warnings do
             # Allow plugins to reference the current configuration object
             config = initializer.configuration
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index 66e01d70da..bc22dfc591 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -24,7 +24,7 @@ module Rails
 
       # Returns the plugins that are in engine-form (have an app/ directory)
       def engines
-        @engines ||= plugins.select(&:engine?)
+        @engines ||= plugins.select {|plugin| plugin.engine? }
       end
 
       # Returns all the plugins that could be found by the current locators.
@@ -66,7 +66,7 @@ module Rails
       end
 
       def engine_metal_paths
-        engines.collect(&:metal_path)
+        engines.collect {|engine| engine.metal_path }
       end
 
       protected
@@ -79,18 +79,18 @@ module Rails
         end
 
         def add_engine_routing_configurations
-          engines.select(&:routed?).collect(&:routing_file).each do |routing_file|
+          engines.select {|engine| engine.routed? }.map {|engine| engine.routing_file }.each do |routing_file|
             ActionController::Routing::Routes.add_configuration_file(routing_file)
           end
         end
 
         def add_engine_controller_paths
-          ActionController::Routing.controller_paths += engines.collect(&:controller_path)
+          ActionController::Routing.controller_paths += engines.collect {|engine| engine.controller_path }
         end
 
         def add_engine_view_paths
           # reverse it such that the last engine can overwrite view paths from the first, like with routes
-          paths = ActionView::PathSet.new(engines.collect(&:view_path).reverse)
+          paths = ActionView::PathSet.new(engines.collect {|engine| engine.view_path }.reverse)
           ActionController::Base.view_paths.concat(paths)
           ActionMailer::Base.view_paths.concat(paths) if configuration.frameworks.include?(:action_mailer)
         end
@@ -170,7 +170,7 @@ module Rails
         # so we load all in alphabetical order. If it is an empty array, we load no plugins, if it is
         # non empty, we load the named plugins in the order specified.
         def registered_plugin_names
-          configuration.plugins ? configuration.plugins.map(&:to_s) : nil
+          configuration.plugins ? configuration.plugins.map {|plugin| plugin.to_s } : nil
         end
 
         def loaded?(plugin_name)
diff --git a/railties/lib/rails/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb
index a6fc388a8e..1057c004e0 100644
--- a/railties/lib/rails/plugin/locator.rb
+++ b/railties/lib/rails/plugin/locator.rb
@@ -25,7 +25,7 @@ module Rails
       end
       
       def plugin_names
-        plugins.map(&:name)
+        plugins.map {|plugin| plugin.name }
       end
     end
     
diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb
index adc43da864..b031be29af 100644
--- a/railties/lib/rails/rack/metal.rb
+++ b/railties/lib/rails/rack/metal.rb
@@ -1,4 +1,6 @@
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/dependencies'
 
 module Rails
   module Rack
@@ -26,7 +28,7 @@ module Rails
 
         load_list.map do |requested_metal|
           if metal = all_metals[requested_metal]
-            require metal
+            require_dependency metal
             requested_metal.constantize
           end
         end.compact