AO3-5513 Review

Hello reviewdog

Author: Bilka2

app/controllers/fandoms_controller.rb

@@ -5,22 +5,22 @@ def index
     if @collection
       @media = Media.canonical.by_name - [Media.find_by(name: ArchiveConfig.MEDIA_NO_TAG_NAME)] - [Media.find_by(name: ArchiveConfig.MEDIA_UNCATEGORIZED_NAME)]
       @page_subtitle = @collection.title
-      @medium = Media.find_by_name(params[:medium_id]) if params[:medium_id]
+      @medium = Media.find_by_name(params[:media_id]) if params[:media_id]
       @counts = SearchCounts.fandom_ids_for_collection(@collection)
       @fandoms = (@medium ? @medium.fandoms : Fandom.all).where(id: @counts.keys).by_name
-    elsif params[:medium_id]
-      if @medium = Media.find_by_name(params[:medium_id])
+    elsif params[:media_id]
+      if @medium = Media.find_by_name(params[:media_id])
          @page_subtitle = @medium.name
         if @medium == Media.uncategorized
           @fandoms = @medium.fandoms.in_use.by_name
         else
           @fandoms = @medium.fandoms.canonical.by_name.with_count
         end
       else
-        raise ActiveRecord::RecordNotFound, "Couldn't find media category named '#{params[:medium_id]}'"
+        raise ActiveRecord::RecordNotFound, "Couldn't find media category named '#{params[:media_id]}'"
       end
     else
-      redirect_to media_path(notice: "Please choose a media category to start browsing fandoms.")
+      redirect_to media_index_path(notice: "Please choose a media category to start browsing fandoms.")
       return
     end
     @fandoms_by_letter = @fandoms.group_by {|f| f.sortable_name[0].upcase}
@@ -30,7 +30,7 @@ def show
     @fandom = Fandom.find_by_name(params[:id])
     if @fandom.nil?
       flash[:error] = ts("Could not find fandom named %{fandom_name}", fandom_name: params[:id])
-      redirect_to media_path and return
+      redirect_to media_index_path and return
     end
     @characters = @fandom.characters.canonical.by_name
   end

app/controllers/media_controller.rb

@@ -20,6 +20,6 @@ def index
   end
 
   def show
-    redirect_to medium_fandoms_path(medium_id: params[:id])
+    redirect_to media_fandoms_path(media_id: params[:id])
   end
 end

app/controllers/tags_controller.rb

@@ -181,10 +181,10 @@ def create
       return
     end
 
-    raise "Redshirt: Attempted to constantize invalid class initialize create #{type.classify}" unless Tag::TYPES.include?(type.classify) || type == "Media"
+    raise "Redshirt: Attempted to constantize invalid class initialize create #{type.classify}" unless Tag::TYPES.include?(type.classify)
 
     model = begin
-              type == "Media" ? type.constantize : type.classify.constantize
+              type.classify.constantize
             rescue StandardError
               nil
             end
@@ -248,7 +248,7 @@ def update
     new_tag_type = params[:tag].delete(:type)
 
     # Limiting the conditions under which you can update the tag type
-    types = logged_in_as_admin? ? Tag::TYPES : Tag::USER_DEFINED
+    types = logged_in_as_admin? ? (Tag::USER_DEFINED + %w[Media]) : Tag::USER_DEFINED
     @tag = @tag.recategorize(new_tag_type) if @tag.can_change_type? && (types + %w[UnsortedTag]).include?(new_tag_type)
 
     unless params[:tag].empty?

app/views/bookmarks/index.html.erb

@@ -46,7 +46,7 @@
 <% end %>
 
 <% unless @owner.present? || @bookmarkable.present? %>
-  <p><%= ts("These are some of the latest bookmarks created on the Archive. To find more bookmarks, #{link_to 'choose a fandom', media_path} or #{link_to 'try our advanced search', search_bookmarks_path}.").html_safe %>
+  <p><%= ts("These are some of the latest bookmarks created on the Archive. To find more bookmarks, #{link_to 'choose a fandom', media_index_path} or #{link_to 'try our advanced search', search_bookmarks_path}.").html_safe %>
 <% end %>
 
 <%== pagy_nav @pagy %>

app/views/fandoms/index.html.erb

@@ -3,9 +3,9 @@
   <% if @collection %>
     <%= link_to(@collection.title, @collection) %> > <%= ts("Fandoms") %>
   <% elsif @medium %>
