Merge pull request #292 from plural/resources-lint

Fix lint issues for resources.

Author: plural

app/resources/card_cycle_resource.rb

@@ -22,7 +22,8 @@ class CardCycleResource < ApplicationResource
   has_many :printings
   many_to_many :cards, through: :printings do
     link do |c|
-      format('%s?filter[card_cycle_id]=%s', Rails.application.routes.url_helpers.cards_url, c.id)
+      format('%<url>s?filter[card_cycle_id]=%<card_cycle_id>s', url: Rails.application.routes.url_helpers.cards_url,
+                                                                card_cycle_id: c.id)
     end
   end
 

app/resources/card_resource.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Public resource for Card objects.
-class CardResource < ApplicationResource
+class CardResource < ApplicationResource # rubocop:disable Metrics/ClassLength
   primary_endpoint '/cards', %i[index show]
 
   self.default_page_size = 1000
@@ -77,40 +77,44 @@ class CardResource < ApplicationResource
              .distinct
       else
         raise JSONAPI::Exceptions::BadRequest,
-              format('Invalid search query: [%s] / %s', value[0], query_builder.parse_error)
+              format('Invalid search query: [%<query>s] / %<error>s', query: value[0],
+                                                                      error: query_builder.parse_error)
       end
     end
   end
 
   many_to_many :card_cycles do
     link do |c|
-      format('%s?filter[id]=%s', Rails.application.routes.url_helpers.card_cycles_url, c.card_cycle_ids.join(','))
+      format('%<url>s?filter[id]=%<ids>s', url: Rails.application.routes.url_helpers.card_cycles_url,
+                                           ids: c.card_cycle_ids.join(','))
     end
   end
   many_to_many :card_sets do
     link do |c|
-      format('%s?filter[id]=%s', Rails.application.routes.url_helpers.card_sets_url, c.card_set_ids.join(','))
+      format('%<url>s?filter[id]=%<ids>s', url: Rails.application.routes.url_helpers.card_sets_url,
+                                           ids: c.card_set_ids.join(','))
     end
   end
   many_to_many :card_subtypes do
     link do |c|
       card_subtype_ids = c.card_subtype_ids.empty? ? 'none' : c.card_subtype_ids.join(',')
-      format('%s?filter[id]=%s', Rails.application.routes.url_helpers.card_subtypes_url, card_subtype_ids)
+      format('%<url>s?filter[id]=%<ids>s', url: Rails.application.routes.url_helpers.card_subtypes_url,
+                                           ids: card_subtype_ids)
     end
   end
   belongs_to :card_type
   belongs_to :faction
   has_many :printings do
     link do |c|
-      format('%s?filter[card_id]=%s', Rails.application.routes.url_helpers.printings_url, c.id)
+      format('%<url>s?filter[card_id]=%<id>s', url: Rails.application.routes.url_helpers.printings_url, id: c.id)
     end
   end
   has_many :rulings
   belongs_to :side
 
   many_to_many :decklists do
     link do |c|
-      format('%s?filter[card_id]=%s', Rails.application.routes.url_helpers.decklists_url, c.id)
+      format('%<url>s?filter[card_id]=%<id>s', url: Rails.application.routes.url_helpers.decklists_url, id: c.id)
     end
   end
 

app/resources/card_set_resource.rb

@@ -19,7 +19,7 @@ class CardSetResource < ApplicationResource
 
   belongs_to :card_cycle do
     link do |c|
-      format('%s/%s', Rails.application.routes.url_helpers.card_cycles_url, c.card_cycle_id)
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.card_cycles_url, id: c.card_cycle_id)
     end
   end
   belongs_to :card_set_type

app/resources/card_subtype_resource.rb

@@ -10,12 +10,13 @@ class CardSubtypeResource < ApplicationResource
 
   many_to_many :cards do
     link do |t|
-      '%s?filter[card_subtype_id]=%s' % [Rails.application.routes.url_helpers.cards_url, t.id]
+      format('%<url>s?filter[card_subtype_id]=%<id>s', url: Rails.application.routes.url_helpers.cards_url, id: t.id)
     end
   end
   many_to_many :printings do
     link do |t|
-      '%s?filter[card_subtype_id]=%s' % [Rails.application.routes.url_helpers.printings_url, t.id]
+      format('%<url>s?filter[card_subtype_id]=%<id>s', url: Rails.application.routes.url_helpers.printings_url,
+                                                       id: t.id)
     end
   end
 end

app/resources/deck_resource.rb

@@ -62,15 +62,15 @@ class DeckResource < PrivateApplicationResource
   # explicitly set, presumably because this is a delegated field on the model.
   belongs_to :faction, foreign_key: :faction_id do # rubocop:disable Rails/RedundantForeignKey
     link do |decklist|
