Merge branch 'master' of git://github.com/lifo/docrails

Conflicts:
	activerecord/RUNNING_UNIT_TESTS

7 files changed, 51 insertions, 53 deletions

diff --git a/activesupport/lib/active_support/core_ext/kernel/reporting.rb b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
index c6920098a8..526b8378a5 100644
--- a/activesupport/lib/active_support/core_ext/kernel/reporting.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/reporting.rb
@@ -59,7 +59,7 @@ module Kernel
       raise unless exception_classes.any? { |cls| e.kind_of?(cls) }
     end
   end
-  
+
   # Captures the given stream and returns it:
   #
   #   stream = capture(:stdout) { puts "Cool" }
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 02c19448fd..dd23f8d82d 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -9,7 +9,7 @@ module ActiveSupport
   module Testing
     module Performance
       extend ActiveSupport::Concern
-      
+
       included do
         superclass_delegating_accessor :profile_options
         self.profile_options = {}
@@ -20,7 +20,7 @@ module ActiveSupport
           include ForClassicTestUnit
         end
       end
-      
+
       # each implementation should define metrics and freeze the defaults
       DEFAULTS =
         if ARGV.include?('--benchmark') # HAX for rake test
@@ -32,7 +32,7 @@ module ActiveSupport
             :output => 'tmp/performance',
             :benchmark => false }
         end
-      
+
       def full_profile_options
         DEFAULTS.merge(profile_options)
       end
@@ -40,7 +40,7 @@ module ActiveSupport
       def full_test_name
         "#{self.class.name}##{method_name}"
       end
-      
+
       module ForMiniTest
         def run(runner)
           @runner = runner
@@ -53,7 +53,7 @@ module ActiveSupport
               end
             end
           end
-          
+
           return
         end
 
@@ -122,7 +122,7 @@ module ActiveSupport
       protected
         # overridden by each implementation
         def run_gc; end
-      
+
         def run_warmup
           run_gc
 
@@ -132,7 +132,7 @@ module ActiveSupport
 
           run_gc
         end
-        
+
         def run_profile(metric)
           klass = full_profile_options[:benchmark] ? Benchmarker : Profiler
           performer = klass.new(self, metric)
@@ -163,7 +163,7 @@ module ActiveSupport
             "#{full_profile_options[:output]}/#{full_test_name}_#{@metric.name}"
           end
       end
-      
+
       # overridden by each implementation
       class Profiler < Performer
         def time_with_block
@@ -171,7 +171,7 @@ module ActiveSupport
           yield
           Time.now - before
         end
-        
+
         def run;    end
         def record; end
       end
@@ -181,10 +181,10 @@ module ActiveSupport
           super
           @supported = @metric.respond_to?('measure')
         end
-           
+
         def run
           return unless @supported
-          
+
           full_profile_options[:runs].to_i.times { run_test(@metric, :benchmark) }
           @total = @metric.total
         end
@@ -237,7 +237,7 @@ module ActiveSupport
             "#{super}.csv"
           end
       end
-      
+
       module Metrics
         def self.[](name)
           const_get(name.to_s.camelize)
@@ -247,7 +247,7 @@ module ActiveSupport
 
         class Base
           include ActionView::Helpers::NumberHelper
-          
+
           attr_reader :total
 
           def initialize
@@ -265,15 +265,15 @@ module ActiveSupport
               @total += (measure - before)
             end
           end
-          
+
           # overridden by each implementation
           def profile; end
-            
+
           protected
             # overridden by each implementation
             def with_gc_stats; end
         end
-        
+
         class Time < Base
           def measure
             ::Time.now.to_f
@@ -287,19 +287,19 @@ module ActiveSupport
             end
           end
         end
-        
+
         class Amount < Base
           def format(measurement)
             number_with_delimiter(measurement.floor)
           end
         end
-        
+
         class DigitalInformationUnit < Base
           def format(measurement)
             number_to_human_size(measurement, :precision => 2)
           end
         end
-        
+
         # each implementation provides its own metrics like ProcessTime, Memory or GcRuns
       end
     end
diff --git a/activesupport/lib/active_support/testing/performance/jruby.rb b/activesupport/lib/active_support/testing/performance/jruby.rb
index 326904bbac..b347539f13 100644
--- a/activesupport/lib/active_support/testing/performance/jruby.rb
+++ b/activesupport/lib/active_support/testing/performance/jruby.rb
@@ -1,5 +1,5 @@
 require 'jruby/profiler'
-require 'java' 
+require 'java'
 java_import java.lang.management.ManagementFactory
 
 module ActiveSupport
@@ -12,21 +12,21 @@ module ActiveSupport
           { :metrics => [:wall_time],
             :formats => [:flat, :graph] }
         end).freeze
-      
+
       protected
         def run_gc
           ManagementFactory.memory_mx_bean.gc
-        end   
+        end
 
       class Profiler < Performer
         def initialize(*args)
           super
           @supported = @metric.is_a?(Metrics::WallTime)
         end
-        
+
         def run
           return unless @supported
-          
+
           @total = time_with_block do
             @data = JRuby::Profiler.profile do
               full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
@@ -36,7 +36,7 @@ module ActiveSupport
 
         def record
           return unless @supported
-          
+
           klasses = full_profile_options[:formats].map { |f| JRuby::Profiler.const_get("#{f.to_s.camelize}ProfilePrinter") }.compact
 
           klasses.each do |klass|
@@ -61,7 +61,7 @@ module ActiveSupport
           end
       end
 
-      module Metrics        
+      module Metrics
         class Base
           def profile
             yield
