Refactor

app/controllers/concerns/epp/common.rb

@@ -15,19 +15,7 @@ module Epp::Common
   end
 
   def get_params_hash(path)
-    node_set = parsed_frame.css(path).children.select{ |x| x.element? && x.element_children.empty? }
-
-    node_set.inject({}) do |hash, obj|
-      #convert to array if 1 or more attributes with same name
-      if hash[obj.name.to_sym] && !hash[obj.name.to_sym].is_a?(Array)
-        hash[obj.name.to_sym] = [hash[obj.name.to_sym]]
-        hash[obj.name.to_sym] << obj.text.strip
-      else
-        hash[obj.name.to_sym] = obj.text.strip
-      end
-
-      hash
-    end
+    Hash.from_xml(parsed_frame.css(path).to_xml).with_indifferent_access
   end
 
   def epp_session

app/controllers/epp/commands_controller.rb

@@ -10,12 +10,14 @@ class Epp::CommandsController < ApplicationController
 
   private
   def create
-    type = OBJECT_TYPES[parsed_frame.css('create create').attr('schemaLocation').value]
+    ph = get_params_hash('create create')[:create]
+    type = OBJECT_TYPES[ph[:schemaLocation]]
     send("create_#{type}")
   end
 
   def check
-    type = OBJECT_TYPES[parsed_frame.css('check check').attr('schemaLocation').value]
+    ph = get_params_hash('check check')[:check]
+    type = OBJECT_TYPES[ph[:schemaLocation]]
     send("check_#{type}")
   end
 end

app/controllers/epp/sessions_controller.rb

@@ -27,7 +27,7 @@ class Epp::SessionsController < ApplicationController
   ### HELPER METHODS ###
 
   def login_params
-    login_params = parsed_frame.css('epp command login')
-    { username: login_params.css('clID').text, password: login_params.css('pw').text }
+    ph = get_params_hash('epp command login')[:login]
+    { username: ph[:clID], password: ph[:pw] }
   end
 end

app/helpers/epp/contacts_helper.rb

@@ -1,13 +1,5 @@
 module Epp::ContactsHelper
   def create_contact
-    ccp = contact_create_params
-  end
-
-  ### HELPER METHODS ###
-
-  def contact_create_params
-    {
-      addr: get_params_hash('epp command create create postalInfo addr')
-    }
+    cp = Hash.from_xml(parsed_frame.css("epp command create create").to_xml).with_indifferent_access
   end
 end

app/helpers/epp/domains_helper.rb

@@ -5,28 +5,23 @@ module Epp::DomainsHelper
   end
 
   def check_domain
-    @domains = Domain.check_availability(domain_check_params[:names])
+    ph = get_params_hash('epp command check check')[:check]
+    @domains = Domain.check_availability(ph[:name])
     render '/epp/domains/check'
   end
 
   ### HELPER METHODS ###
 
   def domain_create_params
-    node_set = parsed_frame.css("epp command create create").children.select(&:element?)
-    command_params = node_set.inject({}) {|hash, obj| hash[obj.name.to_sym] = obj.text;hash }
+    ph = get_params_hash('epp command create create')[:create]
 
     {
-      name: command_params[:name],
+      name: ph[:name],
       registrar_id: current_epp_user.registrar.try(:id),
       registered_at: Time.now,
       valid_from: Date.today,
-      valid_to: Date.today + command_params[:period].to_i.years,
-      auth_info: command_params[:authInfo]
+      valid_to: Date.today + ph[:period].to_i.years,
+      auth_info: ph[:authInfo]
     }
   end
-
-  def domain_check_params
-    node_set = parsed_frame.css('epp command check check name')
-    node_set.inject({names: []}){ |hash, obj| hash[:names] << obj.text; hash }
-  end
 end

app/models/domain.rb

@@ -20,6 +20,8 @@ class Domain < ActiveRecord::Base
 
   class << self
     def check_availability(domains)
+      domains = [domains] if domains.is_a?(String)
+
       res = []
       domains.each do |x|
         if !DomainNameValidator.validate(x)

spec/epp/requests/contacts/create.xml

@@ -1,34 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<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">
-<command>
-  <create>
-    <contact:create xmlns:contact="http://www.nic.cz/xml/epp/contact-1.6" xsi:schemaLocation="http://www.nic.cz/xml/epp/contact-1.6 contact-1.6.xsd">
-        <contact:id>sh8013</contact:id>
-        <contact:postalInfo type="int">
-          <contact:name>John Doe</contact:name>
-          <contact:org>Example Inc.</contact:org>
-          <contact:addr>
-            <contact:street>123 Example Dr.</contact:street>
-            <contact:street>Suite 100</contact:street>
-            <contact:city>Dulles</contact:city>
-            <contact:sp>VA</contact:sp>
-            <contact:pc>20166-6503</contact:pc>
-            <contact:cc>US</contact:cc>
-          </contact:addr>
-        </contact:postalInfo>
-        <contact:voice x="1234">+1.7035555555</contact:voice>
-        <contact:fax>+1.7035555556</contact:fax>
-        <contact:email>jdoe@example.com</contact:email>
-        <contact:authInfo>
-          <contact:pw>2fooBAR</contact:pw>
-        </contact:authInfo>
-        <contact:disclose flag="0">
-          <contact:voice/>
-          <contact:email/>
-        </contact:disclose>
-      </contact:create>
-    </create>
-    <clTRID>ABC-12345</clTRID>
-  </command>
+<?xml version="1.0" encoding="utf-8" standalone="no"?><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"><command><create><contact:create
+xmlns:contact="http://www.nic.cz/xml/epp/contact-1.6"
+xsi:schemaLocation="http://www.nic.cz/xml/epp/contact-1.6 contact-1.6.xsd">
+<contact:id>CID:TEST:10</contact:id>
+<contact:postalInfo>
+<contact:name>Test</contact:name>
+<contact:addr><contact:street>Test Street 11-2</contact:street>
+<contact:city>Test City</contact:city>
+<contact:pc>123456</contact:pc>
+<contact:cc>EE</contact:cc>
+</contact:addr>
+</contact:postalInfo>
+<contact:voice>+372.5555555</contact:voice>
+<contact:email>test@test.com</contact:email>
+<contact:ident type="op">37812124567</contact:ident>
+</contact:create>
+</create>
+<clTRID>neka005#10-02-08at13:51:37</clTRID>
+</command>
 </epp>