\n#{text}#{text}
" - end - - def preprocess(full_document) - entities = [ - ['&', '&'], - ['>', '>'], - ['<', '<'] - ] - entities.each do |original, replacement| - full_document = full_document.gsub(original, replacement) - end - - if @specialchars - full_document = specialchars(full_document) - end - - our_unsafe_chars = '()' - full_document = full_document.gsub(%r{ - \[ \s*? ( [^ \] ]+ ) \s*? \] - (?: - \( \s*? (\S+) \s*? (?: "([^"]+)" )? \) \s*? - ) - }xm) do |m| - content = $1 - link = URI.escape($2, our_unsafe_chars) - title = $3 - - title_chunk = if title - %W{" #{title}"} - else - '' - end - %Q{[#{content}](#{link}#{title_chunk})} - end - - return full_document - end - - - - def single_emphasis(text) - "#{text}" - end - - def specialchars(text) - if @specialchars - map = [ - ["<3", "♥"], - ["<->", "↔"], - ["->", "→"], - ["<-", "←"], - ["\.\.\.", "…"], - ["(tm)", "™"], - ["(r)", "®"], - ["(c)", "©"] - ] - end - - map.each do |mapping| - text = text.gsub(mapping[0], mapping[1]) - end - - return text - end - - - def triple_emphasis(text) - single_emphasis(double_emphasis(text)) - end - end end end diff --git a/spec/helpers/markdownify_helper_spec.rb b/spec/helpers/markdownify_helper_spec.rb index 08ba42f90..95c960d64 100644 --- a/spec/helpers/markdownify_helper_spec.rb +++ b/spec/helpers/markdownify_helper_spec.rb @@ -7,302 +7,27 @@ require 'spec_helper' describe MarkdownifyHelper do describe "#markdownify" do - it 'does not error if youtube_maps in the hash is explicitly set to nil' do - expect{ - markdownify("http://www.youtube.com/watch?v=pZROlhHOvuo", :youtube_maps => nil) - }.should_not raise_error - end - - it 'does not error if youtube_maps in the hash is explicitly set to nil' do - expect{ - markdownify("http://vimeo.com/18589934", :vimeo_maps => nil) - }.should_not raise_error - end - - describe "autolinks" do - it "should not allow basic XSS/HTML" do - markdownify("").should == "<script>alert('XSS is evil')</script>
" + describe "not doing something dumb" do + it "strips out script tags" do + markdownify("").should == + "alert('XSS is evil')
\n" end - it "should recognize basic http links (1/3)" do - proto="http" - url="bugs.joindiaspora.com/issues/332" - full_url = "#{proto}://#{url}" - markdownify(full_url).should == %Q{} - end - - it "should recognize basic http links (2/3)" do - proto="http" - url="webmail.example.com?~()!*/" - full_url = "#{proto}://#{url}" - markdownify(full_url).should == %Q{} - end - - it "should recognize basic http links (3/3)" do - proto="http" - url="127.0.0.1:3000/users/sign_in" - full_url = "#{proto}://#{url}" - markdownify(full_url).should == %Q{} - end - - it "should recognize secure https links" do - proto="https" - url="127.0.0.1:3000/users/sign_in" - full_url = "#{proto}://#{url}" - markdownify(full_url).should == %Q{} - end - - it "doesn't muck up code text" do - message = %{`puts "Hello"`} - markdownify(message).should =~ %r{puts "Hello"}
- message = %Q{~~~\nA\nB\n~~~\n}
- markdownify(message).should =~ %r{\nA\nB\ni ♥ you
" - end - - it "replaces various things with (their) HTML entities" do - message = "... <-> -> <- (tm) (r) (c)" - markdownify(message).should == "… ↔ → ← ™ ® ©
" - end - - it "skips doing it if you say so" do - message = "... -> <-" - markdownify(message, :specialchars => false).should == "... -> <-
" - end - end - - describe "weak emphasis" do - it "should be recognized (1/2)" do - message = "*some text* some text *some text* some text" - markdownify(message).should == "some text some text some text some text
" - end - - it "should be recognized (2/2)" do - message = "_some text_ some text _some text_ some text" - markdownify(message).should == "some text some text some text some text
" - end - end - - describe "strong emphasis" do - it "should be recognized (1/2)" do - message = "**some text** some text **some text** some text" - markdownify(message).should == "some text some text some text some text
" - end - - it "should be recognized (2/2)" do - message = "__some text__ some text __some text__ some text" - markdownify(message).should == "some text some text some text some text
" - end - end - - describe "nested weak and strong emphasis" do - it "should be rendered correctly" do - message = "__this is _some_ text__" - markdownify(message).should == "this is some text
" - message = "*this is **some** text*" - markdownify(message).should == "this is some text
" - message = "___some text___" - markdownify(message).should == "some text
" - end - end - - describe "links" do - it "should be recognized without title attribute" do - message = "[link text](http://someurl.com) [link text](http://someurl.com)" - markdownify(message).should == '' - end - - it "should be recognized with title attribute" do - message = '[link text](http://someurl.com "some title") [link text](http://someurl.com "some title")' - markdownify(message).should == '' - end - - it "should have a robust link parsing" do - message = "[wikipedia](http://en.wikipedia.org/wiki/Text_(literary_theory))" - link = markdownify(message) - link.should =~ %r{href="http://en.wikipedia.org/wiki/Text_%28literary_theory%29"} - - message = "[ links]( google.com)" - markdownify(message).should == %Q{} - - message = "[_http_](http://google.com/search?q=with_multiple__underscores*and**asterisks )" - markdownify(message).should == %Q{} - message = %{[___FTP___]( ftp://ftp.uni-kl.de/CCC/26C3/mp4/26c3-3540-en-a_hackers_utopia.mp4 'File Transfer Protocol')} - markdownify(message).should == %{} - - message = %{[**any protocol**](foo://bar.example.org/yes_it*makes*no_sense)} - markdownify(message).should == %{} - - message = "This [ *text* ]( http://en.wikipedia.org/wiki/Text_(literary_theory) ) with many [ links]( google.com) tests [_http_](http://google.com/search?q=with_multiple__underscores*and**asterisks ), [___FTP___]( ftp://ftp.uni-kl.de/CCC/26C3/mp4/26c3-3540-en-a_hackers_utopia.mp4 'File Transfer Protocol'), [**any protocol**](foo://bar.example.org/yes_it*makes*no_sense)" - markdownify(message).should == 'This text with many links tests http, FTP, any protocol
' - end - - end - - describe "nested emphasis and links tags" do - it "should be rendered correctly" do - message = '[**some *link* text**](someurl.com "some title")' - markdownify(message).should == '' - end - end - - it "should allow escaping" do - message = '*some text* \*some text* \**some text* _some text_ \_some text_ \__some text_' - markdownify(message).should == "some text *some text* *some text some text _some text_ _some text
" - end - - describe "newlines" do - it 'skips inserting newlines if you pass the newlines option' do - message = "These\nare\n\some\nnew\lines" - res = markdownify(message, :newlines => false) - res.should == "#{message}
" - end - - it 'generates breaklines' do - message = "These\nare\nsome\nnew\nlines" - res = markdownify(message) - res.should == "These
are
some
new
lines
Some text, then a line break and a link
joindiaspora.com
some more text