diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/deprecation.rb | 33 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/routes.rake | 19 |
4 files changed, 9 insertions, 47 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb index bbf28a8c08..7c41367a84 100644 --- a/railties/lib/rails.rb +++ b/railties/lib/rails.rb @@ -8,7 +8,6 @@ require 'active_support/core_ext/logger' require 'rails/application' require 'rails/version' -require 'rails/deprecation' require 'active_support/railtie' require 'action_dispatch/railtie' diff --git a/railties/lib/rails/deprecation.rb b/railties/lib/rails/deprecation.rb deleted file mode 100644 index 37896e0cae..0000000000 --- a/railties/lib/rails/deprecation.rb +++ /dev/null @@ -1,33 +0,0 @@ -require "active_support/string_inquirer" -require "active_support/basic_object" - -module Rails - class DeprecatedConstant < ActiveSupport::BasicObject - def self.deprecate(old, new) - constant = self.new(old, new) - eval "::#{old} = constant" - end - - def initialize(old, new) - @old, @new = old, new - @target = ::Kernel.eval "proc { #{@new} }" - @warned = false - end - - def method_missing(meth, *args, &block) - ::ActiveSupport::Deprecation.warn("#{@old} is deprecated. Please use #{@new}") unless @warned - @warned = true - - target = @target.call - if target.respond_to?(meth) - target.send(meth, *args, &block) - else - super - end - end - end - - DeprecatedConstant.deprecate("RAILS_ROOT", "::Rails.root.to_s") - DeprecatedConstant.deprecate("RAILS_ENV", "::Rails.env") - DeprecatedConstant.deprecate("RAILS_DEFAULT_LOGGER", "::Rails.logger") -end diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 6eba0f77e7..cdff1743ff 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -355,6 +355,8 @@ module Rails def app_name @app_name ||= File.basename(destination_root) end + + alias_method :defined_app_name, :app_name def defined_app_const_base Rails.respond_to?(:application) && defined?(Rails::Application) && @@ -362,6 +364,7 @@ module Rails end def app_const_base + defined_app_name # ensures the correct app_name if it's already defined @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize end diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake index 306c88c261..02e22361e0 100644 --- a/railties/lib/rails/tasks/routes.rake +++ b/railties/lib/rails/tasks/routes.rake @@ -1,35 +1,28 @@ desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.' task :routes => :environment do Rails.application.reload_routes! - - all_routes = Rails.application.routes.routes - named_routes = Rails.application.routes.named_routes.routes + all_routes = Rails.application.routes.routes if ENV['CONTROLLER'] all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] } end routes = all_routes.collect do |route| - # TODO: The :index method is deprecated in 1.9 in favor of :key - # but we don't have :key in 1.8.7. We can remove this check when - # stop supporting 1.8.x - key = Hash.method_defined?('key') ? 'key' : 'index' - name = named_routes.send(key, route).to_s reqs = route.requirements.dup reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/ reqs = reqs.empty? ? "" : reqs.inspect - {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs} + {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs} end routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route - name_width = routes.map{ |r| r[:name] }.map(&:length).max - verb_width = routes.map{ |r| r[:verb] }.map(&:length).max - path_width = routes.map{ |r| r[:path] }.map(&:length).max + name_width = routes.map{ |r| r[:name].length }.max + verb_width = routes.map{ |r| r[:verb].length }.max + path_width = routes.map{ |r| r[:path].length }.max routes.each do |r| puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}" end -end
\ No newline at end of file +end |