Download as
Browse Code »

Commit 31e6f9507bc47ca96ac596af41f1d1c348c53d51

Authored by Antonio Terceiro
1 parent b449ecbd
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Rewrite Article#first_paragraph using an actual HTML parser 

(ActionItem1668)
Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @31e6f95
  1 +require 'hpricot'
  2 +
1 class Article < ActiveRecord::Base 3 class Article < ActiveRecord::Base
2 4
3 # xss_terminate plugin can't sanitize array fields 5 # xss_terminate plugin can't sanitize array fields
@@ -340,8 +342,7 @@ class Article &lt; ActiveRecord::Base @@ -340,8 +342,7 @@ class Article &lt; ActiveRecord::Base
340 end 342 end
341 343
342 def first_paragraph 344 def first_paragraph
343 - to_html =~ /<p>(.*)<\/p>/  
344 - $1 || '' 345 + Hpricot(to_html).search('p').first.to_html
345 end 346 end
346 347
347 def creator 348 def creator
test/unit/article_test.rb
  Diff comments   View file @31e6f95
@@ -89,8 +89,8 @@ class ArticleTest &lt; Test::Unit::TestCase @@ -89,8 +89,8 @@ class ArticleTest &lt; Test::Unit::TestCase
89 should 'provide first paragraph of HTML version' do 89 should 'provide first paragraph of HTML version' do
90 profile = create_user('testinguser').person 90 profile = create_user('testinguser').person
91 a = fast_create(Article, :name => 'my article', :profile_id => profile.id) 91 a = fast_create(Article, :name => 'my article', :profile_id => profile.id)
92 - a.expects(:body).returns('<p>the first paragraph of the article</p> The second paragraph')  
93 - assert_equal 'the first paragraph of the article', a.first_paragraph 92 + a.expects(:body).returns('<p>the first paragraph of the article</p><p>The second paragraph</p>')
  93 + assert_equal '<p>the first paragraph of the article</p>', a.first_paragraph
94 end 94 end
95 95
96 should 'inform the icon to be used' do 96 should 'inform the icon to be used' do