match trailing slash for vimeo links

This commit is contained in:
MrZYX 2011-05-23 14:32:16 +02:00
parent 8e3149ca01
commit c732940b58
2 changed files with 12 additions and 3 deletions

View file

@ -97,7 +97,7 @@ module MarkdownifyHelper
end
def process_vimeo(message, vimeo_maps)
regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})/
regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})\/?/
processed_message = message.gsub(regex) do |matched_string|
match_data = message.match(regex)
video_id = match_data[1]
@ -131,4 +131,4 @@ module MarkdownifyHelper
end
message
end
end
end

View file

@ -44,6 +44,15 @@ describe MarkdownifyHelper do
res.should =~ /data-video-id="#{video_id}"/
end
it "matches a trailing slash in a vimeo link" do
video_id = "17449557"
url = "http://www.vimeo.com/#{video_id}/"
res = markdownify(url)
res.should =~ /data-host="vimeo.com"/
res.should =~ /data-video-id="#{video_id}"/
res.should_not =~ />\//
end
it "recognizes youtube links" do
video_id = "0x__dDWdf23"
url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
@ -236,4 +245,4 @@ describe MarkdownifyHelper do
end
end
end
end
end