@@ -26,7 +26,7 @@ class Notable::App < Sinatra::Default
end
def format_note(note)
- "#{note.body} - <em>#{note.created_at.strftime('%H:%M')} #{note.created_at_to_s}</em>"
+ "#{note.html_body} - <em>#{note.created_at.strftime('%H:%M')} #{note.created_at_to_s}</em>"
end
def choose_format
lib/notable/app.rb
@@ -23,5 +23,11 @@ module Notable
created_at.strftime('%d %b')
end
end
+
+ def html_body
+ body.gsub(/((http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((\:[0-9]{1,5})?\/?.*)?)/) do |match|
+ "<a href=\"#{match}\">#{match}</a>"
+ end
+ end
end
end
lib/notable/note.rb
@@ -130,7 +130,7 @@ describe "Notable::App - Note Creation" do
describe "post '/' with a body" do
before do
- post '/', {}, :input => 'A new note!'
+ post '/', {}, :input => 'A new note! http://www.example.com'
end
it "returns 201 Created" do
@@ -150,6 +150,13 @@ describe "Notable::App - Note Creation" do
parsed_body.at('//body//li').should.not.be.nil
parsed_body.at('//body//li').inner_html.should.match(/^A new note!/)
end
+
+ it "converts a URL to a link" do
+ get '/'
+ parsed_body.at('//body//li').at('a').should.not.be.nil
+ parsed_body.at('//body//li').at('a')[:href].should.equal 'http://www.example.com'
+ parsed_body.at('//body//li').at('a').inner_html.should.equal 'http://www.example.com'
+ end
end
describe "post '/' without a valid note" do
@@ -172,7 +179,9 @@ end
describe "With Some Notes" do
before do
DataMapper.auto_migrate!
- @notes = %w{bat cat dog dolphin giraffe pony}
+ @link = 'http://example.net'
+ @link_note = "A test #{@link}"
+ @notes = %w{bat cat dog dolphin giraffe pony} + [@link_note]
@notes.each_with_index do |n, i|
Timecop.travel(2009, 3, 25, 10, 10, i) do
post '/', :note => n
@@ -191,7 +200,7 @@ describe "With Some Notes" do
end
it "should have all the items in a list" do
- parsed_body.search('//body//li').size.should.equal 6
+ parsed_body.search('//body//li').size.should.equal 7
end
end
@@ -207,8 +216,8 @@ describe "With Some Notes" do
end
it "gets more than 5 when you ask for it" do
- get '/last/7'
- parsed_body.search('//body//li').size.should.equal 6
+ get '/last/8'
+ parsed_body.search('//body//li').size.should.equal 7
end
it "gets five when you give it a silly request" do
@@ -246,7 +255,7 @@ describe "With Some Notes" do
end
it "returns an array of the items" do
- parsed_json.size.should.equal 6
+ parsed_json.size.should.equal 7
end
it "returns an array of hashes" do
@@ -269,8 +278,8 @@ describe "With Some Notes" do
end
it "gets more than 5 when you ask for it" do
- get_json '/last/7'
- parsed_json.size.should.equal 6
+ get_json '/last/8'
+ parsed_json.size.should.equal 7
end
it "gets five when you give it a silly request" do
@@ -331,7 +340,7 @@ describe "With Some Notes" do
end
it "has the correct number of items" do
- parsed_xml.search('/rss/channel/item').size.should.equal 6
+ parsed_xml.search('/rss/channel/item').size.should.equal 7
end
describe "an item" do
@@ -340,15 +349,15 @@ describe "With Some Notes" do
end
it "has the correct title" do
- @item.at('/title[text()="pony"]').should.not.be.nil
+ @item.at('/title').inner_html.should.equal @link_note
end
- it "has the correct description" do
- @item.at('/description[text()="pony"]').should.not.be.nil
+ it "has the correct description, with html escaped." do
+ @item.at('/description').inner_html.should.equal %Q|A test <a href="#{@link}">#{@link}</a>|
end
it "has the correct timestamp" do
- @item.at('/pubDate').inner_html.should.equal("Wed, 25 Mar 2009 10:10:05 GMT")
+ @item.at('/pubDate').inner_html.should.equal("Wed, 25 Mar 2009 10:10:06 GMT")
end
end
end
spec/notable_app_spec.rb
@@ -8,6 +8,6 @@
- @notes.each do |note|
%item
%title&= note.body
- %description&= note.body
+ %description&= note.html_body
%pubDate= note.created_at.new_offset.strftime('%a, %d %b %Y %H:%M:%S GMT')
views/rss.haml
2d2c4f65f8219de218e201737c4b1cb0d042090d
Jonathan Stott
jonathan.stott@gmail.com
http://github.com/namelessjon/notable/commit/2b5a31d5fbb243833a02792132d216c0c6f77c4c
2b5a31d5fbb243833a02792132d216c0c6f77c4c
2009-07-10T15:57:41-07:00
2009-07-10T15:57:41-07:00
Convert urls in notes to links in html+feed
a4584728732b237c769973877af79beafc9cfdf9
Jonathan Stott
jonathan.stott@gmail.com