Merge branch 'story/121580929-empty-nokogiri' into staging

# Conflicts:
#	lib/epp_constraint.rb
This commit is contained in:
Vladimir Krylov 2016-06-15 17:29:37 +03:00
commit 3c71c0a06d
2 changed files with 21 additions and 3 deletions

View file

@ -12,8 +12,8 @@ class EppConstraint
def matches?(request)
# TODO: Maybe move this to controller to keep params clean
request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip} if request.params[:raw_frame]
request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame])
request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces!
request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame] || request.params[:frame])
request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces!
unless [:keyrelay, :poll, :session, :not_found].include?(@type)
element = "//#{@type}:#{request.params[:action]}"