Merge branch 'master' of github.com:internetee/registry

.rubocop.yml

@@ -35,3 +35,6 @@ Style/IndentHash:
 Style/SingleLineBlockParams:
   Enabled: false
 
+# No need for nested module/class definition as far as I know
+Style/ClassAndModuleChildren:
+  Enabled: false

Gemfile

@@ -71,7 +71,7 @@ group :development, :test do
   gem 'capybara', '~> 2.4.1'
   # For feature testing
   # gem 'capybara-webkit', '1.2.0' # Webkit driver didn't work with turbolinks
-  gem 'phantomjs', :require => 'phantomjs/poltergeist'
+  gem 'phantomjs', require: 'phantomjs/poltergeist'
   gem 'poltergeist', '~> 1.5.1' # We are using PhantomJS instead
 
   # For cleaning db in feature and epp tests

app/helpers/epp/contacts_helper.rb

@@ -1,5 +1,4 @@
-module Epp
-  module ContactsHelper
+module Epp::ContactsHelper
   def create_contact
     @contact = Contact.new(contact_and_address_attributes)
     render '/epp/contacts/create' and return if stamp(@contact) && @contact.save
@@ -147,5 +146,4 @@ module Epp
     Contact::IDENT_TYPES.any? { |type| return type if result.include?(type) }
     nil
   end
-  end
 end

app/models/address.rb

@@ -20,9 +20,9 @@ class Address < ActiveRecord::Base
 
       parsed_frame.css('postalInfo').each do |pi|
         attr = pi.attributes['type'].try(:value)
-        errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type')} and next unless attr
-        if !TYPES.include?(attr)
-          errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr }}
+        errors << { code: 2003, msg: I18n.t('errors.messages.attr_missing', key: 'type') } and next unless attr
+        unless TYPES.include?(attr)
+          errors << { code: 2005, msg: I18n.t('errors.messages.invalid_type'), value: { obj: 'type', val: attr } }
           next
         end
         errors << { code: 2005, msg: I18n.t('errors.messages.repeating_postal_info') } and next if used.include?(attr)

app/models/contact.rb

@@ -97,7 +97,7 @@ class Contact < ActiveRecord::Base
     destroy
   end
 
-  def epp_code_map
+  def epp_code_map # rubocop:disable Metrics/MethodLength
     {
       '2302' => [ # Object exists
         [:code, :epp_id_taken]

app/models/domain.rb

@@ -285,7 +285,7 @@ class Domain < ActiveRecord::Base
     add_epp_error('2306', 'curExpDate', cur_exp_date, I18n.t('errors.messages.epp_exp_dates_do_not_match'))
   end
 
-  def epp_code_map
+  def epp_code_map # rubocop:disable Metrics/MethodLength
     domain_validation_sg = SettingGroup.domain_validation
 
     {