Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging

Rodrigo Souto
2 parents 6e10728c 68426a08
Showing 23 changed files with 550 additions and 5 deletions Show diff stats
app/helpers/person_notifier_helper.rb
app/models/person.rb
app/models/person_notifier.rb
app/views/person_notifier/mailer/_add_member_in_community.rhtml
app/views/person_notifier/mailer/_comment.rhtml
app/views/person_notifier/mailer/_create_article.rhtml
app/views/person_notifier/mailer/_default_activity.rhtml
app/views/person_notifier/mailer/_join_community.rhtml
app/views/person_notifier/mailer/_leave_scrap.rhtml
app/views/person_notifier/mailer/_leave_scrap_to_self.rhtml
app/views/person_notifier/mailer/_new_friendship.rhtml
app/views/person_notifier/mailer/_profile_comments.rhtml
app/views/person_notifier/mailer/_reply_scrap_on_self.rhtml
app/views/person_notifier/mailer/_upload_image.rhtml
app/views/person_notifier/mailer/content_summary.rhtml
app/views/profile_editor/_person.rhtml
config/initializers/person_notification.rb
lib/acts_as_having_settings.rb
test/functional/invite_controller_test.rb
test/unit/acts_as_having_settings_test.rb
@@ -0,0 +1,15 @@
+module PersonNotifierHelper
+
+  include ApplicationHelper
+
+  private
+
+  def path_to_image(source)
+    top_url + source
+  end
+
+  def top_url
+    top_url = @profile.environment ? @profile.environment.top_url : ''
+  end
+
+end
@@ -490,6 +490,17 @@ class Person &lt; Profile
     gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
   end
+  settings_items :last_notification, :type => DateTime
+  settings_items :notification_time, :type => :integer, :default => 0
+
+  def notifier
+    @notifier ||= PersonNotifier.new(self)
+  end
+
+  after_update do |person|
+    person.notifier.reschedule_next_notification_mail
+  end
+
   protected
   def followed_by?(profile)
