Use secure.gravatar.com when running over SSL
This commit is contained in:
parent
786fe29db4
commit
85468fb4ce
2 changed files with 38 additions and 1 deletions
|
@ -1,7 +1,9 @@
|
|||
require 'digest/md5'
|
||||
module ApplicationHelper
|
||||
|
||||
def gravatar_icon(user_email)
|
||||
"http://www.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email)}?s=40&d=identicon"
|
||||
gravatar_host = request.ssl? ? "https://secure.gravatar.com" : "http://www.gravatar.com"
|
||||
"#{gravatar_host}/avatar/#{Digest::MD5.hexdigest(user_email)}?s=40&d=identicon"
|
||||
end
|
||||
|
||||
def fixed_mode?
|
||||
|
|
35
spec/helpers/application_helper_spec.rb
Normal file
35
spec/helpers/application_helper_spec.rb
Normal file
|
@ -0,0 +1,35 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe ApplicationHelper do
|
||||
context ".gravatar_icon" do
|
||||
context "over http" do
|
||||
it "returns the correct URL to www.gravatar.com" do
|
||||
expected = "http://www.gravatar.com/avatar/f7daa65b2aa96290bb47c4d68d11fe6a?s=40&d=identicon"
|
||||
|
||||
# Pretend we're running over HTTP
|
||||
helper.stub(:request) do
|
||||
request = double('request')
|
||||
request.stub(:ssl?) { false }
|
||||
request
|
||||
end
|
||||
|
||||
helper.gravatar_icon("admin@local.host").should == expected
|
||||
end
|
||||
end
|
||||
|
||||
context "over https" do
|
||||
it "returns the correct URL to secure.gravatar.com" do
|
||||
expected = "https://secure.gravatar.com/avatar/f7daa65b2aa96290bb47c4d68d11fe6a?s=40&d=identicon"
|
||||
|
||||
# Pretend we're running over HTTPS
|
||||
helper.stub(:request) do
|
||||
request = double('request')
|
||||
request.stub(:ssl?) { true }
|
||||
request
|
||||
end
|
||||
|
||||
helper.gravatar_icon("admin@local.host").should == expected
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Reference in a new issue