Merge branch 'refactor_event_plugin' into 'master'

Refactor event plugin This removes HTML generation from the model improving the MVC compliance. See merge request !915

Merge branch 'refactor_event_plugin' into 'master'
Refactor event plugin This removes HTML generation from the model improving the MVC compliance. See merge request !915
Braulio Bhavamitra
2 parents fa17838c 8951ae04
Showing 6 changed files with 65 additions and 65 deletions Show diff stats
plugins/event/lib/event_plugin/event_block.rb
plugins/event/lib/event_plugin/event_block_helper.rb
plugins/event/test/unit/event_block_helper_test.rb
plugins/event/test/unit/event_block_test.rb
plugins/event/views/blocks/event.html.erb
plugins/event/views/event_plugin/event_block_item.html.erb
 class EventPlugin::EventBlock < Block
-  include DatesHelper
-
   attr_accessible :all_env_events, :limit, :future_only, :date_distance_limit
   settings_items :all_env_events, :type => :boolean, :default => false
@@ -49,38 +47,6 @@ class EventPlugin::EventBlock &lt; Block
     event_list
   end
-  def content(args={})
-    block = self
-    proc do
-      render(
-        :file => 'blocks/event',
-        :locals => { :block => block }
-      )
-    end
-  end
-
-  def human_time_left(days_left)
-    months_left = (days_left/30.0).round
-    if days_left <= -60
-      n_('One month ago', '%d months ago', -months_left) % -months_left
-    elsif days_left < 0
-      n_('Yesterday', '%d days ago', -days_left) % -days_left
-    elsif days_left == 0
-      _("Today")
-    elsif days_left < 60
-      n_('Tomorrow', '%d days left to start', days_left) % days_left
-    else
-      n_('One month left to start', '%d months left to start', months_left) % months_left
-    end
-  end
-
-  def date_to_html(date)
-    content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
-    content_tag(:span, month_name(date.month, true), :class => 'month') +
-    content_tag(:span, date.day.to_s, :class => 'day') +
-    content_tag(:span, date.year.to_s, :class => 'year')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -0,0 +1,25 @@
+module EventPlugin::EventBlockHelper
+  include DatesHelper
+
+  def date_to_html(date)
+    content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
+    content_tag(:span, month_name(date.month, true), :class => 'month') +
+    content_tag(:span, date.day.to_s, :class => 'day') +
+    content_tag(:span, date.year.to_s, :class => 'year')
+  end
+
+  def human_time_left(days_left)
+    months_left = (days_left/30.0).round
+    if days_left <= -60
+      n_('One month ago', '%d months ago', -months_left) % -months_left
+    elsif days_left < 0
+      n_('Yesterday', '%d days ago', -days_left) % -days_left
+    elsif days_left == 0
+      _("Today")
+    elsif days_left < 60
+      n_('Tomorrow', '%d days left to start', days_left) % days_left
+    else
+      n_('One month left to start', '%d months left to start', months_left) % months_left
+    end
+  end
+end
@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class EventBlockHelperTest < ActionView::TestCase
+  include EventPlugin::EventBlockHelper
+
+  should 'write formatable data in html' do
+    html = '<span class="week-day">Tue</span>'+
+           '<span class="month">Sep</span>'+
+           '<span class="day">27</span>'+
+           '<span class="year">1983</span>'
+
+    assert_equal html, date_to_html(Date.new 1983, 9, 27)
+  end
+
+  should 'say human left time for an event' do
+    assert_match /Tomorrow/, human_time_left(1)
+    assert_match /5 days left/, human_time_left(5)
+    assert_match /30 days left/, human_time_left(30)
+    assert_match /2 months left/, human_time_left(60)
+    assert_match /3 months left/, human_time_left(85)
+  end
+
+  should 'say human past time for an event' do
+    assert_match /Yesterday/, human_time_left(-1)
+    assert_match /5 days ago/, human_time_left(-5)
+    assert_match /30 days ago/, human_time_left(-30)
+    assert_match /2 months ago/, human_time_left(-60)
+    assert_match /3 months ago/, human_time_left(-85)
+  end
+
+  should 'say human present time for an event' do
+    assert_match /Today/, human_time_left(0)
+  end
+end
@@ -77,35 +77,6 @@ class EventBlockTest &lt; ActiveSupport::TestCase
     assert_equal 2, @block.events.length
   end
