Avoid count hits and add comments in archived articles. Added to new unit tests and translated msg

Michel Felipe
1 parent 4edfee6d
Showing 9 changed files with 79 additions and 11 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/article.rb
app/models/comment.rb
app/views/content_viewer/_publishing_info.html.erb
plugins/vote/test/functional/vote_plugin_profile_controller_test.rb
po/noosfero.pot
po/pt/noosfero.po
test/unit/article_test.rb
test/unit/comment_test.rb
@@ -99,7 +99,6 @@ class CmsController &lt; MyProfileController
         @article.image.save!
       end
       @article.last_changed_by = user
-      @article.old_parent_id = @article.parent_id
       if @article.update_attributes(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
@@ -638,13 +638,21 @@ class Article &lt; ActiveRecord::Base
   end
   def hit
-    self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
-    self.hits += 1
+    if !archived?
+      self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
+      self.hits += 1
+    end
   end
   def self.hit(articles)
-    Article.where(:id => articles.map(&:id)).update_all('hits = hits + 1')
-    articles.each { |a| a.hits += 1 }
+    ids = []
+    articles.each do |article|
+      if !article.archived?
+        ids << article.id
+        article.hits += 1
+      end
+    end
+    Article.where(:id => ids).update_all('hits = hits + 1') if !ids.empty?
   end
   def can_display_hits?
@@ -851,7 +859,7 @@ class Article &lt; ActiveRecord::Base
   end
   def parent_archived?
-     if (self.old_parent_id != self.parent_id) && self.parent && self.parent.archived?
+     if self.parent_id_changed? && self.parent && self.parent.archived?
        errors.add(:parent_folder, N_('is archived!!'))
      end
   end
@@ -35,6 +35,8 @@ class Comment &lt; ActiveRecord::Base
     end
   end
+  validate :article_archived?
+
   acts_as_having_settings
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
@@ -214,4 +216,10 @@ class Comment &lt; ActiveRecord::Base
     self.article.archived?
   end
+  protected
+
+  def article_archived?
+    errors.add(:article, N_('associated with this comment is achived!')) if archived?
+  end
+
 end
@@ -16,7 +16,7 @@
   <div id='article-sub-header'>
     <% if @page.display_hits? %>
       <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+        <%= n_('Viewed one time %{desc}', 'Viewed %{num} times %{desc}', @page.hits) % { :num => @page.hits, :desc => @page.archived? ? '<b>'+_('(Not countable anymore)')+'</b>' : '' } %>
       </div>
     <% end %>
@@ -36,12 +36,14 @@ class VotePluginProfileControllerTest &lt; ActionController::TestCase
   end
   should 'not vote if a target is archived' do
-    article = Article.create!(:profile => profile, :name => 'Archived article', :archived => true)
+    article = Article.create!(:profile => profile, :name => 'Archived article', :archived => false)
     comment = Comment.create!(:body => 'Comment test', :source => article, :author => profile)
     xhr :post, :vote, :profile => profile.identifier, :id => article.id, :model => 'article', :vote => 1
-    assert profile.votes.empty?
+    assert !profile.votes.empty?
+    article.update_attributes(:archived => true)
     xhr :post, :vote, :profile => profile.identifier, :id => comment.id, :model => 'comment', :vote => 1
+
     assert !profile.voted_for?(comment)
   end
@@ -5073,6 +5073,10 @@ msgid_plural &quot;Viewed %{num} times&quot;
 msgstr[0] ""
 msgstr[1] ""
+#: app/views/content_viewer/_publishing_info.html.erb:19
+msgid "(Not countable anymore)"
+msgstr ""
+
 #: app/views/content_viewer/versions_diff.html.erb:5
 msgid "Changes on \"%s\""
 msgstr ""
@@ -5231,11 +5231,15 @@ msgid &quot;Reply&quot;
 msgstr "Responder"
 #: app/views/content_viewer/_publishing_info.html.erb:19
-msgid "Viewed one time"
-msgid_plural "Viewed %{num} times"
+msgid "Viewed one time %{desc}"
+msgid_plural "Viewed %{num} times %{desc}"
 msgstr[0] "Visualizado uma vez"
 msgstr[1] "Visualizado %{num} vezes"
+#: app/views/content_viewer/_publishing_info.html.erb:19
+msgid "(Not countable anymore)"
+msgstr "(Não mais contabilizado)"
+
 #: app/views/content_viewer/versions_diff.html.erb:5
 msgid "Changes on \"%s\""
 msgstr "Mudanças em \"%s\""
@@ -2177,10 +2177,21 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a3 = fast_create(Article)
     Article.hit([a1, a2, a3])
     Article.hit([a2, a3])
+
     assert_equal [1, 2, 2], [a1.hits, a2.hits, a3.hits]
     assert_equal [1, 2, 2], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
   end
+  should 'not update hit attribute of archiveds articles' do
+    a1 = fast_create(Article)
+    a2 = fast_create(Article, :archived => true)
+    a3 = fast_create(Article, :archived => true)
+    Article.hit([a1, a2, a3])
+
+    assert_equal [1, 0, 0], [a1.hits, a2.hits, a3.hits]
+    assert_equal [1, 0, 0], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
+  end
+
   should 'vote in a article' do
     article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => nil)
     profile.vote(article, 5)
@@ -2222,4 +2233,25 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert !a.display_preview?
   end
