aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/base/filter_parameter_logging.rb4
-rw-r--r--actionpack/lib/action_view/helpers/form_tag_helper.rb5
-rw-r--r--actionpack/test/controller/filter_params_test.rb3
-rw-r--r--actionpack/test/template/form_tag_helper_test.rb12
-rw-r--r--railties/lib/initializer.rb50
-rw-r--r--railties/lib/rails/configuration.rb33
-rw-r--r--railties/lib/rails/paths.rb120
-rw-r--r--railties/lib/railties_path.rb2
-rw-r--r--railties/test/abstract_unit.rb1
-rw-r--r--railties/test/initializer/path_test.rb86
-rw-r--r--railties/test/initializer/root/app/controllers/.keep0
-rw-r--r--railties/test/initializer/root/app/helpers/.keep0
-rw-r--r--railties/test/initializer/root/app/metal/.keep0
-rw-r--r--railties/test/initializer/root/app/models/.keep0
-rw-r--r--railties/test/initializer/root/app/views/.keep0
-rw-r--r--railties/test/initializer/root/config/database.yml4
-rw-r--r--railties/test/initializer/root/config/environments/.keep0
-rw-r--r--railties/test/initializer/root/config/locales/.keep0
-rw-r--r--railties/test/initializer/root/config/routes.rb0
-rw-r--r--railties/test/initializer/root/lib/.keep0
-rw-r--r--railties/test/initializer/root/tmp/.keep0
-rw-r--r--railties/test/initializer/root/tmp/cache/.keep0
-rw-r--r--railties/test/initializer/root/vendor/.keep0
-rw-r--r--railties/test/paths_test.rb119
24 files changed, 400 insertions, 39 deletions
diff --git a/actionpack/lib/action_controller/base/filter_parameter_logging.rb b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
index 26cd03f277..065e62a37f 100644
--- a/actionpack/lib/action_controller/base/filter_parameter_logging.rb
+++ b/actionpack/lib/action_controller/base/filter_parameter_logging.rb
@@ -43,6 +43,10 @@ module ActionController
filtered_parameters[key] = '[FILTERED]'
elsif value.is_a?(Hash)
filtered_parameters[key] = filter_parameters(value)
+ elsif value.is_a?(Array)
+ filtered_parameters[key] = value.collect do |item|
+ filter_parameters(item)
+ end
elsif block_given?
key = key.dup
value = value.dup if value
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 8ab78e7bc6..ca6ba501e2 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -231,6 +231,8 @@ module ActionView
# * <tt>:rows</tt> - Specify the number of rows in the textarea
# * <tt>:cols</tt> - Specify the number of columns in the textarea
# * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
+ # * <tt>:escape</tt> - By default, the contents of the text input are HTML escaped.
+ # If you need unescaped contents, set this to false.
# * Any other key creates standard HTML attributes for the tag.
#
# ==== Examples
@@ -258,6 +260,9 @@ module ActionView
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
+ escape = options.key?("escape") ? options.delete("escape") : true
+ content = html_escape(content) if escape
+
content_tag :textarea, content, { "name" => name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
end
diff --git a/actionpack/test/controller/filter_params_test.rb b/actionpack/test/controller/filter_params_test.rb
index 8c9e4f81de..f7864745eb 100644
--- a/actionpack/test/controller/filter_params_test.rb
+++ b/actionpack/test/controller/filter_params_test.rb
@@ -40,7 +40,8 @@ class FilterParamTest < ActionController::TestCase
[{'foo'=>'bar', 'bar'=>'foo'},{'foo'=>'[FILTERED]', 'bar'=>'foo'},%w'foo baz'],
[{'foo'=>'bar', 'baz'=>'foo'},{'foo'=>'[FILTERED]', 'baz'=>'[FILTERED]'},%w'foo baz'],
[{'bar'=>{'foo'=>'bar','bar'=>'foo'}},{'bar'=>{'foo'=>'[FILTERED]','bar'=>'foo'}},%w'fo'],
- [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana']]
+ [{'foo'=>{'foo'=>'bar','bar'=>'foo'}},{'foo'=>'[FILTERED]'},%w'f banana'],
+ [{'baz'=>[{'foo'=>'baz'}]}, {'baz'=>[{'foo'=>'[FILTERED]'}]}, %w(foo)]]
test_hashes.each do |before_filter, after_filter, filter_words|
FilterParamController.filter_parameter_logging(*filter_words)
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 09d199b75d..f387123117 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -159,6 +159,18 @@ class FormTagHelperTest < ActionView::TestCase
assert_match VALID_HTML_ID, input_elem['id']
end
+ def test_text_area_tag_escape_content
+ actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40"
+ expected = %(<textarea cols="20" id="body" name="body" rows="40">&lt;b&gt;hello world&lt;/b&gt;</textarea>)
+ assert_dom_equal expected, actual
+ end
+
+ def test_text_area_tag_unescaped_content
+ actual = text_area_tag "body", "<b>hello world</b>", :size => "20x40", :escape => false
+ expected = %(<textarea cols="20" id="body" name="body" rows="40"><b>hello world</b></textarea>)
+ assert_dom_equal expected, actual
+ end
+
def test_text_field_tag
actual = text_field_tag "title", "Hello!"
expected = %(<input id="title" name="title" type="text" value="Hello!" />)
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index cdf2a22c83..cd23158e98 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -5,6 +5,7 @@ require 'railties_path'
require 'rails/version'
require 'rails/gem_dependency'
require 'rails/rack'
+require 'rails/paths'
require 'rails/core'
require 'rails/configuration'
@@ -112,24 +113,6 @@ module Rails
require 'ruby_version_check'
end
- Initializer.default.add :set_root_path do
- raise 'RAILS_ROOT is not set' unless defined?(RAILS_ROOT)
- raise 'RAILS_ROOT is not a directory' unless File.directory?(RAILS_ROOT)
-
- configuration.root_path =
- # Pathname is incompatible with Windows, but Windows doesn't have
- # real symlinks so File.expand_path is safe.
- if RUBY_PLATFORM =~ /(:?mswin|mingw)/
- File.expand_path(RAILS_ROOT)
-
- # Otherwise use Pathname#realpath which respects symlinks.
- else
- Pathname.new(RAILS_ROOT).realpath.to_s
- end
-
- RAILS_ROOT.replace configuration.root_path
- end
-
# If Rails is vendored and RubyGems is available, install stub GemSpecs
# for Rails, Active Support, Active Record, Action Pack, Action Mailer, and
# Active Resource. This allows Gem plugins to depend on Rails even when
@@ -158,8 +141,9 @@ module Rails
# Set the <tt>$LOAD_PATH</tt> based on the value of
# Configuration#load_paths. Duplicates are removed.
Initializer.default.add :set_load_path do
- load_paths = configuration.load_paths + configuration.framework_paths
- load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
+ # TODO: Think about unifying this with the general Rails paths
+ configuration.framework_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
+ configuration.paths.add_to_load_path
$LOAD_PATH.uniq!
end
@@ -179,6 +163,10 @@ module Rails
begin
require 'active_support'
require 'active_support/core_ext/kernel/reporting'
+ require 'active_support/core_ext/logger'
+
+ # TODO: This is here to make Sam Ruby's tests pass. Needs discussion.
+ require 'active_support/core_ext/numeric/bytes'
configuration.frameworks.each { |framework| require(framework.to_s) }
rescue LoadError => e
# Re-raise as RuntimeError because Mongrel would swallow LoadError.
@@ -217,6 +205,8 @@ module Rails
Initializer.default.add :load_environment do
silence_warnings do
next if @environment_loaded
+ next unless File.file?(configuration.environment_path)
+
@environment_loaded = true
config = configuration
@@ -307,6 +297,7 @@ module Rails
end
end
+ # TODO: Why are we silencing warning here?
silence_warnings { Object.const_set "RAILS_DEFAULT_LOGGER", logger }
end
@@ -326,6 +317,7 @@ module Rails
# Sets the dependency loading mechanism based on the value of
# Configuration#cache_classes.
Initializer.default.add :initialize_dependency_mechanism do
+ # TODO: Remove files from the $" and always use require
ActiveSupport::Dependencies.mechanism = configuration.cache_classes ? :require : :load
end
@@ -409,10 +401,6 @@ module Rails
end
end
- # Add the load paths used by support functions such as the info controller
- Initializer.default.add :add_support_load_paths do
- end
-
Initializer.default.add :check_for_unbuilt_gems do
unbuilt_gems = config.gems.select {|gem| gem.frozen? && !gem.built? }
if unbuilt_gems.size > 0
@@ -462,6 +450,7 @@ Run `rake gems:build` to build the unbuilt gems.
# # pick up any gems that plugins depend on
Initializer.default.add :add_gem_load_paths do
require 'rails/gem_dependency'
+ # TODO: This seems extraneous
Rails::GemDependency.add_frozen_gem_path
unless config.gems.empty?
require "rubygems"
@@ -529,6 +518,7 @@ Run `rake gems:install` to install the missing gems.
end
end
+ # TODO: Make a DSL way to limit an initializer to a particular framework
# # Prepare dispatcher callbacks and run 'prepare' callbacks
Initializer.default.add :prepare_dispatcher do
@@ -557,20 +547,10 @@ Run `rake gems:install` to install the missing gems.
end
end
- # # Load view path cache
- Initializer.default.add :load_view_paths do
- if configuration.frameworks.include?(:action_view)
- if configuration.cache_classes
- view_path = ActionView::FileSystemResolverWithFallback.new(configuration.view_path)
- ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller)
- ActionMailer::Base.template_root = view_path if configuration.frameworks.include?(:action_mailer)
- end
- end
- end
-
# Eager load application classes
Initializer.default.add :load_application_classes do
next if $rails_rake_task
+
if configuration.cache_classes
configuration.eager_load_paths.each do |load_path|
matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index fdb071fc18..59132efe98 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -10,7 +10,7 @@ module Rails
:log_path, :log_level, :logger, :preload_frameworks,
:database_configuration_file, :cache_store, :time_zone,
:view_path, :metals, :controller_paths, :routes_configuration_file,
- :eager_load_paths, :dependency_loading
+ :eager_load_paths, :dependency_loading, :paths
def initialize
set_root_path!
@@ -61,7 +61,36 @@ module Rails
Pathname.new(RAILS_ROOT).realpath.to_s
end
- RAILS_ROOT.replace self.root_path
+ @paths = Rails::Application::Root.new(root_path)
+ @paths.app = "app"
+ @paths.app.metals = "app/metal"
+ @paths.app.models = "app/models"
+ @paths.app.controllers = "app/controllers"
+ @paths.app.helpers = "app/helpers"
+ @paths.app.services = "app/services"
+ @paths.lib = "lib"
+ @paths.vendor = "vendor"
+ @paths.vendor.plugins = "vendor/plugins"
+ @paths.cache = "tmp/cache"
+ @paths.config = "config"
+ @paths.config.locales = "config/locales"
+ @paths.config.environments = "config/environments"
+
+ @paths.app.controllers.push *builtin_directories
+
+ @paths.app.load_path!
+ @paths.app.metals.load_path!
+ @paths.app.models.eager_load!
+ @paths.app.controllers.eager_load!
+ @paths.app.helpers.eager_load!
+ @paths.app.services.load_path!
+ @paths.app.metals.eager_load!
+ @paths.lib.load_path!
+ @paths.vendor.load_path!
+
+ @paths.config.environments.glob = "#{RAILS_ENV}.rb"
+
+ RAILS_ROOT.replace root_path
end
# Enable threaded mode. Allows concurrent requests to controller actions and
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
new file mode 100644
index 0000000000..aada7d4a56
--- /dev/null
+++ b/railties/lib/rails/paths.rb
@@ -0,0 +1,120 @@
+require 'set'
+
+module Rails
+ class Application
+ module PathParent
+ def method_missing(id, *args)
+ name = id.to_s
+
+ if name =~ /^(.*)=$/
+ @children[$1] = Path.new(args.first, @root)
+ elsif path = @children[name]
+ path
+ else
+ super
+ end
+ end
+ end
+
+ class Root
+ include PathParent
+
+ attr_reader :path
+ def initialize(path)
+ raise unless path.is_a?(String)
+
+ @children = {}
+
+ # TODO: Move logic from set_root_path initializer
+ @path = File.expand_path(path)
+ @root = self
+ @load_once, @eager_load, @all_paths = [], [], []
+ end
+
+ def load_once
+ @load_once.uniq!
+ @load_once
+ end
+
+ def eager_load
+ @eager_load.uniq!
+ @eager_load
+ end
+
+ def all_paths
+ @all_paths.uniq!
+ @all_paths
+ end
+
+ def load_paths
+ all_paths.map { |path| path.paths }.flatten
+ end
+
+ def add_to_load_path
+ load_paths.reverse_each do |path|
+ $LOAD_PATH.unshift(path) if File.directory?(path)
+ end
+ end
+ end
+
+ class Path
+ include PathParent
+
+ attr_reader :path
+ attr_accessor :glob
+
+ def initialize(path, root)
+ @children = {}
+ @root = root
+ @paths = [path].flatten
+ @glob = "**/*.rb"
+ end
+
+ def push(path)
+ @paths.push path
+ end
+
+ alias << push
+
+ def unshift(path)
+ @paths.unshift path
+ end
+
+ def load_once!
+ @load_once = true
+ @root.load_once.push *self.paths
+ end
+
+ def load_once?
+ @load_once
+ end
+
+ def eager_load!
+ @eager_load = true
+ @root.all_paths << self
+ @root.eager_load.push *self.paths
+ end
+
+ def eager_load?
+ @eager_load
+ end
+
+ def load_path!
+ @load_path = true
+ @root.all_paths << self
+ end
+
+ def load_path?
+ @load_path
+ end
+
+ def paths
+ @paths.map do |path|
+ path.index('/') == 0 ? path : File.join(@root.path, path)
+ end
+ end
+
+ alias to_a paths
+ end
+ end
+end \ No newline at end of file
diff --git a/railties/lib/railties_path.rb b/railties/lib/railties_path.rb
index a298a4cc27..b729c095c8 100644
--- a/railties/lib/railties_path.rb
+++ b/railties/lib/railties_path.rb
@@ -1 +1 @@
-RAILTIES_PATH = File.join(File.dirname(__FILE__), '..')
+RAILTIES_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
index 0addcb8bf3..cef69e90cb 100644
--- a/railties/test/abstract_unit.rb
+++ b/railties/test/abstract_unit.rb
@@ -2,6 +2,7 @@ $:.unshift File.dirname(__FILE__) + "/../../activesupport/lib"
$:.unshift File.dirname(__FILE__) + "/../../activerecord/lib"
$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib"
$:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib"
+$:.unshift File.dirname(__FILE__) + "/../../activeresource/lib"
$:.unshift File.dirname(__FILE__) + "/../lib"
$:.unshift File.dirname(__FILE__) + "/../builtin/rails_info"
diff --git a/railties/test/initializer/path_test.rb b/railties/test/initializer/path_test.rb
new file mode 100644
index 0000000000..37e1eebbc7
--- /dev/null
+++ b/railties/test/initializer/path_test.rb
@@ -0,0 +1,86 @@
+require 'abstract_unit'
+require 'active_support/ruby/shim'
+require 'initializer'
+
+RAILS_ROOT.replace File.join(File.dirname(__FILE__), "root")
+
+module Rails
+ def self.vendor_rails? ; false ; end
+end
+
+# TODO: Can this be reset?
+Rails::Initializer.run do |config|
+ config.frameworks = [:action_controller, :action_view, :action_mailer, :active_record]
+end
+
+class PathsTest < ActiveSupport::TestCase
+ def setup
+ @paths = Rails::Initializer.default.config.paths
+ end
+
+ def root(*path)
+ File.expand_path(File.join(File.dirname(__FILE__), "root", *path))
+ end
+
+ def assert_path(paths, *dir)
+ assert_equal [root(*dir)], paths.paths
+ end
+
+ test "booting up Rails yields a valid paths object" do
+ assert_path @paths.app, "app"
+ assert_path @paths.app.metals, "app", "metal"
+ assert_path @paths.app.models, "app", "models"
+ assert_path @paths.app.helpers, "app", "helpers"
+ assert_path @paths.app.services, "app", "services"
+ assert_path @paths.lib, "lib"
+ assert_path @paths.vendor, "vendor"
+ assert_path @paths.vendor.plugins, "vendor", "plugins"
+ assert_path @paths.cache, "tmp", "cache"
+ assert_path @paths.config, "config"
+ assert_path @paths.config.locales, "config", "locales"
+ assert_path @paths.config.environments, "config", "environments"
+
+ assert_equal Pathname.new(File.dirname(__FILE__)).join("root", "app", "controllers").expand_path,
+ Pathname.new(@paths.app.controllers.to_a.first).expand_path
+ assert_equal Pathname.new(File.dirname(__FILE__)).join("..", "..", "builtin", "rails_info").expand_path,
+ Pathname.new(@paths.app.controllers.to_a[1]).expand_path
+ end
+
+ test "booting up Rails yields a list of paths that are eager" do
+ assert @paths.app.models.eager_load?
+ assert @paths.app.controllers.eager_load?
+ assert @paths.app.helpers.eager_load?
+ assert @paths.app.metals.eager_load?
+ end
+
+ test "environments has a glob equal to the current environment" do
+ assert_equal "#{RAILS_ENV}.rb", @paths.config.environments.glob
+ end
+
+ def assert_in_load_path(*path)
+ assert $:.any? { |p| File.expand_path(p) == root(*path) }, "Load path does not include '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+ end
+
+ def assert_not_in_load_path(*path)
+ assert !$:.any? { |p| File.expand_path(p) == root(*path) }, "Load path includes '#{root(*path)}'. They are:\n-----\n #{$:.join("\n")}\n-----"
+ end
+
+ test "load path includes each of the paths in config.paths as long as the directories exist" do
+ assert_in_load_path "app"
+ assert_in_load_path "app", "controllers"
+ assert_in_load_path "app", "metal"
+ assert_in_load_path "app", "models"
+ assert_in_load_path "app", "helpers"
+ assert_in_load_path "lib"
+ assert_in_load_path "vendor"
+
+ assert_not_in_load_path "app", "views"
+ assert_not_in_load_path "app", "services"
+ assert_not_in_load_path "config"
+ assert_not_in_load_path "config", "locales"
+ assert_not_in_load_path "config", "environments"
+ assert_not_in_load_path "tmp"
+ assert_not_in_load_path "tmp", "cache"
+ end
+
+end \ No newline at end of file
diff --git a/railties/test/initializer/root/app/controllers/.keep b/railties/test/initializer/root/app/controllers/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/controllers/.keep
diff --git a/railties/test/initializer/root/app/helpers/.keep b/railties/test/initializer/root/app/helpers/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/helpers/.keep
diff --git a/railties/test/initializer/root/app/metal/.keep b/railties/test/initializer/root/app/metal/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/metal/.keep
diff --git a/railties/test/initializer/root/app/models/.keep b/railties/test/initializer/root/app/models/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/models/.keep
diff --git a/railties/test/initializer/root/app/views/.keep b/railties/test/initializer/root/app/views/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/app/views/.keep
diff --git a/railties/test/initializer/root/config/database.yml b/railties/test/initializer/root/config/database.yml
new file mode 100644
index 0000000000..ce3356be0c
--- /dev/null
+++ b/railties/test/initializer/root/config/database.yml
@@ -0,0 +1,4 @@
+development:
+ adapter: sqlite3
+ database: db/railties.db
+ timeout: 5000 \ No newline at end of file
diff --git a/railties/test/initializer/root/config/environments/.keep b/railties/test/initializer/root/config/environments/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/environments/.keep
diff --git a/railties/test/initializer/root/config/locales/.keep b/railties/test/initializer/root/config/locales/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/locales/.keep
diff --git a/railties/test/initializer/root/config/routes.rb b/railties/test/initializer/root/config/routes.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/config/routes.rb
diff --git a/railties/test/initializer/root/lib/.keep b/railties/test/initializer/root/lib/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/lib/.keep
diff --git a/railties/test/initializer/root/tmp/.keep b/railties/test/initializer/root/tmp/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/tmp/.keep
diff --git a/railties/test/initializer/root/tmp/cache/.keep b/railties/test/initializer/root/tmp/cache/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/tmp/cache/.keep
diff --git a/railties/test/initializer/root/vendor/.keep b/railties/test/initializer/root/vendor/.keep
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/railties/test/initializer/root/vendor/.keep
diff --git a/railties/test/paths_test.rb b/railties/test/paths_test.rb
new file mode 100644
index 0000000000..a1ed43ad6d
--- /dev/null
+++ b/railties/test/paths_test.rb
@@ -0,0 +1,119 @@
+require 'abstract_unit'
+require 'rails/paths'
+
+class PathsTest < ActiveSupport::TestCase
+
+ def setup
+ @root = Rails::Application::Root.new("/foo/bar")
+ end
+
+ test "the paths object is initialized with the root path" do
+ root = Rails::Application::Root.new("/fiz/baz")
+ assert_equal "/fiz/baz", root.path
+ end
+
+ test "creating a root level path" do
+ @root.app = "/foo/bar"
+ assert_equal ["/foo/bar"], @root.app.to_a
+ end
+
+ test "relative paths are relative to the paths root" do
+ @root.app = "app"
+ assert_equal ["/foo/bar/app"], @root.app.to_a
+ end
+
+ test "creating a child level path" do
+ @root.app = "/foo/bar"
+ @root.app.models = "/foo/bar/baz"
+ assert_equal ["/foo/bar/baz"], @root.app.models.to_a
+ end
+
+ test "child level paths are relative from the root" do
+ @root.app = "/app"
+ @root.app.models = "baz"
+
+ assert_equal ["/foo/bar/baz"], @root.app.models.to_a
+ end
+
+ test "adding multiple physical paths as an array" do
+ @root.app = ["/app", "/app2"]
+ assert_equal ["/app", "/app2"], @root.app.to_a
+ end
+
+ test "adding multiple physical paths using #push" do
+ @root.app = "/app"
+ @root.app.push "/app2"
+ assert_equal ["/app", "/app2"], @root.app.to_a
+ end
+
+ test "adding multiple physical paths using <<" do
+ @root.app = "/app"
+ @root.app << "/app2"
+ assert_equal ["/app", "/app2"], @root.app.to_a
+ end
+
+ test "adding multiple physical paths using #unshift" do
+ @root.app = "/app"
+ @root.app.unshift "/app2"
+ assert_equal ["/app2", "/app"], @root.app.to_a
+ end
+
+ test "the root can only have one physical path" do
+ assert_raise(RuntimeError) { Rails::Application::Root.new(["/fiz", "/biz"]) }
+ assert_raise(NoMethodError) { @root.push "/biz" }
+ assert_raise(NoMethodError) { @root.unshift "/biz" }
+ assert_raise(NoMethodError) { @root << "/biz" }
+ end
+
+ test "it is possible to add a path that should be loaded only once" do
+ @root.app = "/app"
+ @root.app.load_once!
+ assert @root.app.load_once?
+ assert @root.load_once.include?(@root.app.paths.first)
+ end
+
+ test "making a path load_once more than once only includes it once in @root.load_once" do
+ @root.app = "/app"
+ @root.app.load_once!
+ @root.app.load_once!
+ assert_equal 1, @root.load_once.select {|p| p == @root.app.paths.first }.size
+ end
+
+ test "it is possible to mark a path as eager" do
+ @root.app = "/app"
+ @root.app.eager_load!
+ assert @root.app.eager_load?
+ assert @root.eager_load.include?(@root.app.paths.first)
+ end
+
+ test "making a path eager more than once only includes it once in @root.eager_paths" do
+ @root.app = "/app"
+ @root.app.eager_load!
+ @root.app.eager_load!
+ assert_equal 1, @root.eager_load.select {|p| p == @root.app.paths.first }.size
+ end
+
+ test "a path should have a glob that defaults to **/*.rb" do
+ @root.app = "/app"
+ assert_equal "**/*.rb", @root.app.glob
+ end
+
+ test "it should be possible to override a path's default glob" do
+ @root.app = "/app"
+ @root.app.glob = "*.rb"
+ assert_equal "*.rb", @root.app.glob
+ end
+
+ test "a path can be added to the load path" do
+ @root.app = "app"
+ @root.app.load_path!
+ @root.app.models = "app/models"
+ assert_equal ["/foo/bar/app"], @root.load_paths
+ end
+
+ test "adding a path to the eager paths also adds it to the load path" do
+ @root.app = "app"
+ @root.app.eager_load!
+ assert_equal ["/foo/bar/app"], @root.load_paths
+ end
+end \ No newline at end of file