zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 19:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story#118912395 - rearrange before_action for more readability

Browse source
This commit is contained in:
Vladimir Krylov 2016-05-20 15:32:06 +03:00
parent 866f44815d
commit a51f536781
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/epp_controller.rb
View file

@ -6,8 +6,14 @@ class EppController < ApplicationController
before_action :generate_svtrid before_action :generate_svtrid
before_action :latin_only before_action :latin_only
before_action :validate_against_schema before_action :validate_against_schema
before_action :validate_request
before_action :update_epp_session
around_action :catch_epp_errors
helper_method :current_user
def validate_against_schema def validate_against_schema
return if ['hello', 'error', 'keyrelay'].include?(params[:action]) return if ['hello', 'error', 'keyrelay'].include?(params[:action])
schema.validate(params[:nokogiri_frame]).each do |error| schema.validate(params[:nokogiri_frame]).each do |error|
@ -20,10 +26,7 @@ class EppController < ApplicationController
handle_errors and return if epp_errors.any? handle_errors and return if epp_errors.any?
end end
before_action :validate_request
before_action :update_epp_session
around_action :catch_epp_errors
def catch_epp_errors def catch_epp_errors
err = catch(:epp_error) do err = catch(:epp_error) do
yield yield
@ -34,7 +37,6 @@ class EppController < ApplicationController
handle_errors handle_errors
end end
helper_method :current_user
rescue_from StandardError do |e| rescue_from StandardError do |e|
@errors ||= [] @errors ||= []