Renamed Orchestra to Notifications once again [#3321 state:resolved]

4 files changed, 39 insertions, 39 deletions

diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index fa657ac99a..63f7338a68 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -18,9 +18,9 @@ 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 :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
+  autoload :Notifications, 'active_support/notifications'
   autoload :Rescuable, 'active_support/rescuable'
   autoload :SecureRandom, 'active_support/secure_random'
   autoload :StringInquirer, 'active_support/string_inquirer'
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index a2717499e7..818983fdd6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -256,7 +256,7 @@ module ActiveSupport
           if self.class.instrument
             payload = { :key => key }
             payload.merge!(options) if options.is_a?(Hash)
-            ActiveSupport::Orchestra.instrument(:"cache_#{operation}", payload, &block)
+            ActiveSupport::Notifications.instrument(:"cache_#{operation}", payload, &block)
           else
             yield
           end
diff --git a/activesupport/lib/active_support/orchestra.rb b/activesupport/lib/active_support/notifications.rb
index 5f57127401..7e9ffca13f 100644
--- a/activesupport/lib/active_support/orchestra.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -3,10 +3,10 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport
-  # Orchestra provides an instrumentation API for Ruby. To instrument an action
-  # in Ruby you just need to do:
+  # Notifications provides an instrumentation API for Ruby. To instrument an
+  # action in Ruby you just need to do:
   #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
@@ -15,39 +15,39 @@ module ActiveSupport
   #
   #   @events = []
   #
-  #   ActiveSupport::Orchestra.subscribe do |event|
+  #   ActiveSupport::Notifications.subscribe do |event|
   #     @events << event
   #   end
   #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
   #   event = @events.first
-  #   event.class     #=> ActiveSupport::Orchestra::Event
+  #   event.class     #=> ActiveSupport::Notifications::Event
   #   event.name      #=> :render
   #   event.duration  #=> 10 (in miliseconds)
   #   event.result    #=> "Foo"
   #   event.payload   #=> { :extra => :information }
   #
-  # When subscribing to Orchestra, you can pass a pattern, to only consume
+  # When subscribing to Notifications, you can pass a pattern, to only consume
   # events that match the pattern:
   #
-  #   ActiveSupport::Orchestra.subscribe(/render/) do |event|
+  #   ActiveSupport::Notifications.subscribe(/render/) do |event|
   #     @render_events << event
   #   end
   #
-  # Orchestra ships with a queue implementation that consumes and publish events
+  # Notifications ships with a queue implementation that consumes and publish events
   # to subscribers in a thread. You can use any queue implementation you want.
   #
-  module Orchestra
+  module Notifications
     mattr_accessor :queue
 
     class << self
       delegate :instrument, :to => :instrumenter
 
       def instrumenter
-        Thread.current[:orchestra_instrumeter] ||= Instrumenter.new(publisher)
+        Thread.current[:notifications_instrumeter] ||= Instrumenter.new(publisher)
       end
 
       def publisher
@@ -119,7 +119,7 @@ module ActiveSupport
       end
     end
 
-    # This is a default queue implementation that ships with Orchestra. It
+    # This is a default queue implementation that ships with Notifications. It
     # consumes events in a thread and publish them to all registered subscribers.
     #
     class LittleFanout
@@ -167,5 +167,5 @@ module ActiveSupport
     end
   end
 
-  Orchestra.queue = Orchestra::LittleFanout.new
+  Notifications.queue = Notifications::LittleFanout.new
 end
diff --git a/activesupport/test/orchestra_test.rb b/activesupport/test/notifications_test.rb
index 1b2f98c7dd..561ee2b0ba 100644
--- a/activesupport/test/orchestra_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -1,13 +1,13 @@
 require 'abstract_unit'
 
 # Allow LittleFanout to be cleaned.
-class ActiveSupport::Orchestra::LittleFanout
+class ActiveSupport::Notifications::LittleFanout
   def clear
     @listeners.clear
   end
 end
 
-class OrchestraEventTest < Test::Unit::TestCase
+class NotificationsEventTest < Test::Unit::TestCase
   def test_events_are_initialized_with_name_and_payload
     event = event(:foo, :payload => :bar)
     assert_equal :foo, event.name
@@ -37,24 +37,24 @@ class OrchestraEventTest < Test::Unit::TestCase
   protected
 
     def event(*args)
-      ActiveSupport::Orchestra::Event.new(*args)
+      ActiveSupport::Notifications::Event.new(*args)
     end
 end
 
-class OrchestraMainTest < Test::Unit::TestCase
+class NotificationsMainTest < Test::Unit::TestCase
   def setup
     @events = []
     Thread.abort_on_exception = true
-    ActiveSupport::Orchestra.subscribe { |event| @events << event }
+    ActiveSupport::Notifications.subscribe { |event| @events << event }
   end
 
   def teardown
     Thread.abort_on_exception = false
-    ActiveSupport::Orchestra.queue.clear
+    ActiveSupport::Notifications.queue.clear
   end
 
-  def test_orchestra_returns_action_result
-    result = ActiveSupport::Orchestra.instrument(:awesome, :payload => "orchestra") do
+  def test_notifications_returns_action_result
+    result = ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
       1 + 1
     end
 
@@ -62,7 +62,7 @@ class OrchestraMainTest < Test::Unit::TestCase
   end
 
   def test_events_are_published_to_a_listener
-    ActiveSupport::Orchestra.instrument(:awesome, :payload => "orchestra") do
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
       1 + 1
     end
 
@@ -70,12 +70,12 @@ class OrchestraMainTest < Test::Unit::TestCase
 
     assert_equal 1, @events.size
     assert_equal :awesome, @events.last.name
-    assert_equal Hash[:payload => "orchestra"], @events.last.payload
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
   end
 
   def test_nested_events_can_be_instrumented
-    ActiveSupport::Orchestra.instrument(:awesome, :payload => "orchestra") do
-      ActiveSupport::Orchestra.instrument(:wot, :payload => "child") do
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
+      ActiveSupport::Notifications.instrument(:wot, :payload => "child") do
         1 + 1
       end
 
@@ -90,12 +90,12 @@ class OrchestraMainTest < Test::Unit::TestCase
 
     assert_equal 2, @events.size
     assert_equal :awesome, @events.last.name
-    assert_equal Hash[:payload => "orchestra"], @events.last.payload
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
     assert_in_delta 100, @events.last.duration, 70
   end
 
   def test_event_is_pushed_even_if_block_fails
-    ActiveSupport::Orchestra.instrument(:awesome, :payload => "orchestra") do
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
       raise "OMG"
     end rescue RuntimeError
 
@@ -103,22 +103,22 @@ class OrchestraMainTest < Test::Unit::TestCase
 
     assert_equal 1, @events.size
     assert_equal :awesome, @events.last.name
-    assert_equal Hash[:payload => "orchestra"], @events.last.payload
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
   end
 
   def test_event_is_pushed_even_without_block
-    ActiveSupport::Orchestra.instrument(:awesome, :payload => "orchestra")
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications")
     sleep(0.1)
 
     assert_equal 1, @events.size
     assert_equal :awesome, @events.last.name
-    assert_equal Hash[:payload => "orchestra"], @events.last.payload
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
   end
 
   def test_subscriber_with_pattern
     @another = []
-    ActiveSupport::Orchestra.subscribe("cache"){ |event| @another << event }
-    ActiveSupport::Orchestra.instrument(:cache){ 1 }
+    ActiveSupport::Notifications.subscribe("cache"){ |event| @another << event }
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
 
     sleep(0.1)
 
@@ -129,10 +129,10 @@ class OrchestraMainTest < Test::Unit::TestCase
 
   def test_subscriber_with_pattern_as_regexp
     @another = []
-    ActiveSupport::Orchestra.subscribe(/cache/){ |event| @another << event }
+    ActiveSupport::Notifications.subscribe(/cache/){ |event| @another << event }
 
-    ActiveSupport::Orchestra.instrument(:something){ 0 }
-    ActiveSupport::Orchestra.instrument(:cache){ 1 }
+    ActiveSupport::Notifications.instrument(:something){ 0 }
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
 
     sleep(0.1)
 
@@ -143,10 +143,10 @@ class OrchestraMainTest < Test::Unit::TestCase
 
   def test_with_several_consumers_and_several_events
     @another = []
-    ActiveSupport::Orchestra.subscribe { |event| @another << event }
+    ActiveSupport::Notifications.subscribe { |event| @another << event }
 
     1.upto(100) do |i|
-      ActiveSupport::Orchestra.instrument(:value){ i }
+      ActiveSupport::Notifications.instrument(:value){ i }
     end
 
     sleep 0.1