From 2dab86c43c3a978727c75a7f15cfdb6452440cbd Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 28 Apr 2012 12:40:50 -0300 Subject: Define only writer method for queue, as reader is declared Remove deprecation warning of method redefined. --- railties/lib/rails/application.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 1680a6ed00..c7b19c964a 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -66,9 +66,10 @@ module Rails end end - attr_accessor :assets, :sandbox, :queue + attr_accessor :assets, :sandbox alias_method :sandbox?, :sandbox attr_reader :reloaders + attr_writer :queue delegate :default_url_options, :default_url_options=, :to => :routes -- cgit v1.2.3 From 72a2edd8c308cf63237b9e010f6595fd3ad08463 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 28 Apr 2012 12:57:39 -0300 Subject: Refactor RoutesReloader a bit to avoid creating extra hash objects --- railties/lib/rails/application/routes_reloader.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb index 7f9190b01a..19f616ec50 100644 --- a/railties/lib/rails/application/routes_reloader.rb +++ b/railties/lib/rails/application/routes_reloader.rb @@ -24,12 +24,11 @@ module Rails def updater @updater ||= begin - dirs = @external_routes.inject({}) do |hash, dir| - hash.merge(dir.to_s => ["rb"]) + dirs = @external_routes.each_with_object({}) do |dir, hash| + hash[dir.to_s] = %w(rb) end updater = ActiveSupport::FileUpdateChecker.new(paths, dirs) { reload! } - updater.execute updater end -- cgit v1.2.3