@@ -0,0 +1,89 @@
+class PersonNotifier
+
+  def initialize(person)
+    @person = person
+  end
+
+  def self.schedule_all_next_notification_mail
+    Delayed::Job.enqueue(NotifyAllJob.new) unless NotifyAllJob.exists?
+  end
+
+  def schedule_next_notification_mail
+    dispatch_notification_mail if !NotifyJob.exists?(@person.id)
+  end
+
+  def dispatch_notification_mail
+    Delayed::Job.enqueue(NotifyJob.new(@person.id), nil, @person.notification_time.hours.from_now) if @person.notification_time>0
+  end
+
+  def reschedule_next_notification_mail
+    return nil unless @person.setting_changed?(:notification_time) || @person.setting_changed?(:last_notification)
+    NotifyJob.find(@person.id).delete_all
+    schedule_next_notification_mail
+  end
+
+  def notify
+    if @person.notification_time && @person.notification_time > 0
+      from = @person.last_notification || DateTime.now - @person.notification_time.hours
+      notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", from])
+      Noosfero.with_locale @person.environment.default_language do
+        Mailer::deliver_content_summary(@person, notifications) unless notifications.empty?
+      end
+      @person.settings[:last_notification] = DateTime.now
+      @person.save!
+    end
+  end
+
+  class NotifyAllJob
+    def self.exists?
+      Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n\n").count > 0
+    end
+
+    def perform
+      Person.find_each {|person| person.notifier.schedule_next_notification_mail }
+    end
+  end
+
+  class NotifyJob < Struct.new(:person_id)
+
+    def self.exists?(person_id)
+      !find(person_id).empty?
+    end
+
+    def self.find(person_id)
+      Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob \nperson_id: #{person_id}\n")
+    end
+
+    def perform
+      Person.find(person_id).notifier.notify
+    end
+
+    def on_permanent_failure
+      person = Person.find(person_id)
+      person.notifier.dispatch_notification_mail
+    end
+
+  end
+
+  class Mailer < ActionMailer::Base
+
+    add_template_helper(PersonNotifierHelper)
+
+    def session
+      {:theme => nil}
+    end
+
+    def content_summary(person, notifications)
+      @current_theme = 'default'
+      @profile = person
+      recipients person.email
+      from "#{@profile.environment.name} <#{@profile.environment.contact_email}>"
+      subject _("[%s] Network Activity") % [@profile.environment.name]
+      body :recipient => @profile.nickname || @profile.name,
+        :environment => @profile.environment.name,
+        :url => @profile.environment.top_url,
+        :notifications => notifications
+      content_type "text/html"
+    end
+  end
+end
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,33 @@
+<% Comment %>
+<% Profile %>
+<% Person %>
+
+<table style="background: #f0f0f1;border-bottom: 1px solid #d2d2d2 !important;border-top: 1px solid #fff;margin-bottom: 0;">
+<tr>
+  <td>
+  <% if comment.author %>
+    <%= link_to profile_image(comment.author, :minor),
+        comment.author_url,
+        :class => 'comment-picture',
+        :title => comment.author_name
+    %>
+  <% end %>
+  </td>
+  <td>
+      <%= comment.author.present? ? link_to(comment.author_name, comment.author.url, :style => "font-size: 12px; color: #333; font-weight: bold; text-decoration: none;") : content_tag('strong', comment.author_name) %>
+      <% unless comment.title.blank? %>
+        <span style="font-size: 12px;"><%= comment.title %></span><br/>
+      <% end %>
+      <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
+      <span style="font-size: 8px; color: #444444"><%= time_ago_as_sentence(comment.created_at) %></span>
+  <br style="clear: both;" />
+
+  <% unless comment.replies.blank? %>
+  <ul class="comment-replies">
+    <% comment.replies.each do |reply| %>
+      <%= render :partial => 'comment', :locals => { :comment => reply } %>
+    <% end %>
+  </ul>
+  <% end %>
+  </td>
+</table>
@@ -0,0 +1,27 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+    <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
+    <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
+    <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+    <p>
+    <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
+    <br/>
+    <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
+    <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') %>
+    </p>
+    <p><%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %></p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1,19 @@
+<table>
+<tr>
+  <td>
+    <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+  </td>
+  <td>
+    <p style="width:550px">
+      <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+      <span style="font-size: 10px; color: #444444; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    </p>
+  </td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+    <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
+  </td>
+</tr>
+</table>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1 @@
+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,13 @@
+<% if activity.comments_count > 2 %>
+  <div style="font-size: 10px;">
+    <% if activity.params['url'].blank?  %>
+      <%= _("%s comments") % activity.comments_count %>
+    <% else %>
+      <%= link_to(_("View all %s comments") % activity.comments_count, activity.params['url']) %>
+    <% end %>
+  </div>
+<% else %>
+  <ul>
+    <%= render :partial => 'comment', :collection => activity.comments %>
+  </ul>
+<% end %>
@@ -0,0 +1 @@
+_leave_scrap.rhtml
 \ No newline at end of file
@@ -0,0 +1,15 @@
+<table>
+  <tr>
+    <td>
+      <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
+    </td>
+    <td>
+      <p style="width:550px">
+        <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
+        <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      </p>
+  </td>
+</tr>
+</table>
+<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
+<br/>
@@ -0,0 +1,18 @@
+<h3><%= _("%s's network activity") % @profile.name %></h3>
+<br/>
+<div>
+<% @notifications.each do |activity| %>
+  <div style="border-left:none;border-right:none;border-top:1px solid #ccc;border-bottom:none;padding:10px;width:600px">
+    <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
+  </div>
+<% end %>
+</div>
+
+<div style="color:#444444;font-size:11px;">
+<p><%= _("Greetings,") %></p>
+<br/>
+<p>--</p>
+<p><%= _('%s team.') % @environment %></p>
+<p><%= url_for @url %></p>
+</div>
+<br/>
@@ -19,3 +19,8 @@
   <%= @plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
   <%= render :partial => 'person_form', :locals => {:f => f} %>