-  should 'say human left time for an event' do
-    assert_match /Tomorrow/, @block.human_time_left(1)
-    assert_match /5 days left/, @block.human_time_left(5)
-    assert_match /30 days left/, @block.human_time_left(30)
-    assert_match /2 months left/, @block.human_time_left(60)
-    assert_match /3 months left/, @block.human_time_left(85)
-  end
-
-  should 'say human past time for an event' do
-    assert_match /Yesterday/, @block.human_time_left(-1)
-    assert_match /5 days ago/, @block.human_time_left(-5)
-    assert_match /30 days ago/, @block.human_time_left(-30)
-    assert_match /2 months ago/, @block.human_time_left(-60)
-    assert_match /3 months ago/, @block.human_time_left(-85)
-  end
-
-  should 'say human present time for an event' do
-    assert_match /Today/, @block.human_time_left(0)
-  end
-
-  should 'write formatable data in html' do
-    html = '<span class="week-day">Tue</span>'+
-           '<span class="month">Sep</span>'+
-           '<span class="day">27</span>'+
-           '<span class="year">1983</span>'
-
-    assert_equal html, @block.date_to_html(Date.new 1983, 9, 27)
-  end
-
   should 'show unlimited time distance events' do
     @block.box.owner = @env
     @block.all_env_events = true
+<% extend EventPlugin::EventBlockHelper %>
+
 <%= block_title(block.title, block.subtitle) %>
 <ul class="events">
@@ -10,7 +12,7 @@
                 :event => event,
                 :block => block,
                 :time_class => days_left < 0 ? 'past' : 'future',
-                :time_left_str => block.human_time_left(days_left)
+                :time_left_str => human_time_left(days_left)
               }
             )
         %>
 <%
+  extend EventPlugin::EventBlockHelper
+
   # compute layout values
   ev_days_tag = ''
   if event.duration > 1