@@ -85,7 +85,7 @@ module ActiveSupport
             ManagementFactory.thread_mx_bean.get_current_thread_cpu_time / 1000 / 1000 / 1000.0 # seconds
           end
         end
-        
+
         class UserTime < Time
           def measure
             ManagementFactory.thread_mx_bean.get_current_thread_user_time / 1000 / 1000 / 1000.0 # seconds
@@ -97,7 +97,7 @@ module ActiveSupport
             ManagementFactory.memory_mx_bean.non_heap_memory_usage.used + ManagementFactory.memory_mx_bean.heap_memory_usage.used
           end
         end
-        
+
         class GcRuns < Amount
           def measure
             ManagementFactory.garbage_collector_mx_beans.inject(0) { |total_runs, current_gc| total_runs += current_gc.collection_count }
diff --git a/activesupport/lib/active_support/testing/performance/rubinius.rb b/activesupport/lib/active_support/testing/performance/rubinius.rb
index 198d235548..d9ebfbe352 100644
--- a/activesupport/lib/active_support/testing/performance/rubinius.rb
+++ b/activesupport/lib/active_support/testing/performance/rubinius.rb
@@ -10,12 +10,12 @@ module ActiveSupport
           { :metrics => [:wall_time],
             :formats => [:flat, :graph] }
         end).freeze
-      
+
       protected
         def run_gc
           GC.run(true)
         end
-      
+
       class Performer; end
 
       class Profiler < Performer
@@ -23,35 +23,35 @@ module ActiveSupport
           super
           @supported = @metric.is_a?(Metrics::WallTime)
         end
-                
+
         def run
           return unless @supported
-          
+
           @profiler = Rubinius::Profiler::Instrumenter.new
-          
+
           @total = time_with_block do
             @profiler.profile(false) do
               full_profile_options[:runs].to_i.times { run_test(@metric, :profile) }
             end
           end
         end
-        
+
         def record
           return unless @supported
-          
+
           if(full_profile_options[:formats].include?(:flat))
             create_path_and_open_file(:flat) do |file|
               @profiler.show(file)
             end
           end
-          
+
           if(full_profile_options[:formats].include?(:graph))
             create_path_and_open_file(:graph) do |file|
               @profiler.show(file)
             end
           end
         end
-        
+
         protected
           def create_path_and_open_file(printer_name)
             fname = "#{output_filename}_#{printer_name}.txt"
@@ -62,10 +62,10 @@ module ActiveSupport
           end
       end
 
-      module Metrics        
+      module Metrics
         class Base
           attr_reader :loopback
-          
+
           def profile
             yield
           end
diff --git a/activesupport/lib/active_support/testing/performance/ruby.rb b/activesupport/lib/active_support/testing/performance/ruby.rb
index b29ec6719c..7d6d047ef6 100644
--- a/activesupport/lib/active_support/testing/performance/ruby.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby.rb
@@ -16,7 +16,7 @@ module ActiveSupport
             :metrics => [:process_time, :memory, :objects],
             :formats => [:flat, :graph_html, :call_tree, :call_stack] }
         end).freeze
-      
+
       protected
         def run_gc
           GC.start
@@ -77,7 +77,7 @@ module ActiveSupport
           def measure_mode
             self.class::Mode
           end
-          
+
           def profile
             RubyProf.resume
             yield
@@ -91,7 +91,7 @@ module ActiveSupport
               yield
             end
         end
-        
+
         class ProcessTime < Time
           Mode = RubyProf::PROCESS_TIME if RubyProf.const_defined?(:PROCESS_TIME)
 
diff --git a/activesupport/lib/active_support/testing/performance/ruby/mri.rb b/activesupport/lib/active_support/testing/performance/ruby/mri.rb
index 86e650050b..142279dd6e 100644
--- a/activesupport/lib/active_support/testing/performance/ruby/mri.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby/mri.rb
@@ -15,7 +15,7 @@ module ActiveSupport
               end
             end
         end
-            
+
         class Memory < DigitalInformationUnit
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_memory)
@@ -24,7 +24,7 @@ module ActiveSupport
             end
           end
         end
-          
+
         class Objects < Amount
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_allocations)
@@ -33,7 +33,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcRuns < Amount
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_gc_runs)
@@ -42,7 +42,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcTime < Time
           # Ruby 1.8 + ruby-prof wrapper
           if RubyProf.respond_to?(:measure_gc_time)
@@ -55,5 +55,3 @@ module ActiveSupport
     end
   end
 end
-            
-            
diff --git a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
index 62095a8fe4..7873262331 100644
--- a/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
+++ b/activesupport/lib/active_support/testing/performance/ruby/yarv.rb
@@ -15,7 +15,7 @@ module ActiveSupport
               end
             end
         end
-        
+
         class Memory < DigitalInformationUnit
           # Ruby 1.9 + GCdata patch
           if GC.respond_to?(:malloc_allocated_size)
@@ -24,7 +24,7 @@ module ActiveSupport
             end
           end
         end
-          
+
         class Objects < Amount
           # Ruby 1.9 + GCdata patch
           if GC.respond_to?(:malloc_allocations)
@@ -33,7 +33,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcRuns < Amount
           # Ruby 1.9
           if GC.respond_to?(:count)
@@ -42,7 +42,7 @@ module ActiveSupport
             end
           end
         end
-        
+
         class GcTime < Time
           # Ruby 1.9 with GC::Profiler
           if defined?(GC::Profiler) && GC::Profiler.respond_to?(:total_time)