Remove all use of the :text option to render

It doesn't actually do what it says, as it sets the content type
to text/html not text/plain so is just confusing and as a result
has been deprecated in newer rails versions.

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index ce1a217cd130c5fa5e07ac210a56b1c9621435f8..c36ded1c0bff58123ab690b2bc754dc557a48728 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -100,7 +100,7 @@ class ApiController < ApplicationController
 
     response.headers["Content-Disposition"] = "attachment; filename=\"tracks.gpx\""
 
 
     response.headers["Content-Disposition"] = "attachment; filename=\"tracks.gpx\""
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   # This is probably the most common call of all. It is used for getting the
   end
 
   # This is probably the most common call of all. It is used for getting the


@@ -198,7 +198,7 @@ class ApiController < ApplicationController
 
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
 
 
     response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   # Get a list of the tiles that have changed within a specified time
   end
 
   # Get a list of the tiles that have changed within a specified time


@@ -241,9 +241,9 @@ class ApiController < ApplicationController
 
       doc.root << changes
 
 
       doc.root << changes
 

-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s

     else
     else

-      render :text => "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", :status => :bad_request
+      render :plain => "Requested zoom is invalid, or the supplied start is after the end time, or the start duration is more than 24 hours", :status => :bad_request

     end
   end
 
     end
   end
 


@@ -294,7 +294,7 @@ class ApiController < ApplicationController
     policy << blacklist
     doc.root << policy
 
     policy << blacklist
     doc.root << policy
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   # External apps that use the api are able to query which permissions
   end
 
   # External apps that use the api are able to query which permissions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ebad7c2c62e9d004cdbf9d234203c7f1f753ea96..14490488507bc5775924d8c2e0f93a7daccf548f 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base
       if request.get?
         redirect_to :controller => "user", :action => "login", :referer => request.fullpath
       else
       if request.get?
         redirect_to :controller => "user", :action => "login", :referer => request.fullpath
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     end
   end
       end
     end
   end


@@ -127,7 +127,7 @@ class ApplicationController < ActionController::Base
         flash[:error] = t("application.require_moderator.not_a_moderator")
         redirect_to :action => "index"
       else
         flash[:error] = t("application.require_moderator.not_a_moderator")
         redirect_to :action => "index"
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     end
   end
       end
     end
   end


@@ -181,7 +181,7 @@ class ApplicationController < ActionController::Base
     unless @user
       # no auth, the user does not exist or the password was wrong
       response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""
     unless @user
       # no auth, the user does not exist or the password was wrong
       response.headers["WWW-Authenticate"] = "Basic realm=\"#{realm}\""

-      render :text => errormessage, :status => :unauthorized
+      render :plain => errormessage, :status => :unauthorized

       return false
     end
   end
       return false
     end
   end


@@ -197,7 +197,7 @@ class ApplicationController < ActionController::Base
   def authorize_moderator(errormessage = "Access restricted to moderators")
     # check user is a moderator
     unless @user.moderator?
   def authorize_moderator(errormessage = "Access restricted to moderators")
     # check user is a moderator
     unless @user.moderator?

-      render :text => errormessage, :status => :forbidden
+      render :plain => errormessage, :status => :forbidden

       false
     end
   end
       false
     end
   end


@@ -288,9 +288,9 @@ class ApplicationController < ActionController::Base
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result.root << (XML::Node.new("message") << message)
 
       result.root << (XML::Node.new("status") << "#{Rack::Utils.status_code(status)} #{Rack::Utils::HTTP_STATUS_CODES[status]}")
       result.root << (XML::Node.new("message") << message)
 

-      render :text => result.to_s, :content_type => "text/xml"
+      render :xml => result.to_s

     else
     else

-      render :text => message, :status => status, :content_type => "text/plain"
+      render :plain => message, :status => status

     end
   end
 
     end
   end
 


@@ -321,7 +321,7 @@ class ApplicationController < ActionController::Base
   def api_call_handle_error
     yield
   rescue ActiveRecord::RecordNotFound => ex
   def api_call_handle_error
     yield
   rescue ActiveRecord::RecordNotFound => ex

