From bb157f5d5ba902b483084d250a2fea5e76234f6b Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 15 Aug 2019 19:18:19 -0500
Subject: [PATCH] models: drop various unused `#named` methods.

---
 app/controllers/wiki_pages_controller.rb  | 1 -
 app/logical/related_tag_query.rb          | 2 +-
 app/models/artist.rb                      | 4 ----
 app/models/tag.rb                         | 4 ----
 app/models/user.rb                        | 4 ----
 app/views/wiki_pages/show_or_new.html.erb | 4 ++--
 test/unit/related_tag_query_test.rb       | 4 ++--
 7 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index a8d97356f..62589e044 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -86,7 +86,6 @@ class WikiPagesController < ApplicationController
       redirect_to wiki_page_path(@wiki_page)
     else
       @wiki_page = WikiPage.new(:title => params[:title])
-      @artist = Artist.named(@wiki_page.title).active.first
       respond_with(@wiki_page)
     end
   end
diff --git a/app/logical/related_tag_query.rb b/app/logical/related_tag_query.rb
index 66065b61d..2c01f3468 100644
--- a/app/logical/related_tag_query.rb
+++ b/app/logical/related_tag_query.rb
@@ -83,7 +83,7 @@ protected
   end
 
   def related_tags
-    tag = Tag.named(query.strip).first
+    tag = Tag.find_by_name(query.strip)
 
     if tag
       tag.related_tag_array.map(&:first)
diff --git a/app/models/artist.rb b/app/models/artist.rb
index 0f0af0d2d..8a90d5ef0 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -464,10 +464,6 @@ class Artist < ApplicationRecord
   end
 
   module SearchMethods
-    def named(name)
-      where(name: normalize_name(name))
-    end
-
     def any_other_name_matches(regex)
       where(id: Artist.from("unnest(other_names) AS other_name").where("other_name ~ ?", regex))
     end
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 7c73a79fb..9ee796dd1 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -930,10 +930,6 @@ class Tag < ApplicationRecord
       where("tags.name LIKE ? ESCAPE E'\\\\'", normalize_name(name).to_escaped_for_sql_like)
     end
 
-    def named(name)
-      where("tags.name = ?", TagAlias.to_aliased([name]).join(""))
-    end
-
     def search(params)
       q = super
 
diff --git a/app/models/user.rb b/app/models/user.rb
index aeaaab861..0243dad15 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -742,10 +742,6 @@ class User < ApplicationRecord
   end
 
   module SearchMethods
-    def named(name)
-      where("lower(name) = ?", name)
-    end
-
     def admins
       where("level = ?", Levels::ADMIN)
     end
diff --git a/app/views/wiki_pages/show_or_new.html.erb b/app/views/wiki_pages/show_or_new.html.erb
index 565a80f35..fd4bdb6d1 100644
--- a/app/views/wiki_pages/show_or_new.html.erb
+++ b/app/views/wiki_pages/show_or_new.html.erb
@@ -10,8 +10,8 @@
         <p>This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.</p>
       </div>
 
-      <% if @artist %>
-        <p><%= link_to "View artist", @artist %></p>
+      <% if @wiki_page.artist.present? %>
+        <p><%= link_to "View artist", @wiki_page.artist %></p>
       <% end %>
 
       <%= wiki_page_alias_and_implication_list(@wiki_page)%>
diff --git a/test/unit/related_tag_query_test.rb b/test/unit/related_tag_query_test.rb
index eac4524a5..8a2c48855 100644
--- a/test/unit/related_tag_query_test.rb
+++ b/test/unit/related_tag_query_test.rb
@@ -31,7 +31,7 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
 
     context "for a tag that already exists" do
       setup do
-        Tag.named("aaa").first.update_related
+        Tag.find_by_name("aaa").update_related
         @query = RelatedTagQuery.new(query: "aaa")
       end
 
@@ -60,7 +60,7 @@ class RelatedTagQueryTest < ActiveSupport::TestCase
         @wp = FactoryBot.create(:wiki_page, title: "aaa", body: "blah [[foo|blah]] [[FOO]] [[bar]] blah")
         @query = RelatedTagQuery.new(query: "xyz")
 
-        Tag.named("aaa").first.update_related
+        Tag.find_by_name("aaa").update_related
       end
 
       should "take wiki tags from the consequent's wiki" do