Merge pull request #2583 from mroderick/fix/gravatar-nil-email

fix(avatar): handle nil email with fallback to member-ID-based placeholder

Author: mroderick

app/helpers/application_helper.rb

@@ -1,4 +1,6 @@
 module ApplicationHelper
+  include DigestHelper
+
   def humanize_date(datetime, end_time = nil, with_time: false, with_year: false)
     return I18n.l(datetime, format: :humanised_with_year) if with_year
     return humanize_date_with_time(datetime, end_time) if with_time

app/helpers/digest_helper.rb

@@ -0,0 +1,7 @@
+module DigestHelper
+  def md5_of(identifier)
+    return '' if identifier.nil?
+
+    Digest::MD5.hexdigest(identifier.to_s.strip.downcase)
+  end
+end

app/models/member.rb

@@ -1,5 +1,6 @@
 class Member < ApplicationRecord
   include Permissions
+  include DigestHelper
 
   enum :how_you_found_us, {
     from_a_friend: 0,
@@ -99,7 +100,8 @@ def received_welcome_for?(subscription)
   end
 
   def avatar(size = 100)
-    "https://secure.gravatar.com/avatar/#{md5_email}?size=#{size}&default=identicon"
+    identifier = email.presence || "member-#{id}@example.com"
+    "https://secure.gravatar.com/avatar/#{md5_of(identifier)}?size=#{size}&default=identicon"
   end
 
   def requires_additional_details?
@@ -172,10 +174,6 @@ def invitations_on(date)
       .where(attending: true)
   end
 
-  def md5_email
-    Digest::MD5.hexdigest(email.strip.downcase)
-  end
-
   def rsvps(period:)
     time_period = "#{period}_rsvps"
 

spec/helpers/application_helper_spec.rb

@@ -12,13 +12,13 @@
 
   describe '#number_to_currency' do
     it 'correctly formats a number to British pounds' do
-      expect(helper.number_to_currency(20100)).to eq('£20,100')
+      expect(helper.number_to_currency(20_100)).to eq('£20,100')
     end
   end
 
   describe '#title and #get_title' do
     it 'sets page title with the given title name' do
-      helper.title("Homapage")
+      helper.title('Homapage')
 
       expect(helper.retrieve_title).to eq('Homapage | codebar.io')
     end
@@ -60,4 +60,22 @@
       expect(title).to eq('Community partners')
     end
   end
+
+  describe '#md5_of' do
+    it 'returns MD5 hash of lowercase string' do
+      expect(helper.md5_of('Test@Example.COM')).to eq(Digest::MD5.hexdigest('test@example.com'))
+    end
+
+    it 'handles nil gracefully' do
+      expect(helper.md5_of(nil)).to eq('')
+    end
+
+    it 'converts integer to string' do
+      expect(helper.md5_of(123)).to eq(Digest::MD5.hexdigest('123'))
+    end
+
+    it 'strips whitespace' do
+      expect(helper.md5_of('  spaces@example.com  ')).to eq(Digest::MD5.hexdigest('spaces@example.com'))
+    end
+  end
 end

spec/models/member_spec.rb

@@ -58,6 +58,15 @@
         expect(member.avatar).to eq("https://secure.gravatar.com/avatar/#{encrypted_email}?size=100&default=identicon")
       end
 
+      describe '#avatar' do
+        let(:member) { Fabricate.build(:member, email: nil) }
+
+        it 'falls back to member ID based email' do
+          encrypted_email = Digest::MD5.hexdigest("member-#{member.id}@example.com")
+          expect(member.avatar).to eq("https://secure.gravatar.com/avatar/#{encrypted_email}?size=100&default=identicon")
+        end
+      end
+
       describe '#recent_notes' do
         it 'returns no notes when member attented no workshops' do
           expect(member.workshop_invitations.attended.length).to eq(0)