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

1 files changed, 28 insertions, 12 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 77a09507a8..59c3c56e59 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -22,14 +22,15 @@ end
 module Rails
   autoload :Info, 'rails/info'
   autoload :InfoController, 'rails/info_controller'
+  autoload :Queueing, 'rails/queueing'
 
   class << self
     def application
-      @@application ||= nil
+      @application ||= nil
     end
 
     def application=(application)
-      @@application = application
+      @application = application
     end
 
     # The Configuration instance used to configure the Rails environment
@@ -37,28 +38,43 @@ module Rails
       application.config
     end
 
+    # Rails.queue is the application's queue. You can push a job onto
+    # the queue by:
+    #
+    #   Rails.queue.push job
+    #
+    # A job is an object that responds to +run+. Queue consumers will
+    # pop jobs off of the queue and invoke the queue's +run+ method.
+    #
+    # Note that depending on your queue implementation, jobs may not
+    # be executed in the same process as they were created in, and
+    # are never executed in the same thread as they were created in.
+    #
+    # If necessary, a queue implementation may need to serialize your
+    # job for distribution to another process. The documentation of
+    # your queue will specify the requirements for that serialization.
+    def queue
+      application.queue
+    end
+
     def initialize!
       application.initialize!
     end
 
     def initialized?
-      @@initialized || false
-    end
-
-    def initialized=(initialized)
-      @@initialized ||= initialized
+      application.initialized?
     end
 
     def logger
-      @@logger ||= nil
+      @logger ||= nil
     end
 
     def logger=(logger)
-      @@logger = logger
+      @logger = logger
     end
 
     def backtrace_cleaner
-      @@backtrace_cleaner ||= begin
+      @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
         require 'rails/backtrace_cleaner'
         Rails::BacktraceCleaner.new
@@ -78,11 +94,11 @@ module Rails
     end
 
     def cache
-      @@cache ||= nil
+      @cache ||= nil
     end
 
     def cache=(cache)
-      @@cache = cache
+      @cache = cache
     end
 
     # Returns all rails groups for loading based on: