diff options
author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
---|---|---|
committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-05-08 03:54:55 +0100 |
commit | aec7456f81985b88d6d604679d754636183b5b3a (patch) | |
tree | 798fcab8ae0c6e2c8c5a63e1f39308ff4bb5a20c /railties/lib/rails/paths.rb | |
parent | 1c2b2233c3a7ec76c0a0eddf5b8be45c489be133 (diff) | |
parent | 70f9558d0e4b8e605576693cbb489caa5cf6a2bc (diff) | |
download | rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.gz rails-aec7456f81985b88d6d604679d754636183b5b3a.tar.bz2 rails-aec7456f81985b88d6d604679d754636183b5b3a.zip |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Conflicts:
activesupport/lib/active_support/testing/performance.rb
Diffstat (limited to 'railties/lib/rails/paths.rb')
-rw-r--r-- | railties/lib/rails/paths.rb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index d15887f561..5d217dcb10 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -31,23 +31,23 @@ module Rails # This means we can get a Path object back like below: # # path = root["app/controllers"] - # path.eager_load? #=> true - # path.is_a?(Rails::Paths::Path) #=> true + # path.eager_load? # => true + # path.is_a?(Rails::Paths::Path) # => true # # The Path object is simply an array and allows you to easily add extra paths: # - # path.is_a?(Array) #=> true - # path.inspect #=> ["app/controllers"] + # path.is_a?(Array) # => true + # path.inspect # => ["app/controllers"] # # path << "lib/controllers" - # path.inspect #=> ["app/controllers", "lib/controllers"] + # path.inspect # => ["app/controllers", "lib/controllers"] # # Notice that when you add a path using #add, the path object created already # contains the path with the same path value given to #add. In some situations, # you may not want this behavior, so you can give :with as option. # # root.add "config/routes", :with => "config/routes.rb" - # root["config/routes"].inspect #=> ["config/routes.rb"] + # root["config/routes"].inspect # => ["config/routes.rb"] # # #add also accepts the following options as argument: eager_load, autoload, # autoload_once and glob. @@ -58,8 +58,8 @@ module Rails # root.path = "/rails" # root.add "app/controllers" # - # root["app/controllers"].expanded #=> ["/rails/app/controllers"] - # root["app/controllers"].existent #=> ["/rails/app/controllers"] + # root["app/controllers"].expanded # => ["/rails/app/controllers"] + # root["app/controllers"].existent # => ["/rails/app/controllers"] # # Check the Path documentation for more information. class Root < ::Hash @@ -156,17 +156,17 @@ module Rails %w(autoload_once eager_load autoload load_path).each do |m| class_eval <<-RUBY, __FILE__, __LINE__ + 1 - def #{m}! - @#{m} = true - end - - def skip_#{m}! - @#{m} = false - end - - def #{m}? - @#{m} - end + def #{m}! # def eager_load! + @#{m} = true # @eager_load = true + end # end + # + def skip_#{m}! # def skip_eager_load! + @#{m} = false # @eager_load = false + end # end + # + def #{m}? # def eager_load? + @#{m} # @eager_load + end # end RUBY end |