Merge remote branch 'rails/master'

6 files changed, 172 insertions, 20 deletions

diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index dd84860a91..6db21f9e12 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -1,3 +1,5 @@
+ORIG_ARGV = ARGV.dup
+
 begin
   old, $VERBOSE = $VERBOSE, nil
   require File.expand_path('../../../load_paths', __FILE__)
@@ -23,7 +25,7 @@ require 'active_support/ruby/shim' if RUBY_VERSION < '1.8.7'
 def uses_memcached(test_name)
   require 'memcache'
   begin
-    MemCache.new('localhost').stats
+    MemCache.new('localhost:11211').stats
     yield
   rescue MemCache::MemCacheError
     $stderr.puts "Skipping #{test_name} tests. Start memcached and try again."
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index d9702dd9ff..affa1b5e18 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -110,6 +110,14 @@ class StringInflectionsTest < Test::Unit::TestCase
     assert_equal 97, 'abc'.ord
   end
 
+  if RUBY_VERSION < '1.9'
+    def test_getbyte
+      assert_equal 97, 'a'.getbyte(0)
+      assert_equal 99, 'abc'.getbyte(2)
+      assert_nil   'abc'.getbyte(3)
+    end
+  end
+
   def test_string_to_time
     assert_equal Time.utc(2005, 2, 27, 23, 50), "2005-02-27 23:50".to_time
     assert_equal Time.local(2005, 2, 27, 23, 50), "2005-02-27 23:50".to_time(:local)
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index 5422c75f5f..c7088638c7 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -25,11 +25,11 @@ class DependenciesTest < Test::Unit::TestCase
     this_dir = File.dirname(__FILE__)
     parent_dir = File.dirname(this_dir)
     $LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir)
-    prior_load_paths = ActiveSupport::Dependencies.load_paths
-    ActiveSupport::Dependencies.load_paths = from.collect { |f| "#{this_dir}/#{f}" }
+    prior_autoload_paths = ActiveSupport::Dependencies.autoload_paths
+    ActiveSupport::Dependencies.autoload_paths = from.collect { |f| "#{this_dir}/#{f}" }
     yield
   ensure
-    ActiveSupport::Dependencies.load_paths = prior_load_paths
+    ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths
     ActiveSupport::Dependencies.mechanism = old_mechanism
     ActiveSupport::Dependencies.explicitly_unloadable_constants = []
   end
@@ -264,7 +264,7 @@ class DependenciesTest < Test::Unit::TestCase
   def test_loadable_constants_for_path_should_provide_all_results
     fake_root = '/usr/apps/backpack'
     with_loading fake_root, fake_root + '/lib' do
-      root = ActiveSupport::Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.autoload_paths.first
       assert_equal ["Lib::A::B", "A::B"], ActiveSupport::Dependencies.loadable_constants_for_path(root + '/lib/a/b')
     end
   end
@@ -272,7 +272,7 @@ class DependenciesTest < Test::Unit::TestCase
   def test_loadable_constants_for_path_should_uniq_results
     fake_root = '/usr/apps/backpack/lib'
     with_loading fake_root, fake_root + '/' do
-      root = ActiveSupport::Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.autoload_paths.first
       assert_equal ["A::B"], ActiveSupport::Dependencies.loadable_constants_for_path(root + '/a/b')
     end
   end
@@ -344,7 +344,7 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_file_search
     with_loading 'dependencies' do
-      root = ActiveSupport::Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.autoload_paths.first
       assert_equal nil, ActiveSupport::Dependencies.search_for_file('service_three')
       assert_equal nil, ActiveSupport::Dependencies.search_for_file('service_three.rb')
       assert_equal root + '/service_one.rb', ActiveSupport::Dependencies.search_for_file('service_one')
@@ -354,14 +354,14 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_file_search_uses_first_in_load_path
     with_loading 'dependencies', 'autoloading_fixtures' do
-      deps, autoload = ActiveSupport::Dependencies.load_paths
+      deps, autoload = ActiveSupport::Dependencies.autoload_paths
       assert_match %r/dependencies/, deps
       assert_match %r/autoloading_fixtures/, autoload
 
       assert_equal deps + '/conflict.rb', ActiveSupport::Dependencies.search_for_file('conflict')
     end
     with_loading 'autoloading_fixtures', 'dependencies' do
-      autoload, deps = ActiveSupport::Dependencies.load_paths
+      autoload, deps = ActiveSupport::Dependencies.autoload_paths
       assert_match %r/dependencies/, deps
       assert_match %r/autoloading_fixtures/, autoload
 
@@ -418,7 +418,7 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_removal_from_tree_should_be_detected
     with_loading 'dependencies' do
