Merge branch 'bugfix/send-406-on-unsupported-format' into 'develop'

Bugfix/send 406 on unsupported format



See merge request !5

1 files changed, 11 insertions, 0 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2af2f29..8d08a2c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,12 @@ class ApplicationController < ActionController::Base
   before_filter :no_cache_header
   before_filter :no_frame_header
   before_filter :language_header
+
+  # UPGRADE: this won't be needed in Rails 5 anymore as it's the default
+  # behavior if a template is present but a different format would be
+  # rendered and that template is not present
+  before_filter :verify_request_format!, if: :mime_types_specified
+
   rescue_from StandardError, :with => :default_error_handler
   rescue_from CouchRest::Exception, :with => :default_error_handler
 
@@ -11,6 +17,11 @@ class ApplicationController < ActionController::Base
 
   protected
 
+  def mime_types_specified
+    mimes = collect_mimes_from_class_level
+    mimes.present?
+  end
+
   def default_error_handler(exc)
     respond_to do |format|
       format.json { render_json_error(exc) }