Fixed structured data for comments and added interactionCount

just3ws · just3ws · commit 8bffd4e68b83 · 2014-10-24T10:40:35.000-05:00
diff --git a/app/helpers/protips_helper.rb b/app/helpers/protips_helper.rb
@@ -120,9 +120,9 @@ def subscription_link(topic, additional_classes="", options={})
 
   def upvote_link(protip, classname)
     if protip.already_voted?(current_user, current_user.try(:tracking_code), request.remote_ip)
-      content_tag :div, "#{protip.upvotes}", class: "upvoted #{classname}"
+      content_tag :div, "#{protip.upvotes}", class: "upvoted #{classname}", itemprop: 'interactionCount'
     else
-      link_to "#{protip.upvotes}", upvote_protip_path(protip.public_id), class: "#{classname} track", remote: true, method: :post, rel: "nofollow", 'data-action' => "upvote protip", 'data-from' => (classname == "small-upvote" ? 'mini protip' : 'protip')
+      link_to "#{protip.upvotes}", upvote_protip_path(protip.public_id), class: "#{classname} track", remote: true, method: :post, rel: "nofollow", 'data-action' => "upvote protip", 'data-from' => (classname == "small-upvote" ? 'mini protip' : 'protip'), itemprop: 'interactionCount'
     end
   end
 
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
@@ -6,12 +6,13 @@
     %meta{itemprop: :alternateName, content: comment.user.username}
     .comment-avatar
       = image_tag(users_image_path(comment.user), class: 'avatar')
-    %a.comment-user{href: profile_path(comment.user.username), 'data-reply-to' => comment.user.username, itemprop: 'creator'}
+    %a.comment-user{href: profile_path(comment.user.username), 'data-reply-to' => comment.user.username, itemprop: 'author'}
       = comment.user.username
     %a.like{href:like_protip_comment_path(comment.commentable.try(:public_id), comment.id), 'data-remote' => 'true', 'data-method' => :post, class: comment_liked_class(comment), rel: "nofollow"}
       = comment_likes(comment)
   .comment{itemprop: :commentText}
     = raw sanitize(formatted_comment(comment.body))
+    -# TODO: Rework the comment editing bar outside of the same element as the commentText
     - if can_edit_comment?(comment)
       .edit-comment.hidden
         = form_for [comment.commentable, comment] do |f|
diff --git a/app/views/protips/_protip.html.haml b/app/views/protips/_protip.html.haml
@@ -70,7 +70,7 @@
 
     %article.tip-panel{ id: protip.public_id }
       = share_on_twitter(protip, 'share-this-tip direction')
-      = upvote_link(protip, "upvote")
+      = upvote_link(protip, 'upvote')
       %header.tip-header
         %h1.tip-title{itemprop: :headline}
           -if mode == 'popup'
@@ -92,7 +92,7 @@
                 = link_to 'delete', delete_tag_protip_path(protip.public_id, CGI.escape(tag)), method: :post, class: "delete"
 
         %div.timestamp.cf{ title: 'Publish time' }
-          %i.fa.fa-clock-o
+          %i.fa.fa-clock-o{ itemprop: 'datePublished' }
           = local_time_ago(protip.created_at)
 
         - if is_admin?
@@ -109,7 +109,7 @@
         = raw sanitize(protip.to_html)
 
     - if include_comments
-      %section.comments{ itemscope: true, itemtype: 'https://schema.org/UserComments', class:('no-comments' if protip.comments.empty? ) }
+      %section.comments{ class:('no-comments' if protip.comments.empty? ) }
         - if protip.comments.any?
           %h2.comments-header
             %i.fa.fa-comments
diff --git a/lib/cfm.rb b/lib/cfm.rb
@@ -14,8 +14,11 @@ def render(text)
       USERNAME_BLACKLIST = %w(include)
 
       private
+
       def render_cfm(text)
-        text.lines.map { |x| inspect_line x }.join("")
+        text.lines.map do |x|
+          inspect_line(x)
+        end.join('')
       end
 
       def coderwall_user_link(username)
@@ -24,7 +27,11 @@ def coderwall_user_link(username)
 
       def inspect_line(line)
         #hotlink coderwall usernames to their profile, but don't search for @mentions in code blocks
-        line.start_with?("    ") ? line : line.gsub(/((?<!\s{4}).*)@([a-zA-Z_\-0-9]+)/) { $1+coderwall_user_link($2) }
+        if line.start_with?('    ')
+          line
+        else
+          line.gsub(/((?<!\s{4}).*)@([a-zA-Z_\-0-9]+)/) { $1+coderwall_user_link($2) }
+        end
       end
     end
   end