-      root = ActiveSupport::Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.autoload_paths.first
       c = ServiceOne
       ActiveSupport::Dependencies.clear
       assert ! defined?(ServiceOne)
@@ -433,7 +433,7 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_references_should_work
     with_loading 'dependencies' do
-      root = ActiveSupport::Dependencies.load_paths.first
+      root = ActiveSupport::Dependencies.autoload_paths.first
       c = ActiveSupport::Dependencies.ref("ServiceOne")
       service_one_first = ServiceOne
       assert_equal service_one_first, c.get
@@ -460,9 +460,9 @@ class DependenciesTest < Test::Unit::TestCase
     end
   end
 
-  def test_load_once_paths_do_not_add_to_autoloaded_constants
+  def test_autoload_once_paths_do_not_add_to_autoloaded_constants
     with_autoloading_fixtures do
-      ActiveSupport::Dependencies.load_once_paths = ActiveSupport::Dependencies.load_paths.dup
+      ActiveSupport::Dependencies.autoload_once_paths = ActiveSupport::Dependencies.autoload_paths.dup
 
       assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder")
       assert ! ActiveSupport::Dependencies.autoloaded?("ModuleFolder::NestedClass")
@@ -473,7 +473,7 @@ class DependenciesTest < Test::Unit::TestCase
     end
   ensure
     Object.class_eval { remove_const :ModuleFolder }
-    ActiveSupport::Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.autoload_once_paths = []
   end
 
   def test_application_should_special_case_application_controller
@@ -760,20 +760,20 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_load_once_constants_should_not_be_unloaded
     with_autoloading_fixtures do
-      ActiveSupport::Dependencies.load_once_paths = ActiveSupport::Dependencies.load_paths
+      ActiveSupport::Dependencies.autoload_once_paths = ActiveSupport::Dependencies.autoload_paths
       ::A.to_s
       assert defined?(A)
       ActiveSupport::Dependencies.clear
       assert defined?(A)
     end
   ensure
-    ActiveSupport::Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.autoload_once_paths = []
     Object.class_eval { remove_const :A if const_defined?(:A) }
   end
 
-  def test_load_once_paths_should_behave_when_recursively_loading
+  def test_autoload_once_paths_should_behave_when_recursively_loading
     with_loading 'dependencies', 'autoloading_fixtures' do
-      ActiveSupport::Dependencies.load_once_paths = [ActiveSupport::Dependencies.load_paths.last]
+      ActiveSupport::Dependencies.autoload_once_paths = [ActiveSupport::Dependencies.autoload_paths.last]
       assert !defined?(CrossSiteDependency)
       assert_nothing_raised { CrossSiteDepender.nil? }
       assert defined?(CrossSiteDependency)
@@ -784,7 +784,7 @@ class DependenciesTest < Test::Unit::TestCase
         "CrossSiteDependency shouldn't have been unloaded!"
     end
   ensure
-    ActiveSupport::Dependencies.load_once_paths = []
+    ActiveSupport::Dependencies.autoload_once_paths = []
   end
 
   def test_hook_called_multiple_times
diff --git a/activesupport/test/descendants_tracker_test.rb b/activesupport/test/descendants_tracker_test.rb
index 3a424180de..ff24e310de 100644
--- a/activesupport/test/descendants_tracker_test.rb
+++ b/activesupport/test/descendants_tracker_test.rb
@@ -35,7 +35,7 @@ class DescendantsTrackerTest < Test::Unit::TestCase
   end
 
   def test_clear_with_autoloaded_parent_children_and_granchildren
-    mark_as_autoloaded *ALL do
+    mark_as_autoloaded(*ALL) do
       ActiveSupport::DescendantsTracker.clear
       assert ActiveSupport::DescendantsTracker.descendants.slice(*ALL).empty?
     end