-    render :text => "", :status => :not_found
+    head :not_found

   rescue LibXML::XML::Error, ArgumentError => ex
     report_error ex.message, :bad_request
   rescue ActiveRecord::RecordInvalid => ex
   rescue LibXML::XML::Error, ArgumentError => ex
     report_error ex.message, :bad_request
   rescue ActiveRecord::RecordInvalid => ex


@@ -391,7 +391,7 @@ class ApplicationController < ActionController::Base
 
     respond_to do |format|
       format.html { render :template => "user/no_such_user", :status => :not_found }
 
     respond_to do |format|
       format.html { render :template => "user/no_such_user", :status => :not_found }

-      format.all { render :text => "", :status => :not_found }
+      format.all { head :not_found }

     end
   end
 
     end
   end
 

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 77ca20fbea9a2d1012ddf0c80b7db7eaf6d03666..185a3bd19fbeee8117bb85d48985fe3382183408 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -34,7 +34,7 @@ class ChangesetController < ApplicationController
     # Subscribe user to changeset comments
     cs.subscribers << @user
 
     # Subscribe user to changeset comments
     cs.subscribers << @user
 

-    render :text => cs.id.to_s, :content_type => "text/plain"
+    render :plain => cs.id.to_s

   end
 
   ##
   end
 
   ##


@@ -43,7 +43,7 @@ class ChangesetController < ApplicationController
   def read
     changeset = Changeset.find(params[:id])
 
   def read
     changeset = Changeset.find(params[:id])
 

-    render :text => changeset.to_xml(params[:include_discussion].presence).to_s, :content_type => "text/xml"
+    render :xml => changeset.to_xml(params[:include_discussion].presence).to_s

   end
 
   ##
   end
 
   ##


@@ -61,7 +61,7 @@ class ChangesetController < ApplicationController
     changeset.set_closed_time_now
 
     changeset.save!
     changeset.set_closed_time_now
 
     changeset.save!

-    render :text => ""
+    render :nothing => true

   end
 
   ##
   end
 
   ##


@@ -104,7 +104,7 @@ class ChangesetController < ApplicationController
     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!
     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!

-    render :text => cs.to_xml.to_s, :content_type => "text/xml"
+    render :xml => cs.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -132,7 +132,7 @@ class ChangesetController < ApplicationController
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit

-      render :text => result.to_s, :content_type => "text/xml"
+      render :xml => result.to_s

     end
   end
 
     end
   end
 


@@ -197,7 +197,7 @@ class ChangesetController < ApplicationController
         end
     end
 
         end
     end
 

-    render :text => result.to_s, :content_type => "text/xml"
+    render :xml => result.to_s

   end
 
   ##
   end
 
   ##


@@ -224,7 +224,7 @@ class ChangesetController < ApplicationController
       results.root << cs.to_xml_node
     end
 
       results.root << cs.to_xml_node
     end
 

-    render :text => results.to_s, :content_type => "text/xml"
+    render :xml => results.to_s

   end
 
   ##
   end
 
   ##


@@ -244,7 +244,7 @@ class ChangesetController < ApplicationController
 
     check_changeset_consistency(changeset, @user)
     changeset.update_from(new_changeset, @user)
 
     check_changeset_consistency(changeset, @user)
     changeset.update_from(new_changeset, @user)

-    render :text => changeset.to_xml, :mime_type => "text/xml"
+    render :xml => changeset.to_xml

   end
 
   ##
   end
 
   ##


@@ -335,7 +335,7 @@ class ChangesetController < ApplicationController
     changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id)
 
     # Return a copy of the updated changeset
     changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id)
 
     # Return a copy of the updated changeset

-    render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -356,7 +356,7 @@ class ChangesetController < ApplicationController
     changeset.subscribers << @user
 
     # Return a copy of the updated changeset
     changeset.subscribers << @user
 
     # Return a copy of the updated changeset

