Rails.root is now a Pathname, not a String

Antonio Terceiro
1 parent 0fcf86d4
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
config/initializers/image_uploads.rb
lib/tasks/gettext.rake
 if File.writable?(Rails.root)
-  misplaced_directories = Dir.glob(Rails.root + '/public/images/[0-9]*')
+  misplaced_directories = Dir.glob(Rails.root.join('public/images/[0-9]*'))
   unless misplaced_directories.empty?
-    new_location = Rails.root + '/public/image_uploads'
+    new_location = Rails.root.join('public/image_uploads')
     if !File.exists?(new_location)
       FileUtils.mkdir(new_location)
     end
@@ -22,11 +22,11 @@ task :symlinkmo do
   langmap = {
     'pt' => 'pt_BR',
   }
-  FileUtils.mkdir_p(Rails.root + '/locale')
-  Dir.glob(Rails.root + '/locale/*').each do |dir|
+  mkdir_p(File.join(Rails.root, 'locale'))
+  Dir.glob(File.join(Rails.root, 'locale/*')).each do |dir|
     lang = File.basename(dir)
     orig_lang = langmap[lang] || lang
-    FileUtils.mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES")
+    mkdir_p("#{Rails.root}/locale/#{lang}/LC_MESSAGES")
     ['iso_3166', 'rails'].each do |domain|
       origin = "/usr/share/locale/#{orig_lang}/LC_MESSAGES/#{domain}.mo"
       target = "#{Rails.root}/locale/#{lang}/LC_MESSAGES/#{domain}.mo"
1	if File.writable?(Rails.root)	1	if File.writable?(Rails.root)
2	- misplaced_directories = Dir.glob(Rails.root + '/public/images/[0-9]*')	2	+ misplaced_directories = Dir.glob(Rails.root.join('public/images/[0-9]*'))
3	unless misplaced_directories.empty?	3	unless misplaced_directories.empty?
4	- new_location = Rails.root + '/public/image_uploads'	4	+ new_location = Rails.root.join('public/image_uploads')
5	if !File.exists?(new_location)	5	if !File.exists?(new_location)
6	FileUtils.mkdir(new_location)	6	FileUtils.mkdir(new_location)
7	end	7	end