-      '%s/%s' % [ Rails.application.routes.url_helpers.factions_url, decklist.faction_id ]
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.factions_url, id: decklist.faction_id)
     end
   end
 
   # The rubocop warning is disabled because this relationship won't work
   # without it because there is no identity_card table.
   belongs_to :identity_card, resource: CardResource, foreign_key: :identity_card_id do # rubocop:disable Rails/RedundantForeignKey
     link do |deck|
-      '%s/%s' % [ Rails.application.routes.url_helpers.cards_url, deck.identity_card_id ]
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.cards_url, id: deck.identity_card_id)
     end
   end
 

app/resources/decklist_resource.rb

@@ -46,15 +46,15 @@ class DecklistResource < ApplicationResource
   # explicitly set, presumably because this is a delegated field on the model.
   belongs_to :faction, foreign_key: :faction_id do # rubocop:disable Rails/RedundantForeignKey
     link do |decklist|
-      format('%s/%s', Rails.application.routes.url_helpers.factions_url, decklist.faction_id)
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.factions_url, id: decklist.faction_id)
     end
   end
 
   # The rubocop warning is disabled because this relationship won't work
   # without it because there is no identity_card table.
   belongs_to :identity_card, resource: CardResource, foreign_key: :identity_card_id do # rubocop:disable Rails/RedundantForeignKey
     link do |decklist|
-      format('%s/%s', Rails.application.routes.url_helpers.cards_url, decklist.identity_card_id)
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.cards_url, id: decklist.identity_card_id)
     end
   end
 

app/resources/printing_resource.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Public resource for Printing objects.
-class PrintingResource < ApplicationResource
+class PrintingResource < ApplicationResource # rubocop:disable Metrics/ClassLength
   primary_endpoint '/printings', %i[index show]
   self.default_page_size = 1000
 
@@ -89,35 +89,37 @@ class PrintingResource < ApplicationResource
              .distinct
       else
         raise JSONAPI::Exceptions::BadRequest,
-              format('Invalid search query: [%s] / %s', value[0], query_builder.parse_error)
+              format('Invalid search query: [%<query>s] / %<error>s', query: value[0], error: query_builder.parse_error)
       end
     end
   end
 
   belongs_to :card
   belongs_to :card_cycle do
     link do |p|
-      format('%s/%s', Rails.application.routes.url_helpers.card_cycles_url, p.card_cycle_id)
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.card_cycles_url, id: p.card_cycle_id)
     end
   end
   belongs_to :card_set
   belongs_to :card_type
   belongs_to :faction
   belongs_to :side do
     link do |p|
-      format('%s/%s', Rails.application.routes.url_helpers.sides_url, p.side_id)
+      format('%<url>s/%<id>s', url: Rails.application.routes.url_helpers.sides_url, id: p.side_id)
     end
   end
 
   many_to_many :card_subtypes do
     link do |p|
-      format('%s?filter[id]=%s', Rails.application.routes.url_helpers.card_subtypes_url, p.card_subtype_ids.join(','))
+      format('%<url>s?filter[id]=%<ids>s', url: Rails.application.routes.url_helpers.card_subtypes_url,
+                                           ids: p.card_subtype_ids.join(','))
     end
   end
 
   many_to_many :illustrators do
     link do |p|
-      format('%s?filter[id]=%s', Rails.application.routes.url_helpers.illustrators_url, p.illustrator_ids.join(','))
+      format('%<url>s?filter[id]=%<ids>s', url: Rails.application.routes.url_helpers.illustrators_url,
+                                           ids: p.illustrator_ids.join(','))
     end
   end
 
@@ -126,7 +128,7 @@ class PrintingResource < ApplicationResource
       CardPool.by_printing_ids(printings.map(&:id))
     end
     link do |p|
-      format('%s?filter[printing_id]=%s', Rails.application.routes.url_helpers.card_pools_url, p.id)
+      format('%<url>s?filter[printing_id]=%<id>s', url: Rails.application.routes.url_helpers.card_pools_url, id: p.id)
     end
   end
 end

app/resources/user_resource.rb

@@ -11,12 +11,12 @@ class UserResource < PrivateApplicationResource
 
   has_many :decks do
     link do |user|
-      '%s?filter[user_id]=%s' % [Rails.application.routes.url_helpers.decks_url, user.id]
+      format('%<url>s?filter[user_id]=%<id>s', url: Rails.application.routes.url_helpers.decks_url, id: user.id)
     end
   end
   has_many :decklists do
     link do |user|
-      '%s?filter[user_id]=%s' % [Rails.application.routes.url_helpers.decklists_url, user.id]
+      format('%<url>s?filter[user_id]=%<id>s', url: Rails.application.routes.url_helpers.decklists_url, id: user.id)
     end
   end
 end