-    render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -377,7 +377,7 @@ class ChangesetController < ApplicationController
     changeset.subscribers.delete(@user)
 
     # Return a copy of the updated changeset
     changeset.subscribers.delete(@user)
 
     # Return a copy of the updated changeset

-    render :text => changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -396,7 +396,7 @@ class ChangesetController < ApplicationController
     comment.update(:visible => false)
 
     # Return a copy of the updated changeset
     comment.update(:visible => false)
 
     # Return a copy of the updated changeset

-    render :text => comment.changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => comment.changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -415,7 +415,7 @@ class ChangesetController < ApplicationController
     comment.update(:visible => true)
 
     # Return a copy of the updated changeset
     comment.update(:visible => true)
 
     # Return a copy of the updated changeset

-    render :text => comment.changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => comment.changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -440,7 +440,7 @@ class ChangesetController < ApplicationController
       format.rss
     end
   rescue OSM::APIBadUserInput
       format.rss
     end
   rescue OSM::APIBadUserInput

-    render :text => "", :status => :bad_request
+    head :bad_request

   end
 
   private
   end
 
   private

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 8863e2fd9f2de594797e9561af339acd13f753ab..19bc84ac785e6e8193235784ab1eb65f38588911 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -158,7 +158,7 @@ class DiaryEntryController < ApplicationController
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else
         @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
         @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
       else

-        render :text => "", :status => :not_found
+        head :not_found

         return
       end
     else
         return
       end
     else

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 57f86ec9fc7dd704d1b3e1d6347a1b6b28f8bbfd..a5f1810b7b05755d2262aa646a24df71239dfe69 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -35,7 +35,7 @@ class GeocoderController < ApplicationController
     end
 
     if @sources.empty?
     end
 
     if @sources.empty?

-      render :text => "", :status => :bad_request
+      head :bad_request

     else
       render :layout => map_layout
     end
     else
       render :layout => map_layout
     end

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8d29fd0726b21ff8d286f59d899ccc2d5ca355c6..9f6703b07688dbeb716fffb35cd47b34abb56760 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -19,7 +19,7 @@ class NodeController < ApplicationController
 
     # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
     node.create_with_history @user
 
     # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
     node.create_with_history @user

-    render :text => node.id.to_s, :content_type => "text/plain"
+    render :plain => node.id.to_s

   end
 
   # Dump the details on a node given in params[:id]
   end
 
   # Dump the details on a node given in params[:id]


@@ -29,9 +29,9 @@ class NodeController < ApplicationController
     response.last_modified = node.timestamp
 
     if node.visible
     response.last_modified = node.timestamp
 
     if node.visible

-      render :text => node.to_xml.to_s, :content_type => "text/xml"
+      render :xml => node.to_xml.to_s

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -45,7 +45,7 @@ class NodeController < ApplicationController
     end
 
     node.update_from(new_node, @user)
     end
 
     node.update_from(new_node, @user)

-    render :text => node.version.to_s, :content_type => "text/plain"
+    render :plain => node.version.to_s

   end
 
   # Delete a node. Doesn't actually delete it, but retains its history
   end
 
   # Delete a node. Doesn't actually delete it, but retains its history


@@ -59,7 +59,7 @@ class NodeController < ApplicationController
       raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
     node.delete_with_history!(new_node, @user)
       raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
     end
     node.delete_with_history!(new_node, @user)

-    render :text => node.version.to_s, :content_type => "text/plain"
+    render :plain => node.version.to_s

   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.
   end
 
   # Dump the details on many nodes whose ids are given in the "nodes" parameter.


@@ -79,6 +79,6 @@ class NodeController < ApplicationController
       doc.root << node.to_xml_node
     end
 
       doc.root << node.to_xml_node
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 end
   end
 end

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index 4869ae3e15da873b14df8e709d1c4243ffec682b..f41a94a33eb9d73f13da2f440899bd778ab88b63 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -33,12 +33,12 @@ class OldController < ApplicationController
       doc.root << element.to_xml_node
     end
 
       doc.root << element.to_xml_node
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def version
     if @old_element.redacted? && !show_redactions?
   end
 
   def version
     if @old_element.redacted? && !show_redactions?