diff --git a/activesupport/test/log_subscriber_test.rb b/activesupport/test/log_subscriber_test.rb
new file mode 100644
index 0000000000..0c1f3c51ed
--- /dev/null
+++ b/activesupport/test/log_subscriber_test.rb
@@ -0,0 +1,123 @@
+require 'abstract_unit'
+require 'active_support/log_subscriber/test_helper'
+
+class MyLogSubscriber < ActiveSupport::LogSubscriber
+  attr_reader :event
+
+  def some_event(event)
+    @event = event
+    info event.name
+  end
+
+  def foo(event)
+    debug "debug"
+    info "info"
+    warn "warn"
+  end
+
+  def bar(event)
+    info "#{color("cool", :red)}, #{color("isn't it?", :blue, true)}"
+  end
+
+  def puke(event)
+    raise "puke"
+  end
+end
+
+class SyncLogSubscriberTest < ActiveSupport::TestCase
+  include ActiveSupport::LogSubscriber::TestHelper
+
+  def setup
+    super
+    @log_subscriber = MyLogSubscriber.new
+  end
+
+  def teardown
+    super
+    ActiveSupport::LogSubscriber.log_subscribers.clear
+  end
+
+  def instrument(*args, &block)
+    ActiveSupport::Notifications.instrument(*args, &block)
+  end
+
+  def test_proxies_method_to_rails_logger
+    @log_subscriber.foo(nil)
+    assert_equal %w(debug), @logger.logged(:debug)
+    assert_equal %w(info), @logger.logged(:info)
+    assert_equal %w(warn), @logger.logged(:warn)
+  end
+
+  def test_set_color_for_messages
+    ActiveSupport::LogSubscriber.colorize_logging = true
+    @log_subscriber.bar(nil)
+    assert_equal "\e[31mcool\e[0m, \e[1m\e[34misn't it?\e[0m", @logger.logged(:info).last
+  end
+
+  def test_does_not_set_color_if_colorize_logging_is_set_to_false
+    @log_subscriber.bar(nil)
+    assert_equal "cool, isn't it?", @logger.logged(:info).last
+  end
+
+  def test_event_is_sent_to_the_registered_class
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "some_event.my_log_subscriber"
+    wait
+    assert_equal %w(some_event.my_log_subscriber), @logger.logged(:info)
+  end
+
+  def test_event_is_an_active_support_notifications_event
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "some_event.my_log_subscriber"
+    wait
+    assert_kind_of ActiveSupport::Notifications::Event, @log_subscriber.event
+  end
+
+  def test_does_not_send_the_event_if_it_doesnt_match_the_class
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "unknown_event.my_log_subscriber"
+    wait
+    # If we get here, it means that NoMethodError was not raised.
+  end
+
+  def test_does_not_send_the_event_if_logger_is_nil
+    ActiveSupport::LogSubscriber.logger = nil
+    @log_subscriber.expects(:some_event).never
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "some_event.my_log_subscriber"
+    wait
+  end
+
+  def test_does_not_fail_with_non_namespaced_events
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "whatever"
+    wait
+  end
+
+  def test_flushes_loggers
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    ActiveSupport::LogSubscriber.flush_all!
+    assert_equal 1, @logger.flush_count
+  end
+
+  def test_flushes_the_same_logger_just_once
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    ActiveSupport::LogSubscriber.attach_to :another, @log_subscriber
+    ActiveSupport::LogSubscriber.flush_all!
+    wait
+    assert_equal 1, @logger.flush_count
+  end
+
+  def test_logging_does_not_die_on_failures
+    ActiveSupport::LogSubscriber.attach_to :my_log_subscriber, @log_subscriber
+    instrument "puke.my_log_subscriber"
+    instrument "some_event.my_log_subscriber"
+    wait
+
+    assert_equal 1, @logger.logged(:info).size
+    assert_equal 'some_event.my_log_subscriber', @logger.logged(:info).last
+
+    assert_equal 1, @logger.logged(:error).size
+    assert_equal 'Could not log "puke.my_log_subscriber" event. RuntimeError: puke', @logger.logged(:error).last
+  end
+end
\ No newline at end of file
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 0f36f5204d..3d1bae163f 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'active_support/json'
 
 class OrderedHashTest < Test::Unit::TestCase
   def setup
@@ -185,6 +186,12 @@ class OrderedHashTest < Test::Unit::TestCase
     assert @ordered_hash.inspect.include?(@hash.inspect)
   end
 
+  def test_json
+    ordered_hash = ActiveSupport::OrderedHash[:foo, :bar]
+    hash = Hash[:foo, :bar]
+    assert_equal ordered_hash.to_json, hash.to_json
+  end
+
   def test_alternate_initialization_with_splat
     alternate = ActiveSupport::OrderedHash[1,2,3,4]
     assert_kind_of ActiveSupport::OrderedHash, alternate
@@ -244,4 +251,16 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_equal @ordered_hash.keys,   @deserialized_ordered_hash.keys
     assert_equal @ordered_hash.values, @deserialized_ordered_hash.values
   end
+
+  def test_update_sets_keys
+    @updated_ordered_hash = ActiveSupport::OrderedHash.new
+    @updated_ordered_hash.update(:name => "Bob")
+    assert_equal [:name],  @updated_ordered_hash.keys
+  end
+
+  def test_invert
+    expected = ActiveSupport::OrderedHash[@values.zip(@keys)]
+    assert_equal expected, @ordered_hash.invert
+    assert_equal @values.zip(@keys), @ordered_hash.invert.to_a
+  end
 end