nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown

Browse source
This commit is contained in:
Maxwell Salzberg 2011-08-30 22:15:52 -07:00
commit 272ab55482
9 changed files with 64 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/helpers/markdownify_helper.rb
View file

@ -5,8 +5,8 @@
require File.expand_path("#{Rails.root}/lib/diaspora/markdownify")
module MarkdownifyHelper
def markdownify(message, render_options={})
return '' if message.blank?
def markdownify(target, render_options={})
markdown_options = {
:autolink => true,
:fenced_code_blocks => true,
@ -18,9 +18,30 @@ module MarkdownifyHelper
render_options[:filter_html] = true
# This ugly little hack basically means
# "Give me the rawest contents of target available"
if target.respond_to?(:raw_message)
message = target.raw_message
elsif target.respond_to?(:text)
message = target.text
else
message = target.to_s
end
return '' if message.blank?
renderer = Diaspora::Markdownify::HTML.new(render_options)
markdown = Redcarpet::Markdown.new(renderer, markdown_options)
message = markdown.render(message)
if target.respond_to?(:format_mentions)
message = target.format_mentions(message)
end
message = Diaspora::Taggable.format_tags(message, :no_escape => true)
return message.html_safe
end

2
app/views/comments/_comment.html.haml
View file

@ -14,7 +14,7 @@
–
%span{:class => direction_for(comment.text)}
= markdownify(Diaspora::Taggable.format_tags(comment.text), :youtube_maps => comment.youtube_titles)
= markdownify(comment, :youtube_maps => comment.youtube_titles)
.comment_info
%time.timeago{:datetime => comment.created_at}

2
app/views/comments/_comment.mobile.haml
View file

@ -15,5 +15,5 @@
.from
= person_link(comment.author)
%p{ :class => direction_for(comment.text) }
= markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
= markdownify(comment, :youtube_maps => comment[:youtube_titles])

2
app/views/messages/_message.haml
View file

@ -12,5 +12,5 @@
= how_long_ago(message)
%p{ :class => direction_for(message.text) }
= markdownify(message.text)
= markdownify(message)

2
app/views/photos/show.html.haml
View file

@ -40,7 +40,7 @@
.span-8.last
%p
= markdownify(photo.status_message.text)
= markdownify(photo.status_message)
%span{:style=>'font-size:smaller'}
=link_to t('.collection_permalink'), post_path(photo.status_message)
%br

2
app/views/posts/show.mobile.haml
View file

@ -11,7 +11,7 @@
= render 'reshares/reshare', :reshare => @post, :post => @post.root
- else
%p
= markdownify(@post.text, :youtube_maps => @post[:youtube_titles])
= markdownify(@post, :youtube_maps => @post[:youtube_titles])
- for photo in @post.photos
= link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo.url(:thumb_medium)

2
app/views/status_messages/_status_message.haml
View file

@ -16,4 +16,4 @@
= link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
%p{:class => direction_for(post.text)}
!= markdownify(post.text, :youtube_maps => post[:youtube_titles])
!= markdownify(post, :youtube_maps => post[:youtube_titles])

22
lib/diaspora/markdownify.rb
View file

@ -8,7 +8,6 @@ module Diaspora
def initialize(options={})
super
@expand_tags = options.fetch(:expand_tabs, true)
@newlines = options.fetch(:newlines, true)
@specialchars = options.fetch(:specialchars, true)
@youtube_maps = options.fetch(:youtube_maps, {})
@ -100,10 +99,6 @@ module Diaspora
end
def paragraph(text)
if @expand_tags
text = Diaspora::Taggable.format_tags(text, :no_escape => true)
end
if @newlines
br = linebreak
@ -118,6 +113,15 @@ module Diaspora
end
def preprocess(full_document)
entities = {
'>' => '>',
'<' => '&lt;',
'&' => '&amp;',
}
entities.each do |k,v|
full_document = full_document.gsub(k, v)
end
if @specialchars
full_document = specialchars(full_document)
end
@ -152,10 +156,10 @@ module Diaspora
def specialchars(text)
if @specialchars
map = [
["<3", "&hearts;"],
["<->", "&#8596;"],
["->", "&rarr;"],
["<-", "&larr;"],
["&lt;3", "&hearts;"],
["&lt;-&gt;", "&#8596;"],
["-&gt;", "&rarr;"],
["&lt;-", "&larr;"],
["\.\.\.", "&hellip;"],
["(tm)", "&trade;"],
["(r)", "&reg;"],

29
spec/helpers/markdownify_helper_spec.rb
View file

@ -5,10 +5,11 @@
require 'spec_helper'
describe MarkdownifyHelper do
describe "#markdownify" do
describe "autolinks" do
it "should not allow basic XSS/HTML" do
markdownify("<script>alert('XSS is evil')</script>").should == "<p>alert('XSS is evil')</p>"
markdownify("<script>alert('XSS is evil')</script>").should == "<p>&lt;script&gt;alert('XSS is evil')&lt;/script&gt;</p>"
end
it "should recognize basic http links (1/3)" do
@ -250,12 +251,6 @@ describe MarkdownifyHelper do
markdownify(message).should == '<p>This <a target="_blank" href="http://en.wikipedia.org/wiki/Text_%28literary_theory%29"><em>text</em></a> with many <a target="_blank" href="http://google.com">links</a> tests <a target="_blank" href="http://google.com/search?q=with_multiple__underscores*and**asterisks"><em>http</em></a>, <a target="_blank" href="ftp://ftp.uni-kl.de/CCC/26C3/mp4/26c3-3540-en-a_hackers_utopia.mp4" title="File Transfer Protocol"><em><strong>FTP</strong></em></a>, <a target="_blank" href="foo://bar.example.org/yes_it*makes*no_sense"><strong>any protocol</strong></a></p>'
end
it "should leave #tag links intact" do
message = %{<a href="/tags/tagged" class="tag">#tagged</a>}
markdownify(message).should == "<p>#{message}</p>"
message = %{alice - 1 - <a href="/tags/tagged" class="tag">#tagged</a>}
markdownify(message).should == "<p>#{message}</p>"
end
end
describe "nested emphasis and links tags" do
@ -294,6 +289,26 @@ describe MarkdownifyHelper do
markdownify(nil).should == ''
end
context 'when formatting status messages' do
it "should leave tags intact" do
message = Factory.create(:status_message,
:author => alice.person,
:text => "I love #markdown")
formatted = markdownify(message)
formatted.should =~ %r{<a href="/tags/markdown" class="tag">#markdown</a>}
end
it "should leave mentions intact" do
message = Factory.create(:status_message,
:author => alice.person,
:text => "Hey @{Bob; #{bob.diaspora_handle}}!")
formatted = markdownify(message)
formatted.should =~ /hovercard/
end
end
context 'performance' do
before do
@message = "HHello,Hello_, I _am a strong robot.*Hello, I am *a strong robot.Hello, I am a strong robot.Hello, I am a strong robot.Hello, I am a strong robot.Hello, I am a **strong robot.Hello, I am _a _strong *robot**.Hello*, I am a strong "