From f17891b14d67d6bc15b0348b3e6f45142e327958 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 20:21:52 -0500
Subject: [PATCH 01/10] Add image_url property to User

---
 app/models/user.rb       | 7 +++++++
 test/models/user_test.rb | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5110ea7f..aeea6361 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 ##
 # a person using the Indent web application. Owns all other content.
 class User < ActiveRecord::Base
@@ -57,6 +59,11 @@ class User < ActiveRecord::Base
     ].sum
   end
 
+  def image_url
+    email_md5 = Digest::MD5.hexdigest(email.downcase)
+    "https://www.gravatar.com/avatar/#{email_md5}"
+  end
+
   private
 
   # Attributes that are non-public, and should be blacklisted from any public
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index c43b03fb..50f226d7 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -2,5 +2,9 @@ require 'test_helper'
 
 # Tests for the User model class
 class UserTest < ActiveSupport::TestCase
-  # Blank, for now
+  test 'user has a Gravatar profile image' do
+    user = build(:user, email: 'profile.image.test@example.com')
+
+    assert_equal user.image_url, 'https://www.gravatar.com/avatar/d2fd00e79c471f49c33b6bcb6b08d08d'
+  end
 end

From d34b99f9ea636dc4bd04bb5dbc976ea8c9be138c Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 20:35:03 -0500
Subject: [PATCH 02/10] Make Gravatars identicons by default

---
 app/models/user.rb       | 2 +-
 test/models/user_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index aeea6361..605fe076 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -61,7 +61,7 @@ class User < ActiveRecord::Base
 
   def image_url
     email_md5 = Digest::MD5.hexdigest(email.downcase)
-    "https://www.gravatar.com/avatar/#{email_md5}"
+    "https://www.gravatar.com/avatar/#{email_md5}?d=identicon"
   end
 
   private
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 50f226d7..55d42fed 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -5,6 +5,6 @@ class UserTest < ActiveSupport::TestCase
   test 'user has a Gravatar profile image' do
     user = build(:user, email: 'profile.image.test@example.com')
 
-    assert_equal user.image_url, 'https://www.gravatar.com/avatar/d2fd00e79c471f49c33b6bcb6b08d08d'
+    assert_match 'https://www.gravatar.com/avatar/d2fd00e79c471f49c33b6bcb6b08d08d', user.image_url
   end
 end

From 801a5fd55ff04ac352b49d63065f0b11c87809fa Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 20:37:44 -0500
Subject: [PATCH 03/10] Add user avatar to User page metadata

---
 app/models/user.rb            | 5 +++--
 app/views/users/show.html.erb | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 605fe076..691097df 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,9 +59,10 @@ class User < ActiveRecord::Base
     ].sum
   end
 
-  def image_url
+  def image_url(size=80)
     email_md5 = Digest::MD5.hexdigest(email.downcase)
-    "https://www.gravatar.com/avatar/#{email_md5}?d=identicon"
+    # 80px is Gravatar's default size
+    "https://www.gravatar.com/avatar/#{email_md5}?d=identicon&s=#{size}"
   end
 
   private
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index db0a0e34..bb711360 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,12 +1,15 @@
 <script type="application/ld+json">
 <%
-set_meta_tags title: @user.name, description: "#{@user.name}’s profile on notebook.ai"
+set_meta_tags title: @user.name,
+description: "#{@user.name}’s profile on notebook.ai",
+image_src: @user.image_url
 
 content_jsonld = {
   '@id': user_url,
   '@type': 'http://schema.org/Person',
   'http://schema.org/name': @user.name,
-  'http://schema.org/description': "#{@user.name}’s profile on notebook.ai"
+  'http://schema.org/description': "#{@user.name}’s profile on notebook.ai",
+  'https://schema.org/image': @user.image_url(120)
 }
 %>
 <%= content_jsonld.to_json.html_safe %> %>

From 6475d52a567a2c09489eb8831ce1e365919f933a Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 21:08:59 -0500
Subject: [PATCH 04/10] Add a default name to users

---
 app/models/user.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 691097df..db4bbbd0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -37,6 +37,10 @@ class User < ActiveRecord::Base
     super(options)
   end
 
