From c14d15d7b7cb01147a30a942d21a1a62f19bbd28 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Tue, 21 Feb 2017 16:15:26 +0200
Subject: [PATCH] Rename registrar's url attribute to website

#279
---
 app/models/whois_record.rb                                | 2 +-
 app/presenters/registrar_presenter.rb                     | 4 ++--
 app/views/for_models/whois.erb                            | 2 +-
 app/views/mailers/shared/registrar/_registrar.en.html.erb | 2 +-
 app/views/mailers/shared/registrar/_registrar.en.text.erb | 2 +-
 app/views/mailers/shared/registrar/_registrar.et.html.erb | 2 +-
 app/views/mailers/shared/registrar/_registrar.et.text.erb | 2 +-
 app/views/mailers/shared/registrar/_registrar.ru.html.erb | 2 +-
 app/views/mailers/shared/registrar/_registrar.ru.text.erb | 2 +-
 .../20170221115548_rename_registrar_url_to_website.rb     | 5 +++++
 db/schema-read-only.rb                                    | 4 ++--
 db/structure.sql                                          | 4 +++-
 spec/fabricators/registrar_fabricator.rb                  | 2 +-
 spec/presenters/registrar_presenter_spec.rb               | 8 ++++----
 spec/views/mailers/shared/registrar/registrar_shared.rb   | 2 +-
 15 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 db/migrate/20170221115548_rename_registrar_url_to_website.rb

diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index e5de62ac0..bd16e0c99 100644
--- a/app/models/whois_record.rb
+++ b/app/models/whois_record.rb
@@ -85,7 +85,7 @@ class WhoisRecord < ActiveRecord::Base
 
     # update registar triggers when adding new attributes
     h[:registrar]         = domain.registrar.name
-    h[:registrar_url]     = domain.registrar.url
+    h[:registrar_website] = domain.registrar.website
     h[:registrar_phone]   = domain.registrar.phone
     h[:registrar_address] = domain.registrar.address
     h[:registrar_changed] = domain.registrar.updated_at.try(:to_s, :iso8601)
diff --git a/app/presenters/registrar_presenter.rb b/app/presenters/registrar_presenter.rb
index 1fe415feb..57c130faa 100644
--- a/app/presenters/registrar_presenter.rb
+++ b/app/presenters/registrar_presenter.rb
@@ -16,8 +16,8 @@ class RegistrarPresenter
     registrar.phone
   end
 
-  def url
-    registrar.url
+  def website
+    registrar.website
   end
 
   private
diff --git a/app/views/for_models/whois.erb b/app/views/for_models/whois.erb
index 303d95d72..390511031 100644
--- a/app/views/for_models/whois.erb
+++ b/app/views/for_models/whois.erb
@@ -40,7 +40,7 @@ changed:    <%= contact['changed'].to_s.tr('T',' ').sub('+', ' +') %>
 <%- end -%>
 Registrar:
 name:       <%= json['registrar'] %>
-url:        <%= json['registrar_url'] %>
+url:        <%= json['registrar_website'] %>
 phone:      <%= json['registrar_phone'] %>
 changed:    <%= json['registrar_changed'].to_s.tr('T',' ').sub('+', ' +') %>
 
diff --git a/app/views/mailers/shared/registrar/_registrar.en.html.erb b/app/views/mailers/shared/registrar/_registrar.en.html.erb
index 699fcd19d..914221e19 100644
--- a/app/views/mailers/shared/registrar/_registrar.en.html.erb
+++ b/app/views/mailers/shared/registrar/_registrar.en.html.erb
@@ -2,5 +2,5 @@
   <%= registrar.name %><br>
   Email: <%= registrar.email %><br>
   Phone: <%= registrar.phone %><br>
-  Website: <%= registrar.url %>
+  Website: <%= registrar.website %>
 </p>
diff --git a/app/views/mailers/shared/registrar/_registrar.en.text.erb b/app/views/mailers/shared/registrar/_registrar.en.text.erb
index 96882b11d..1a5fbd650 100644
--- a/app/views/mailers/shared/registrar/_registrar.en.text.erb
+++ b/app/views/mailers/shared/registrar/_registrar.en.text.erb
@@ -1,4 +1,4 @@
 <%= registrar.name %>
 Email: <%= registrar.email %>
 Phone: <%= registrar.phone %>
-Website: <%= registrar.url %>
+Website: <%= registrar.website %>
diff --git a/app/views/mailers/shared/registrar/_registrar.et.html.erb b/app/views/mailers/shared/registrar/_registrar.et.html.erb
index 199115210..647b753d5 100644
--- a/app/views/mailers/shared/registrar/_registrar.et.html.erb
+++ b/app/views/mailers/shared/registrar/_registrar.et.html.erb
@@ -2,5 +2,5 @@
   <%= registrar.name %><br>
   Email: <%= registrar.email %><br>
   Telefon: <%= registrar.phone %><br>
-  Veebileht: <%= registrar.url %>
+  Veebileht: <%= registrar.website %>
 </p>
diff --git a/app/views/mailers/shared/registrar/_registrar.et.text.erb b/app/views/mailers/shared/registrar/_registrar.et.text.erb
index 0e8b16e30..2e435fbc9 100644
--- a/app/views/mailers/shared/registrar/_registrar.et.text.erb
+++ b/app/views/mailers/shared/registrar/_registrar.et.text.erb
@@ -1,4 +1,4 @@
 <%= registrar.name %>
 Email: <%= registrar.email %>
 Telefon: <%= registrar.phone %>
