was never used except to extract the data it contained. Instead each class
now has a status method that returns the HTTP status code to use and a
to_s method to return a textual description of the error.
ex.record.errors.each { |attr,msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" }
report_error message, :bad_request
rescue OSM::APIError => ex
ex.record.errors.each { |attr,msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" }
report_error message, :bad_request
rescue OSM::APIError => ex
- render_opts = ex.render_opts
- report_error render_opts[:text], render_opts[:status]
+ report_error ex.message, ex.status
rescue Exception => ex
report_error "#{ex.class}: #{ex.message}", :internal_server_error
end
rescue Exception => ex
report_error "#{ex.class}: #{ex.message}", :internal_server_error
end
# The base class for API Errors.
class APIError < RuntimeError
# The base class for API Errors.
class APIError < RuntimeError
- def render_opts
- { :text => "Generic API Error", :status => :internal_server_error, :content_type => "text/plain" }
+ def status
+ :internal_server_error
# Raised when an API object is not found.
class APINotFoundError < APIError
# Raised when an API object is not found.
class APINotFoundError < APIError
- def render_opts
- { :text => "The API wasn't found", :status => :not_found, :content_type => "text/plain" }
+ def status
+ :not_found
+ end
+
+ def to_s
+ "Object not found"
def initialize(message = "")
@message = message
end
def initialize(message = "")
@message = message
end
-
- def render_opts
- { :text => "Precondition failed: #{@message}", :status => :precondition_failed, :content_type => "text/plain" }
+
+ def status
+ :precondition_failed
end
attr_reader :object, :object_id
end
attr_reader :object, :object_id
+
+ def status
+ :gone
+ end
- def render_opts
- { :text => "The #{object} with the id #{object_id} has already been deleted", :status => :gone, :content_type => "text/plain" }
+ def to_s
+ "The #{object} with the id #{object_id} has already been deleted"
end
end
# Raised when the user logged in isn't the same as the changeset
class APIUserChangesetMismatchError < APIError
end
end
# Raised when the user logged in isn't the same as the changeset
class APIUserChangesetMismatchError < APIError
- def render_opts
- { :text => "The user doesn't own that changeset", :status => :conflict, :content_type => "text/plain" }
+ def status
+ :conflict
+ end
+
+ def to_s
+ "The user doesn't own that changeset"
end
attr_reader :changeset
end
attr_reader :changeset
-
- def render_opts
- { :text => "The changeset #{@changeset.id} was closed at #{@changeset.closed_at}.", :status => :conflict, :content_type => "text/plain" }
+
+ def status
+ :conflict
+ end
+
+ def to_s
+ "The changeset #{@changeset.id} was closed at #{@changeset.closed_at}"
end
end
# Raised when a change is expecting a changeset, but the changeset doesn't exist
class APIChangesetMissingError < APIError
end
end
# Raised when a change is expecting a changeset, but the changeset doesn't exist
class APIChangesetMissingError < APIError
- def render_opts
- { :text => "You need to supply a changeset to be able to make a change", :status => :conflict, :content_type => "text/plain" }
- "You need to supply a changeset to be able to make a change"
+ "You need to supply a changeset to be able to make a change"
def initialize(provided, allowed)
@provided, @allowed = provided, allowed
end
def initialize(provided, allowed)
@provided, @allowed = provided, allowed
end
-
- def render_opts
- { :text => "Changeset mismatch: Provided #{@provided} but only " +
- "#{@allowed} is allowed.", :status => :conflict, :content_type => "text/plain" }
+
+ def status
+ :conflict
+ end
+
+ def rto_s
+ "Changeset mismatch: Provided #{@provided} but only #{@allowed} is allowed"
def initialize(provided)
@provided = provided
end
def initialize(provided)
@provided = provided
end
+
+ def status
+ :bad_request
+ end
- def render_opts
- { :text => "Unknown action #{@provided}, choices are create, modify, delete.",
- :status => :bad_request, :content_type => "text/plain" }
+ def to_s
+ "Unknown action #{@provided}, choices are create, modify, delete"
@model, @xml, @message = model, xml, message
end
@model, @xml, @message = model, xml, message
end
- def render_opts
- { :text => "Cannot parse valid #{@model} from xml string #{@xml}. #{@message}",
- :status => :bad_request, :content_type => "text/plain" }
+ def status
+ :bad_request
+ end
+
+ def to_s
+ "Cannot parse valid #{@model} from xml string #{@xml}. #{@message}"
attr_reader :provided, :latest, :id, :type
attr_reader :provided, :latest, :id, :type
- def render_opts
- { :text => "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}",
- :status => :conflict, :content_type => "text/plain" }
- "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}"
+ "Version mismatch: Provided #{provided}, server had: #{latest} of #{type} #{id}"
attr_reader :type, :id, :tag_key
attr_reader :type, :id, :tag_key
- def render_opts
- { :text => "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}.",
- :status => :bad_request, :content_type => "text/plain" }
+ def status
+ :bad_request
+ end
+
+ def to_s
+ "Element #{@type}/#{@id} has duplicate tags with key #{@tag_key}"
end
attr_reader :provided, :max
end
attr_reader :provided, :max
+
+ def status
+ :bad_request
+ end
- def render_opts
- { :text => "You tried to add #{provided} nodes to the way, however only #{max} are allowed",
- :status => :bad_request, :content_type => "text/plain" }
+ def to_s
+ "You tried to add #{provided} nodes to the way, however only #{max} are allowed"
- def render_opts
- { :text => @message, :content_type => "text/plain", :status => :bad_request }
+ def status
+ :bad_request
+ end
+
+ def to_s
+ @message
@supported_method = supported_method
end
@supported_method = supported_method
end
- def render_opts
- { :text => "Only method #{@supported_method} is supported on this URI.", :status => :method_not_allowed }
+ def status
+ :method_not_allowed
+ end
+
+ def to_s
+ "Only method #{@supported_method} is supported on this URI"
end
end
##
# raised when an API call takes too long
class APITimeoutError < APIError
end
end
##
# raised when an API call takes too long
class APITimeoutError < APIError
- def render_opts
- { :text => "Request timed out", :status => :request_timeout }
+ def status
+ :request_timeout
content diff
post :upload, :id => cs_id
assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
content diff
post :upload, :id => cs_id
assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
- assert_equal @response.body, "Unknown action ping, choices are create, modify, delete."
+ assert_equal @response.body, "Unknown action ping, choices are create, modify, delete"
put :update, :id => current_nodes(:public_visible_node).id
assert_response :bad_request,
"adding duplicate tags to a node should fail with 'bad request'"
put :update, :id => current_nodes(:public_visible_node).id
assert_response :bad_request,
"adding duplicate tags to a node should fail with 'bad request'"
- assert_equal "Element node/#{current_nodes(:public_visible_node).id} has duplicate tags with key #{current_node_tags(:t1).k}.", @response.body
+ assert_equal "Element node/#{current_nodes(:public_visible_node).id} has duplicate tags with key #{current_node_tags(:t1).k}", @response.body
end
# test whether string injection is possible
end
# test whether string injection is possible
put :update, :id => current_ways(:visible_way).id
assert_response :bad_request,
"adding a duplicate tag to a way should fail with 'bad request'"
put :update, :id => current_ways(:visible_way).id
assert_response :bad_request,
"adding a duplicate tag to a way should fail with 'bad request'"
- assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}.", @response.body
+ assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
put :update, :id => current_ways(:visible_way).id
assert_response :bad_request,
"adding new duplicate tags to a way should fail with 'bad request'"
put :update, :id => current_ways(:visible_way).id
assert_response :bad_request,
"adding new duplicate tags to a way should fail with 'bad request'"
- assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate.", @response.body
+ assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate", @response.body
put :create
assert_response :bad_request,
"adding new duplicate tags to a way should fail with 'bad request'"
put :create
assert_response :bad_request,
"adding new duplicate tags to a way should fail with 'bad request'"
- assert_equal "Element way/ has duplicate tags with key addr:housenumber.", @response.body
+ assert_equal "Element way/ has duplicate tags with key addr:housenumber", @response.body