-      render :text => "", :status => :forbidden
+      head :forbidden

 
     else
       response.last_modified = @old_element.timestamp
 
     else
       response.last_modified = @old_element.timestamp


@@ -46,7 +46,7 @@ class OldController < ApplicationController
       doc = OSM::API.new.get_xml_doc
       doc.root << @old_element.to_xml_node
 
       doc = OSM::API.new.get_xml_doc
       doc.root << @old_element.to_xml_node
 

-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s

     end
   end
 
     end
   end
 


@@ -64,7 +64,7 @@ class OldController < ApplicationController
     end
 
     # just return an empty 200 OK for success
     end
 
     # just return an empty 200 OK for success

-    render :text => ""
+    render :nothing => true

   end
 
   private
   end
 
   private

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 587cfce8292b6e962d3362d2eac8f18b425bbdb8..846d623f29dc7dd2ed0531280cba4dbc1abc2fb2 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -16,16 +16,16 @@ class RelationController < ApplicationController
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     relation.create_with_history @user
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
     relation.create_with_history @user

-    render :text => relation.id.to_s, :content_type => "text/plain"
+    render :plain => relation.id.to_s

   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible
   end
 
   def read
     relation = Relation.find(params[:id])
     response.last_modified = relation.timestamp
     if relation.visible

-      render :text => relation.to_xml.to_s, :content_type => "text/xml"
+      render :xml => relation.to_xml.to_s

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -40,7 +40,7 @@ class RelationController < ApplicationController
     end
 
     relation.update_from new_relation, @user
     end
 
     relation.update_from new_relation, @user

-    render :text => relation.version.to_s, :content_type => "text/plain"
+    render :plain => relation.version.to_s

   end
 
   def delete
   end
 
   def delete


@@ -48,9 +48,9 @@ class RelationController < ApplicationController
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
       relation.delete_with_history!(new_relation, @user)
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
       relation.delete_with_history!(new_relation, @user)

-      render :text => relation.version.to_s, :content_type => "text/plain"
+      render :plain => relation.version.to_s

     else
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -119,10 +119,10 @@ class RelationController < ApplicationController
 
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
 
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)

-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s

 
     else
 
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -143,7 +143,7 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node
     end
 
       doc.root << relation.to_xml_node
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def relations_for_way
   end
 
   def relations_for_way


@@ -167,6 +167,6 @@ class RelationController < ApplicationController
       doc.root << relation.to_xml_node if relation.visible
     end
 
       doc.root << relation.to_xml_node if relation.visible
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 end
   end
 end

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 8a632e6a2c2cebd9526afec79371a91cddc6e0fb..4b8b2f402509655cb8efd5ed046fa54bc50ba324 100644 (file)
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -33,13 +33,13 @@ class SearchController < ApplicationController
 
     if do_nodes
       response.headers["Error"] = "Searching of nodes is currently unavailable"
 
     if do_nodes
       response.headers["Error"] = "Searching of nodes is currently unavailable"

-      render :text => "", :status => :service_unavailable
+      head :service_unavailable

       return false
     end
 
     unless value
       response.headers["Error"] = "Searching for a key without value is currently unavailable"
       return false
     end
 
     unless value
       response.headers["Error"] = "Searching for a key without value is currently unavailable"

-      render :text => "", :status => :service_unavailable
+      head :service_unavailable

       return false
     end
 
       return false
     end
 


@@ -94,6 +94,6 @@ class SearchController < ApplicationController
       doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
     end
 
       doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 end
   end
 end

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 48b847cddb3b85b83a1f82fef7fa079611fc37b9..abd4696e0404606974eeeb4d3ba95119c69f7304 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -115,7 +115,7 @@ class SiteController < ApplicationController
   def offline; end
 
   def preview
   def offline; end
 
   def preview