-Veebileht: <%= registrar.url %>
+Veebileht: <%= registrar.website %>
diff --git a/app/views/mailers/shared/registrar/_registrar.ru.html.erb b/app/views/mailers/shared/registrar/_registrar.ru.html.erb
index 1c258f10d..63726c2dd 100644
--- a/app/views/mailers/shared/registrar/_registrar.ru.html.erb
+++ b/app/views/mailers/shared/registrar/_registrar.ru.html.erb
@@ -2,5 +2,5 @@
   <%= registrar.name %><br>
   Электронная почта: <%= registrar.email %><br>
   Телефон: <%= registrar.phone %><br>
-  Веб-сайт: <%= registrar.url %>
+  Веб-сайт: <%= registrar.website %>
 </p>
diff --git a/app/views/mailers/shared/registrar/_registrar.ru.text.erb b/app/views/mailers/shared/registrar/_registrar.ru.text.erb
index 0a74e8974..bb489b9fb 100644
--- a/app/views/mailers/shared/registrar/_registrar.ru.text.erb
+++ b/app/views/mailers/shared/registrar/_registrar.ru.text.erb
@@ -1,4 +1,4 @@
 <%= registrar.name %>
 Электронная почта: <%= registrar.email %>
 Телефон: <%= registrar.phone %>
-Веб-сайт: <%= registrar.url %>
+Веб-сайт: <%= registrar.website %>
diff --git a/db/migrate/20170221115548_rename_registrar_url_to_website.rb b/db/migrate/20170221115548_rename_registrar_url_to_website.rb
new file mode 100644
index 000000000..6aa672b3f
--- /dev/null
+++ b/db/migrate/20170221115548_rename_registrar_url_to_website.rb
@@ -0,0 +1,5 @@
+class RenameRegistrarUrlToWebsite < ActiveRecord::Migration
+  def change
+    rename_column :registrars, :url, :website
+  end
+end
diff --git a/db/schema-read-only.rb b/db/schema-read-only.rb
index 20659dafb..7bebdbba9 100644
--- a/db/schema-read-only.rb
+++ b/db/schema-read-only.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161227193500) do
+ActiveRecord::Schema.define(version: 20170221115548) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1046,7 +1046,7 @@ ActiveRecord::Schema.define(version: 20161227193500) do
     t.string   "street"
     t.string   "zip"
     t.string   "code"
-    t.string   "url"
+    t.string   "website"
     t.string   "directo_handle"
     t.boolean  "vat"
     t.integer  "legacy_id"
diff --git a/db/structure.sql b/db/structure.sql
index 48226e245..373d7239e 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -2704,7 +2704,7 @@ CREATE TABLE registrars (
     street character varying,
     zip character varying,
     code character varying,
-    url character varying,
+    website character varying,
     directo_handle character varying,
     vat boolean,
     legacy_id integer,
@@ -5278,3 +5278,5 @@ INSERT INTO schema_migrations (version) VALUES ('20161004101419');
 
 INSERT INTO schema_migrations (version) VALUES ('20161227193500');
 
+INSERT INTO schema_migrations (version) VALUES ('20170221115548');
+
diff --git a/spec/fabricators/registrar_fabricator.rb b/spec/fabricators/registrar_fabricator.rb
index bd801f642..f3a3fdc59 100644
--- a/spec/fabricators/registrar_fabricator.rb
+++ b/spec/fabricators/registrar_fabricator.rb
@@ -49,7 +49,7 @@ Fabricator(:eis, from: :registrar) do
   city 'Tallinn'
   street 'Paldiski mnt 80'
   zip '10617'
-  url 'www.internet.ee'
+  website 'www.internet.ee'
   code { sequence(:code) { |i| "EIS#{i}" } }
   accounts(count: 1) { Fabricate(:account, account_activities: []) }
 end
diff --git a/spec/presenters/registrar_presenter_spec.rb b/spec/presenters/registrar_presenter_spec.rb
index 8223341a8..8c0196c51 100644
--- a/spec/presenters/registrar_presenter_spec.rb
+++ b/spec/presenters/registrar_presenter_spec.rb
@@ -25,10 +25,10 @@ RSpec.describe RegistrarPresenter do
     end
   end
 
-  describe '#url' do
-    it 'returns url' do
-      expect(registrar).to receive(:url).and_return('test url')
-      expect(presenter.url).to eq('test url')
+  describe '#website' do
+    it 'returns website' do
+      expect(registrar).to receive(:website).and_return('test')
+      expect(presenter.website).to eq('test')
     end
   end
 end
diff --git a/spec/views/mailers/shared/registrar/registrar_shared.rb b/spec/views/mailers/shared/registrar/registrar_shared.rb
index f9c98c94a..2f8311545 100644
--- a/spec/views/mailers/shared/registrar/registrar_shared.rb
+++ b/spec/views/mailers/shared/registrar/registrar_shared.rb
@@ -11,7 +11,7 @@ RSpec.shared_examples 'domain mailer registrar info' do
     name
     email
     phone
-    url
+    website
   )
 
   attributes.each do |attr_name|