Skip to content
Browse files

Removing deprecated config.paths.app.controller API

  • Loading branch information...
1 parent c29ce8a commit 685a9195aa1dcf0231806fe3bc27783145e2100f @guilleiguaran guilleiguaran committed
Showing with 1 addition and 27 deletions.
  1. +0 −26 railties/lib/rails/paths.rb
  2. +1 −1 railties/test/application/paths_test.rb
View
26 railties/lib/rails/paths.rb
@@ -2,24 +2,6 @@
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 @@ def method_missing(id, *args)
#
# Check the Path documentation for more information.
class Root < ::Hash
- include PathParent
attr_accessor :path
def initialize(path)
@@ -121,8 +102,6 @@ def filter_by(constraint)
end
class Path < Array
- include PathParent
-
attr_reader :path
attr_accessor :glob
@@ -194,11 +173,6 @@ def existent
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
View
2 railties/test/application/paths_test.rb
@@ -61,7 +61,7 @@ def assert_not_in_load_path(*path)
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

0 comments on commit 685a919

Please sign in to comment.
Something went wrong with that request. Please try again.