-    <%= link_to ts("Fandoms"), media_path %> > <%= @medium.name %>
+    <%= link_to ts("Fandoms"), media_index_path %> > <%= @medium.name %>
   <% else %>
-    <%= link_to ts("Fandoms"), media_path %>
+    <%= link_to ts("Fandoms"), media_index_path %>
   <% end %>
 </h2>
 <p>You can search this page by pressing <kbd>ctrl F</kbd> / <kbd>cmd F</kbd> and typing in what you are looking for.</p>
@@ -14,7 +14,7 @@
   <%= form_tag "", method: :get, class: "filter", id: "media-filter" do %>
     <fieldset>
       <p title="<%=ts("Choose media type") %>">
-        <%= select_tag :medium_id, options_for_select(["All Media Types"] + @media.map{|m| m.name}, params[:medium_id]) %>
+        <%= select_tag :media_id, options_for_select(["All Media Types"] + @media.map{|m| m.name}, params[:media_id]) %>
         <%= submit_tag ts("Show") %>
       </p>
     </fieldset>

app/views/home/_fandoms.html.erb

@@ -1,10 +1,10 @@
 <ul>
-  <li><%= link_to t(".all_fandoms"), media_path %></li>
+  <li><%= link_to t(".all_fandoms"), media_index_path %></li>
   <%# When changing the cache key, also update Media#expire_caches %>
   <% cache "homepage-fandoms-version1", skip_digest: true do %>
     <% Media.for_menu.each do |medium| %>
       <% unless medium.id.nil? %>
-        <li><%= link_to ts("#{medium.name}"), medium_fandoms_path(medium) %></li>
+        <li><%= link_to ts("#{medium.name}"), media_fandoms_path(medium) %></li>
       <% end %>
     <% end %>
   <% end %>

app/views/home/first_login_help.html.erb

