rubocoped contacts helper

app/helpers/epp/contacts_helper.rb

@@ -1,4 +1,5 @@
-module Epp::ContactsHelper
+module Epp
+  module ContactsHelper
     def create_contact
       @contact = Contact.new(contact_and_address_attributes)
       render '/epp/contacts/create' and return if stamp(@contact) && @contact.save
@@ -9,10 +10,10 @@ module Epp::ContactsHelper
     def update_contact
       code = params_hash['epp']['command']['update']['update'][:id]
       @contact = Contact.where(code: code).first
-    if has_rights? && stamp(@contact) && @contact.update_attributes(contact_and_address_attributes(:update))
+      if rights? && stamp(@contact) && @contact.update_attributes(contact_and_address_attributes(:update))
         render 'epp/contacts/update'
       else
-      epp_errors << { code: '2303', msg: t('errors.messages.epp_obj_does_not_exist'), value: { obj: 'id', val: code } } if @contact == []
+        contact_exists?
         handle_errors(@contact)
       end
     end
@@ -34,7 +35,7 @@ module Epp::ContactsHelper
     end
 
     def info_contact
-    handle_errors and return unless has_rights?
+      handle_errors and return unless rights?
       @contact = find_contact
       handle_errors(@contact) and return unless @contact
       render 'epp/contacts/info'
@@ -47,15 +48,15 @@ module Epp::ContactsHelper
     ## CREATE
     def validate_contact_create_request
       @ph = params_hash['epp']['command']['create']['create']
-    xml_attrs_present?(@ph, [['id'],
+      xml_attrs_present?(@ph, [%w(id),
                                %w(authInfo pw),
                                %w(postalInfo)])
-   if @ph['postalInfo'].is_a?(Hash) || @ph['postalInfo'].is_a?(Array)
-      xml_nested_attrs_present?( @ph['postalInfo'], [ %w(name),
+      return epp_errors.empty? unless @ph['postalInfo'].is_a?(Hash) || @ph['postalInfo'].is_a?(Array)
+
+      xml_nested_attrs_present?(@ph['postalInfo'], [%w(name),
                                                     %w(addr city),
                                                     %w(addr cc)])
     end
-  end
 
     ## UPDATE
     def validate_contact_update_request
@@ -63,6 +64,12 @@ module Epp::ContactsHelper
       xml_attrs_present?(@ph, [['id']])
     end
 
+    def contact_exists?
+      return true if @contact.is_a?(Contact)
+      epp_errors << { code: '2303', msg: t('errors.messages.epp_obj_does_not_exist'),
+                      value: { obj: 'id', val: code } }
+    end
+
     ## DELETE
     def validate_contact_delete_request
       @ph = params_hash['epp']['command']['delete']['delete']
@@ -86,14 +93,15 @@ module Epp::ContactsHelper
     def find_contact
       contact = Contact.find_by(code: @ph[:id])
       unless contact
-      epp_errors << { code: '2303', msg: t('errors.messages.epp_obj_does_not_exist'), value: { obj: 'id', val: @ph[:id] } }
+        epp_errors << { code: '2303',
+                        msg: t('errors.messages.epp_obj_does_not_exist'),
+                        value: { obj: 'id', val: @ph[:id] } }
       end
       contact
     end
 
-  def has_rights?
+    def rights?
       pw = @ph.try(:[], :authInfo).try(:[], :pw) || @ph.try(:[], :chg).try(:[], :authInfo).try(:[], :pw) || []
-    id = @ph[:id]
 
       return true if  !find_contact.nil? && find_contact.auth_info_matches(pw)
 
@@ -104,20 +112,22 @@ module Epp::ContactsHelper
     def contact_and_address_attributes(type = :create)
       case type
       when :update
-      contact_hash = Contact.extract_attributes(@ph[:chg], type)
-      contact_hash = contact_hash.merge(
-        Address.extract_attributes(( @ph.try(:[], :chg).try(:[], :postalInfo) || [] ),  type)
-      )
+        contact_hash = merge_attribute_hash(@ph[:chg], type)
       else
-      contact_hash = Contact.extract_attributes(@ph, type)
-      contact_hash = contact_hash.merge(
-        Address.extract_attributes(( @ph.try(:[], :postalInfo) || [] ),  type)
-      )
+        contact_hash = merge_attribute_hash(@ph, type)
       end
       contact_hash[:ident_type] = ident_type unless ident_type.nil?
       contact_hash
     end
 
+    def merge_attribute_hash(prms, type)
+      contact_hash = Contact.extract_attributes(prms, type)
+      contact_hash = contact_hash.merge(
+        Address.extract_attributes((prms.try(:[], :postalInfo) || []))
+      )
+      contact_hash
+    end
+
     def ident_type
       result = params[:frame].slice(/(?<=\<ns2:ident type=)(.*)(?=<)/)
 
@@ -126,4 +136,5 @@ module Epp::ContactsHelper
       Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) }
       nil
     end
+  end
 end

app/models/address.rb

@@ -13,7 +13,7 @@ class Address < ActiveRecord::Base
   #validates_inclusion_of :type, in: TYPES
 
   class << self
-    def extract_attributes(ah, _type = :create)
+    def extract_attributes(ah)
       address_hash = {}
       [ah].flatten.each do |pi|
         address_hash[local?(pi)] = addr_hash_from_params(pi)