1 files changed, 30 insertions, 36 deletions

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 77a09507a8..2797205334 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -21,44 +21,46 @@ end
 
 module Rails
   autoload :Info, 'rails/info'
-  autoload :InfoController, 'rails/info_controller'
+  autoload :InfoController,    'rails/info_controller'
+  autoload :WelcomeController, 'rails/welcome_controller'
 
   class << self
-    def application
-      @@application ||= nil
-    end
-
-    def application=(application)
-      @@application = application
-    end
+    attr_accessor :application, :cache, :logger
 
     # The Configuration instance used to configure the Rails environment
     def configuration
       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
-    end
-
-    def logger
-      @@logger ||= nil
-    end
-
-    def logger=(logger)
-      @@logger = logger
+      application.initialized?
     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
@@ -70,35 +72,27 @@ module Rails
     end
 
     def env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+      @_env ||= begin
+        ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+        ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"])
+      end
     end
 
     def env=(environment)
       @_env = ActiveSupport::StringInquirer.new(environment)
     end
 
-    def cache
-      @@cache ||= nil
-    end
-
-    def cache=(cache)
-      @@cache = cache
-    end
-
     # Returns all rails groups for loading based on:
     #
     # * The Rails environment;
     # * The environment variable RAILS_GROUPS;
     # * The optional envs given as argument and the hash with group dependencies;
     #
-    # == Examples
-    #
-    #   groups :assets => [:development, :test]
+    #   groups assets: [:development, :test]
     #
     #   # Returns
     #   # => [:default, :development, :assets] for Rails.env == "development"
     #   # => [:default, :production]           for Rails.env == "production"
-    #
     def groups(*groups)
       hash = groups.extract_options!
       env = Rails.env
@@ -115,7 +109,7 @@ module Rails
     end
 
     def public_path
-      application && application.paths["public"].first
+      application && Pathname.new(application.paths["public"].first)
     end
   end
 end