-    render :text => RichText.new(params[:format], params[:text]).to_html
+    render :html => RichText.new(params[:format], params[:text]).to_html

   end
 
   def id
   end
 
   def id

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 282f6161325557326e65c2136d8a345e3db30fcb..329de0dfc3e5be59b9273fbfce7680c5e806da62 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -92,7 +92,7 @@ class SwfController < ApplicationController
     m = pack_rect(bounds_left, bounds_right, bounds_bottom, bounds_top) + 0.chr + 12.chr + pack_u16(1) + m
     m = "FWS" + 6.chr + pack_u32(m.length + 8) + m
 
     m = pack_rect(bounds_left, bounds_right, bounds_bottom, bounds_top) + 0.chr + 12.chr + pack_u16(1) + m
     m = "FWS" + 6.chr + pack_u32(m.length + 8) + m
 

-    render :text => m, :content_type => "application/x-shockwave-flash"
+    render :body => m, :content_type => "application/x-shockwave-flash"

   end
 
   private
   end
 
   private

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index f63c8654040210b4a76d5443a049eca1990fe9e7..6e502fdc67d0588854ffe3b5048dac93aa545716 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -145,7 +145,7 @@ class TraceController < ApplicationController
 
     if trace.visible? && (trace.public? || (@user && @user == trace.user))
       if Acl.no_trace_download(request.remote_ip)
 
     if trace.visible? && (trace.public? || (@user && @user == trace.user))
       if Acl.no_trace_download(request.remote_ip)

-        render :text => "", :status => :forbidden
+        head :forbidden

       elsif request.format == Mime::XML
         send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
       elsif request.format == Mime::GPX
       elsif request.format == Mime::XML
         send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
       elsif request.format == Mime::GPX


@@ -154,19 +154,19 @@ class TraceController < ApplicationController
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

     end
   rescue ActiveRecord::RecordNotFound
     end
   rescue ActiveRecord::RecordNotFound

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def edit
     @trace = Trace.find(params[:id])
 
     if !@trace.visible?
   end
 
   def edit
     @trace = Trace.find(params[:id])
 
     if !@trace.visible?

-      render :text => "", :status => :not_found
+      head :not_found

     elsif @user.nil? || @trace.user != @user
     elsif @user.nil? || @trace.user != @user

-      render :text => "", :status => :forbidden
+      head :forbidden

     else
       @title = t "trace.edit.title", :name => @trace.name
 
     else
       @title = t "trace.edit.title", :name => @trace.name
 


@@ -180,16 +180,16 @@ class TraceController < ApplicationController
       end
     end
   rescue ActiveRecord::RecordNotFound
       end
     end
   rescue ActiveRecord::RecordNotFound

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def delete
     trace = Trace.find(params[:id])
 
     if !trace.visible?
   end
 
   def delete
     trace = Trace.find(params[:id])
 
     if !trace.visible?

-      render :text => "", :status => :not_found
+      head :not_found

     elsif @user.nil? || trace.user != @user
     elsif @user.nil? || trace.user != @user

-      render :text => "", :status => :forbidden
+      head :forbidden

     else
       trace.visible = false
       trace.save
     else
       trace.visible = false
       trace.save


@@ -197,7 +197,7 @@ class TraceController < ApplicationController
       redirect_to :action => :list, :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound
       redirect_to :action => :list, :display_name => @user.display_name
     end
   rescue ActiveRecord::RecordNotFound

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def georss
   end
 
   def georss


@@ -221,13 +221,13 @@ class TraceController < ApplicationController
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
       else
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     else
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

     end
   rescue ActiveRecord::RecordNotFound
     end
   rescue ActiveRecord::RecordNotFound

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def icon
   end
 
   def icon


@@ -238,22 +238,22 @@ class TraceController < ApplicationController
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
       else
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
       else

-        render :text => "", :status => :forbidden
+        head :forbidden

       end
     else
       end
     else

-      render :text => "", :status => :not_found
+      head :not_found

     end
   rescue ActiveRecord::RecordNotFound
     end
   rescue ActiveRecord::RecordNotFound

-    render :text => "", :status => :not_found
+    head :not_found

   end
 
   def api_read
     trace = Trace.visible.find(params[:id])
 
     if trace.public? || trace.user == @user
   end
 
   def api_read
     trace = Trace.visible.find(params[:id])
 
     if trace.public? || trace.user == @user

