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

resolved issue regarding profile images referenced at https:// locations.

Browse source
This commit is contained in:
danielvincent 2010-10-29 14:56:41 -07:00
parent 6eb50ea934
commit 7acc138a21
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/people_controller.rb
View file

@ -73,12 +73,12 @@ class PeopleController < ApplicationController
private
def prep_image_url(params)
if params[:profile] && params[:profile][:image_url]
url = APP_CONFIG[:pod_url].dup
url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
if params[:profile][:image_url].empty?
params[:profile].delete(:image_url)
else
if /^http:\/\// =~ params[:profile][:image_url]
url = APP_CONFIG[:pod_url].dup
url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
if params[:profile][:image_url].match(/^https?:\/\//)
params[:profile][:image_url] = params[:profile][:image_url]
else
params[:profile][:image_url] = url + params[:profile][:image_url]

15
spec/controllers/people_controller_spec.rb
View file

@ -46,8 +46,23 @@ describe PeopleController do
image_url = user.person.profile.image_url
put("update", :id => user.person.id, "person" => params)
user.person.reload
user.person.profile.image_url.should == image_url
end
it "doesn't prepend (https?://) if already present in image_url" do
params = {:profile=>
{:image_url => "https://google.com/image.png",
:last_name => user.person.profile.last_name,
:first_name => user.person.profile.first_name}}
put("update", :id => user.person.id, "person" => params)
user.person.reload
user.person.profile.image_url.should == params[:profile][:image_url]
end
end
end
end