+
+  <h2><%= _('Notification options') %></h2>
+  <div>
+    <%= select_tag 'profile_data[notification_time]', options_for_select([[_('Disabled'), 0], [_('Hourly'), 1], [_('Half Day'), 12], [_('Daily'), 24]], @profile.notification_time) %>
+  </div>
@@ -0,0 +1 @@
+PersonNotifier.schedule_all_next_notification_mail
@@ -14,6 +14,17 @@ module ActsAsHavingSettings
         def #{settings_field}
           self[:#{settings_field}] ||= Hash.new
         end
+
+        def setting_changed?(setting_field)
+          setting_field = setting_field.to_sym
+          changed_settings = self.changes['#{settings_field}']
+          return false if changed_settings.nil?
+
+          old_setting_value = changed_settings.first.nil? ? nil : changed_settings.first[setting_field]
+          new_setting_value = changed_settings.last[setting_field]
+          old_setting_value != new_setting_value
+        end
+
         before_save :symbolize_settings_keys
         private
         def symbolize_settings_keys
@@ -36,11 +47,9 @@ module ActsAsHavingSettings
             val.nil? ? (#{default}.is_a?(String) ? gettext(#{default}) : #{default}) : val
           end
           def #{setting}=(value)
-
-            #UPGRADE Leandro: I add this line to save the serialize attribute
-            send(self.class.settings_field.to_s + '_will_change!')
-
-            send(self.class.settings_field)[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
+            h = send(self.class.settings_field).clone
+            h[:#{setting}] = self.class.acts_as_having_settings_type_cast(value, #{data_type.inspect})
+            send(self.class.settings_field.to_s + '=', h)
           end
         CODE
       end
@@ -7,6 +7,7 @@ class InviteControllerTest &lt; ActionController::TestCase
     @friend = create_user('thefriend').person
     @community = fast_create(Community)
     login_as ('testuser')
+    Delayed::Job.destroy_all
   end
   attr_accessor :profile, :friend, :community
@@ -80,4 +80,38 @@ class ActsAsHavingSettingsTest &lt; ActiveSupport::TestCase
     assert obj.save
   end
+  should 'setting_changed be true if a setting passed as parameter was changed' do
+    obj = TestClass.new
+    obj.flag = true
+    assert obj.setting_changed? 'flag'
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was not changed' do
+    obj = TestClass.new
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was changed with the same value' do
+    obj = TestClass.new
+    obj.flag = true
+    obj.save
+    obj.flag = true
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be false if a setting passed as parameter was not changed but another setting is changed' do
+    obj = TestClass.new(:name => 'some name')
+    obj.save
+    obj.name = 'antoher nme'
+    assert !obj.setting_changed?('flag')
+  end
+
+  should 'setting_changed be true for all changed fields' do
+    obj = TestClass.new(:name => 'some name', :flag => false)
+    obj.save
+    obj.name = 'another nme'
+    obj.flag = true
+    assert obj.setting_changed?('flag')
+    assert obj.setting_changed?('name')
+  end
 end
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PersonNotifierHelperTest < ActiveSupport::TestCase
+
+  include PersonNotifierHelper
+  include ActionView::Helpers::TagHelper
+
+  def setup
+    @profile = mock
+    @env = Environment.new
+  end
+  attr_reader :profile, :env
+
+  should 'append top url of environment at image path' do
+    profile.expects(:environment).returns(env).at_least_once
+    assert_match /src="http:\/\/localhost\/image.png"/, image_tag("/image.png")
+  end
+
+  should 'return original path if do not have an environment' do
+    profile.expects(:environment).returns(nil).at_least_once
+    assert_match /src="\/image.png"/, image_tag("/image.png")
+  end
+
+end
@@ -0,0 +1,214 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class PersonNotifierTest < ActiveSupport::TestCase
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  CHARSET = "utf-8"
+
+  def setup
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+    Person.destroy_all
+    @admin = create_user('adminuser').person
+    @member = create_user('member').person
+    @admin.notification_time = 24
+    @member.notification_time = 24
+    @admin.save!
+    @member.save!
+    @community = fast_create(Community)
+    @community.add_member(@admin)
+    @article = fast_create(TextileArticle, :name => 'Article test', :profile_id => @community.id, :notify_comments => true)
+    Delayed::Job.destroy_all
+  end
+
+  should 'deliver mail to community members' do
+    @community.add_member(@member)
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_equal [@member.email], sent.to
+  end
+
+  should 'do not send mail if do not have notifications' do
+    @community.add_member(@member)
+    ActionTracker::Record.delete_all
+    notify
+    assert ActionMailer::Base.deliveries.empty?
+  end
+
+  should 'do not send mail to people not joined to community' do
+    ActionMailer::Base.deliveries = []
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert !sent
+  end
+
+  should 'display author name in delivered mail' do
+    @community.add_member(@member)
+    Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article)
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_match /#{@admin.name}/, sent.body
+  end
+
+  should 'do not include comment created before last notification' do
+    @community.add_member(@member)
+    ActionTracker::Record.delete_all
+    comment = Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article )
+    @member.last_notification = DateTime.now + 1.day
+    notify
+    assert ActionMailer::Base.deliveries.empty?
+  end
+
+  should 'update last notification date' do
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    @community.add_member(@member)
+    assert_equal nil, @member.last_notification
+    notify
+    assert @member.last_notification
+  end
+
+  should 'reschedule after notification' do
+    Comment.create!(:author => @admin, :title => 'test comment 2', :body => 'body 2!', :source => @article)
+    @community.add_member(@member)
+    assert_equal nil, @member.last_notification
+    notify
+    assert PersonNotifier::NotifyJob.find(@member.id)
+  end
+
+  should 'schedule next mail at notification time' do
+    @member.notification_time = 12
+    @member.notifier.schedule_next_notification_mail
+    assert_equal @member.notification_time, DateTime.now.hour - Delayed::Job.first.run_at.hour
+  end
+
+  should 'do not schedule duplicated notification mail' do
+    @member.notification_time = 12
+    @member.notifier.schedule_next_notification_mail
+    @member.notifier.schedule_next_notification_mail
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'do not schedule next mail if notification time is zero' do
+    @member.notification_time = 0
+    @member.notifier.schedule_next_notification_mail
+    assert_equal 0, Delayed::Job.count
+  end
+
+  should 'schedule next notifications for all person with notification time greater than zero' do
+    @member.notification_time = 1
+    @admin.notification_time = 0
+    @admin.save!
+    @member.save!
+    Delayed::Job.delete_all
+    PersonNotifier.schedule_all_next_notification_mail
+    process_delayed_job_queue
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'do not create duplicated job' do
+    PersonNotifier.schedule_all_next_notification_mail
+    PersonNotifier.schedule_all_next_notification_mail
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'schedule after update and set a valid notification time' do
+    @member.notification_time = 0
+    @member.save!
+    assert_equal 0, Delayed::Job.count
+    @member.notification_time = 12
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'reschedule with changed notification time' do
+    @member.notification_time = 2
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+    @member.notification_time = 12
+    @member.save!
+    assert_equal 1, Delayed::Job.count
+    assert_equal @member.notification_time, DateTime.now.hour - Delayed::Job.first.run_at.hour
+  end
+
+  should 'display error message if fail to render a notificiation' do
+    @community.add_member(@member)
+    Comment.create!(:author => @admin, :title => 'test comment', :body => 'body!', :source => @article)
+    ActionTracker::Record.any_instance.stubs(:verb).returns("some_invalid_verb")
+    notify
+    sent = ActionMailer::Base.deliveries.first
+    assert_match /cannot render notification for some_invalid_verb/, sent.body
+  end
+
+  ActionTrackerConfig.verb_names.each do |verb|
+    should "render notification for verb #{verb}" do
+      action = mock()
+      action.stubs(:verb).returns(verb)
+      action.stubs(:user).returns(@member)
+      action.stubs(:created_at).returns(DateTime.now)
+      action.stubs(:target).returns(fast_create(Forum))
+      action.stubs(:comments_count).returns(0)
+      action.stubs(:comments).returns([])
+      action.stubs(:params).returns({'name' => 'home', 'url' => '/', 'lead' => ''})
+      action.stubs(:get_url).returns('')
+
+      notifications = []
+      notifications.stubs(:find).returns([action])
+      Person.any_instance.stubs(:tracked_notifications).returns(notifications)
+
+      notify
+      sent = ActionMailer::Base.deliveries.first
+      assert_no_match /cannot render notification for #{verb}/, sent.body
+    end
+  end
+
+  should 'exists? method in NotifyAllJob return false if there is no instance of this class created' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyJob.new)
+    assert !PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'exists? method in NotifyAllJob return false if there is no jobs created' do
+    assert !PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'exists? method in NotifyAllJob return true if there is at least one instance of this class' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    assert PersonNotifier::NotifyAllJob.exists?
+  end
+
+  should 'perform create NotifyJob for all users with notification_time' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    process_delayed_job_queue
+    assert_equal 2, Delayed::Job.count
+  end
+
+  should 'perform create NotifyJob for all users with notification_time defined greater than zero' do
+    @member.notification_time = 1
+    @admin.notification_time = 0
+    @admin.save!
+    @member.save!
+    Delayed::Job.delete_all
+    Delayed::Job.enqueue(PersonNotifier::NotifyAllJob.new)
+    process_delayed_job_queue
+    assert_equal 1, Delayed::Job.count
+  end
+
+  should 'NotifyJob failed jobs create a new NotifyJob on permanent failure' do
+    Delayed::Job.enqueue(PersonNotifier::NotifyJob.new(@member.id))
+
+    PersonNotifier.any_instance.stubs(:notify).raises('error')
+
+    process_delayed_job_queue
+    jobs = Delayed::Job.all
+
+    assert 1, jobs.select{|j| j.failed?}.size
+    assert 1, jobs.select{|j| !j.failed?}.size
+  end
+
+  def notify
+    ActionTracker::Record.all.map{|action| Person.notify_activity(action)}
+    process_delayed_job_queue
+    @member.notifier.notify
+  end
+
+end
@@ -1401,6 +1401,17 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_equal person.activities, []
   end
+  should 'person notifier be PersonNotifier class' do
+    p =  Person.new
+    assert p.notifier.kind_of?(PersonNotifier)
+  end
+
+  should 'reschedule next notification after update' do
+    p = fast_create(Person, :user_id => fast_create(User).id)
+    PersonNotifier.any_instance.expects(:reschedule_next_notification_mail).once
+    assert p.update_attribute(:name, 'Person name changed')
+  end
+
   should 'merge memberships of plugins to original memberships' do
     class Plugin1 < Noosfero::Plugin
       def person_memberships(person)
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+module PersonNotifierHelper
	2	+
	3	+ include ApplicationHelper
	4	+
	5	+ private
	6	+
	7	+ def path_to_image(source)
	8	+ top_url + source
	9	+ end
	10	+
	11	+ def top_url
	12	+ top_url = @profile.environment ? @profile.environment.top_url : ''
	13	+ end
	14	+
	15	+end
	@@ -490,6 +490,17 @@ class Person < Profile		@@ -490,6 +490,17 @@ class Person < Profile
490	gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)	490	gravatar_profile_image_url(self.email, :size=>20, :d => gravatar_default)
491	end	491	end
492		492
		493	+ settings_items :last_notification, :type => DateTime
		494	+ settings_items :notification_time, :type => :integer, :default => 0
		495	+
		496	+ def notifier
		497	+ @notifier \|\|= PersonNotifier.new(self)
		498	+ end
		499	+
		500	+ after_update do \|person\|
		501	+ person.notifier.reschedule_next_notification_mail
		502	+ end
		503	+
