diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-05-24 20:52:38 -0500 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2011-05-24 23:02:48 -0500 |
commit | 685a9195aa1dcf0231806fe3bc27783145e2100f (patch) | |
tree | b8a4ed0b3f5a6a19b5d2e0af95145f63f2bb3d72 | |
parent | c29ce8add01ed54a1d87c1420672aea70eab9297 (diff) | |
download | rails-685a9195aa1dcf0231806fe3bc27783145e2100f.tar.gz rails-685a9195aa1dcf0231806fe3bc27783145e2100f.tar.bz2 rails-685a9195aa1dcf0231806fe3bc27783145e2100f.zip |
Removing deprecated config.paths.app.controller API
-rw-r--r-- | railties/lib/rails/paths.rb | 26 | ||||
-rw-r--r-- | railties/test/application/paths_test.rb | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb index 5d217dcb10..e9b5042f60 100644 --- a/railties/lib/rails/paths.rb +++ b/railties/lib/rails/paths.rb @@ -2,24 +2,6 @@ require 'set' module Rails module Paths - module PathParent #:nodoc: - def method_missing(id, *args) - match = id.to_s.match(/^(.*)=$/) - full = [@current, $1 || id].compact.join("/") - - ActiveSupport::Deprecation.warn 'config.paths.app.controller API is deprecated in ' << - 'favor of config.paths["app/controller"] API.' - - if match || args.any? - @root[full] = Path.new(@root, full, *args) - elsif path = @root[full] - path - else - super - end - end - end - # This object is an extended hash that behaves as root of the Rails::Paths system. # It allows you to collect information about how you want to structure your application # paths by a Hash like API. It requires you to give a physical path on initialization. @@ -63,7 +45,6 @@ module Rails # # Check the Path documentation for more information. class Root < ::Hash - include PathParent attr_accessor :path def initialize(path) @@ -121,8 +102,6 @@ module Rails end class Path < Array - include PathParent - attr_reader :path attr_accessor :glob @@ -194,11 +173,6 @@ module Rails expanded.select { |f| File.exists?(f) } end - def paths - ActiveSupport::Deprecation.warn "paths is deprecated. Please call expand instead." - expanded - end - alias to_a expanded end end diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb index b1ff6e9cb1..03e0247556 100644 --- a/railties/test/application/paths_test.rb +++ b/railties/test/application/paths_test.rb @@ -61,7 +61,7 @@ module ApplicationTests end test "environments has a glob equal to the current environment" do - assert_equal "#{Rails.env}.rb", @paths.config.environments.glob + assert_equal "#{Rails.env}.rb", @paths["config/environments"].glob end test "load path includes each of the paths in config.paths as long as the directories exist" do |