Rename Orchestra to Notifications [#3321 state:resolved]

4 files changed, 40 insertions, 40 deletions

diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index f3a68b482f..2b5ebcf390 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -18,7 +18,7 @@ module ActiveSupport
   autoload :MessageVerifier, 'active_support/message_verifier'
   autoload :Multibyte, 'active_support/multibyte'
   autoload :OptionMerger, 'active_support/option_merger'
-  autoload :Orchestra, 'active_support/orchestra'
+  autoload :Notifications, 'active_support/notifications'
   autoload :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
   autoload :Rescuable, 'active_support/rescuable'
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index a415686020..e0f671f283 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -247,7 +247,7 @@ module ActiveSupport
           payload = { :key => key }
           payload.merge!(options) if options.is_a?(Hash)
 
-          event = ActiveSupport::Orchestra.instrument(:"cache_#{operation}", payload, &block)
+          event = ActiveSupport::Notifications.instrument(:"cache_#{operation}", payload, &block)
           log("#{operation} (%.1fms)" % event.duration, key, options)
           event.result
         end
diff --git a/activesupport/lib/active_support/orchestra.rb b/activesupport/lib/active_support/notifications.rb
index efe30669d8..6335686196 100644
--- a/activesupport/lib/active_support/orchestra.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,10 +1,10 @@
 require 'thread'
 
 module ActiveSupport
-  # Orchestra provides an instrumentation API for Ruby. To instrument an action
+  # Notifications provides an instrumentation API for Ruby. To instrument an action
   # in Ruby you just need to:
   #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
@@ -12,23 +12,23 @@ module ActiveSupport
   # to push. You can even register an array:
   #
   #   @listener = []
-  #   ActiveSupport::Orchestra.register @listener
+  #   ActiveSupport::Notifications.register @listener
   #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
-  #   event           #=> ActiveSupport::Orchestra::Event
+  #   event           #=> ActiveSupport::Notifications::Event
   #   event.name      #=> :render
   #   event.duration  #=> 10 (in miliseconds)
   #   event.result    #=> "Foo"
   #   event.payload   #=> { :extra => :information }
   #
-  # Orchestra ships with a default listener implementation which puts events in
+  # Notifications ships with a default listener implementation which puts events in
   # a stream and consume them in a Thread. This implementation is thread safe
-  # and is available at ActiveSupport::Orchestra::Listener.
+  # and is available at ActiveSupport::Notifications::Listener.
   #
-  module Orchestra
+  module Notifications
     @stacked_events = Hash.new { |h,k| h[k] = [] }
     @listeners = []
 
diff --git a/activesupport/test/orchestra_test.rb b/activesupport/test/notifications_test.rb
index 683cc36f6a..8f00eff106 100644
--- a/activesupport/test/orchestra_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -1,59 +1,59 @@
 require 'abstract_unit'
 
-class OrchestraEventTest < Test::Unit::TestCase
+class NotificationsEventTest < Test::Unit::TestCase
   def setup
-    @parent = ActiveSupport::Orchestra::Event.new(:parent)
+    @parent = ActiveSupport::Notifications::Event.new(:parent)
   end
 
   def test_initialization_with_name_and_parent_and_payload
-    event = ActiveSupport::Orchestra::Event.new(:awesome, @parent, :payload => "orchestra")
+    event = ActiveSupport::Notifications::Event.new(:awesome, @parent, :payload => "notifications")
     assert_equal(:awesome, event.name)
     assert_equal(@parent, event.parent)
-    assert_equal({ :payload => "orchestra" }, event.payload)
+    assert_equal({ :payload => "notifications" }, event.payload)
   end
 
   def test_thread_id_is_set_on_initialization
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
+    event = ActiveSupport::Notifications::Event.new(:awesome)
     assert_equal Thread.current.object_id, event.thread_id
   end
 
   def test_current_time_is_set_on_initialization
     previous_time = Time.now.utc
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
+    event = ActiveSupport::Notifications::Event.new(:awesome)
     assert_kind_of Time, event.time
     assert event.time.to_f >= previous_time.to_f
   end
- 
+
   def test_duration_is_set_when_event_finishes
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
+    event = ActiveSupport::Notifications::Event.new(:awesome)
     sleep(0.1)
     event.finish!
     assert_in_delta 100, event.duration, 30
   end
 end
 
-class OrchestraMainTest < Test::Unit::TestCase
+class NotificationsMainTest < Test::Unit::TestCase
   def setup
     @listener = []
-    ActiveSupport::Orchestra.register @listener
+    ActiveSupport::Notifications.register @listener
   end
 
   def teardown
-    ActiveSupport::Orchestra.unregister @listener
+    ActiveSupport::Notifications.unregister @listener
   end
 
-  def test_orchestra_allows_any_action_to_be_instrumented
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
+  def test_notifications_allows_any_action_to_be_instrumented
+    event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
       sleep(0.1)
     end
 
     assert_equal :awesome, event.name
-    assert_equal "orchestra", event.payload
+    assert_equal "notifications", event.payload
     assert_in_delta 100, event.duration, 30
   end
 
   def test_block_result_is_stored
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
+    event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
       1 + 1
     end
 
@@ -61,18 +61,18 @@ class OrchestraMainTest < Test::Unit::TestCase
   end
 
   def test_events_are_published_to_a_listener
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
+    event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
       1 + 1
     end
 
     assert_equal 1, @listener.size
     assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
+    assert_equal "notifications", @listener.last.payload
   end
 
   def test_nested_events_can_be_instrumented
-    ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      ActiveSupport::Orchestra.instrument(:wot, "child") do
+    ActiveSupport::Notifications.instrument(:awesome, "notifications") do
+      ActiveSupport::Notifications.instrument(:wot, "child") do
         sleep(0.1)
       end
 
@@ -86,23 +86,23 @@ class OrchestraMainTest < Test::Unit::TestCase
 
     assert_equal 2, @listener.size
     assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
+    assert_equal "notifications", @listener.last.payload
     assert_in_delta 100, @listener.first.parent.duration, 30
   end
 
   def test_event_is_pushed_even_if_block_fails
-    ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
+    ActiveSupport::Notifications.instrument(:awesome, "notifications") do
       raise "OMG"
     end rescue RuntimeError
 
     assert_equal 1, @listener.size
     assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
+    assert_equal "notifications", @listener.last.payload
   end
 end
 
-class OrchestraListenerTest < Test::Unit::TestCase
-  class MyListener < ActiveSupport::Orchestra::Listener
+class NotificationsListenerTest < Test::Unit::TestCase
+  class MyListener < ActiveSupport::Notifications::Listener
     attr_reader :consumed
 
     def consume(event)
@@ -113,11 +113,11 @@ class OrchestraListenerTest < Test::Unit::TestCase
 
   def setup
     @listener = MyListener.new
-    ActiveSupport::Orchestra.register @listener
+    ActiveSupport::Notifications.register @listener
   end
 
   def teardown
-    ActiveSupport::Orchestra.unregister @listener
+    ActiveSupport::Notifications.unregister @listener
   end
 
   def test_thread_is_exposed_by_listener
@@ -125,7 +125,7 @@ class OrchestraListenerTest < Test::Unit::TestCase
   end
 
   def test_event_is_consumed_when_an_action_is_instrumented
-    ActiveSupport::Orchestra.instrument(:sum) do
+    ActiveSupport::Notifications.instrument(:sum) do
       1 + 1
     end
     sleep 0.1
@@ -136,10 +136,10 @@ class OrchestraListenerTest < Test::Unit::TestCase
 
   def test_with_sevaral_consumers_and_several_events
     @another = MyListener.new
-    ActiveSupport::Orchestra.register @another
+    ActiveSupport::Notifications.register @another
 
     1.upto(100) do |i|
-      ActiveSupport::Orchestra.instrument(:value) do
+      ActiveSupport::Notifications.instrument(:value) do
         i
       end
     end
@@ -156,6 +156,6 @@ class OrchestraListenerTest < Test::Unit::TestCase
     assert_equal 1, @another.consumed.first.result
     assert_equal 100, @another.consumed.last.result
   ensure
-    ActiveSupport::Orchestra.unregister @another
+    ActiveSupport::Notifications.unregister @another
   end
 end