+  should 'check if a article is archived' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile)
+    a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    a2 = Article.create!(:name => 'Test 2', :profile => profile, :archived => true)
+    folder.update_attributes(:archived => true)
+    a1.reload
+
+    assert a1.archived?
+    assert a2.archived?
+  end
+
+  should 'try add a child article to a archived folder' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile, :archived => true)
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    end
+
+    assert_match 'Parent folder is archived', err.message
+  end
+
 end
@@ -94,6 +94,17 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal cc + 1, ActionTracker::Record.find(activity.id).comments_count
   end
+  should 'try add a comment to a archived article' do
+    person = fast_create(Person)
+    article = Article.create!(:name => 'Test', :profile => person, :archived => true)
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      comment = create(Comment, :source => article, :author_id => person.id)
+    end
+
+    assert_match 'Article associated with this comment is achived', err.message
+  end
+
   should 'provide author name for authenticated authors' do
     owner = create_user('testuser').person
     assert_equal 'testuser', build(Comment, :author => owner).author_name
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	<div id='article-sub-header'>	16	<div id='article-sub-header'>
17	<% if @page.display_hits? %>	17	<% if @page.display_hits? %>
18	<div id="article-hits">	18	<div id="article-hits">
19	- <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>	19	+ <%= n_('Viewed one time %{desc}', 'Viewed %{num} times %{desc}', @page.hits) % { :num => @page.hits, :desc => @page.archived? ? '<b>'+_('(Not countable anymore)')+'</b>' : '' } %>
20	</div>	20	</div>
21	<% end %>	21	<% end %>
22		22
	@@ -2177,10 +2177,21 @@ class ArticleTest < ActiveSupport::TestCase		@@ -2177,10 +2177,21 @@ class ArticleTest < ActiveSupport::TestCase
2177	a3 = fast_create(Article)	2177	a3 = fast_create(Article)
2178	Article.hit([a1, a2, a3])	2178	Article.hit([a1, a2, a3])
2179	Article.hit([a2, a3])	2179	Article.hit([a2, a3])
		2180	+
2180	assert_equal [1, 2, 2], [a1.hits, a2.hits, a3.hits]	2181	assert_equal [1, 2, 2], [a1.hits, a2.hits, a3.hits]
2181	assert_equal [1, 2, 2], [a1.reload.hits, a2.reload.hits, a3.reload.hits]	2182	assert_equal [1, 2, 2], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
2182	end	2183	end
2183		2184
		2185	+ should 'not update hit attribute of archiveds articles' do
		2186	+ a1 = fast_create(Article)
		2187	+ a2 = fast_create(Article, :archived => true)
		2188	+ a3 = fast_create(Article, :archived => true)
		2189	+ Article.hit([a1, a2, a3])
		2190	+
		2191	+ assert_equal [1, 0, 0], [a1.hits, a2.hits, a3.hits]
		2192	+ assert_equal [1, 0, 0], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
		2193	+ end
		2194	+
2184	should 'vote in a article' do	2195	should 'vote in a article' do
2185	article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => nil)	2196	article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => nil)
2186	profile.vote(article, 5)	2197	profile.vote(article, 5)
	@@ -2222,4 +2233,25 @@ class ArticleTest < ActiveSupport::TestCase		@@ -2222,4 +2233,25 @@ class ArticleTest < ActiveSupport::TestCase
2222	assert !a.display_preview?	2233	assert !a.display_preview?
2223	end	2234	end
2224		2235
		2236	+ should 'check if a article is archived' do
		2237	+ folder = Folder.create!(:name => 'Parent Archived', :profile => profile)
		2238	+ a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
		2239	+ a2 = Article.create!(:name => 'Test 2', :profile => profile, :archived => true)
		2240	+ folder.update_attributes(:archived => true)
		2241	+ a1.reload
		2242	+
		2243	+ assert a1.archived?
		2244	+ assert a2.archived?
		2245	+ end
		2246	+
		2247	+ should 'try add a child article to a archived folder' do
		2248	+ folder = Folder.create!(:name => 'Parent Archived', :profile => profile, :archived => true)
		2249	+
		2250	+ err = assert_raises ActiveRecord::RecordInvalid do
		2251	+ a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
		2252	+ end
		2253	+
		2254	+ assert_match 'Parent folder is archived', err.message
		2255	+ end
		2256	+
2225	end	2257	end
	@@ -94,6 +94,17 @@ class CommentTest < ActiveSupport::TestCase		@@ -94,6 +94,17 @@ class CommentTest < ActiveSupport::TestCase
94	assert_equal cc + 1, ActionTracker::Record.find(activity.id).comments_count	94	assert_equal cc + 1, ActionTracker::Record.find(activity.id).comments_count
95	end	95	end
96		96
		97	+ should 'try add a comment to a archived article' do
		98	+ person = fast_create(Person)
		99	+ article = Article.create!(:name => 'Test', :profile => person, :archived => true)
		100	+
		101	+ err = assert_raises ActiveRecord::RecordInvalid do
		102	+ comment = create(Comment, :source => article, :author_id => person.id)
		103	+ end
		104	+
		105	+ assert_match 'Article associated with this comment is achived', err.message
		106	+ end
		107	+
97	should 'provide author name for authenticated authors' do	108	should 'provide author name for authenticated authors' do
98	owner = create_user('testuser').person	109	owner = create_user('testuser').person
99	assert_equal 'testuser', build(Comment, :author => owner).author_name	110	assert_equal 'testuser', build(Comment, :author => owner).author_name