From f8ec89b9998398b54800e1f244fa40f4b25951d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= Date: Sat, 9 Jun 2012 19:02:18 +0200 Subject: [PATCH 1/5] Test stable- and release- branches on Travis too --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index abc95cb9..be952ece 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,8 @@ branches: - unstable - master - stable + - /^stable-.*$/ + - /^release-.*$/ notifications: email: false irc: "irc.freenode.org#chiliproject" From 5ef63ec4bb722b19310b371309aac6b088a5ffd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= Date: Sun, 10 Jun 2012 19:42:52 +0200 Subject: [PATCH 2/5] Fix option parsing for gravatars #1034 In addition to that: * the default size was 50px in the old lib, this has been restored * some tests to test the default and option parsing --- app/helpers/application_helper.rb | 4 +++- test/unit/helpers/application_helper_test.rb | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3cfc5628..80a8a50d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -959,7 +959,9 @@ module ApplicationHelper def gravatar(email, options={}) gravatarify_options = {} gravatarify_options[:secure] = options.delete :ssl - [:default, :size, :rating, :filetype].each {|key| gravatarify_options[:key] = options.delete :key} + [:default, :size, :rating, :filetype].each {|key| gravatarify_options[key] = options.delete key} + # Default size is 50x50 px + gravatarify_options[:size] ||= 50 gravatarify_options[:html] = options gravatar_tag email, gravatarify_options end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 8c9af006..00985c3c 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -664,6 +664,11 @@ RAW Setting.gravatar_enabled = '1' assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) assert avatar('jsmith ').include?(Digest::MD5.hexdigest('jsmith@somenet.foo')) + # Default size is 50 + assert avatar('jsmith ').include?('s=50') + assert avatar('jsmith ', :size => 24).include?('s=24') + # Non-avatar options should be considered html options + assert avatar('jsmith ', :title => 'John Smith').include?('title="John Smith"') assert_nil avatar('jsmith') assert_nil avatar(nil) From caceb58947a87ee59dddafb9fa0efff95a2200e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=A4fer?= Date: Sun, 10 Jun 2012 20:34:23 +0200 Subject: [PATCH 3/5] Restore the default class for gravatars #1034 --- app/helpers/application_helper.rb | 1 + test/unit/helpers/application_helper_test.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 80a8a50d..2ecf9671 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -962,6 +962,7 @@ module ApplicationHelper [:default, :size, :rating, :filetype].each {|key| gravatarify_options[key] = options.delete key} # Default size is 50x50 px gravatarify_options[:size] ||= 50 + options[:class] ||= 'gravatar' gravatarify_options[:html] = options gravatar_tag email, gravatarify_options end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 00985c3c..b964b85d 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -669,6 +669,9 @@ RAW assert avatar('jsmith ', :size => 24).include?('s=24') # Non-avatar options should be considered html options assert avatar('jsmith ', :title => 'John Smith').include?('title="John Smith"') + # The default class of the img tag should be gravatar + assert avatar('jsmith ').include?('class="gravatar"') + assert !avatar('jsmith ', :class => 'picture').include?('class="gravatar"') assert_nil avatar('jsmith') assert_nil avatar(nil) From 8e41daf92afa9da1edd136fb40f0551b86603d6c Mon Sep 17 00:00:00 2001 From: Holger Just Date: Sun, 10 Jun 2012 20:07:36 +0200 Subject: [PATCH 4/5] Update changelog for v3.2.1 --- doc/CHANGELOG.rdoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/CHANGELOG.rdoc b/doc/CHANGELOG.rdoc index 74ffb3ae..8d5f4581 100644 --- a/doc/CHANGELOG.rdoc +++ b/doc/CHANGELOG.rdoc @@ -1,5 +1,9 @@ = ChiliProject Changelog +== 2012-06-10 v3.2.1 + +* Bug #1034: Gravatar + == 2012-06-09 v3.2.0 * Bug #844: Set autocomplete=off for some fields in Registration form From c9d141061d83b6fd6234bfcf8a24f81de4807499 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Sun, 10 Jun 2012 20:08:40 +0200 Subject: [PATCH 5/5] Bump version to v3.2.1 --- lib/chili_project/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chili_project/version.rb b/lib/chili_project/version.rb index ab4d8f98..40724554 100644 --- a/lib/chili_project/version.rb +++ b/lib/chili_project/version.rb @@ -19,7 +19,7 @@ module ChiliProject MAJOR = 3 MINOR = 2 - PATCH = 0 + PATCH = 1 TINY = PATCH # Redmine compat # Used by semver to define the special version (if any).