From: David Lutterkort <[email protected]>
* add pretty HTML output
* error.xml.haml into a errors/ subdirectory
* add a status attribute to the XML error
---
server/server.rb | 3 ++-
server/views/error.xml.haml | 7 -------
server/views/errors/validation_failure.html.haml | 11 +++++++++++
server/views/errors/validation_failure.xml.haml | 7 +++++++
4 files changed, 20 insertions(+), 8 deletions(-)
delete mode 100644 server/views/error.xml.haml
create mode 100644 server/views/errors/validation_failure.html.haml
create mode 100644 server/views/errors/validation_failure.xml.haml
diff --git a/server/server.rb b/server/server.rb
index 535847a..6a0f4cc 100644
--- a/server/server.rb
+++ b/server/server.rb
@@ -73,7 +73,8 @@ error Deltacloud::Validation::Failure do
$stdout.flush
response.status = 400
respond_to do |format|
- format.xml { haml :error, :layout => false }
+ format.xml { haml :"errors/validation_failure", :layout => false }
+ format.html { haml :"errors/validation_failure" }
end
end
diff --git a/server/views/error.xml.haml b/server/views/error.xml.haml
deleted file mode 100644
index d7ef1af..0000000
--- a/server/views/error.xml.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}"}
- %parameter #[email protected]}
- %message #[email protected]}
- - unless @error.param.options.empty?
- %valid_options
- - @error.param.options.each do |v|
- %value #{v}
diff --git a/server/views/errors/validation_failure.html.haml
b/server/views/errors/validation_failure.html.haml
new file mode 100644
index 0000000..1d3ee48
--- /dev/null
+++ b/server/views/errors/validation_failure.html.haml
@@ -0,0 +1,11 @@
+%h1 Validation Failure
+
+%p= @error.message
+
+%dl
+ %di
+ %dt Request URL
+ %dd= request.env['REQUEST_URI']
+ %di
+ %dt Parameter
+ %dd= @error.name
diff --git a/server/views/errors/validation_failure.xml.haml
b/server/views/errors/validation_failure.xml.haml
new file mode 100644
index 0000000..24519ed
--- /dev/null
+++ b/server/views/errors/validation_failure.xml.haml
@@ -0,0 +1,7 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status =>
"#{response.status}"}
+ %parameter #[email protected]}
+ %message #[email protected]}
+ - unless @error.param.options.empty?
+ %valid_options
+ - @error.param.options.each do |v|
+ %value #{v}
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
