diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-29 15:49:02 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-29 15:49:02 -0700 |
| commit | 3de6a75d3fb06cc1da9251ed8ce1a11dd433d8cc (patch) | |
| tree | d54858b0942bf80e040a0a97fe0e74f73adcfc65 /railties/lib/rails | |
| parent | 75df4c11650a148f6672ce6407b624b840ec7b50 (diff) | |
| parent | 72a2edd8c308cf63237b9e010f6595fd3ad08463 (diff) | |
| download | rails-3de6a75d3fb06cc1da9251ed8ce1a11dd433d8cc.tar.gz rails-3de6a75d3fb06cc1da9251ed8ce1a11dd433d8cc.tar.bz2 rails-3de6a75d3fb06cc1da9251ed8ce1a11dd433d8cc.zip | |
Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactor
Remove some warnings and minor refactor in RoutesReloader
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/application/routes_reloader.rb | 5 |
2 files changed, 4 insertions, 4 deletions
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 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 |