Refactor DisplayContentBlock#content into views

This takes advantage of the structure at BoxesHelper for content rendering. It improves MVC compliance.

Refactor DisplayContentBlock#content into views
This takes advantage of the structure at BoxesHelper for content rendering. It improves MVC compliance.
Rafael Reggiani Manzo
1 parent 95bab8a2
Showing 7 changed files with 161 additions and 165 deletions Show diff stats
plugins/display_content/lib/display_content_block.rb
plugins/display_content/test/unit/display_content_block_test.rb
plugins/display_content/views/blocks/_document.slim
plugins/display_content/views/blocks/_read_more.slim
plugins/display_content/views/blocks/_section.slim
plugins/display_content/views/blocks/_tag.slim
plugins/display_content/views/blocks/display_content.slim
@@ -142,53 +142,6 @@ class DisplayContentBlock &lt; Block
     documents
   end
-  def content(args={})
-    block = self
-
-    items = self.docs
-
-    proc do
-      block.block_title(block.title, block.subtitle) +
-        content_tag('ul', items.map {|item|
-        if !item.folder? && item.class != RssFeed
-          content_sections = ''
-          read_more_section = ''
-          tags_section = ''
-
-          block.sections.select { |section|
-            case section[:value]
-            when 'publish_date'
-              content_sections += (block.display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '')
-            when 'title'
-              content_sections += (block.display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
-            when 'abstract'
-              content_sections += (block.display_section?(section) ? (content_tag('div', item.abstract.html_safe , :class => 'lead')) : '' )
-              if block.display_section?(section)
-                read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
-              end
-            when 'body'
-              content_sections += (block.display_section?(section) ? (content_tag('div', item.body.html_safe ,:class => 'body')) : '' )
-            when 'image'
-              image_section = image_tag item.image.public_filename if item.image
-              if !image_section.blank?
-                content_sections += (block.display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
-              end
-            when 'tags'
-              if !item.tags.empty?
-                tags_section = item.tags.map { |t| content_tag('span', t.name) }.join("")
-                content_sections += (block.display_section?(section) ? (content_tag('div', tags_section, :class => 'tags')) : '')
-              end
-            end
-          }
-
-          content_sections += read_more_section if !read_more_section.blank?
-#raise sections.inspect
-          content_tag('li', content_sections.html_safe)
-        end
-      }.join(" ").html_safe)
-    end
-  end
-
   def url_params
     params = {:block_id => self.id}
     if self.owner.is_a?(Profile)
@@ -347,53 +347,6 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
   end
-  should 'list links for all articles title defined in nodes' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
-
-    block = DisplayContentBlock.new
-    block.sections = [{:value => 'title', :checked => true}]
-    block.nodes = [a1.id, a2.id]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /.*<a.*>#{a1.title}<\/a>/, instance_eval(&block.content)
-    assert_match /.*<a.*>#{a2.title}<\/a>/, instance_eval(&block.content)
-  end
-
-  should 'list content for all articles lead defined in nodes' do
-    profile = create_user('testuser').person
-    Article.delete_all
-    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
-    a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
-
-    block = DisplayContentBlock.new
-    block.sections = [{:value => 'abstract', :checked => true}]
-    block.nodes = [a1.id, a2.id]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /<div class="lead">#{a1.lead}<\/div>/, instance_eval(&block.content)
-    assert_match /<div class="lead">#{a2.lead}<\/div>/, instance_eval(&block.content)
-  end
-
-  should 'not crash when referenced article is removed' do
-    profile = create_user('testuser').person
-    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    block = DisplayContentBlock.new
-    block.nodes = [a1.id]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    Article.delete_all
-    assert_match /<ul><\/ul>/, instance_eval(&block.content)
-  end
   include ActionView::Helpers
   include Rails.application.routes.url_helpers
@@ -420,48 +373,6 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equal params, block.url_params
   end
-  should 'show title if defined by user' do
-    profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
-
-    block = DisplayContentBlock.new
-    block.nodes = [a.id]
-    block.sections = [{:value => 'title', :checked => true}]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /.*<a.*>#{a.title}<\/a>/, instance_eval(&block.content)
-  end
-
-  should 'show abstract if defined by user' do
-    profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
-
-    block = DisplayContentBlock.new
-    block.nodes = [a.id]
-    block.sections = [{:value => 'abstract', :checked => true}]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /#{a.abstract}/, instance_eval(&block.content)
-  end
-
-  should 'show body if defined by user' do
-    profile = create_user('testuser').person
-    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
-
-    block = DisplayContentBlock.new
-    block.nodes = [a.id]
-    block.sections = [{:value => 'body', :checked => true}]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /#{a.body}/, instance_eval(&block.content)
-  end
-
   should 'display_attribute be true for title by default' do
     profile = create_user('testuser').person
@@ -489,20 +400,6 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert block.display_section?({:value => 'publish_date', :checked => true})
   end
-  should 'show publishd date if defined by user' do
-    profile = create_user('testuser').person
-    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
-
-    block = DisplayContentBlock.new
-    block.nodes = [a.id]
-    block.sections = [{:value => 'publish_date', :checked => true}]
-    box = mock()
-    block.stubs(:box).returns(box)
-    box.stubs(:owner).returns(profile)
-
-    assert_match /#{a.published_at}/, instance_eval(&block.content)
-  end
-
   should 'do not save children if a folder is checked' do
     profile = create_user('testuser').person
     Article.delete_all
@@ -648,6 +545,117 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     assert_equal [], block.parent_nodes
   end
+end
+
+require 'boxes_helper'
+
+class DisplayContentBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  should 'list links for all articles title defined in nodes' do
+    profile = create_user('testuser').person
+    Article.delete_all
+    a1 = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+    a2 = fast_create(TextileArticle, :name => 'test article 2', :profile_id => profile.id)
+
+    block = DisplayContentBlock.new
+    block.sections = [{:value => 'title', :checked => true}]
+    block.nodes = [a1.id, a2.id]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /.*<a.*>#{a1.title}<\/a>/, render_block_content(block)
+    assert_match /.*<a.*>#{a2.title}<\/a>/, render_block_content(block)
+  end
+
+  should 'list content for all articles lead defined in nodes' do
+    profile = create_user('testuser').person
+    Article.delete_all
+    a1 = fast_create(TinyMceArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'abstract article 1')
+    a2 = fast_create(TinyMceArticle, :name => 'test article 2', :profile_id => profile.id, :abstract => 'abstract article 2')
+
+    block = DisplayContentBlock.new
+    block.sections = [{:value => 'abstract', :checked => true}]
+    block.nodes = [a1.id, a2.id]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /<div class="lead">#{a1.lead}<\/div>/, render_block_content(block)
+    assert_match /<div class="lead">#{a2.lead}<\/div>/, render_block_content(block)
+  end
+
+  should 'not crash when referenced article is removed' do
+    profile = create_user('testuser').person
+    a1 = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id)
+
+    block = DisplayContentBlock.new
+    block.nodes = [a1.id]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    Article.delete_all
+    assert_match /<ul><\/ul>/, render_block_content(block)
+  end
+
+  should 'show title if defined by user' do
+    profile = create_user('testuser').person
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id)
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:value => 'title', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /.*<a.*>#{a.title}<\/a>/, render_block_content(block)
+  end
+
+  should 'show abstract if defined by user' do
+    profile = create_user('testuser').person
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :abstract => 'some abstract')
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:value => 'abstract', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /#{a.abstract}/, render_block_content(block)
+  end
+
+  should 'show body if defined by user' do
+    profile = create_user('testuser').person
+    a = fast_create(TextileArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:value => 'body', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /#{a.body}/, render_block_content(block)
+  end
+
+  should 'show publishd date if defined by user' do
+    profile = create_user('testuser').person
+    a = fast_create(TextArticle, :name => 'test article 1', :profile_id => profile.id, :body => 'some body')
+
+    block = DisplayContentBlock.new
+    block.nodes = [a.id]
+    block.sections = [{:value => 'publish_date', :checked => true}]
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(profile)
+
+    assert_match /#{a.published_at}/, render_block_content(block)
+  end
+
   should 'show articles in recent order' do
     profile = create_user('testuser').person
     Article.delete_all
@@ -663,8 +671,8 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.order_by_recent = true
-    a1_index = instance_eval(&block.content).index(a1.name)
-    a2_index = instance_eval(&block.content).index(a2.name)
+    a1_index = render_block_content(block).index(a1.name)
+    a2_index = render_block_content(block).index(a2.name)
     assert a2_index < a1_index
   end
@@ -684,8 +692,8 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.order_by_recent = false
-    a1_index = instance_eval(&block.content).index(a1.name)
-    a2_index = instance_eval(&block.content).index(a2.name)
+    a1_index = render_block_content(block).index(a1.name)
+    a2_index = render_block_content(block).index(a2.name)
     assert a1_index < a2_index
   end
@@ -706,7 +714,7 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.order_by_recent = true
     block.limit_to_show = 1
-    a1_index = instance_eval(&block.content).index(a1.name)
+    a1_index = render_block_content(block).index(a1.name)
     assert a1_index.nil?
   end
@@ -730,15 +738,15 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-    assert_nil instance_eval(&block.content).index(en_article.name)
-    assert_nil instance_eval(&block.content).index(en_article2.name)
-    assert instance_eval(&block.content).index(pt_article.name).present?
+    assert_nil render_block_content(block).index(en_article.name)
+    assert_nil render_block_content(block).index(en_article2.name)
+    assert render_block_content(block).index(pt_article.name).present?
     FastGettext.stubs(:locale).returns('en')
-    assert instance_eval(&block.content).index(en_article.name)
-    assert instance_eval(&block.content).index(en_article2.name)
-    assert_nil instance_eval(&block.content).index(pt_article.name)
+    assert render_block_content(block).index(en_article.name)
+    assert render_block_content(block).index(en_article2.name)
+    assert_nil render_block_content(block).index(pt_article.name)
   end
   should 'replace article with its translation' do
@@ -758,12 +766,12 @@ class DisplayContentBlockTest &lt; ActiveSupport::TestCase
     block.stubs(:box).returns(box)
     box.stubs(:owner).returns(profile)
-    assert_nil instance_eval(&block.content).index(en_article.name)
-    assert instance_eval(&block.content).index(pt_article.name).present?
+    assert_nil render_block_content(block).index(en_article.name)
+    assert render_block_content(block).index(pt_article.name).present?
     FastGettext.stubs(:locale).returns('en')
-    assert instance_eval(&block.content).index(en_article.name).present?
-    assert_nil instance_eval(&block.content).index(pt_article.name)
+    assert render_block_content(block).index(en_article.name).present?
+    assert_nil render_block_content(block).index(pt_article.name)
   end
 end
@@ -0,0 +1,4 @@
+li
+  - unless item.folder? || item.class == RssFeed
+    = render partial: 'blocks/section', collection: block.sections, locals: { block: block, item: item }
+    = render partial: 'blocks/read_more', locals: { item: item, abstract_section: block.sections.bsearch { |section| section[:value] == 'abstract' }, block: block }
 \ No newline at end of file
@@ -0,0 +1,3 @@
+- if !abstract_section.nil? && block.display_section?(abstract_section)
+  div class='read_more'
+    = link_to(_('Read more'), item.url)
@@ -0,0 +1,22 @@
+- if block.display_section?(section)
+  - case section[:value]
+  - when 'publish_date'
+    div class='published-at'
+      = show_date(item.published_at, false)
+  - when 'title'
+    div class='title'
+      = link_to(h(item.title), item.url)
+  - when 'abstract'
+    div class='lead'
+      = item.abstract
+  - when 'body'
+    div class='body'
+      = item.body
+  - when 'image'
+    - unless item.image || item.image.public_filename
+      div class='image'
+        = link_to(image_tag(item.image.public_filename), item.url)
+  - when 'tags'
+    - unless item.tags.empty?
+      div class='tags'
+        = render partial: 'blocks/tag', collection: item.tags
@@ -0,0 +1,2 @@
+span
+  = tag.name
 \ No newline at end of file
@@ -0,0 +1,4 @@
+= block.block_title(block.title, block.subtitle)
+
+ul
+  = render partial: 'blocks/document', collection: block.docs, as: :item, locals: { block: block }
	@@ -142,53 +142,6 @@ class DisplayContentBlock < Block		@@ -142,53 +142,6 @@ class DisplayContentBlock < Block
142	documents	142	documents
143	end	143	end
144		144
145	- def content(args={})
146	- block = self
147	-
148	- items = self.docs
149	-
150	- proc do
151	- block.block_title(block.title, block.subtitle) +
152	- content_tag('ul', items.map {\|item\|
153	- if !item.folder? && item.class != RssFeed
154	- content_sections = ''
155	- read_more_section = ''
156	- tags_section = ''
157	-
158	- block.sections.select { \|section\|
159	- case section[:value]
160	- when 'publish_date'
161	- content_sections += (block.display_section?(section) ? (content_tag('div', show_date(item.published_at, false), :class => 'published-at') ) : '')
162	- when 'title'
163	- content_sections += (block.display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '')
164	- when 'abstract'
165	- content_sections += (block.display_section?(section) ? (content_tag('div', item.abstract.html_safe , :class => 'lead')) : '' )
166	- if block.display_section?(section)
167	- read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
168	- end
169	- when 'body'
170	- content_sections += (block.display_section?(section) ? (content_tag('div', item.body.html_safe ,:class => 'body')) : '' )
171	- when 'image'
172	- image_section = image_tag item.image.public_filename if item.image
173	- if !image_section.blank?
174	- content_sections += (block.display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' )
175	- end
176	- when 'tags'
177	- if !item.tags.empty?
178	- tags_section = item.tags.map { \|t\| content_tag('span', t.name) }.join("")
179	- content_sections += (block.display_section?(section) ? (content_tag('div', tags_section, :class => 'tags')) : '')
180	- end
181	- end
182	- }
183	-
184	- content_sections += read_more_section if !read_more_section.blank?
185	-#raise sections.inspect
186	- content_tag('li', content_sections.html_safe)
187	- end
188	- }.join(" ").html_safe)
189	- end
190	- end
191	-
192	def url_params	145	def url_params
193	params = {:block_id => self.id}	146	params = {:block_id => self.id}
194	if self.owner.is_a?(Profile)	147	if self.owner.is_a?(Profile)
	@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
		1	+li
		2	+ - unless item.folder? \|\| item.class == RssFeed
		3	+ = render partial: 'blocks/section', collection: block.sections, locals: { block: block, item: item }
		4	+ = render partial: 'blocks/read_more', locals: { item: item, abstract_section: block.sections.bsearch { \|section\| section[:value] == 'abstract' }, block: block }
0	\ No newline at end of file	5	\ No newline at end of file
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+- if !abstract_section.nil? && block.display_section?(abstract_section)
	2	+ div class='read_more'
	3	+ = link_to(_('Read more'), item.url)
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+- if block.display_section?(section)
	2	+ - case section[:value]
	3	+ - when 'publish_date'
	4	+ div class='published-at'
	5	+ = show_date(item.published_at, false)
	6	+ - when 'title'
	7	+ div class='title'
	8	+ = link_to(h(item.title), item.url)
	9	+ - when 'abstract'
	10	+ div class='lead'
	11	+ = item.abstract
	12	+ - when 'body'
	13	+ div class='body'
	14	+ = item.body
	15	+ - when 'image'
	16	+ - unless item.image \|\| item.image.public_filename
	17	+ div class='image'
	18	+ = link_to(image_tag(item.image.public_filename), item.url)
	19	+ - when 'tags'
	20	+ - unless item.tags.empty?
	21	+ div class='tags'
	22	+ = render partial: 'blocks/tag', collection: item.tags
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+span
		2	+ = tag.name
0	\ No newline at end of file	3	\ No newline at end of file
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+= block.block_title(block.title, block.subtitle)
	2	+
	3	+ul
	4	+ = render partial: 'blocks/document', collection: block.docs, as: :item, locals: { block: block }