From 4dabe265c646ed4f96ead2748ba9f4ec655bec8b Mon Sep 17 00:00:00 2001 From: Ben Halpern Date: Tue, 26 Nov 2019 08:35:34 -0500 Subject: [PATCH] Fix linting (#4933) [deploy] --- app/helpers/application_helper.rb | 2 +- app/helpers/articles_helper.rb | 4 +-- app/views/articles/show.html.erb | 4 +-- .../registrations/_registration_form.html.erb | 4 +-- app/views/layouts/_top_bar.html.erb | 6 ++-- app/views/social_previews/article.html.erb | 2 +- app/views/social_previews/comment.html.erb | 2 +- app/views/social_previews/listing.html.erb | 6 ++-- app/views/social_previews/tag.html.erb | 2 +- app/views/social_previews/user.html.erb | 2 +- app/views/users/_profile_header.html.erb | 26 ++++++++--------- app/views/users/show.html.erb | 28 +++++++++---------- spec/helpers/articles_helper_spec.rb | 8 +++--- 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index db9a1c877..4d17bc940 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -172,7 +172,7 @@ module ApplicationHelper if ApplicationConfig["LOGO_SVG"].present? ApplicationConfig["LOGO_SVG"].html_safe else - inline_svg("devplain.svg", class: "logo", size: "20% * 20%", aria: true, title: "App logo") + inline_svg_tag("devplain.svg", class: "logo", size: "20% * 20%", aria: true, title: "App logo") end end diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb index c86b2371b..3c3d6fc9e 100644 --- a/app/helpers/articles_helper.rb +++ b/app/helpers/articles_helper.rb @@ -21,13 +21,13 @@ module ArticlesHelper end end - def image_tag_or_inline_svg(service_name, width: nil, height: nil) + def image_tag_or_inline_svg_tag(service_name, width: nil, height: nil) name = "#{service_name}-logo.svg" if internal_navigation? image_tag(name, class: "icon-img", alt: "#{service_name} logo", width: width, height: height) else - inline_svg(name, class: "icon-img", aria: true, title: "#{service_name} logo", width: width, height: height) + inline_svg_tag(name, class: "icon-img", aria: true, title: "#{service_name} logo", width: width, height: height) end end diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb index d8e5b5b07..d97596d33 100644 --- a/app/views/articles/show.html.erb +++ b/app/views/articles/show.html.erb @@ -125,10 +125,10 @@ <% if @user.twitter_username.present? %> - <%= image_tag_or_inline_svg "twitter", width: 18, height: 18 %> + <%= image_tag_or_inline_svg_tag "twitter", width: 18, height: 18 %> <% end %> <% if @user.github_username.present? %> - <%= image_tag_or_inline_svg "github", width: 18, height: 18 %> + <%= image_tag_or_inline_svg_tag "github", width: 18, height: 18 %> <% end %> <% if @article.published_timestamp.present? %> diff --git a/app/views/devise/registrations/_registration_form.html.erb b/app/views/devise/registrations/_registration_form.html.erb index 26dc29b3f..07895cef3 100644 --- a/app/views/devise/registrations/_registration_form.html.erb +++ b/app/views/devise/registrations/_registration_form.html.erb @@ -75,10 +75,10 @@ <% end %>
<%= ApplicationConfig["APP_DOMAIN"] %>/users/auth/twitter/callback" class="sign-up-link" data-no-instant> - <%= inline_svg("twitter-logo.svg", class: "icon-img", aria: true, title: "twitter logo") %> Sign In with Twitter + <%= inline_svg_tag("twitter-logo.svg", class: "icon-img", aria: true, title: "twitter logo") %> Sign In with Twitter

We require social login to prevent abuse.

diff --git a/app/views/layouts/_top_bar.html.erb b/app/views/layouts/_top_bar.html.erb index 3cb3031a2..9f27f605a 100644 --- a/app/views/layouts/_top_bar.html.erb +++ b/app/views/layouts/_top_bar.html.erb @@ -18,11 +18,11 @@ WRITE A POST - <%= inline_svg("connect.svg", size: "100% * 100%", aria: true, title: "Connect") %> + <%= inline_svg_tag("connect.svg", size: "100% * 100%", aria: true, title: "Connect") %>
- <%= inline_svg("bell.svg", size: "100% * 100%", aria: true, title: "Notifications") %> + <%= inline_svg_tag("bell.svg", size: "100% * 100%", aria: true, title: "Notifications") %>
diff --git a/app/views/social_previews/comment.html.erb b/app/views/social_previews/comment.html.erb index dcaf8ef22..29037905a 100644 --- a/app/views/social_previews/comment.html.erb +++ b/app/views/social_previews/comment.html.erb @@ -143,7 +143,7 @@ <%= truncate @comment.user.name, length: 25 %>・<%= @comment.readable_publish_date %> diff --git a/app/views/social_previews/listing.html.erb b/app/views/social_previews/listing.html.erb index 1f3352b1e..6f485d788 100644 --- a/app/views/social_previews/listing.html.erb +++ b/app/views/social_previews/listing.html.erb @@ -35,7 +35,7 @@ } h1 { - color: <%= HexComparer.new([@cat_color]).brightness(0.70) %>; + color: <%= HexComparer.new([@cat_color]).brightness(0.70) %>; width: 92%; margin: 0; padding: 1vw; @@ -46,7 +46,7 @@ font-size: 3.1vw; padding: 0 4vw; font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", "Roboto", sans-serif; - color: <%= HexComparer.new([@cat_color]).brightness(0.77) %>; + color: <%= HexComparer.new([@cat_color]).brightness(0.77) %>; } .preview-category { @@ -81,7 +81,7 @@ <%= @category %> diff --git a/app/views/social_previews/tag.html.erb b/app/views/social_previews/tag.html.erb index 0f224cd53..15e0702a5 100644 --- a/app/views/social_previews/tag.html.erb +++ b/app/views/social_previews/tag.html.erb @@ -102,7 +102,7 @@ <% end %> diff --git a/app/views/social_previews/user.html.erb b/app/views/social_previews/user.html.erb index 4c0bbd862..92eeb2d1e 100644 --- a/app/views/social_previews/user.html.erb +++ b/app/views/social_previews/user.html.erb @@ -90,7 +90,7 @@ <%= @user.name %> diff --git a/app/views/users/_profile_header.html.erb b/app/views/users/_profile_header.html.erb index 9b758956b..d5cf27116 100644 --- a/app/views/users/_profile_header.html.erb +++ b/app/views/users/_profile_header.html.erb @@ -34,68 +34,68 @@

<% if @user.twitter_username.present? %> - <%= inline_svg("twitter-logo.svg", class: "icon-img", aria: true, title: "Twitter logo") %> + <%= inline_svg_tag("twitter-logo.svg", class: "icon-img", aria: true, title: "Twitter logo") %> <% end %> <% if @user.github_username.present? %> - <%= inline_svg("github-logo.svg", class: "icon-img", aria: true, title: "GitHub logo") %> + <%= inline_svg_tag("github-logo.svg", class: "icon-img", aria: true, title: "GitHub logo") %> <% end %> <% if @user.class.name == "User" %> <% if @user.mastodon_url.present? %> - <%= inline_svg("mastodon-logo.svg", class: "icon-img", aria: true, title: "Mastodon logo") %> + <%= inline_svg_tag("mastodon-logo.svg", class: "icon-img", aria: true, title: "Mastodon logo") %> <% end %> <% if @user.facebook_url.present? %> - <%= inline_svg("facebook-logo.svg", class: "icon-img", aria: true, title: "Facebook logo") %> + <%= inline_svg_tag("facebook-logo.svg", class: "icon-img", aria: true, title: "Facebook logo") %> <% end %> <% if @user.linkedin_url.present? %> - <%= inline_svg("linkedin_icon.svg", class: "icon-img", aria: true, title: "LinkedIn logo") %> + <%= inline_svg_tag("linkedin_icon.svg", class: "icon-img", aria: true, title: "LinkedIn logo") %> <% end %> <% if @user.behance_url.present? %> - <%= inline_svg("behance_icon.svg", class: "icon-img", aria: true, title: "Behance logo") %> + <%= inline_svg_tag("behance_icon.svg", class: "icon-img", aria: true, title: "Behance logo") %> <% end %> <% if @user.stackoverflow_url.present? %> - <%= inline_svg("stackoverflow-logo.svg", class: "icon-img", aria: true, title: "StackOverflow logo") %> + <%= inline_svg_tag("stackoverflow-logo.svg", class: "icon-img", aria: true, title: "StackOverflow logo") %> <% end %> <% if @user.dribbble_url.present? %> - <%= inline_svg("dribbble_icon.svg", class: "icon-img", aria: true, title: "Dribbble logo") %> + <%= inline_svg_tag("dribbble_icon.svg", class: "icon-img", aria: true, title: "Dribbble logo") %> <% end %> <% if @user.medium_url.present? %> - <%= inline_svg("medium_icon.svg", class: "icon-img", aria: true, title: "Medium logo") %> + <%= inline_svg_tag("medium_icon.svg", class: "icon-img", aria: true, title: "Medium logo") %> <% end %> <% if @user.gitlab_url.present? %> - <%= inline_svg("gitlab.svg", class: "icon-img", aria: true, title: "GitLab logo") %> + <%= inline_svg_tag("gitlab.svg", class: "icon-img", aria: true, title: "GitLab logo") %> <% end %> <% if @user.instagram_url.present? %> - <%= inline_svg("instagram-logo.svg", class: "icon-img", aria: true, title: "Instagram logo") %> + <%= inline_svg_tag("instagram-logo.svg", class: "icon-img", aria: true, title: "Instagram logo") %> <% end %> <% if @user.twitch_url.present? %> - <%= inline_svg("twitch-logo.svg", class: "icon-img", aria: true, title: "Twitch logo") %> + <%= inline_svg_tag("twitch-logo.svg", class: "icon-img", aria: true, title: "Twitch logo") %> <% end %> <% if @user.website_url.present? %> - <%= inline_svg("external-link-logo.svg", class: "icon-img", aria: true, title: "external link icon") %> + <%= inline_svg_tag("external-link-logo.svg", class: "icon-img", aria: true, title: "external link icon") %> <% end %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c79e6fb07..b7c91645a 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -57,71 +57,71 @@

<% if @user.twitter_username? %> - <%= inline_svg("twitter-logo.svg", class: "icon-img", aria: true, title: "Twitter logo") %> + <%= inline_svg_tag("twitter-logo.svg", class: "icon-img", aria: true, title: "Twitter logo") %> <% end %> <% if @user.github_username? %> - <%= inline_svg("github-logo.svg", class: "icon-img", aria: true, title: "GitHub logo") %> + <%= inline_svg_tag("github-logo.svg", class: "icon-img", aria: true, title: "GitHub logo") %> <% end %> <% if @user.mastodon_url? %> - <%= inline_svg("mastodon-logo.svg", class: "icon-img", aria: true, title: "Mastodon logo") %> + <%= inline_svg_tag("mastodon-logo.svg", class: "icon-img", aria: true, title: "Mastodon logo") %> <% end %> <% if @user.facebook_url? %> - <%= inline_svg("facebook-logo.svg", class: "icon-img", aria: true, title: "Facebook logo") %> + <%= inline_svg_tag("facebook-logo.svg", class: "icon-img", aria: true, title: "Facebook logo") %> <% end %> <% if @user.linkedin_url? %> - <%= inline_svg("linkedin_icon.svg", class: "icon-img", aria: true, title: "LinkedIn logo") %> + <%= inline_svg_tag("linkedin_icon.svg", class: "icon-img", aria: true, title: "LinkedIn logo") %> <% end %> <% if @user.behance_url? %> - <%= inline_svg("behance_icon.svg", class: "icon-img", aria: true, title: "Behance logo") %> + <%= inline_svg_tag("behance_icon.svg", class: "icon-img", aria: true, title: "Behance logo") %> <% end %> <% if @user.stackoverflow_url? %> - <%= inline_svg("stackoverflow-logo.svg", class: "icon-img", aria: true, title: "StackOverflow logo") %> + <%= inline_svg_tag("stackoverflow-logo.svg", class: "icon-img", aria: true, title: "StackOverflow logo") %> <% end %> <% if @user.dribbble_url? %> - <%= inline_svg("dribbble_icon.svg", class: "icon-img", aria: true, title: "Dribbble logo") %> + <%= inline_svg_tag("dribbble_icon.svg", class: "icon-img", aria: true, title: "Dribbble logo") %> <% end %> <% if @user.medium_url? %> - <%= inline_svg("medium_icon.svg", class: "icon-img", aria: true, title: "Medium logo") %> + <%= inline_svg_tag("medium_icon.svg", class: "icon-img", aria: true, title: "Medium logo") %> <% end %> <% if @user.gitlab_url? %> - <%= inline_svg("gitlab.svg", class: "icon-img", aria: true, title: "GitLab logo") %> + <%= inline_svg_tag("gitlab.svg", class: "icon-img", aria: true, title: "GitLab logo") %> <% end %> <% if @user.instagram_url? %> - <%= inline_svg("instagram-logo.svg", class: "icon-img", aria: true, title: "Instagram logo") %> + <%= inline_svg_tag("instagram-logo.svg", class: "icon-img", aria: true, title: "Instagram logo") %> <% end %> <% if @user.twitch_username? %> <%= link_to twitch_live_stream_path(username: @user.username) do %> - <%= inline_svg("twitch-logo.svg", class: "icon-img", id: "icon-twitch", aria: true, title: "Twitch logo") %> + <%= inline_svg_tag("twitch-logo.svg", class: "icon-img", id: "icon-twitch", aria: true, title: "Twitch logo") %> <% end %> <% elsif @user.twitch_url? %> - <%= inline_svg("twitch-logo.svg", class: "icon-img", aria: true, title: "Twitch logo") %> + <%= inline_svg_tag("twitch-logo.svg", class: "icon-img", aria: true, title: "Twitch logo") %> <% end %> <% if @user.website_url? %> - <%= inline_svg("external-link-logo.svg", class: "icon-img", aria: true, title: "external link icon") %> + <%= inline_svg_tag("external-link-logo.svg", class: "icon-img", aria: true, title: "external link icon") %> <% end %>

diff --git a/spec/helpers/articles_helper_spec.rb b/spec/helpers/articles_helper_spec.rb index d309f0daf..0ac9b4afa 100644 --- a/spec/helpers/articles_helper_spec.rb +++ b/spec/helpers/articles_helper_spec.rb @@ -23,18 +23,18 @@ describe ArticlesHelper do end end - describe "#image_tag_or_inline_svg" do + describe "#image_tag_or_inline_svg_tag" do helper do def internal_navigation? true end end - subject { helper.image_tag_or_inline_svg("twitter") } + subject { helper.image_tag_or_inline_svg_tag("twitter") } it { is_expected.to start_with("