@@ -64,9 +64,9 @@
     <% media_movie = Media.find_by_name("Movies") %>
     <%= t(".browsing.html",
           fandoms_link: link_to(t(".browsing.fandoms"), menu_fandoms_path),
-          all_fandoms_link: link_to(t(".browsing.all_fandoms"), media_path),
+          all_fandoms_link: link_to(t(".browsing.all_fandoms"), media_index_path),
           movies_link: if media_movie
-                         link_to(t(".browsing.movies"), medium_fandoms_path(media_movie))
+                         link_to(t(".browsing.movies"), media_fandoms_path(media_movie))
                        else
                          t(".browsing.movies")
                        end,

app/views/home/site_map.html.erb

@@ -3,7 +3,7 @@
   <h3 class="heading"><%= t(".explore.header") %></h3>
   <ul>
     <li><%= link_to t(".explore.homepage"), root_path %></li>
-    <li><%= link_to t(".explore.fandoms"), media_path %></li>
+    <li><%= link_to t(".explore.fandoms"), media_index_path %></li>
     <li><%= link_to t(".explore.recent_works"), works_path %></li>
     <li><%= link_to t(".explore.people"), search_people_path %></li>
     <li><%= link_to t(".explore.bookmarks"), bookmarks_path %></li>

app/views/media/index.html.erb

@@ -6,7 +6,7 @@
 <ul class="media fandom index group">
 <% for medium in @media %>
   <li id="medium_<%= medium.id %>" class="medium listbox group">
-    <h3 class="heading"><%= link_to medium.name, medium_fandoms_path(medium) %></h3>
+    <h3 class="heading"><%= link_to medium.name, media_fandoms_path(medium) %></h3>
 
     <ol class="index group">
     <% for fandom in @fandom_listing[medium] %>
@@ -20,7 +20,7 @@
     </ol>
 
     <% unless @fandom_listing[medium].size < 5 %>
-    <p class="actions" role="navigation"><%= link_to ts("All %{media_type}...", :media_type => medium.name), medium_fandoms_path(medium) %></p>
+    <p class="actions" role="navigation"><%= link_to ts("All %{media_type}...", :media_type => medium.name), media_fandoms_path(medium) %></p>
     <% end %>
   </li>
 <% end %>

app/views/menu/_menu_fandoms.html.erb

@@ -1,10 +1,10 @@
 <ul class="menu">
-  <li><%= link_to t(".all"), media_path %></li>
+  <li><%= link_to t(".all"), media_index_path %></li>
   <%# When changing the cache key, also update Media#expire_caches %>
   <% cache "menu-fandoms-version4", skip_digest: true do %>
     <% Media.for_menu.each do |medium| %>
       <% unless medium.id.nil? %>
-        <li id="medium_<%= medium.id %>"><%= link_to medium.name, medium_fandoms_path(medium) %></li>
+        <li id="medium_<%= medium.id %>"><%= link_to medium.name, media_fandoms_path(medium) %></li>
       <% end %>
     <% end %>
   <% end %>

app/views/tags/edit.html.erb

@@ -47,7 +47,7 @@
 
       <dt><%= ts("Category") %></dt>
       <dd>
-        <% types = logged_in_as_admin? ? Tag::TYPES : Tag::USER_DEFINED %>
+        <% types = logged_in_as_admin? ? (Tag::USER_DEFINED + %w[Media]) : Tag::USER_DEFINED %>
         <% if @tag.can_change_type? %>
           <%= f.select :type,
                 options_for_select(types + %w[UnsortedTag],

app/views/works/index.html.erb

@@ -43,7 +43,7 @@
 <!---/subnav-->
 
 <% unless @owner.present? %>
-  <p><%= ts("These are some of the latest works posted to the Archive. To find more works, #{link_to 'choose a fandom', media_path} or #{link_to 'try our advanced search', search_works_path}.").html_safe %>
+  <p><%= ts("These are some of the latest works posted to the Archive. To find more works, #{link_to 'choose a fandom', media_index_path} or #{link_to 'try our advanced search', search_works_path}.").html_safe %>
 <% end %>
 
 <%== pagy_nav @pagy %>

config/initializers/inflections.rb

@@ -3,12 +3,12 @@
 # Add new inflection rules using the following format. Inflections
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.irregular "Media", "Media"
 #   inflect.plural /^(ox)$/i, "\\1en"
 #   inflect.singular /^(ox)en/i, "\\1"
-#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
-# end
+end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|

features/collections/collection_navigation.feature

@@ -82,11 +82,11 @@ Feature: Basic collection navigation
       And I post the work "Breaking Free" with fandom "High School Musical" in the collection "We all sing together"
       And I go to "We all sing together" collection's page
       And I follow "Fandoms ("
-      And I select "Movies" from "medium_id"
+      And I select "Movies" from "media_id"
       And I press "Show"
     Then I should see "High School Musical"
       And I should not see "Steven's Universe"
-    When I select "TV Shows" from "medium_id"
+    When I select "TV Shows" from "media_id"
       And I press "Show"
     Then I should not see "High School Musical"
       And I should see "Steven's Universe"

features/step_definitions/tag_steps.rb

@@ -102,10 +102,6 @@
   rel.add_association(fand)
 end
 
-Given "the non(-)canonical media {string}" do |tag_name|
-  Media.find_or_create_by_name(tag_name)
-end
-
 Given /^a (non-?canonical|canonical) (\w+) "([^\"]*)"$/ do |canonical_status, tag_type, tag_name|
   t = tag_type.classify.constantize.find_or_create_by_name(tag_name)
   t.canonical = canonical_status == "canonical"
@@ -230,16 +226,16 @@
   blank_tag.save!(validate: false)
 end
 
-Given "I have just created the canonical media tag {string}" do |name|
+Given "I create the canonical media tag {string}" do |name|
   step %{I am logged in as a "tag_wrangling" admin}
   visit(new_tag_path)
   fill_in("Name", with: name)
-  choose("Medium")
+  choose("Media")
   check("Canonical")
   click_button("Create Tag")
 end
 
-Given "I have just recategorized the {string} fandom as a {string} tag" do |name, tag_type|
+Given "I recategorize the {string} fandom as a {string} tag" do |name, tag_type|
   step %{I am logged in as a "tag_wrangling" admin}
   visit(edit_tag_path(Fandom.create(name: name)))
   select(tag_type, from: "tag_type")

features/support/paths.rb

@@ -11,7 +11,7 @@ def path_to(page_name)
     when /the home\s?page/
       '/'
     when /the media page/
-      media_path
+      media_index_path
     when /^the search bookmarks page$/i
       step %{all indexing jobs have been run}
       search_bookmarks_path
@@ -278,7 +278,7 @@ def path_to(page_name)
     when /^the unassigned fandoms page $/i
       unassigned_fandoms_path
     when /^the "(.*)" fandoms page$/i
-      medium_fandoms_path(Media.find_by(name: Regexp.last_match(1)))
+      media_fandoms_path(Media.find_by(name: Regexp.last_match(1)))
     when /^the "(.*)" tag page$/i
       tag_path(Tag.find_by_name($1))
     when /^the '(.*)' tag edit page$/i