context_content: adapt to new file presenter

Rodrigo Souto · Victor Costa
1 parent 4b0c7f1f
Showing 5 changed files with 30 additions and 20 deletions Show diff stats
app/models/article.rb
plugins/context_content/controllers/profile/context_content_plugin_profile_controller.rb
plugins/context_content/lib/context_content_block.rb
plugins/context_content/test/unit/context_content_block_test.rb
plugins/context_content/views/blocks/context_content.rhtml
@@ -288,6 +288,11 @@ class Article &lt; ActiveRecord::Base
     'text-html'
   end
+  # TODO Migrate the class method icon_name to instance methods.
+  def icon_name
+    self.class.icon_name(self)
+  end
+
   def mime_type
     'text/html'
   end
@@ -350,22 +355,6 @@ class Article &lt; ActiveRecord::Base
     true
   end
-  def folder?
-    false
-  end
-
-  def blog?
-    false
-  end
-
-  def forum?
-    false
-  end
-
-  def uploaded_file?
-    false
-  end
-
   def has_posts?
     false
   end
@@ -597,6 +586,22 @@ class Article &lt; ActiveRecord::Base
     false
   end
+  def folder?
+    false
+  end
+
+  def blog?
+    false
+  end
+
+  def forum?
+    false
+  end
+
+  def uploaded_file?
+    false
+  end
+
   def author
     if versions.empty?
       last_changed_by
@@ -5,7 +5,7 @@ class ContextContentPluginProfileController &lt; ProfileController
     block = Block.find(params[:id])
     p = params[:page].to_i
     contents = block.contents(profile.articles.find(params[:article_id]), p)
-    
+
     if contents
       render :update do |page|
         page.replace_html "context_content_#{block.id}", :file => "blocks/context_content", :locals => {:block => block, :contents => contents}
@@ -46,8 +46,9 @@ class ContextContentBlock &lt; Block
       if content.image?
         image_tag(content.public_filename(:thumb))
       else
-        extra_class = content.kind_of?(UploadedFile) ? "extension-#{content.extension}" : ''
-        content_tag 'div', '', :class => "context-icon icon-#{content.class.icon_name(content)} #{extra_class}"
+        extra_class = content.uploaded_file? ? "extension-#{content.extension}" : ''
+        klasses = [content.icon_name].flatten.map{|name| 'icon-'+name}.join(' ')
+        content_tag 'div', '', :class => "context-icon #{klasses} #{extra_class}"
       end
     end
   end
@@ -128,19 +128,22 @@ class ContextContentBlockTest &lt; ActiveSupport::TestCase
   should 'display thumbnail for image content' do
     content = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
+    content = FilePresenter.for(content)
     expects(:image_tag).once
     instance_eval(&@block.content_image(content))
   end
   should 'display div as content image for content that is not a image' do
     content = fast_create(Folder)
+    content = FilePresenter.for(content)
     expects(:content_tag).once
     instance_eval(&@block.content_image(content))
   end
   should 'display div with extension class for uploaded file that is not a image' do
     content = UploadedFile.new(:uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain'))
-    expects(:content_tag).with('div', '', :class => "context-icon icon-text-plain extension-txt").once
+    content = FilePresenter.for(content)
+    expects(:content_tag).with('div', '', :class => "context-icon icon-text icon-text-plain extension-txt").once
     instance_eval(&@block.content_image(content))
   end
 <% contents.each do |content| %>
+  <% content = FilePresenter.for(content) %>
   <span class="item">
     <a href="<%= url_for(content.view_url) %>">
       <div class="image">
	@@ -5,7 +5,7 @@ class ContextContentPluginProfileController < ProfileController		@@ -5,7 +5,7 @@ class ContextContentPluginProfileController < ProfileController
5	block = Block.find(params[:id])	5	block = Block.find(params[:id])
6	p = params[:page].to_i	6	p = params[:page].to_i
7	contents = block.contents(profile.articles.find(params[:article_id]), p)	7	contents = block.contents(profile.articles.find(params[:article_id]), p)
8	-	8	+
9	if contents	9	if contents
10	render :update do \|page\|	10	render :update do \|page\|
11	page.replace_html "context_content_#{block.id}", :file => "blocks/context_content", :locals => {:block => block, :contents => contents}	11	page.replace_html "context_content_#{block.id}", :file => "blocks/context_content", :locals => {:block => block, :contents => contents}
1	<% contents.each do \|content\| %>	1	<% contents.each do \|content\| %>
		2	+ <% content = FilePresenter.for(content) %>
2	<span class="item">	3	<span class="item">
3	<a href="<%= url_for(content.view_url) %>">	4	<a href="<%= url_for(content.view_url) %>">
4	<div class="image">	5	<div class="image">