1 files changed, 11 insertions, 1 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 5d46bbefe6..fe789f3c2a 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -52,6 +52,11 @@ module Rails
       end
     end
 
+    # Returns a Pathname object of the current rails project,
+    # otherwise it returns nil if there is no project:
+    #
+    #   Rails.root
+    #     # => #<Pathname:/Users/someuser/some/path/project>
     def root
       application && application.config.root
     end
@@ -62,7 +67,7 @@ module Rails
     #   Rails.env.development? # => true
     #   Rails.env.production? # => false
     def env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || "development")
+      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
     end
 
     # Sets the Rails environment.
@@ -94,6 +99,11 @@ module Rails
       groups
     end
 
+    # Returns a Pathname object of the public folder of the current
+    # rails project, otherwise it returns nil if there is no project:
+    #
+    #   Rails.public_path
+    #     # => #<Pathname:/Users/someuser/some/path/project/public>
     def public_path
       application && Pathname.new(application.paths["public"].first)
     end