-      render :text => trace.to_xml.to_s, :content_type => "text/xml"
+      render :xml => trace.to_xml.to_s

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
     end
   end
 


@@ -272,9 +272,9 @@ class TraceController < ApplicationController
       trace.visibility = new_trace.visibility
       trace.save!
 
       trace.visibility = new_trace.visibility
       trace.save!
 

-      render :text => "", :status => :ok
+      head :ok

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
     end
   end
 


@@ -285,9 +285,9 @@ class TraceController < ApplicationController
       trace.visible = false
       trace.save!
 
       trace.visible = false
       trace.save!
 

-      render :text => "", :status => :ok
+      head :ok

     else
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
     end
   end
 


@@ -303,7 +303,7 @@ class TraceController < ApplicationController
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end
     else

-      render :text => "", :status => :forbidden
+      head :forbidden

     end
   end
 
     end
   end
 


@@ -324,14 +324,14 @@ class TraceController < ApplicationController
       do_create(params[:file], tags, description, visibility)
 
       if @trace.id
       do_create(params[:file], tags, description, visibility)
 
       if @trace.id

-        render :text => @trace.id.to_s, :content_type => "text/plain"
+        render :plain => @trace.id.to_s

       elsif @trace.valid?
       elsif @trace.valid?

-        render :text => "", :status => :internal_server_error
+        head :internal_server_error

       else
       else

-        render :text => "", :status => :bad_request
+        head :bad_request

       end
     else
       end
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 540753de51308ef8a8f1d7201efc2949710d8345..2ff9646e649a2c8784df78ec58891558cadc9446 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -194,7 +194,7 @@ class UserController < ApplicationController
         redirect_to :action => "lost_password"
       end
     else
         redirect_to :action => "lost_password"
       end
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -375,7 +375,7 @@ class UserController < ApplicationController
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -389,7 +389,7 @@ class UserController < ApplicationController
     @user.traces.reload.each do |trace|
       doc.root << trace.to_xml_node
     end
     @user.traces.reload.each do |trace|
       doc.root << trace.to_xml_node
     end

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def view
   end
 
   def view


@@ -752,9 +752,7 @@ class UserController < ApplicationController
   ##
   # require that the user in the URL is the logged in user
   def require_self
   ##
   # require that the user in the URL is the logged in user
   def require_self

-    if params[:display_name] != @user.display_name
-      render :text => "", :status => :forbidden
-    end
+    head :forbidden if params[:display_name] != @user.display_name

   end
 
   ##
   end
 
   ##

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index bf9bab213296f1ad4bc3324b480ad89f9a4895cd..b5928979238b4618d39ef4b3c22ff1e498368032 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -20,7 +20,7 @@ class UserPreferenceController < ApplicationController
     end
 
     doc.root << el1
     end
 
     doc.root << el1

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   ##
   end
 
   ##


@@ -28,7 +28,7 @@ class UserPreferenceController < ApplicationController
   def read_one
     pref = UserPreference.find([@user.id, params[:preference_key]])
 
   def read_one
     pref = UserPreference.find([@user.id, params[:preference_key]])
 

-    render :text => pref.v.to_s, :content_type => "text/plain"
+    render :plain => pref.v.to_s

   end
 
   # update the entire set of preferences
   end
 
   # update the entire set of preferences


@@ -57,7 +57,7 @@ class UserPreferenceController < ApplicationController
 
     new_preferences.each_value(&:save!)
 
 
     new_preferences.each_value(&:save!)
 

-    render :text => "", :content_type => "text/plain"
+    render :nothing => true, :content_type => "text/plain"

   end
 
   ##
   end
 
   ##


@@ -74,7 +74,7 @@ class UserPreferenceController < ApplicationController
     pref.v = request.raw_post.chomp
     pref.save!
 
     pref.v = request.raw_post.chomp
     pref.save!
 

-    render :text => "", :content_type => "text/plain"
+    render :nothing => true, :content_type => "text/plain"

   end
 
   ##
   end
 
   ##