493	protected	504	protected
494		505
495	def followed_by?(profile)	506	def followed_by?(profile)
@@ -0,0 +1,89 @@		@@ -0,0 +1,89 @@
	1	+class PersonNotifier
	2	+
	3	+ def initialize(person)
	4	+ @person = person
	5	+ end
	6	+
	7	+ def self.schedule_all_next_notification_mail
	8	+ Delayed::Job.enqueue(NotifyAllJob.new) unless NotifyAllJob.exists?
	9	+ end
	10	+
	11	+ def schedule_next_notification_mail
	12	+ dispatch_notification_mail if !NotifyJob.exists?(@person.id)
	13	+ end
	14	+
	15	+ def dispatch_notification_mail
	16	+ Delayed::Job.enqueue(NotifyJob.new(@person.id), nil, @person.notification_time.hours.from_now) if @person.notification_time>0
	17	+ end
	18	+
	19	+ def reschedule_next_notification_mail
	20	+ return nil unless @person.setting_changed?(:notification_time) \|\| @person.setting_changed?(:last_notification)
	21	+ NotifyJob.find(@person.id).delete_all
	22	+ schedule_next_notification_mail
	23	+ end
	24	+
	25	+ def notify
	26	+ if @person.notification_time && @person.notification_time > 0
	27	+ from = @person.last_notification \|\| DateTime.now - @person.notification_time.hours
	28	+ notifications = @person.tracked_notifications.find(:all, :conditions => ["created_at > ?", from])
	29	+ Noosfero.with_locale @person.environment.default_language do
	30	+ Mailer::deliver_content_summary(@person, notifications) unless notifications.empty?
	31	+ end
	32	+ @person.settings[:last_notification] = DateTime.now
	33	+ @person.save!
	34	+ end
	35	+ end
	36	+
	37	+ class NotifyAllJob
	38	+ def self.exists?
	39	+ Delayed::Job.where(:handler => "--- !ruby/object:PersonNotifier::NotifyAllJob {}\n\n").count > 0
	40	+ end
	41	+
	42	+ def perform
	43	+ Person.find_each {\|person\| person.notifier.schedule_next_notification_mail }
	44	+ end
	45	+ end
	46	+
	47	+ class NotifyJob < Struct.new(:person_id)
	48	+
	49	+ def self.exists?(person_id)
	50	+ !find(person_id).empty?
	51	+ end
	52	+
	53	+ def self.find(person_id)
	54	+ Delayed::Job.where(:handler => "--- !ruby/struct:PersonNotifier::NotifyJob \nperson_id: #{person_id}\n")
	55	+ end
	56	+
	57	+ def perform
	58	+ Person.find(person_id).notifier.notify
	59	+ end
	60	+
	61	+ def on_permanent_failure
	62	+ person = Person.find(person_id)
	63	+ person.notifier.dispatch_notification_mail
	64	+ end
	65	+
	66	+ end
	67	+
	68	+ class Mailer < ActionMailer::Base
	69	+
	70	+ add_template_helper(PersonNotifierHelper)
	71	+
	72	+ def session
	73	+ {:theme => nil}
	74	+ end
	75	+
	76	+ def content_summary(person, notifications)
	77	+ @current_theme = 'default'
	78	+ @profile = person
	79	+ recipients person.email
	80	+ from "#{@profile.environment.name} <#{@profile.environment.contact_email}>"
	81	+ subject _("[%s] Network Activity") % [@profile.environment.name]
	82	+ body :recipient => @profile.nickname \|\| @profile.name,
	83	+ :environment => @profile.environment.name,
	84	+ :url => @profile.environment.top_url,
	85	+ :notifications => notifications
	86	+ content_type "text/html"
	87	+ end
	88	+ end
	89	+end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+<%= render :partial => 'default_activity', :locals => { :activity => activity } %>
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+<% Comment %>
	2	+<% Profile %>
	3	+<% Person %>
	4	+
	5	+<table style="background: #f0f0f1;border-bottom: 1px solid #d2d2d2 !important;border-top: 1px solid #fff;margin-bottom: 0;">
	6	+<tr>
	7	+ <td>
	8	+ <% if comment.author %>
	9	+ <%= link_to profile_image(comment.author, :minor),
	10	+ comment.author_url,
	11	+ :class => 'comment-picture',
	12	+ :title => comment.author_name
	13	+ %>
	14	+ <% end %>
	15	+ </td>
	16	+ <td>
	17	+ <%= comment.author.present? ? link_to(comment.author_name, comment.author.url, :style => "font-size: 12px; color: #333; font-weight: bold; text-decoration: none;") : content_tag('strong', comment.author_name) %>
	18	+ <% unless comment.title.blank? %>
	19	+ <span style="font-size: 12px;"><%= comment.title %></span><br/>
	20	+ <% end %>
	21	+ <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
	22	+ <span style="font-size: 8px; color: #444444"><%= time_ago_as_sentence(comment.created_at) %></span>
	23	+ <br style="clear: both;" />
	24	+
	25	+ <% unless comment.replies.blank? %>
	26	+ <ul class="comment-replies">
	27	+ <% comment.replies.each do \|reply\| %>
	28	+ <%= render :partial => 'comment', :locals => { :comment => reply } %>
	29	+ <% end %>
	30	+ </ul>
	31	+ <% end %>
	32	+ </td>
	33	+</table>
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+<table>
	2	+<tr>
	3	+ <td>
	4	+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
	5	+ </td>
	6	+ <td>
	7	+ <p style="width:550px">
	8	+ <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
	9	+ <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
	10	+ <span style="font-size: 10px; color: #444444; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
	11	+ </p>
	12	+ <p>
	13	+ <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
	14	+ <br/>
	15	+ <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span>
	16	+ <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0\|\s)+/, ' ').gsub(/^\s+/, '') %>
	17	+ </p>
	18	+ <p><%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %></p>
	19	+ </td>
	20	+</tr>
	21	+<tr>
	22	+ <td></td>
	23	+ <td>
	24	+ <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
	25	+ </td>
	26	+</tr>
	27	+</table>
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+<table>
	2	+<tr>
	3	+ <td>
	4	+ <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
	5	+ </td>
	6	+ <td>
	7	+ <p style="width:550px">
	8	+ <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
	9	+ <span style="font-size: 10px; color: #444444; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
	10	+ </p>
	11	+ </td>
	12	+</tr>
	13	+<tr>
	14	+ <td></td>
	15	+ <td>
	16	+ <%= render :partial => 'profile_comments', :locals => { :activity => activity } %>
	17	+ </td>
	18	+</tr>
	19	+</table>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+_leave_scrap.rhtml
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<% if activity.comments_count > 2 %>
	2	+ <div style="font-size: 10px;">
	3	+ <% if activity.params['url'].blank? %>
	4	+ <%= _("%s comments") % activity.comments_count %>
	5	+ <% else %>
	6	+ <%= link_to(_("View all %s comments") % activity.comments_count, activity.params['url']) %>
	7	+ <% end %>
	8	+ </div>
	9	+<% else %>
	10	+ <ul>
	11	+ <%= render :partial => 'comment', :collection => activity.comments %>
	12	+ </ul>
	13	+<% end %>
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+<h3><%= _("%s's network activity") % @profile.name %></h3>
	2	+<br/>
	3	+<div>
	4	+<% @notifications.each do \|activity\| %>
	5	+ <div style="border-left:none;border-right:none;border-top:1px solid #ccc;border-bottom:none;padding:10px;width:600px">
	6	+ <%= render :partial => activity.verb, :locals => { :activity => activity } rescue "cannot render notification for #{activity.verb}" %>
	7	+ </div>
	8	+<% end %>
	9	+</div>
	10	+
	11	+<div style="color:#444444;font-size:11px;">
	12	+<p><%= _("Greetings,") %></p>
	13	+<br/>
	14	+<p>--</p>
	15	+<p><%= _('%s team.') % @environment %></p>
	16	+<p><%= url_for @url %></p>
	17	+</div>
	18	+<br/>