@@ -18,7 +20,7 @@
 <%=
   link_to(safe_join([
       content_tag('time',
-        block.date_to_html(event.start_date),
+        date_to_html(event.start_date),
         :itemprop => 'startDate',
         :datetime => show_date(event.start_date),
         :class => 'date ' + img_class, :style => bg,
1	class EventPlugin::EventBlock < Block	1	class EventPlugin::EventBlock < Block
2	- include DatesHelper
3	-
4	attr_accessible :all_env_events, :limit, :future_only, :date_distance_limit	2	attr_accessible :all_env_events, :limit, :future_only, :date_distance_limit
5		3
6	settings_items :all_env_events, :type => :boolean, :default => false	4	settings_items :all_env_events, :type => :boolean, :default => false
	@@ -49,38 +47,6 @@ class EventPlugin::EventBlock < Block		@@ -49,38 +47,6 @@ class EventPlugin::EventBlock < Block
49	event_list	47	event_list
50	end	48	end
51		49
52	- def content(args={})
53	- block = self
54	- proc do
55	- render(
56	- :file => 'blocks/event',
57	- :locals => { :block => block }
58	- )
59	- end
60	- end
61	-
62	- def human_time_left(days_left)
63	- months_left = (days_left/30.0).round
64	- if days_left <= -60
65	- n_('One month ago', '%d months ago', -months_left) % -months_left
66	- elsif days_left < 0
67	- n_('Yesterday', '%d days ago', -days_left) % -days_left
68	- elsif days_left == 0
69	- _("Today")
70	- elsif days_left < 60
71	- n_('Tomorrow', '%d days left to start', days_left) % days_left
72	- else
73	- n_('One month left to start', '%d months left to start', months_left) % months_left
74	- end
75	- end
76	-
77	- def date_to_html(date)
78	- content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
79	- content_tag(:span, month_name(date.month, true), :class => 'month') +
80	- content_tag(:span, date.day.to_s, :class => 'day') +
81	- content_tag(:span, date.year.to_s, :class => 'year')
82	- end
83	-
84	def self.expire_on	50	def self.expire_on
85	{ :profile => [:article], :environment => [:article] }	51	{ :profile => [:article], :environment => [:article] }
86	end	52	end
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+module EventPlugin::EventBlockHelper
	2	+ include DatesHelper
	3	+
	4	+ def date_to_html(date)
	5	+ content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
	6	+ content_tag(:span, month_name(date.month, true), :class => 'month') +
	7	+ content_tag(:span, date.day.to_s, :class => 'day') +
	8	+ content_tag(:span, date.year.to_s, :class => 'year')
	9	+ end
	10	+
	11	+ def human_time_left(days_left)
	12	+ months_left = (days_left/30.0).round
	13	+ if days_left <= -60
	14	+ n_('One month ago', '%d months ago', -months_left) % -months_left
	15	+ elsif days_left < 0
	16	+ n_('Yesterday', '%d days ago', -days_left) % -days_left
	17	+ elsif days_left == 0
	18	+ _("Today")
	19	+ elsif days_left < 60
	20	+ n_('Tomorrow', '%d days left to start', days_left) % days_left
	21	+ else
	22	+ n_('One month left to start', '%d months left to start', months_left) % months_left
	23	+ end
	24	+ end
	25	+end
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+require 'test_helper'
	2	+
	3	+class EventBlockHelperTest < ActionView::TestCase
	4	+ include EventPlugin::EventBlockHelper
	5	+
	6	+ should 'write formatable data in html' do
	7	+ html = '<span class="week-day">Tue</span>'+
	8	+ '<span class="month">Sep</span>'+
	9	+ '<span class="day">27</span>'+
	10	+ '<span class="year">1983</span>'
	11	+
	12	+ assert_equal html, date_to_html(Date.new 1983, 9, 27)
	13	+ end
	14	+
	15	+ should 'say human left time for an event' do
	16	+ assert_match /Tomorrow/, human_time_left(1)
	17	+ assert_match /5 days left/, human_time_left(5)
	18	+ assert_match /30 days left/, human_time_left(30)
	19	+ assert_match /2 months left/, human_time_left(60)
	20	+ assert_match /3 months left/, human_time_left(85)
	21	+ end
	22	+
	23	+ should 'say human past time for an event' do
	24	+ assert_match /Yesterday/, human_time_left(-1)
	25	+ assert_match /5 days ago/, human_time_left(-5)
	26	+ assert_match /30 days ago/, human_time_left(-30)
	27	+ assert_match /2 months ago/, human_time_left(-60)
	28	+ assert_match /3 months ago/, human_time_left(-85)
	29	+ end
	30	+
	31	+ should 'say human present time for an event' do
	32	+ assert_match /Today/, human_time_left(0)
	33	+ end
	34	+end
	@@ -77,35 +77,6 @@ class EventBlockTest < ActiveSupport::TestCase		@@ -77,35 +77,6 @@ class EventBlockTest < ActiveSupport::TestCase
77	assert_equal 2, @block.events.length	77	assert_equal 2, @block.events.length
78	end	78	end
79		79
80	- should 'say human left time for an event' do
81	- assert_match /Tomorrow/, @block.human_time_left(1)
82	- assert_match /5 days left/, @block.human_time_left(5)
83	- assert_match /30 days left/, @block.human_time_left(30)
84	- assert_match /2 months left/, @block.human_time_left(60)
85	- assert_match /3 months left/, @block.human_time_left(85)
86	- end
87	-
88	- should 'say human past time for an event' do
89	- assert_match /Yesterday/, @block.human_time_left(-1)
90	- assert_match /5 days ago/, @block.human_time_left(-5)
91	- assert_match /30 days ago/, @block.human_time_left(-30)
92	- assert_match /2 months ago/, @block.human_time_left(-60)
93	- assert_match /3 months ago/, @block.human_time_left(-85)
94	- end
95	-
96	- should 'say human present time for an event' do
97	- assert_match /Today/, @block.human_time_left(0)
98	- end
99	-
100	- should 'write formatable data in html' do
101	- html = '<span class="week-day">Tue</span>'+
102	- '<span class="month">Sep</span>'+
103	- '<span class="day">27</span>'+
104	- '<span class="year">1983</span>'
105	-
106	- assert_equal html, @block.date_to_html(Date.new 1983, 9, 27)
107	- end
108	-
109	should 'show unlimited time distance events' do	80	should 'show unlimited time distance events' do
110	@block.box.owner = @env	81	@block.box.owner = @env
111	@block.all_env_events = true	82	@block.all_env_events = true