<%= article.title %>
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 05f2f62d8..46ac009f7 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -124,7 +124,7 @@
<% if @organization %>
- .get(width: 50) %>)
+  %>)
<%= @user.name %>
diff --git a/app/views/articles/tags/_sidebar.html.erb b/app/views/articles/tags/_sidebar.html.erb
index cb770b527..9ee724c75 100644
--- a/app/views/articles/tags/_sidebar.html.erb
+++ b/app/views/articles/tags/_sidebar.html.erb
@@ -54,7 +54,7 @@
<% @moderators.each do |user| %>
<% end %>
diff --git a/app/views/chat_channels/show.json.jbuilder b/app/views/chat_channels/show.json.jbuilder
index 885442833..1fab47d65 100644
--- a/app/views/chat_channels/show.json.jbuilder
+++ b/app/views/chat_channels/show.json.jbuilder
@@ -2,7 +2,7 @@ json.messages @chat_messages.reverse do |message|
json.extract!(message, :id, :user_id, :edited_at)
json.username message.user.username
- json.profile_image_url ProfileImage.new(message.user).get(width: 90)
+ json.profile_image_url Images::Profile.call(message.user.profile_image_url, length: 90)
json.message message.message_html
json.markdown message.message_markdown
json.timestamp message.created_at
diff --git a/app/views/comments/_comment.json.jbuilder b/app/views/comments/_comment.json.jbuilder
index be524362c..9d90c1fe1 100644
--- a/app/views/comments/_comment.json.jbuilder
+++ b/app/views/comments/_comment.json.jbuilder
@@ -12,7 +12,7 @@ json.user do
json.id current_user.id
json.username current_user.username
json.name current_user.name
- json.profile_pic ProfileImage.new(current_user).get(width: 50)
+ json.profile_pic Images::Profile.call(current_user.profile_image_url, length: 50)
json.twitter_username current_user.twitter_username
json.github_username current_user.github_username
end
diff --git a/app/views/comments/_comment_proper.html.erb b/app/views/comments/_comment_proper.html.erb
index 5ac61a776..7ae19702d 100644
--- a/app/views/comments/_comment_proper.html.erb
+++ b/app/views/comments/_comment_proper.html.erb
@@ -26,7 +26,7 @@
.get(width: 90) %>)
@<%= org.slug %>
+What next?
-.get(width: 90) %>)
Purchase Credits for @<%= org.slug %>
+ %>)
Purchase Credits for @<%= org.slug %>
<% if org.credits.unspent.size > 0 %>.get(width: 90) %>)
@<%= org.slug %>
+ %>)
@<%= org.slug %>
<% if org.enough_credits?(Sponsorship::CREDITS[level]) %>diff --git a/app/views/social_previews/articles/article.html.erb b/app/views/social_previews/articles/article.html.erb index fa60c6025..3ff8fbcdb 100644 --- a/app/views/social_previews/articles/article.html.erb +++ b/app/views/social_previews/articles/article.html.erb @@ -127,7 +127,7 @@
<%= @article.title %>
<%= @article.title %>
<%= @comment.title %>
-.get(width: 640) %>)
+  %>)
<%= truncate @user.name, length: 32 %>
- .get(width: 150) %>)
" />
+  %>)
" />
<% else %>
- .get(width: 150) %>)
" />
+  %>)
" />
<% end %>
diff --git a/app/views/users/_organizations_area.html.erb b/app/views/users/_organizations_area.html.erb
index a9b575897..3d36b81e9 100644
--- a/app/views/users/_organizations_area.html.erb
+++ b/app/views/users/_organizations_area.html.erb
@@ -8,7 +8,7 @@
<% @user.organizations.each do |organization| %>
- .get(width: 90) %>)
+  %>)
<% end %>
diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb
index 8b5d21c55..e9d0d554a 100644
--- a/app/views/users/_profile.html.erb
+++ b/app/views/users/_profile.html.erb
@@ -42,7 +42,7 @@
<% if @user.profile_image_url.present? %>
- .get(width: 50) %>)
+  %>)
<%= f.file_field :profile_image, accept: "image/*", class: "crayons-card crayons-card--secondary p-3 flex items-center flex-1 w-100" %>
<% end %>
diff --git a/app/views/users/_profile_header.html.erb b/app/views/users/_profile_header.html.erb
index 4493539f9..ed9aee8f3 100644
--- a/app/views/users/_profile_header.html.erb
+++ b/app/views/users/_profile_header.html.erb
@@ -20,7 +20,7 @@
- .get(width: 320) %>)
+  %>)
@<%= @user.username %> diff --git a/app/views/users/_liquid.html.erb b/app/views/users/_liquid.html.erb index a15580ca7..182464717 100644 --- a/app/views/users/_liquid.html.erb +++ b/app/views/users/_liquid.html.erb @@ -9,12 +9,12 @@ <% if user_path.present? %>
diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder index f5339f0c5..67db4f3c0 100644 --- a/app/views/users/index.json.jbuilder +++ b/app/views/users/index.json.jbuilder @@ -2,6 +2,6 @@ json.array! @users.each do |user| json.extract!(user, :id, :name, :username) json.summary truncate(user.summary.presence || "Active #{community_name} author", length: 100) - json.profile_image_url ProfileImage.new(user).get(width: 90) + json.profile_image_url Images::Profile.call(user.profile_image_url, length: 90) json.following false end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index a939c7d83..c7d5d8f31 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -29,7 +29,7 @@
- .get(width: 320) %>)
+  %>)
diff --git a/spec/liquid_tags/link_tag_spec.rb b/spec/liquid_tags/link_tag_spec.rb index a18aa7ade..2f4e1aaa1 100644 --- a/spec/liquid_tags/link_tag_spec.rb +++ b/spec/liquid_tags/link_tag_spec.rb @@ -35,7 +35,7 @@ RSpec.describe LinkTag, type: :liquid_tag do
- .get(width: 150)})
+ })
diff --git a/spec/requests/api/v0/followers_spec.rb b/spec/requests/api/v0/followers_spec.rb
index befcf59c6..8c9285ee9 100644
--- a/spec/requests/api/v0/followers_spec.rb
+++ b/spec/requests/api/v0/followers_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe "Api::V0::FollowersController", type: :request do
expect(response_follower["name"]).to eq(follower.name)
expect(response_follower["path"]).to eq(follower.path)
expect(response_follower["username"]).to eq(follower.username)
- expect(response_follower["profile_image"]).to eq(ProfileImage.new(follower).get(width: 60))
+ expect(response_follower["profile_image"]).to eq(Images::Profile.call(follower.profile_image_url, length: 60))
end
it "supports pagination" do
diff --git a/spec/requests/api/v0/users_spec.rb b/spec/requests/api/v0/users_spec.rb
index 6d081bb8d..4b0a51a88 100644
--- a/spec/requests/api/v0/users_spec.rb
+++ b/spec/requests/api/v0/users_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe "Api::V0::Users", type: :request do
end
expect(response_user["joined_at"]).to eq(user.created_at.strftime("%b %e, %Y"))
- expect(response_user["profile_image"]).to eq(ProfileImage.new(user).get(width: 320))
+ expect(response_user["profile_image"]).to eq(Images::Profile.call(user.profile_image_url, length: 320))
end
end
@@ -74,7 +74,7 @@ RSpec.describe "Api::V0::Users", type: :request do
end
expect(response_user["joined_at"]).to eq(user.created_at.strftime("%b %e, %Y"))
- expect(response_user["profile_image"]).to eq(ProfileImage.new(user).get(width: 320))
+ expect(response_user["profile_image"]).to eq(Images::Profile.call(user.profile_image_url, length: 320))
end
it "returns 200 if no authentication and site config is set to private but user is authenticated" do
@@ -92,7 +92,7 @@ RSpec.describe "Api::V0::Users", type: :request do
end
expect(response_user["joined_at"]).to eq(user.created_at.strftime("%b %e, %Y"))
- expect(response_user["profile_image"]).to eq(ProfileImage.new(user).get(width: 320))
+ expect(response_user["profile_image"]).to eq(Images::Profile.call(user.profile_image_url, length: 320))
end
end
end
diff --git a/spec/requests/api/v0/webhooks_spec.rb b/spec/requests/api/v0/webhooks_spec.rb
index fa0b74ad6..0572b0895 100644
--- a/spec/requests/api/v0/webhooks_spec.rb
+++ b/spec/requests/api/v0/webhooks_spec.rb
@@ -121,15 +121,18 @@ RSpec.describe "Api::V0::Webhooks", type: :request do
get api_webhook_path(webhook.id)
response_webhook_user = response.parsed_body["user"]
- user_profile_image = ProfileImage.new(webhook.user)
- expect(response_webhook_user["name"]).to eq(webhook.user.name)
- expect(response_webhook_user["username"]).to eq(webhook.user.username)
- expect(response_webhook_user["twitter_username"]).to eq(webhook.user.twitter_username)
- expect(response_webhook_user["github_username"]).to eq(webhook.user.github_username)
- expect(response_webhook_user["website_url"]).to eq(webhook.user.processed_website_url)
- expect(response_webhook_user["profile_image"]).to eq(user_profile_image.get(width: 640))
- expect(response_webhook_user["profile_image_90"]).to eq(user_profile_image.get(width: 90))
+ expect(response_webhook_user).to eq({
+ "name" => webhook.user.name,
+ "username" => webhook.user.username,
+ "twitter_username" => webhook.user.twitter_username,
+ "github_username" => webhook.user.github_username,
+ "website_url" => webhook.user.processed_website_url,
+ "profile_image" => Images::Profile.call(webhook.user.profile_image_url,
+ length: 640),
+ "profile_image_90" => Images::Profile.call(webhook.user.profile_image_url,
+ length: 90)
+ })
end
end
diff --git a/spec/requests/articles/articles_show_spec.rb b/spec/requests/articles/articles_show_spec.rb
index 62945ca1e..17846350b 100644
--- a/spec/requests/articles/articles_show_spec.rb
+++ b/spec/requests/articles/articles_show_spec.rb
@@ -70,7 +70,7 @@ RSpec.describe "ArticlesShow", type: :request do
"@id" => URL.organization(organization)
},
"url" => URL.organization(organization),
- "image" => ProfileImage.new(organization).get(width: 320),
+ "image" => Images::Profile.call(organization.profile_image_url, length: 320),
"name" => organization.name,
"description" => organization.summary
},
diff --git a/spec/requests/chat_channels_spec.rb b/spec/requests/chat_channels_spec.rb
index 08420c5c2..389224548 100644
--- a/spec/requests/chat_channels_spec.rb
+++ b/spec/requests/chat_channels_spec.rb
@@ -406,7 +406,7 @@ RSpec.describe "ChatChannels", type: :request do
expected_last_opened_at = Time.zone.parse(response_channel_users[user.username]["last_opened_at"]).to_i
response_user = response_channel_users[user.username]
- expect(response_user["profile_image"]).to eq(ProfileImage.new(user).get(width: 90))
+ expect(response_user["profile_image"]).to eq(Images::Profile.call(user.profile_image_url, length: 90))
expect(response_user["darker_color"]).to eq(user.decorate.darker_color)
expect(response_user["name"]).to eq(user.name)
expect(expected_last_opened_at).to eq(user.chat_channel_memberships.last.last_opened_at.to_i)
diff --git a/spec/requests/followings_spec.rb b/spec/requests/followings_spec.rb
index 74baddba1..27f92ca82 100644
--- a/spec/requests/followings_spec.rb
+++ b/spec/requests/followings_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe "FollowingsController", type: :request do
expect(response_following["name"]).to eq(followed.name)
expect(response_following["path"]).to eq(followed.path)
expect(response_following["username"]).to eq(followed.username)
- expect(response_following["profile_image"]).to eq(ProfileImage.new(followed).get(width: 60))
+ expect(response_following["profile_image"]).to eq(Images::Profile.call(followed.profile_image_url, length: 60))
end
end
end
@@ -111,7 +111,7 @@ RSpec.describe "FollowingsController", type: :request do
expect(response_following["name"]).to eq(followed.name)
expect(response_following["path"]).to eq(followed.path)
expect(response_following["username"]).to eq(followed.username)
- expect(response_following["profile_image"]).to eq(ProfileImage.new(followed).get(width: 60))
+ expect(response_following["profile_image"]).to eq(Images::Profile.call(followed.profile_image_url, length: 60))
end
end
end
@@ -148,7 +148,7 @@ RSpec.describe "FollowingsController", type: :request do
expect(response_following["name"]).to eq(followed.name)
expect(response_following["path"]).to eq("/#{followed.path}")
expect(response_following["username"]).to eq(followed.name)
- expect(response_following["profile_image"]).to eq(ProfileImage.new(followed).get(width: 60))
+ expect(response_following["profile_image"]).to eq(Images::Profile.call(followed.profile_image_url, length: 60))
end
end
end
diff --git a/spec/requests/user/user_show_spec.rb b/spec/requests/user/user_show_spec.rb
index 9ae8be9cc..24ea7806c 100644
--- a/spec/requests/user/user_show_spec.rb
+++ b/spec/requests/user/user_show_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe "UserShow", type: :request do
user.twitch_username,
user.website_url,
],
- "image" => ProfileImage.new(user).get(width: 320),
+ "image" => Images::Profile.call(user.profile_image_url, length: 320),
"name" => user.name,
"email" => user.email,
"jobTitle" => user.employment_title,
diff --git a/spec/requests/user/user_suggestions_spec.rb b/spec/requests/user/user_suggestions_spec.rb
index d3af33183..4b5e01970 100644
--- a/spec/requests/user/user_suggestions_spec.rb
+++ b/spec/requests/user/user_suggestions_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe "Users", type: :request do
"name" => suggested_user.name,
"username" => suggested_user.username,
"summary" => suggested_user.summary,
- "profile_image_url" => ProfileImage.new(suggested_user).get(width: 90),
+ "profile_image_url" => Images::Profile.call(suggested_user.profile_image_url, length: 90),
"following" => false,
)
end
diff --git a/spec/labor/profile_image_spec.rb b/spec/services/images/profile_spec.rb
similarity index 60%
rename from spec/labor/profile_image_spec.rb
rename to spec/services/images/profile_spec.rb
index 13735983b..cd68dbf9e 100644
--- a/spec/labor/profile_image_spec.rb
+++ b/spec/services/images/profile_spec.rb
@@ -1,17 +1,17 @@
require "rails_helper"
-RSpec.describe ProfileImage, type: :labor do
+RSpec.describe Images::Profile, type: :services do
describe "#get" do
it "returns user profile_image_url" do
user = build_stubbed(:user)
- expect(described_class.new(user).get).to eq(user.profile_image_url)
+ expect(described_class.call(user.profile_image_url)).to eq(user.profile_image_url)
end
context "when user has no profile_image" do
it "returns backup image prefixed with Cloudinary" do
user = build_stubbed(:user, profile_image: nil)
correct_prefix = "/c_fill,f_auto,fl_progressive,h_120,q_auto,w_120/"
- expect(described_class.new(user).get).to include(correct_prefix + described_class::BACKUP_LINK)
+ expect(described_class.call(user.profile_image_url)).to include(correct_prefix + described_class::BACKUP_LINK)
end
end
end