nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use camo for medium and small avatars

Browse source
This commit is contained in:
Benjamin Neff 2015-04-24 01:36:51 +02:00
parent 0bad6dba88
commit 344b198900
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/presenters/avatar_presenter.rb
View file

@ -1,11 +1,11 @@
class AvatarPresenter < BasePresenter class AvatarPresenter < BasePresenter
DEFAULT_IMAGE = ActionController::Base.helpers.image_path("user/default.png")
DEFAULT_IMAGE = ActionController::Base.helpers.image_path('user/default.png')
def base_hash def base_hash
{ small: image_url_small || DEFAULT_IMAGE, {
medium: image_url_medium || DEFAULT_IMAGE, small: image_url(:thumb_small) || DEFAULT_IMAGE,
medium: image_url(:thumb_medium) || DEFAULT_IMAGE,
large: image_url || DEFAULT_IMAGE large: image_url || DEFAULT_IMAGE
} }
end end

22
spec/presenters/avatar_presenter_spec.rb Normal file
View file

@ -0,0 +1,22 @@
require "spec_helper"
describe AvatarPresenter do
describe "#base_hash" do
it "calls image_url() for the avatars" do
@profile = FactoryGirl.create(:profile_with_image_url, person: alice.person)
@presenter = AvatarPresenter.new(@profile)
expect(@profile).to receive(:image_url).exactly(3).times
expect(@presenter.base_hash).to be_present
end
it "returns the default images if no images set" do
@profile = FactoryGirl.create(:profile, person: alice.person)
@presenter = AvatarPresenter.new(@profile)
expect(@presenter.base_hash).to eq(
small: "/assets/user/default.png",
medium: "/assets/user/default.png",
large: "/assets/user/default.png"
)
end
end
end