+  def name
+    self[:name] || 'Anonymous author'
+  end
+
   def content
     {
       characters: characters,

From 59e4ca81641293a08ff755d0cb37db01eb4af086 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 21:11:09 -0500
Subject: [PATCH 05/10] Allow specifying a size for user image

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index db4bbbd0..70f0781a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -66,7 +66,7 @@ class User < ActiveRecord::Base
   def image_url(size=80)
     email_md5 = Digest::MD5.hexdigest(email.downcase)
     # 80px is Gravatar's default size
-    "https://www.gravatar.com/avatar/#{email_md5}?d=identicon&s=#{size}"
+    "https://www.gravatar.com/avatar/#{email_md5}?d=identicon&s=#{size}".html_safe
   end
 
   private

From 96fb62e75888d643c476cd78b04b2a01475cfeed Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 21:13:30 -0500
Subject: [PATCH 06/10] Display user image to their profile page

---
 app/views/users/show.html.erb | 7 ++++---
 config/application.rb         | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index bb711360..6c41fa61 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -25,13 +25,14 @@ content_jsonld = {
 %>
 
 <div class="row">
-	<div class="col s4">
+	<div class="col m3 s4">
+
 		<div class="hoverable card">
 			<div class="card-image">
-				<%= image_tag 'card-headers/universes.jpg', style: 'height: 190px' %>
-				<span class="card-title"><%= @user.name.present? ? @user.name : 'Anonymous author' %></span>
+				<%= image_tag @user.image_url(500).html_safe %>
 			</div>
 			<div class="card-content">
+				<div class="card-title"><b><%= @user.name %></b></div>
 				<p>
 					I'm creating universes on Notebook! I'm currently sharing the following public content:
 				</p>
diff --git a/config/application.rb b/config/application.rb
index a2a26240..14bcb5be 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,5 +26,8 @@ module PlanCharacters
     # Filter sensitive parameters out of logs
     config.filter_parameters << :password
     config.filter_parameters << :password_confirmation
+
+    # Don't encode ampersands into \u0026 when creating JSON
+    config.active_support.escape_html_entities_in_json = false
   end
 end

From f86c91081265131681aca5c734a099727ee553a4 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Wed, 21 Sep 2016 21:16:58 -0500
Subject: [PATCH 07/10] Make all images for user metadata 120px

---
 app/views/users/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 6c41fa61..58611ce2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,7 +2,7 @@
 <%
 set_meta_tags title: @user.name,
 description: "#{@user.name}’s profile on notebook.ai",
-image_src: @user.image_url
+image_src: @user.image_url(120)
 
 content_jsonld = {
   '@id': user_url,

From 75455a3a6267cd85f7d0e6cd5743f8c48624af60 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Thu, 22 Sep 2016 11:03:39 -0500
Subject: [PATCH 08/10] Add links to users profile image

---
 app/views/users/show.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 58611ce2..419fa6df 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -28,8 +28,8 @@ content_jsonld = {
 	<div class="col m3 s4">
 
 		<div class="hoverable card">
-			<div class="card-image">
-				<%= image_tag @user.image_url(500).html_safe %>
+			<div class="card-image waves-effect waves-block waves-light">
+				<%= image_tag @user.image_url(500).html_safe, class: 'activator' %>
 			</div>
 			<div class="card-content">
 				<div class="card-title"><b><%= @user.name %></b></div>
@@ -46,6 +46,10 @@ content_jsonld = {
 				</div>
 
 			</div>
+			<div class="card-reveal">
+				<span class="card-title grey-text text-darken-4">Profile Picture<i class="material-icons right">close</i></span>
+				<p>Profile picture are powered by <%= link_to 'Gravatar', 'https://gravatar.com/', target: "_blank" %>, using the email you provided in your <%= link_to 'account settings', edit_user_registration_path %>.</p>
+			</div>
 			<div class="card-action">
 				<a href="#">Author links coming soon</a>
 			</div>

From 4184366e327149c2406577f6475029837e91218b Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Thu, 22 Sep 2016 11:05:17 -0500
Subject: [PATCH 09/10] Fix typo

---
 app/views/users/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 419fa6df..912295e2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -48,7 +48,7 @@ content_jsonld = {
 			</div>
 			<div class="card-reveal">
 				<span class="card-title grey-text text-darken-4">Profile Picture<i class="material-icons right">close</i></span>
-				<p>Profile picture are powered by <%= link_to 'Gravatar', 'https://gravatar.com/', target: "_blank" %>, using the email you provided in your <%= link_to 'account settings', edit_user_registration_path %>.</p>
+				<p>Profile pictures are powered by <%= link_to 'Gravatar', 'https://gravatar.com/', target: "_blank" %>, using the email you provided in your <%= link_to 'account settings', edit_user_registration_path %>.</p>
 			</div>
 			<div class="card-action">
 				<a href="#">Author links coming soon</a>

From 9ae81c40d649da1ce6eae312132e9be479bc8beb Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.c.richter@gmail.com>
Date: Thu, 22 Sep 2016 13:11:41 -0500
Subject: [PATCH 10/10] Add a message about image dimensions

---
 app/views/users/show.html.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 912295e2..5aa16744 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -49,6 +49,7 @@ content_jsonld = {
 			<div class="card-reveal">
 				<span class="card-title grey-text text-darken-4">Profile Picture<i class="material-icons right">close</i></span>
 				<p>Profile pictures are powered by <%= link_to 'Gravatar', 'https://gravatar.com/', target: "_blank" %>, using the email you provided in your <%= link_to 'account settings', edit_user_registration_path %>.</p>
+				<p>For the prettiest profile, use an avatar at least 250 pixels wide.</p>
 			</div>
 			<div class="card-action">
 				<a href="#">Author links coming soon</a>