From c72a2738ddc3ac550f13cb67b1df9d6fababd31a Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 27 Jun 2014 16:33:00 +0300 Subject: [PATCH] Refactor epp_head to helper --- app/controllers/concerns/epp/common.rb | 9 +++++++++ app/views/epp/domains/check.xml.builder | 3 +++ app/views/epp/sessions/greeting.xml.builder | 3 +-- spec/epp/requests/domains/check.xml | 6 ++++++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 spec/epp/requests/domains/check.xml diff --git a/app/controllers/concerns/epp/common.rb b/app/controllers/concerns/epp/common.rb index 1a1394822..26176a0a8 100644 --- a/app/controllers/concerns/epp/common.rb +++ b/app/controllers/concerns/epp/common.rb @@ -3,6 +3,7 @@ module Epp::Common included do protect_from_forgery with: :null_session + helper_method :epp_head end def proxy @@ -21,4 +22,12 @@ module Epp::Common def current_epp_user @current_epp_user ||= EppUser.find(epp_session[:epp_user_id]) if epp_session[:epp_user_id] end + + def epp_head xml + xml.instruct! + xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do + yield + end + end + end diff --git a/app/views/epp/domains/check.xml.builder b/app/views/epp/domains/check.xml.builder index e69de29bb..aec746fbb 100644 --- a/app/views/epp/domains/check.xml.builder +++ b/app/views/epp/domains/check.xml.builder @@ -0,0 +1,3 @@ +epp_head do + xml.bla +end diff --git a/app/views/epp/sessions/greeting.xml.builder b/app/views/epp/sessions/greeting.xml.builder index 033549ad3..64fbc4c9f 100644 --- a/app/views/epp/sessions/greeting.xml.builder +++ b/app/views/epp/sessions/greeting.xml.builder @@ -1,5 +1,4 @@ -xml.instruct! -xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd') do +epp_head(xml) do xml.greeting do xml.svID 'EPP server (DSDng)' xml.svDate '2014-06-18T17:46:59+03:00' diff --git a/spec/epp/requests/domains/check.xml b/spec/epp/requests/domains/check.xml new file mode 100644 index 000000000..2de9b73fc --- /dev/null +++ b/spec/epp/requests/domains/check.xml @@ -0,0 +1,6 @@ +test.ee + + +imkt004#14-06-27at16:13:33 + +