@@ -82,6 +82,6 @@ class UserPreferenceController < ApplicationController
   def delete_one
     UserPreference.find([@user.id, params[:preference_key]]).delete
 
   def delete_one
     UserPreference.find([@user.id, params[:preference_key]]).delete
 

-    render :text => "", :content_type => "text/plain"
+    render :nothing => true, :content_type => "text/plain"

   end
 end
   end
 end

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index c988545c717a00c7258a06c049f6e14ad83379b9..f7f270575024100ef365c1ecf2d152f982957fd8 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -16,7 +16,7 @@ class WayController < ApplicationController
 
     # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
     way.create_with_history @user
 
     # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml
     way.create_with_history @user

-    render :text => way.id.to_s, :content_type => "text/plain"
+    render :plain => way.id.to_s

   end
 
   def read
   end
 
   def read


@@ -25,9 +25,9 @@ class WayController < ApplicationController
     response.last_modified = way.timestamp
 
     if way.visible
     response.last_modified = way.timestamp
 
     if way.visible

-      render :text => way.to_xml.to_s, :content_type => "text/xml"
+      render :xml => way.to_xml.to_s

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -40,7 +40,7 @@ class WayController < ApplicationController
     end
 
     way.update_from(new_way, @user)
     end
 
     way.update_from(new_way, @user)

-    render :text => way.version.to_s, :content_type => "text/plain"
+    render :plain => way.version.to_s

   end
 
   # This is the API call to delete a way
   end
 
   # This is the API call to delete a way


@@ -50,9 +50,9 @@ class WayController < ApplicationController
 
     if new_way && new_way.id == way.id
       way.delete_with_history!(new_way, @user)
 
     if new_way && new_way.id == way.id
       way.delete_with_history!(new_way, @user)

-      render :text => way.version.to_s, :content_type => "text/plain"
+      render :plain => way.version.to_s

     else
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -73,9 +73,9 @@ class WayController < ApplicationController
       end
       doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
 
       end
       doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
 

-      render :text => doc.to_s, :content_type => "text/xml"
+      render :xml => doc.to_s

     else
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -96,7 +96,7 @@ class WayController < ApplicationController
       doc.root << way.to_xml_node
     end
 
       doc.root << way.to_xml_node
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   ##
   end
 
   ##


@@ -112,6 +112,6 @@ class WayController < ApplicationController
       doc.root << way.to_xml_node if way.visible
     end
 
       doc.root << way.to_xml_node if way.visible
     end
 

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 end
   end
 end

diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
index 0812ec786b93be7c431a73e776e8b106346a5335..51f8dfd400113c5a3c1cc67b386713b45d4fc973 100644 (file)
--- a/test/controllers/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1122,7 +1122,7 @@ class UserControllerTest < ActionController::TestCase
     basic_authorization(user.email, "test")
     get :api_gpx_files
     assert_response :success
     basic_authorization(user.email, "test")
     get :api_gpx_files
     assert_response :success

-    assert_equal "text/xml", response.content_type
+    assert_equal "application/xml", response.content_type

 
     # check the data that is returned
     assert_select "gpx_file[id='#{trace1.id}']", 1 do
 
     # check the data that is returned
     assert_select "gpx_file[id='#{trace1.id}']", 1 do

diff --git a/test/controllers/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb
index fac864ae9e6d63d46735edd359ac85020b914f24..ff6e19c38540b41df6fe66c88b4eaa57f38ff146 100644 (file)
--- a/test/controllers/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -53,7 +53,7 @@ class UserPreferenceControllerTest < ActionController::TestCase
     # try the read again
     get :read
     assert_response :success
     # try the read again
     get :read
     assert_response :success

-    assert_equal "text/xml", @response.content_type
+    assert_equal "application/xml", @response.content_type

     assert_select "osm" do
       assert_select "preferences", :count => 1 do
         assert_select "preference", :count => 2
     assert_select "osm" do
       assert_select "preferences", :count => 1 do
         assert_select "preference", :count => 2