Download as
Browse Code »

Commit 9dae005ffc0a96c3382d11ebe6ef6406809a582e

Authored by Joenio Costa
2 parents de8d5749 f42d8db4
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/58' of git://gitorious.org/noosfero/noosfero

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @9dae005
... ... @@ -587,17 +587,18 @@ module ApplicationHelper
587 587  
588 588 def gravatar_url_for(email, options = {})
589 589 # Ta dando erro de roteamento
  590 + default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
590 591 url_for( { :gravatar_id => Digest::MD5.hexdigest(email),
591 592 :host => 'www.gravatar.com',
592 593 :protocol => 'http://',
593 594 :only_path => false,
594 595 :controller => 'avatar.php',
595   - :d => NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
  596 + :d => default
596 597 }.merge(options) )
597 598 end
598 599  
599 600 def str_gravatar_url_for(email, options = {})
600   - default = NOOSFERO_CONF['gravatar'] ? NOOSFERO_CONF['gravatar'] : nil
  601 + default = theme_option['gravatar'] || NOOSFERO_CONF['gravatar'] || nil
601 602 url = 'http://www.gravatar.com/avatar.php?gravatar_id=' +
602 603 Digest::MD5.hexdigest(email)
603 604 {
... ...
test/unit/application_helper_test.rb
  Diff comments   View file @9dae005
... ... @@ -468,6 +468,7 @@ class ApplicationHelperTest < Test::Unit::TestCase
468 468 end
469 469  
470 470 should 'generate a gravatar url' do
  471 + stubs(:theme_option).returns({})
471 472 with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
472 473 url = str_gravatar_url_for( 'rms@gnu.org', :size => 50 )
473 474 assert_match(/^http:\/\/www\.gravatar\.com\/avatar\.php\?/, url)
... ... @@ -475,6 +476,14 @@ class ApplicationHelperTest < Test::Unit::TestCase
475 476 assert_match(/(\?|&)d=crazyvatar(&|$)/, url)
476 477 assert_match(/(\?|&)size=50(&|$)/, url)
477 478 end
  479 + stubs(:theme_option).returns('gravatar' => 'nicevatar')
  480 + with_constants :NOOSFERO_CONF => {'gravatar' => 'crazyvatar'} do
  481 + url = str_gravatar_url_for( 'rms@gnu.org', :size => 50 )
  482 + assert_match(/^http:\/\/www\.gravatar\.com\/avatar\.php\?/, url)
  483 + assert_match(/(\?|&)gravatar_id=ed5214d4b49154ba0dc397a28ee90eb7(&|$)/, url)
  484 + assert_match(/(\?|&)d=nicevatar(&|$)/, url)
  485 + assert_match(/(\?|&)size=50(&|$)/, url)
  486 + end
478 487 end
479 488  
480 489 should 'use theme passed via param when in development mode' do
... ...