Victor Costa · Hugo Melo · Hugo Melo · Hugo Melo · Hugo Melo · Leandro Santos
Showing 37 changed files Show diff stats
controllers/admin/gamification_plugin_badges_controller.rb
lib/ext/environment.rb
lib/ext/organization.rb
lib/gamification_plugin/api.rb
lib/gamification_plugin/badge.rb
lib/gamification_plugin/dashboard_helper.rb
lib/merit/badge_rules.rb
lib/merit/point_rules.rb
lib/merit_ext.rb
models/gamification_plugin/points_categorization.rb
models/gamification_plugin/points_type.rb
public/admin.css
public/admin.js
public/style.css
script/check_merit_actions_vs_points.rb
script/export_ranking.rb
script/process_merit_rules.rb
test/functional/gamification_plugin_badges_controller_test.rb
test/functional/gamification_plugin_profile_controller_test.rb
test/test_helper.rb
 class GamificationPluginBadgesController < PluginAdminController
  
   def index
-    @gamification_plugin_badges = environment.gamification_plugin_badges
+    @gamification_plugin_badges = environment.gamification_plugin_badges.group_by(&:owner)
   end
  
   def show
@@ -17,8 +17,13 @@ class GamificationPluginBadgesController &lt; PluginAdminController
   end
  
   def create
+    owner_id = params[:gamification_plugin_badge].delete(:owner_id)
     @gamification_plugin_badge = GamificationPlugin::Badge.new(params[:gamification_plugin_badge])
-    @gamification_plugin_badge.owner = environment
+    if owner_id.present?
+      @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
+    else
+      @gamification_plugin_badge.owner = environment
+    end
  
     if @gamification_plugin_badge.save
       session[:notice] = _('Badge was successfully created.')
@@ -31,6 +36,14 @@ class GamificationPluginBadgesController &lt; PluginAdminController
   def update
     @gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
  
+    # FIXME avoid code duplication
+    owner_id = params[:gamification_plugin_badge].delete(:owner_id)
+    if owner_id.present?
+      @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
+    else
+      @gamification_plugin_badge.owner = environment
+    end
+
     if @gamification_plugin_badge.update_attributes(params[:gamification_plugin_badge])
       session[:notice] = _('Badge was successfully updated.')
       redirect_to :action => :index
@@ -39,6 +52,10 @@ class GamificationPluginBadgesController &lt; PluginAdminController
     end
   end
  
+  def search_owners
+    render :text => prepare_to_token_input(environment.organizations).to_json
+  end
+
   def destroy
     @gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
     @gamification_plugin_badge.destroy
@@ -2,6 +2,11 @@ require_dependency &#39;environment&#39;
  
 class Environment
  
-  has_many :gamification_plugin_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+  has_many :gamification_plugin_environment_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+  has_many :gamification_plugin_organization_badges, :through => :organizations
+
+  def gamification_plugin_badges
+    GamificationPlugin::Badge.joins('left join profiles on profiles.id = owner_id').where(['owner_id = ? or profiles.environment_id = ?', self.id, self.id])
+  end
  
 end
@@ -0,0 +1,7 @@
+require_dependency 'organization'
+
+class Organization
+
+  has_many :gamification_plugin_organization_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
+
+end
@@ -3,7 +3,7 @@ class GamificationPlugin::API &lt; Grape::API
   resource :gamification_plugin do
  
     get 'badges' do
-      environment.gamification_plugin_badges.group(:name).count
+      environment.gamification_plugin_badges.group('gamification_plugin_badges.name').count
     end
  
     resource :my do
@@ -57,7 +57,7 @@ class GamificationPlugin::API &lt; Grape::API
       get ':id/points_by_profile' do
         person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
         return not_found! if person.blank?
-        {points: person.points_by_type(params[:profile]) }
+        {points: person.points_by_profile(params[:profile]) }
       end
  
       get ':id/points_out_of_profiles' do
@@ -75,4 +75,3 @@ class GamificationPlugin::API &lt; Grape::API
     end
   end
 end
-
-class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
+class GamificationPlugin::Badge < ActiveRecord::Base
  
   belongs_to :owner, :polymorphic => true
  
@@ -12,13 +12,22 @@ module GamificationPlugin::DashboardHelper
   end
  
   def score_point_category(point)
-    point = GamificationPlugin::PointsType.where(name: point.score.category).first
+    point = GamificationPlugin::PointsType.where(id: point.score.category).first
     point.nil? ? '' : point.description
   end
  
+  def score_point_target_link(point, text)
+    url = Merit::PointRules.target_url(point)
+    url.present? ? link_to(text, url) : text
+  end
+
+  def score_point_action_class(point)
+    point.undo_rule? ? 'undo_action':'do_action'
+  end
+
   def ranking(target, from_date=nil, limit=10)
     # FIXME move these queries to profile model
-    ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).order('sum(num_points) DESC').group('profiles.id')
+    ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).reorder('sum(num_points) DESC').group('profiles.id')
     ranking = ranking.where("merit_score_points.created_at >= ?", from_date) if from_date.present?
     target_ranking = Profile.from("(#{ranking.to_sql}) profiles").where('profiles.id' => target.id).first
  
@@ -35,4 +44,15 @@ module GamificationPlugin::DashboardHelper
     (context_ranking.blank? ? '' : render(:partial => 'gamification/ranking', :locals => {:ranking => context_ranking, :target_ranking => target_ranking, :ranking_class => 'context'}))
   end
  
+  def badges_title(owner)
+    return _('Badges for %s' % owner.name) if owner.kind_of?(Organization)
+    _('Badges')
+  end
+
+  def grouped_badges
+    environment.gamification_plugin_badges.all.group_by(&:owner).sort do |a, b|
+      a.first.kind_of?(Environment) ? -1 : a.first.name <=> b.first.name
+    end
+  end
+
 end
@@ -14,6 +14,7 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         }
       ],
@@ -22,6 +23,7 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: lambda {|comment| comment.source.author},
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? Comment.where(source_id: Article.where(author_id: author.id)).count : 0 }
         }
       ],
@@ -30,6 +32,7 @@ module Merit
           action: 'article#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|article| article.profile },
           value: lambda { |article, author| author.present? ? TextArticle.where(author_id: author.id).count : 0 }
         },
       ],
@@ -38,6 +41,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voteable.author},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, author| vote.voteable ? Vote.for_voteable(vote.voteable).where('vote > 0').count : 0}
         }
       ],
@@ -46,6 +50,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voteable.author},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, author| Vote.for_voteable(vote.voteable).where('vote < 0').count }
         }
       ],
@@ -54,6 +59,7 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voter},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| voter ? Vote.for_voter(voter).count : 0 }
         }
       ],
@@ -65,6 +71,7 @@ module Merit
           value: lambda { |friendship, person| person.friends.count }
         }
       ],
+      manual: [],
  
 #FIXME review the name of the badges and see a way to make it generic
       creative: [
@@ -72,12 +79,14 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         },
         {
           action: 'article#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|article| article.profile },
           value: lambda { |article, author| author.present? ? author.articles.count : 0 }
         },
       ],
@@ -86,6 +95,7 @@ module Merit
           action: 'articlefollower#create',
           default_threshold: 5,
           to: lambda {|article| article.person },
+          target_profile: lambda {|article_follower| article_follower.article.profile },
           model: 'ArticleFollower',
           value: lambda { |article, person| person.present? ? person.article_followers.count : 0 }
         }
@@ -95,12 +105,14 @@ module Merit
           action: 'Vote#create',
           default_threshold: 5,
           to: lambda { |vote| vote.voter },
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| Vote.for_voter(voter).count }
         },
         {
           action: 'Event#create',
           default_threshold: 5,
           to: lambda { |article| article.author },
+          target_profile: lambda {|article| article.profile },
           value: lambda { |event, author| author.events.count }
         },
       ],
@@ -109,12 +121,14 @@ module Merit
           action: 'vote#create',
           default_threshold: 5,
           to: lambda {|vote| vote.voter},
+          target_profile: lambda {|vote| vote.voteable.profile },
           value: lambda { |vote, voter| voter ? voter.votes.where('vote > 0').count : 0 }
         },
         {
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         }
       ],
@@ -123,6 +137,7 @@ module Merit
           action: 'articlefollower#create',
           default_threshold: 5,
           to: :person,
+          target_profile: lambda {|article_follower| article_follower.article.profile },
           model: 'ArticleFollower',
           value: lambda { |article_follower, person| person.present? ? person.article_followers.count : 0 }
         },
@@ -130,11 +145,28 @@ module Merit
           action: 'comment#create',
           default_threshold: 5,
           to: :author,
+          target_profile: lambda {|comment| comment.profile },
           value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
         },
       ]
     }
  
+    def target_author(source, setting)
+      if setting[:to].is_a? Symbol
+        source.send(setting[:to])
+      else
+        setting[:to].call(source) rescue nil
+      end
+    end
+
+    def target_profile(source, setting)
+      setting[:target_profile].present? ? setting[:target_profile].call(source) : nil
+    end
+
+    def check_organization_badge(badge, source, setting)
+      !badge.owner.kind_of?(Organization) || badge.owner == target_profile(source, setting)
+    end
+
     def initialize(environment=nil)
       return if environment.nil?
       @environment = environment
@@ -142,7 +174,7 @@ module Merit
       rules = AVAILABLE_RULES
       rules.merge! CONFERENCE_RULES if defined? CONFERENCE_RULES
  
-      environment.gamification_plugin_badges.all.each do |badge|
+      environment.gamification_plugin_badges.each do |badge|
         next if rules[badge.name.to_sym].nil?
         rules[badge.name.to_sym].each do |setting|
           options = {badge: badge.name, level: badge.level, to: setting[:to]}
@@ -150,18 +182,11 @@ module Merit
           grant_on setting[:action], options do |source|
             can_be_granted = true
             rules[badge.name.to_sym].each do |s|
-              if setting[:to].is_a? Symbol
-                to = source.send(setting[:to])
-              else
-                begin
-                  to = setting[:to].call(source)
-                rescue
-                  to = nil
-                end
-              end
-                # pass source and to for different situations
+              to = target_author(source, setting)
+              # pass source and to for different situations
               action = (badge.custom_fields || {}).fetch(s[:action], {})
               can_be_granted &= s[:value].call(source, to) >= action.fetch(:threshold, s[:default_threshold]).to_i
+              can_be_granted &= check_organization_badge(badge, source, setting)
             end
             can_be_granted
           end
@@ -11,6 +11,7 @@ module Merit
         description: _('Comment author'),
         default_weight: 40,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_article_author: {
         action: 'comment#create',
@@ -20,6 +21,7 @@ module Merit
         description: _('Article author of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_article: {
         action: 'comment#create',
@@ -29,6 +31,7 @@ module Merit
         description: _('Source article of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
+        target_url: lambda {|comment| comment.url},
       },
       comment_community: {
         action: 'comment#create',
@@ -38,7 +41,8 @@ module Merit
         description: _('Article community of a comment'),
         default_weight: 50,
         target_profile: lambda {|comment| comment.source.profile },
-        condition: lambda {|comment, profile| comment.profile.community?}
+        condition: lambda {|comment, profile| comment.profile.community?},
+        target_url: lambda {|comment| comment.url},
       },
       article_author: {
         action: 'article#create',
@@ -48,6 +52,7 @@ module Merit
         description: _('Article author'),
         default_weight: 50,
         target_profile: lambda {|article| article.profile },
+        target_url: lambda {|article| article.url},
       },
       article_community: {
         action: 'article#create',
@@ -57,7 +62,8 @@ module Merit
         description: _('Article community'),
         default_weight: 10,
         target_profile: lambda {|article| article.profile },
-        condition: lambda {|article, profile| article.profile.present? and article.profile.community? }
+        condition: lambda {|article, profile| article.profile.present? and article.profile.community? },
+        target_url: lambda {|article| article.url},
       },
       vote_voteable_author: {
         action: 'vote#create',
@@ -67,6 +73,7 @@ module Merit
         description: _('Author of a voted content'),
         default_weight: 20,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       vote_voteable: {
         action: 'vote#create',
@@ -76,6 +83,7 @@ module Merit
         description: _('Voted content'),
         default_weight: 30,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       vote_voter: {
         action: 'vote#create',
@@ -85,6 +93,7 @@ module Merit
         description: _('Voter'),
         default_weight: 10,
         target_profile: lambda {|vote| vote.voteable.present? ? vote.voteable.profile : nil },
+        target_url: lambda {|vote| vote.voteable.url},
       },
       friends: {
         action: 'friendship#create',
@@ -150,6 +159,7 @@ module Merit
     end
  
     def profile_condition(setting, target, profile)
+      return false if target == true
       profile.nil? || setting[:target_profile].blank? || setting[:target_profile].call(target) == profile
     end
  
@@ -163,6 +173,15 @@ module Merit
       end
     end
  
+    def self.target_url(point)
+      rule_name = point.point_type.present? ? point.point_type.name : point.score.category
+      target_url = AVAILABLE_RULES[rule_name.to_sym][:target_url]
+      return nil if target_url.blank? || point.action.blank?
+
+      model = BaseTargetFinder.new(Merit::Rule.new, point.action).get_target_from_database
+      model.present? ? target_url.call(model) : nil
+    end
+
     def initialize(environment=nil)
       return if environment.nil?
       @environment = environment
@@ -17,6 +17,15 @@ module Merit
   class Score
     class Point
       belongs_to :action
+
+      def point_type
+        @point_type ||= GamificationPlugin::PointsType.where(id: score.category).first
+      end
+
+      def undo_rule?
+        rule = Merit::PointRules::AVAILABLE_RULES[point_type.name.to_sym]
+        rule[:undo_action] == "#{action.target_model}##{action.action_method}"
+      end
     end
   end
  
@@ -34,7 +43,7 @@ module Merit
   module ClassMethods
  
     def has_merit_actions(options = {})
-      after_create { |obj| obj.new_merit_action(:create, options) }
+      after_create { |obj| obj.delay.new_merit_action(:create, options) }
       before_destroy { |obj| obj.new_merit_action(:destroy, options) }
     end
  
-class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord
+class GamificationPlugin::PointsCategorization < ActiveRecord::Base
   belongs_to :profile
   belongs_to :point_type, class_name: 'GamificationPlugin::PointsType', foreign_key: :point_type_id
   attr_accessible :profile_id, :profile, :point_type_id, :weight
@@ -10,5 +10,5 @@ class GamificationPlugin::PointsCategorization &lt; Noosfero::Plugin::ActiveRecord
   scope :for_type, lambda { |p_type| joins(:point_type).where(gamification_plugin_points_types: {name: p_type}) }
   scope :for_profile, lambda { |p_profile| joins(:profile).where(profiles: {identifier: p_profile}) }
  
-  scope :grouped_profiles, select(:profile_id).group(:profile_id).includes(:profile)
+  scope :grouped_profiles, -> { select(:profile_id).group(:profile_id).includes(:profile) }
 end
-class GamificationPlugin::PointsType < Noosfero::Plugin::ActiveRecord
+class GamificationPlugin::PointsType < ActiveRecord::Base
   attr_accessible :description, :name
  
   validates :name, presence: true, uniqueness: true
 .gamification-plugin-rank-rules .template-level {
   display: none !important;
 }
+
+.gamification-plugin-badges .badge-owner-group {
+  text-align: right;
+  color: gray;
+  font-weight: bold;
+}
@@ -13,6 +13,11 @@ var gamificationPluginAdmin = {
   	var name = jQuery('#gamification-plugin-form-badge-name').find('option:selected').text();
   	jQuery('.name_'+name).show();
   	jQuery('.name_'+name).find('input').removeAttr('disabled');
+    if(jQuery('.name_'+name).children().length>0) {
+      jQuery('.action-fields').show();
+    } else {
+      jQuery('.action-fields').hide();
+    }
   }
  
 }
@@ -237,3 +237,7 @@
   float: left;
   width: 180px;
 }
+
+.gamification-dashboard .points .score.undo_action .category {
+  text-decoration: line-through;
+}
@@ -0,0 +1,197 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+#
+# This script was created for ensuring all the actions observed
+# by merit for pontuation was judged and pontuated accordingly
+# It checks the merit_actions registers for each action(model
+# create or destroy) and recreates it
+#
+
+require 'csv'
+
+ActiveRecord::Base.logger.level = Logger::Severity::UNKNOWN
+
+class ProcessObserver
+  def update(changed_data)
+    merit = changed_data[:merit_object]
+    if merit.kind_of?(Merit::Score::Point)
+      action = Merit::Action.find(changed_data[:merit_action_id])
+      new_date = YAML.load(action.target_data).created_at
+      action.update_attribute(:created_at, new_date)
+      merit.update_attribute(:created_at, new_date)
+    end
+  end
+end
+
+def create_action(obj, index, count)
+  target_model = obj.class.base_class.name.downcase
+  action = Merit::Action.find_by_target_id_and_target_model_and_action_method(obj.id, target_model, 'create')
+  if action.nil?
+    puts "#{index}/#{count} Create merit action for #{target_model} #{obj.id}"
+    begin
+      obj.new_merit_action(:create)
+    rescue Exception => e
+      puts "Could not be create: #{e.message}"
+    end
+  end
+end
+
+def recreate_actions person, objects, category
+  puts "Recreating actions for #{person.identifier} on model #{objects.name}"
+  actions = Merit::Action.where(target_id: objects, target_model: objects.name.downcase, action_method: 'create')
+  Merit::Score::Point.where(action_id: actions).destroy_all
+  actions.destroy_all
+  # erase remaining points if any (can be wrong on destroy cases ?)
+  person.score_points.where(score_id: Merit::Score.where(category: category)).destroy_all
+  count = objects.count
+  objects.each_with_index{ |obj, index| create_action(obj, index, count) }
+end
+
+def calc_points categorization, objects
+  rule = Merit::PointRules::AVAILABLE_RULES[categorization.point_type.name.to_sym]
+  return 0 if rule.nil?
+
+  sum = objects.map{|o| rule[:value].respond_to?(:call) ? rule[:value].call(o) : rule[:value] }.sum
+  return sum * categorization.weight
+end
+
+# avoid updating level on every action for increasing performance
+Merit.observers.delete('RankObserver')
+
+Merit.observers << 'ProcessObserver'
+
+class Article < ActiveRecord::Base
+  def self.text_article_types
+    ['ProposalsDiscussionPlugin::Proposal']
+  end
+end
+
+puts "Cleaning up points from actions which don't exist"
+Merit::Score::Point.includes(:action).find_each(batch_size: 100) do |point|
+  point.destroy if point.action.nil?
+end
+
+# erase the badges spreadsheet
+CSV.open( "gamification_wrong_badges.csv", 'w' ) do |csv|
+  csv << ['identifier', 'missing badges', 'exceeding badges']
+end
+# erase the points spreadsheet
+CSV.open( "gamification_points_out_expectation.csv", 'w' ) do |csv|
+  csv << ['identifier', 'name', 'action', 'profile', 'category id', 'category type', 'should have', 'have']
+end
+
+Environment.all.each do |environment|
+  puts "Process environment #{environment.name}"
+
+  Merit::AppPointRules.clear
+  Merit::AppBadgeRules.clear
+  Merit::AppPointRules.merge!(Merit::PointRules.new(environment).defined_rules)
+  Merit::AppBadgeRules.merge!(Merit::BadgeRules.new(environment).defined_rules)
+
+  group_control = YAML.load(File.read(File.join(Rails.root,'tmp','control_group.yml'))) if File.exist?(File.join(Rails.root,'tmp','control_group.yml'))
+  conditions = group_control.nil? ? {} : {:identifier => group_control.map{|k,v| v['profiles']}.flatten}
+
+  clean_profiles_file = File.join(Rails.root,'tmp','gamification_clean_profiles.yml')
+  clean_profiles = YAML.load(File.read(clean_profiles_file)) if File.exist?(File.join(clean_profiles_file))
+  clean_profiles = [0] if clean_profiles.nil?
+
+  people_count = environment.people.where(conditions).where("id not in (?)",clean_profiles).count
+  person_index = 0
+  puts "Analising environment people"
+  environment.people.where("id not in (?)",clean_profiles).find_each(:conditions => conditions) do |person|
+    person_index += 1
+    profile_ids = GamificationPlugin::PointsCategorization.uniq.pluck(:profile_id)
+    profile_ids.keep_if { |item| group_control.keys.include?(item) } unless group_control.nil?
+    profile_ids.delete nil # avoid loosing time with generic for now
+    profile_ids.each do |profile_id|
+      profile = Profile.where(id: profile_id).first
+      if profile.nil?
+        profile_name = 'generic'
+        # person actions
+        person_articles = Article.where(author_id: person.id)
+        comments = Comment.where(author_id: person.id)
+        votes = Vote.for_voter(person)
+        follows = ArticleFollower.where(person_id: person.id)
+      else
+        profile_name = profile.identifier
+        #person actions
+        person_articles = Article.where(author_id: person.id, profile_id: profile)
+        comments = Comment.where(author_id: person.id, source_id: profile.articles)
+        general_votes = Vote.for_voter(person)
+        votes = general_votes.where("(voteable_type = 'Article' and voteable_id in (?)) or (voteable_type = 'Comment' and voteable_id in (?))",profile.articles, Comment.where(source_type: "Article", source_id: profile.articles))
+        follows = ArticleFollower.where(person_id: person.id, article_id: profile.articles)
+      end
+      # received actions
+      comments_received = Comment.where(:source_id => person_articles)
+      votes_received = Vote.where("(voteable_type = 'Article' and voteable_id in (?)) or (voteable_type = 'Comment' and voteable_id in (?))",person_articles, person.comments)
+      follows_received = ArticleFollower.where(:article_id => person_articles)
+
+      puts "#{person_index}/#{people_count} - Analising points for #{person.identifier} on #{profile_name}"
+      #puts "Proposed #{person_articles.count} times, Commented #{comments.count} times, Voted #{votes.count} times, Followed #{follows.count} times"
+      #puts "Received #{votes_received.count} votes, #{comments_received.count} comments, #{follows_received.count} follows\n"
+
+      scope_by_badge_action = {
+        "articlefollower#create" => follows, "comment#create" => comments, "article#create" => person_articles, "vote#create" => votes
+      }
+
+      # ignoring user badges out of environment badges
+      should_and_doesnt_have = []
+      should_not_have = []
+      should_have = true
+      environment.gamification_plugin_badges.each do |badge|
+        (badge.custom_fields || {}).each do |action, config|
+          break if scope_by_badge_action[action].nil? or config[:threshold].nil?
+          should_have &= scope_by_badge_action[action].count >= config[:threshold].to_i
+        end
+        have = person.badges.include? badge
+        if should_have && !have
+          should_and_doesnt_have << "#{badge.title} #{badge.level}"
+        elsif should_have && !have
+          should_not_have << "#{badge.title} #{badge.level}"
+        end
+      end
+      if should_and_doesnt_have.size > 0 || should_not_have.size > 0
+        CSV.open( "gamification_wrong_badges.csv", 'a' ) do |csv|
+          [person.identifier, should_and_doesnt_have.join(' | '), should_not_have.join(' | ')]
+        end
+      end
+
+      scope_by_type = {
+        article_author: person_articles, comment_author: comments, vote_voter: votes, follower: follows,
+        comment_article_author: comments_received, vote_voteable_author: votes_received, followed_article_author: follows_received
+      }
+
+      puts "Points:"
+      is_profile_clean = true
+      scope_by_type.each do |type, scope|
+        c = GamificationPlugin::PointsCategorization.for_type(type).where(profile_id: profile_id).joins(:point_type).first
+        points = calc_points c, scope
+        puts "On #{c.point_type.name} it should have #{points} and have #{person.points(category: c.id.to_s)} "
+        if points != person.points(category: c.id.to_s)
+          recreate_actions person, scope, c.id.to_s
+          points = calc_points c, scope
+          if points != person.reload.points(category: c.id.to_s)
+            puts "after recreating points the person has: #{person.reload.points(category: c.id.to_s)} and should have #{points}"
+            # write to the spreadsheet the person points that couldn't regulate
+            CSV.open( "gamification_points_out_expectation.csv", 'a' ) do |csv|
+              [person.identifier, person.name, scope.first.class.base_class.name, profile_name, c.id, c.point_type.name, scope.count*c.weight, person.points(category: c.id.to_s)]
+            end
+            is_profile_clean = false
+          else
+            puts "points fixed for #{c.point_type.name}!"
+          end
+        end
+      end
+      File.open(clean_profiles_file, 'w') {|f| f.write(clean_profiles.push(person.id).to_yaml)} if is_profile_clean
+      puts
+    end
+  end
+
+  # update everyone's level after the whole pontuation,
+  # which is much faster than on every created action
+  environment.people.find_each(batch_size: 100) do |person|
+    puts "Updating #{person.identifier} level\n"
+    person.update_attribute(:level, person.gamification_plugin_calculate_level)
+  end
+end
@@ -37,15 +37,18 @@ profile_ids.each do |profile_id|
         person_down_votes = person.comments.joins(:votes).where('vote < 0').count + person_articles.joins(:votes).where('vote < 0').count
         person_comments = person.comments.count
         person_followers = (person.following_articles & person.article_followers.where(article_id: person_articles)).count
+        votes = Vote.for_voter(person).count
       else
         person_articles = profile.articles.where(:author_id => person.id)
         person_up_votes = person.comments.where(:source_id => profile.articles).joins(:votes).where('vote > 0').count + person_articles.joins(:votes).where('vote > 0').count
         person_down_votes = person.comments.where(:source_id => profile.articles).joins(:votes).where('vote < 0').count + person_articles.joins(:votes).where('vote < 0').count
         person_comments = person.comments.where(:source_id => profile.articles).count
         person_followers = (person.following_articles & person.article_followers.where(article_id: profile.articles)).count
+        the_votes = Vote.for_voter(person)
+        votes = the_votes.where(voteable_type: 'Article', voteable_id: profile.articles).count + the_votes.where(voteable_type: 'Comment', voteable_id: Comment.where(source_type: ["ProposalsDiscussionPlugin::Proposal", "Article"], source_id: profile.articles)).count
       end
       quantities_values = [
-        Vote.for_voter(person).count,
+        votes,
         person.friends.count,
         person_up_votes,
         person_down_votes,
@@ -35,13 +35,16 @@ end
 #  person.sash.destroy unless person.sash.nil?
 #end
  
+# avoid updating level on every action for increasing performance
+Merit.observers.delete('RankObserver')
+
 Merit.observers << 'ProcessObserver'
  
 class Article < ActiveRecord::Base
   def self.text_article_types
 #   ['TextArticle', 'TextileArticle', 'TinyMceArticle', 'ProposalsDiscussionPlugin::Proposal']
     ['ProposalsDiscussionPlugin::Proposal']
-  end  
+  end
 end
  
 Environment.all.each do |environment|
@@ -56,7 +59,7 @@ Environment.all.each do |environment|
   article_index = 0
  
   puts "Amount of articles '#{article_count}'"
-  environment.articles.where(:type => Article.text_article_types).find_each do |article|
+  environment.articles.includes(:comments).where(:type => Article.text_article_types).find_each(batch_size: 100) do |article|
     article_index += 1
     puts "Analising article #{article_index} of #{article_count}"
     create_action(article, article_index, article_count)
@@ -25,6 +25,14 @@ class GamificationPluginBadgesControllerTest &lt; ActionController::TestCase
     end
   end
  
+  should "should create gamification_plugin_badge with organization as owner" do
+    organization = fast_create(Organization)
+    assert_difference('GamificationPlugin::Badge.count') do
+      post :create, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+      assert_equal organization, GamificationPlugin::Badge.last.owner
+    end
+  end
+
   should "should show gamification_plugin_badge" do
     get :show, id: @gamification_plugin_badge
     assert_response :success
@@ -40,6 +48,23 @@ class GamificationPluginBadgesControllerTest &lt; ActionController::TestCase
     assert assigns(:gamification_plugin_badge)
   end
  
+  should "should change badge owner" do
+    organization = fast_create(Organization)
+    put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+    assert assigns(:gamification_plugin_badge)
+    assert_equal organization, @gamification_plugin_badge.reload.owner
+  end
+
+  should "should keep badge owner when update" do
+    organization = fast_create(Organization)
+    @gamification_plugin_badge.owner = organization
+    @gamification_plugin_badge.save!
+
+    put :update, id: @gamification_plugin_badge, gamification_plugin_badge: { description: @gamification_plugin_badge.description, level: @gamification_plugin_badge.level, name: @gamification_plugin_badge.name, custom_fields: {threshold: @gamification_plugin_badge.threshold}, owner_id: organization.id }
+    assert assigns(:gamification_plugin_badge)
+    assert_equal organization, @gamification_plugin_badge.reload.owner
+  end
+
   should "should destroy gamification_plugin_badge" do
     assert_difference('GamificationPlugin::Badge.count', -1) do
       delete :destroy, id: @gamification_plugin_badge
@@ -11,12 +11,13 @@ class GamificationPluginProfileControllerTest &lt; ActionController::TestCase
   attr_accessor :person, :environment
  
   should 'display points in gamification dashboard' do
-    person.add_points(20, :category => :comment_author)
-    person.add_points(30, :category => :article_author)
+    create_all_point_rules
+    article = create(TextArticle, :profile_id => fast_create(Community).id, :author => person)
+    create(Comment, :source => article, :author_id => create_user.person.id)
     get :dashboard, :profile => person.identifier
-    assert_tag :div, :attributes => {:class => 'score article_author positive'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '30'}
-    assert_tag :div, :attributes => {:class => 'score comment_author positive'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '20'}
-    assert_tag :div, :attributes => {:class => 'score total'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '50'}
+    assert_tag :div, :attributes => {:class => 'score article_author positive do_action'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => default_point_weight(:article_author).to_s}
+    assert_tag :div, :attributes => {:class => 'score comment_article_author positive do_action'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => default_point_weight(:comment_article_author).to_s}
+    assert_tag :div, :attributes => {:class => 'score total'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => (default_point_weight(:comment_article_author) + default_point_weight(:article_author)).to_s}
   end
  
   should 'display level in gamification dashboard' do
@@ -33,7 +34,7 @@ class GamificationPluginProfileControllerTest &lt; ActionController::TestCase
     person.add_badge(badge1.id)
     person.add_badge(badge2.id)
     get :dashboard, :profile => person.identifier
-    assert_select '.badges .badge-list .badge', 1
+    assert_select '.badges .badge-list li.badge', 1
   end
  
 end
@@ -15,6 +15,10 @@ def create_all_point_rules
   end
 end
  
+def default_point_weight(rule_name)
+  Merit::PointRules::AVAILABLE_RULES[rule_name][:default_weight]
+end
+
 def load_point_rule(rule_name, config)
   rule_config = Merit::PointRules::AVAILABLE_RULES[rule_name.to_sym]
   raise "Point rule '#{rule_name}' is not available" if rule_config.nil?
@@ -22,7 +26,7 @@ def load_point_rule(rule_name, config)
   rule_config
 end
  
-#person_points_debug(person)  
+#person_points_debug(person)
 def person_points_debug(person)
   person.score_points.map do |sp|
     puts 'Ponto:'
@@ -8,6 +8,7 @@ class APITest &lt;  ActiveSupport::TestCase
     environment = Environment.default
     environment.enable_plugin(GamificationPlugin)
     GamificationPlugin.gamification_set_rules(@environment)
+    create_all_point_rules
   end
  
   should 'get my own badges' do
@@ -27,14 +28,6 @@ class APITest &lt;  ActiveSupport::TestCase
     assert_not_nil json['percent']
   end
  
-  should 'get my total pontuation' do
-    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
-    person.add_badge(badge.id)
-    get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
-    json = JSON.parse(last_response.body)
-    assert_not_nil json['points']
-  end
-
   should 'get badges of the public person' do
     badge = GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge')
     another_person = create(User, :environment => environment).person
@@ -63,7 +56,7 @@ class APITest &lt;  ActiveSupport::TestCase
     another_person.save
     another_person.add_badge(badge.id)
     get "/api/v1/gamification_plugin/people/#{another_person.id}/badges?#{params.to_query}"
-    json = JSON.parse(last_response.body)
+    JSON.parse(last_response.body)
     assert_equal 404, last_response.status
   end
  
@@ -76,4 +69,115 @@ class APITest &lt;  ActiveSupport::TestCase
     assert_equal 404, last_response.status
   end
  
+  should 'get amount of environment badges grouped by name' do
+    3.times { GamificationPlugin::Badge.create!(:owner => environment, :name => 'test_badge') }
+    get "/api/v1/gamification_plugin/badges"
+    json = JSON.parse(last_response.body)
+    assert_equal 3, json['test_badge']
+  end
+
+  should 'get my points' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    process_delayed_job_queue
+
+    get "/api/v1/gamification_plugin/my/points?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
+  end
+
+  should 'get my points filtered by type' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    process_delayed_job_queue
+
+    params[:type] = 'article_author'
+
+    get "/api/v1/gamification_plugin/my/points_by_type?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get my points filtered by profile' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    process_delayed_job_queue
+
+    params[:profile] = community.identifier
+
+    get "/api/v1/gamification_plugin/my/points_by_profile?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get my points excluding points earned in profiles' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    process_delayed_job_queue
+
+    get "/api/v1/gamification_plugin/my/points_out_of_profiles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2*default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    process_delayed_job_queue
+
+    get "/api/v1/gamification_plugin/people/#{person.id}/points?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author) + default_point_weight(:comment_article_author), json['points']
+  end
+
+  should 'get points of a person filtered by type' do
+    article = create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(Comment, :source_id => article.id, :author => fast_create(Person))
+
+    process_delayed_job_queue
+
+    params[:type] = 'article_author'
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_type?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person filtered by profile' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    process_delayed_job_queue
+
+    params[:profile] = community.identifier
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_by_profile?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal default_point_weight(:article_author), json['points']
+  end
+
+  should 'get points of a person excluding points earned in profiles' do
+    community = fast_create(Community)
+    create_point_rule_definition('article_author', community)
+    create(TextArticle, :profile_id => @person.id, :author => @person)
+    create(TextArticle, :profile_id => community.id, :author => @person)
+
+    process_delayed_job_queue
+
+    get "/api/v1/gamification_plugin/people/#{@person.id}/points_out_of_profiles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2*default_point_weight(:article_author), json['points']
+  end
+
 end
@@ -14,9 +14,12 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('followed_article')
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
  
+    process_delayed_job_queue
+
     c = GamificationPlugin::PointsCategorization.for_type(:followed_article).first
     assert_difference 'article.points(:category => c.id.to_s)', c.weight do
       article.person_followers << person
+      process_delayed_job_queue
     end
   end
  
@@ -25,9 +28,12 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
  
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
  
+    process_delayed_job_queue
+
     c = GamificationPlugin::PointsCategorization.for_type(:follower).first
     assert_difference 'person.points(:category => c.id.to_s)', c.weight do
       article.person_followers << person
+      process_delayed_job_queue
     end
   end
  
@@ -36,9 +42,12 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
  
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
  
+    process_delayed_job_queue
+
     c = GamificationPlugin::PointsCategorization.for_type(:followed_article_author).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       article.person_followers << person
+      process_delayed_job_queue
     end
   end
  
@@ -46,11 +55,18 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('follower')
     follower = create_user('someuser').person
     article = create(TextArticle, :profile_id => community.id, :author => person)
+
+    process_delayed_job_queue
+
     score_points = follower.score_points.count
     points = follower.points
     article.person_followers << follower
+    process_delayed_job_queue
+
     assert_equal score_points + 1, follower.score_points.count
     ArticleFollower.last.destroy
+    process_delayed_job_queue
+
     assert_equal score_points + 2, follower.score_points.count
     assert_equal points, follower.points
   end
@@ -58,9 +74,13 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
   should 'subtract merit points to article author when a user unfollow an article' do
     create_point_rule_definition('follower')
     article = create(TextArticle, :profile_id => community.id, :author => person)
+
+    process_delayed_job_queue
+
     assert_no_difference 'person.points' do
       assert_difference 'person.score_points.count' do
         article.person_followers << fast_create(Person)
+        process_delayed_job_queue
       end
       assert_difference 'person.score_points.count' do
         ArticleFollower.last.destroy
@@ -71,11 +91,16 @@ class ArticleFollowerTest &lt; ActiveSupport::TestCase
   should 'subtract merit points to article when a user unfollow an article' do
     create_point_rule_definition('followed_article')
     article = create(TextArticle, :profile_id => community.id, :author => person)
+    process_delayed_job_queue
     score_points = article.score_points.count
     points = article.points
     article.person_followers << person
+    process_delayed_job_queue
+
     assert_equal score_points + 1, article.score_points.count
     ArticleFollower.last.destroy
+    process_delayed_job_queue
+
     assert_equal score_points + 2, article.score_points.count
     assert_equal points, article.points
   end
@@ -12,6 +12,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'add merit points to author when create a new article' do
     create_point_rule_definition('article_author')
     create(TextArticle, :profile_id => person.id, :author => person)
+    process_delayed_job_queue
     assert_equal 1, person.score_points.count
     assert person.score_points.first.action.present?
   end
@@ -19,8 +20,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'subtract merit points to author when destroy an article' do
     create_point_rule_definition('article_author')
     article = create(TextArticle, :profile_id => person.id, :author => person)
+    process_delayed_job_queue
     assert_equal 1, person.score_points.count
     article.destroy
+    process_delayed_job_queue
     assert_equal 2, person.score_points.count
     assert_equal 0, person.points
   end
@@ -30,6 +33,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     5.times { create(TextArticle, :profile_id => person.id, :author => person) }
+    process_delayed_job_queue
     assert_equal 'article_author', person.badges.first.name
     assert_equal 1, person.badges.first.level
   end
@@ -40,6 +44,8 @@ class ArticleTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     10.times { create(TextArticle, :profile_id => person.id, :author => person) }
+    process_delayed_job_queue
+    sleep 4
     assert_equal ['article_author'], person.badges.map(&:name).uniq
     assert_equal [1, 2], person.badges.map(&:level)
   end
@@ -48,49 +54,59 @@ class ArticleTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('vote_voteable_author')
     community = fast_create(Community)
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
-    assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
-      Vote.create!(:voter => person, :voteable => article, :vote => 1)
-    end
+    points = article.author.points(:category => c.id.to_s)
+    Vote.create!(:voter => person, :voteable => article, :vote => 1)
+    process_delayed_job_queue
+    assert_equal article.author.points(:category => c.id.to_s), points + c.weight
   end
  
   should 'add merit points to article when an user like it' do
     create_point_rule_definition('vote_voteable')
     article = create(TextArticle, :name => 'Test', :profile => person, :author => person)
+    process_delayed_job_queue
     article = article.reload
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable).first
     assert_difference 'article.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to community when create a new article' do
     create_point_rule_definition('article_community')
     community = fast_create(Community)
+    process_delayed_job_queue
     assert_difference 'community.score_points.count' do
       create(TextArticle, :profile_id => community.id, :author => person)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to voter when he likes an article' do
     create_point_rule_definition('vote_voter')
     article = create(TextArticle, :name => 'Test', :profile => person, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to voter when he dislikes an article' do
     create_point_rule_definition('vote_voter')
     article = create(TextArticle, :name => 'Test', :profile => person, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
@@ -101,8 +117,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, :name => 'Test', :profile => person, :author => person)
     4.times { Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => 1) }
     Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => -1)
+    process_delayed_job_queue
     assert_equal [], person.badges
     Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => 1)
+    process_delayed_job_queue
     assert_equal 'positive_votes_received', person.reload.badges.first.name
   end
  
@@ -113,8 +131,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, :name => 'Test', :profile => person, :author => person)
     4.times { Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => -1) }
     Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => 1)
+    process_delayed_job_queue
     assert_equal [], person.badges
     Vote.create!(:voter => fast_create(Person), :voteable => article, :vote => -1)
+    process_delayed_job_queue
     assert_equal 'negative_votes_received', person.reload.badges.first.name
   end
  
@@ -123,6 +143,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     rule = create_point_rule_definition('article_author', community)
     create(TextArticle, profile_id: community.id, author_id: person.id)
+    process_delayed_job_queue
     assert_equal rule.weight, person.points_by_profile(community.identifier)
     assert person.score_points.first.action.present?
   end
@@ -131,8 +152,10 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     rule = create_point_rule_definition('article_author', community)
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
+    process_delayed_job_queue
     assert_equal rule.weight, person.points_by_profile(community.identifier)
     article.destroy
+    process_delayed_job_queue
     assert_equal 0, person.points
   end
  
@@ -140,10 +163,12 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     create_point_rule_definition('vote_voteable_author', community)
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
@@ -151,19 +176,23 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     create_point_rule_definition('vote_voteable', community)
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
+    process_delayed_job_queue
     article = article.reload
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable).first
     assert_difference 'article.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to community when create a new article on community' do
     community = fast_create(Community)
     create_point_rule_definition('article_community')
+    process_delayed_job_queue
     assert_difference 'community.score_points.count' do
       create(TextArticle, :profile_id => community.id, :author => person)
+      process_delayed_job_queue
     end
   end
  
@@ -171,10 +200,12 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     create_point_rule_definition('vote_voter', community)
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
@@ -182,11 +213,35 @@ class ArticleTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     create_point_rule_definition('vote_voter', community)
     article = create(TextArticle, :name => 'Test', :profile => community, :author => person)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'article.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => article, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
+  should "add organization's merit badge to author when create 5 new articles" do
+    organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'article_author', :level => 1)
+    GamificationPlugin.gamification_set_rules(environment)
+
+    5.times { create(TextArticle, :profile_id => organization.id, :author => person) }
+    process_delayed_job_queue
+    assert_equal 'article_author', person.badges.first.name
+    assert_equal 1, person.badges.first.level
+  end
+
+  should "do not earn organization's badge when the article is not posted in the organization itself" do
+    organization = fast_create(Organization)
+    other_organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'article_author', :level => 1)
+    GamificationPlugin.gamification_set_rules(environment)
+
+    5.times { create(TextArticle, :profile_id => other_organization.id, :author => person) }
+    process_delayed_job_queue
+    assert_equal [], person.badges
+  end
+
 end
@@ -0,0 +1,48 @@
+require_relative "../test_helper"
+
+class BadgeRulesTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+  end
+
+  attr_accessor :environment
+
+  should "define badge rules for environment's badges" do
+    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    assert_equal [Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first[:action]], badge_rules.defined_rules.keys
+  end
+
+  should "define badge rules for organization's badges" do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    assert_equal [Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first[:action]], badge_rules.defined_rules.keys
+  end
+
+  should 'check organization returns true when badge belongs to the environment' do
+    badge = GamificationPlugin::Badge.create!(:owner => environment, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    comment = fast_create(Comment)
+    assert badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first)
+  end
+
+  should 'check organization returns true when the comment belongs to the organization' do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    article = fast_create(Article,:profile_id => organization.id)
+    comment = fast_create(Comment, :source_id => article.id)
+    assert badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first)
+  end
+
+  should 'check organization returns false when the comment does not belongs to the organization' do
+    organization = fast_create(Organization)
+    badge = GamificationPlugin::Badge.create!(:owner => organization, :name => :comment_author)
+    badge_rules = Merit::BadgeRules.new(environment)
+    comment = fast_create(Comment)
+    assert !badge_rules.check_organization_badge(badge, comment, Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first)
+  end
+
+end
@@ -5,9 +5,10 @@ class BadgeTest &lt; ActiveSupport::TestCase
   def setup
     @person = create_user('testuser').person
     @environment = Environment.default
+    @organization = fast_create(Organization)
   end
  
-  attr_accessor :person, :environment
+  attr_accessor :person, :environment, :organization
  
   should 'add badge to person' do
     badge = GamificationPlugin::Badge.create!(:owner => environment)
@@ -37,4 +38,16 @@ class BadgeTest &lt; ActiveSupport::TestCase
     assert_equal [badge2], person.badges.notification_pending
   end
  
+  should 'add badge to person with organization as the badge owner' do
+    badge = GamificationPlugin::Badge.create(:owner => organization)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+  end
+
+  should 'add a manual badge to person' do
+    badge = GamificationPlugin::Badge.create!(:name => :manual, :owner => environment)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+  end
+
 end
@@ -13,14 +13,17 @@ class CommentTest &lt; ActiveSupport::TestCase
   should 'add merit points to author when create a new comment' do
     create_point_rule_definition('comment_author')
     create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
     assert_equal 1, person.score_points.count
   end
  
   should 'subtract merit points from author when destroy a comment' do
     create_point_rule_definition('comment_author')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
     assert_equal 1, person.score_points.count
     comment.destroy
+    process_delayed_job_queue
     assert_equal 2, person.score_points.count
     assert_equal 0, person.points
   end
@@ -30,6 +33,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     5.times { create(Comment, :source => article, :author_id => person.id) }
+    process_delayed_job_queue
     assert_equal 'comment_author', person.badges.first.name
   end
  
@@ -38,6 +42,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     5.times { create(Comment, :source => article, :author_id => person.id) }
+    process_delayed_job_queue
     assert_equal 'comment_received', author.badges.first.name
   end
  
@@ -48,8 +53,10 @@ class CommentTest &lt; ActiveSupport::TestCase
     comment = create(Comment, :source => article, :author_id => person.id)
     4.times { Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => 1) }
     Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => -1)
+    process_delayed_job_queue
     assert_equal [], person.badges
     Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => 1)
+    process_delayed_job_queue
     assert_equal 'positive_votes_received', person.reload.badges.first.name
   end
  
@@ -60,18 +67,22 @@ class CommentTest &lt; ActiveSupport::TestCase
     comment = create(Comment, :source => article, :author_id => person.id)
     4.times { Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => -1) }
     Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => 1)
+    process_delayed_job_queue
     assert_equal [], person.badges
     Vote.create!(:voter => fast_create(Person), :voteable => comment, :vote => -1)
+    process_delayed_job_queue
     assert_equal 'negative_votes_received', person.reload.badges.first.name
   end
  
   should 'add merit points to comment owner when an user like his comment' do
     create_point_rule_definition('vote_voteable_author')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
@@ -79,20 +90,24 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('vote_voteable_author')
     comment = create(Comment, :source => article, :author_id => author.id)
     Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points', -1*c.weight do
       Vote.where(:voteable_id => comment.id).destroy_all
+      process_delayed_job_queue
     end
   end
  
   should 'subtract merit points from comment owner when an user dislike his comment' do
     create_point_rule_definition('vote_voteable_author')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', -1*c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
@@ -100,37 +115,44 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('vote_voteable_author')
     comment = create(Comment, :source => article, :author_id => author.id)
     Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points', c.weight do
       Vote.where(:voteable_id => comment.id).destroy_all
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to article author when create a new comment' do
     create_point_rule_definition('comment_article_author')
-    assert_difference 'author.score_points.count' do
-      create(Comment, :source => article, :author_id => person.id)
-    end
+    scores = author.score_points.count
+    create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
+    assert_not_equal author.reload.score_points.count, scores
   end
  
   should 'add merit points to voter when he likes a comment' do
     create_point_rule_definition('vote_voter')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit points to voter when he dislikes a comment' do
     create_point_rule_definition('vote_voter')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
@@ -139,6 +161,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     c = GamificationPlugin::PointsCategorization.for_type(:comment_article).first
     assert_difference 'article.points(:category => c.id.to_s)', c.weight do
       create(Comment, :source => article, :author_id => person.id)
+      process_delayed_job_queue
     end
   end
  
@@ -146,10 +169,12 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('comment_community')
     community = fast_create(Community)
     article = create(TextileArticle, :profile_id => community.id, :author_id => author.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:comment_community).first
     assert_difference 'community.points(:category => c.id.to_s)', c.weight do
       create(Comment, :source => article, :author_id => person.id)
+      process_delayed_job_queue
     end
   end
  
@@ -157,8 +182,10 @@ class CommentTest &lt; ActiveSupport::TestCase
   should 'add merit community points to author when create a new comment in a community' do
     community = fast_create(Community)
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
+    process_delayed_job_queue
     rule = create_point_rule_definition('comment_author', article.profile)
     create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
     assert_equal rule.weight, person.points_by_profile(article.profile.identifier)
   end
  
@@ -167,6 +194,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, profile_id: community.id, author_id: fast_create(Person).id)
     rule = create_point_rule_definition('comment_author', article.profile)
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
     assert_equal rule.weight, person.points_by_profile(article.profile.identifier)
     comment.destroy
     assert_equal 0, person.points_by_profile(article.profile.identifier)
@@ -177,10 +205,12 @@ class CommentTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
     create_point_rule_definition('vote_voteable_author', community)
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).where(profile_id: article.profile.id).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
@@ -190,6 +220,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('vote_voteable_author', community)
     comment = create(Comment, :source => article, :author_id => author.id)
     Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points_by_profile(community.identifier)', -1*c.weight do
@@ -202,10 +233,12 @@ class CommentTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
     create_point_rule_definition('vote_voteable_author', community)
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).where(profile_id: article.profile.id).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', -1*c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
@@ -215,6 +248,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('vote_voteable_author', community)
     comment = create(Comment, :source => article, :author_id => author.id)
     Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voteable_author).first
     assert_difference 'comment.author.points_by_profile(community.identifier)', c.weight do
@@ -225,9 +259,11 @@ class CommentTest &lt; ActiveSupport::TestCase
   should 'add merit community points to article author when create a new comment inside a community' do
     community = fast_create(Community)
     article = create(TextArticle, profile_id: community.id, author_id: author.id)
+    process_delayed_job_queue
     rule = create_point_rule_definition('comment_article_author', community)
     assert_difference 'author.points_by_profile(community.identifier)', rule.weight do
       create(Comment, :source => article, :author_id => author.id)
+      process_delayed_job_queue
     end
   end
  
@@ -236,10 +272,12 @@ class CommentTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
     create_point_rule_definition('vote_voter')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => 1)
+      process_delayed_job_queue
     end
   end
  
@@ -248,20 +286,24 @@ class CommentTest &lt; ActiveSupport::TestCase
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
     create_point_rule_definition('vote_voter')
     comment = create(Comment, :source => article, :author_id => person.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:vote_voter).first
     assert_difference 'comment.author.points(:category => c.id.to_s)', c.weight do
       Vote.create!(:voter => person, :voteable => comment, :vote => -1)
+      process_delayed_job_queue
     end
   end
  
   should 'add merit community points to source article when create a comment inside a community' do
     community = fast_create(Community)
     article = create(TextArticle, profile_id: community.id, author_id: person.id)
+    process_delayed_job_queue
     create_point_rule_definition('comment_article')
     c = GamificationPlugin::PointsCategorization.for_type(:comment_article).first
     assert_difference 'article.points(:category => c.id.to_s)', c.weight do
       create(Comment, :source => article, :author_id => person.id)
+      process_delayed_job_queue
     end
   end
  
@@ -269,12 +311,24 @@ class CommentTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('comment_community')
     community = fast_create(Community)
     article = create(TextileArticle, :profile_id => community.id, :author_id => author.id)
+    process_delayed_job_queue
  
     c = GamificationPlugin::PointsCategorization.for_type(:comment_community).first
     assert_difference 'community.points(:category => c.id.to_s)', c.weight do
       create(Comment, :source => article, :author_id => person.id)
+      process_delayed_job_queue
     end
   end
  
+  should "add organization's merit badge to author when create 5 new comments" do
+    organization = fast_create(Organization)
+    GamificationPlugin::Badge.create!(:owner => organization, :name => 'comment_author')
+    GamificationPlugin.gamification_set_rules(environment)
+    article.profile = organization
+
+    5.times { create(Comment, :source => article, :author_id => person.id) }
+    process_delayed_job_queue
+    assert_equal 'comment_author', person.badges.first.name
+  end
  
 end
@@ -0,0 +1,34 @@
+require_relative "../test_helper"
+
+class DashboardHelperTest < ActiveSupport::TestCase
+
+  include GamificationPlugin::DashboardHelper
+
+  should 'return title for global badges' do
+    owner = Environment.new
+    assert_equal 'Badges', badges_title(owner)
+  end
+
+  should 'return title for organization badges' do
+    owner = Organization.new(:name => 'organization')
+    assert_equal 'Badges for organization', badges_title(owner)
+  end
+
+  should 'return badges grouped by owner' do
+    environment = Environment.default
+    expects(:environment).at_least_once.returns(environment)
+    badge1 = GamificationPlugin::Badge.create!(:owner => fast_create(Organization))
+    badge2 = GamificationPlugin::Badge.create!(:owner => environment)
+    assert_equal [[badge2.owner, [badge2]], [badge1.owner, [badge1]]], grouped_badges
+  end
+
+  should 'return category of a score point' do
+    point_type = GamificationPlugin::PointsType.create!(name: "point category", description: "point category")
+    score = Merit::Score.new
+    score.category = point_type.id.to_s
+    score.save!
+    point = score.score_points.create!
+    assert_equal "point category", score_point_category(point)
+  end
+
+end
-require_relative '../../../../test/test_helper'
+require_relative '../test_helper'
  
 class GamificationPluginTest < ActiveSupport::TestCase
  
@@ -0,0 +1,27 @@
+require_relative "../test_helper"
+
+class MeritExtTest < ActiveSupport::TestCase
+
+  should 'check if the point was originated by an undo action' do
+    point = Merit::Score::Point.new
+    point_type = GamificationPlugin::PointsType.new(name: :comment_author)
+    point.expects(:point_type).returns(point_type)
+    action = mock
+    action.expects(:target_model).returns('comment')
+    action.expects(:action_method).returns('destroy')
+    point.expects(:action).at_least_once.returns(action)
+    assert point.undo_rule?
+  end
+
+  should 'check if the point was originated by a do action' do
+    point = Merit::Score::Point.new
+    point_type = GamificationPlugin::PointsType.new(name: :comment_author)
+    point.expects(:point_type).returns(point_type)
+    action = mock
+    action.expects(:target_model).returns('comment')
+    action.expects(:action_method).returns('create')
+    point.expects(:action).at_least_once.returns(action)
+    assert !point.undo_rule?
+  end
+
+end
@@ -13,8 +13,10 @@ class PersonTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     4.times { Vote.create!(:voter => person, :voteable => fast_create(Comment), :vote => 1) }
+    process_delayed_job_queue
     assert_equal [], person.badges
     Vote.create!(:voter => person, :voteable => fast_create(Comment), :vote => 1)
+    process_delayed_job_queue
     assert_equal 'votes_performed', person.reload.badges.first.name
   end
  
@@ -23,6 +25,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     5.times { |i| person.add_friend(create_user("testuser#{i}").person) }
+    process_delayed_job_queue
     assert_equal 'friendly', person.reload.badges.first.name
   end
  
@@ -30,6 +33,7 @@ class PersonTest &lt; ActiveSupport::TestCase
     create_point_rule_definition('friends')
     other_person = create_user("testuserfriend").person
     person.add_friend(other_person)
+    process_delayed_job_queue
     c = GamificationPlugin::PointsCategorization.for_type(:friends).first
     assert_equal 5, person.score_points(:category => c.id.to_s).sum(:num_points)
   end
@@ -19,4 +19,23 @@ class PointRulesTest &lt; ActiveSupport::TestCase
     assert point_rules.defined_rules.present?
   end
  
+  should 'return target url for a point related to article creation' do
+    person = create_user('testuser').person
+    create_point_rule_definition('article_author')
+    article = create(TextArticle, :profile_id => person.id, :author => person)
+    process_delayed_job_queue
+    url = Merit::PointRules.target_url(person.score_points.last)
+    assert_equal article.url, url
+  end
+
+  should 'return target url for a point related to comment creation' do
+    person = create_user('testuser').person
+    create_point_rule_definition('comment_author')
+    article = create(Article, :profile_id => person.id, :author => person)
+    comment = create(Comment, :source_id => article.id, :author => person)
+    process_delayed_job_queue
+    url = Merit::PointRules.target_url(person.score_points.last)
+    assert_equal comment.url, url
+  end
+
 end
@@ -50,6 +50,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     Person.any_instance.stubs(:is_profile_complete?).returns(true)
     create_point_rule_definition('profile_completion', nil, {value: 0})
     GamificationPlugin.gamification_set_rules(environment)
+    process_delayed_job_queue
     assert_equal 0, person.level
      assert_nothing_raised do
        person.save
@@ -62,8 +63,10 @@ class ProfileTest &lt; ActiveSupport::TestCase
     GamificationPlugin.gamification_set_rules(environment)
  
     person = create_user('testuser').person
+    process_delayed_job_queue
     assert_equal 0, person.level
     create(TextArticle, :profile_id => community.id, :author => person)
+    process_delayed_job_queue
     assert_equal 3, person.reload.level
   end
  
-<% if ranking.empty? %>
+<% if ranking.blank? %>
   <div class="ranking-empty"><%= _('Not enough points for this ranking yet') %></div>
 <% else %>
 <ul class="ranking <%= defined?(ranking_class) ? ranking_class : '' %>">
@@ -22,9 +22,9 @@
     <div class="scores">
       <h3><%= _('Latest Score Points') %></h3>
       <% @target.score_points.order('created_at desc').limit(5).each do |point| %>
-        <div class="score <%= point.score.category %> <%= score_point_class(point) %>">
+        <div class="score <%= point.point_type.name %> <%= score_point_class(point) %> <%= score_point_action_class(point) %>">
           <span class="value"><%= point.num_points %></span>
-          <span class="category"><%= _(score_point_category(point)) %></span>
+          <span class="category"><%= score_point_target_link point, _(score_point_category(point)) %></span>
           <span class="date timeago" title="<%= point.created_at %>"><%= point.created_at %></span>
         </div>
       <% end %>
@@ -34,24 +34,26 @@
  
   <% unless environment.gamification_plugin_badges.empty? %>
   <div class="badges">
-    <h3><%= _('Badges') %></h3>
-    <ul class="badge-list">
-      <% environment.gamification_plugin_badges.group(:name).count.each do |badge_name, amount| %>
-        <% person_badge = @target.badges.where(:name => badge_name).last %>
-        <% badge =  environment.gamification_plugin_badges.where(:name => badge_name).last %>
-        <li class="badge <%= badge.name %>">
-          <div class="badge" title="<%= badge.description %>">
-            <div class="image <%= badge.name %>"></div>
-            <ul class="level rating">
-              <% 1.upto(badge.level).map do |n|%>
-                <span class="star <%= (person_badge && person_badge.level >= n) ? 'earned' : 'not-earned' %>" >★</span>
-              <% end %>
-            </ul>
-            <div class="title"><%= badge.title %></div>
-          </div>
-        </li>
+      <% grouped_badges.each do |owner, badges| %>
+        <h3><%= badges_title owner %></h3>
+        <ul class="badge-list">
+          <% badges.group_by(&:name).each do |badge_name, badges_group| %>
+            <% badge = badges_group.sort_by(&:level).last %>
+            <% person_badge = @target.badges.where(:name => badge.name).last %>
+            <li class="badge <%= badge.name %>">
+              <div class="badge" title="<%= badge.description %>">
+                <div class="image <%= badge.name %>"></div>
+                <ul class="level rating">
+                  <% 1.upto(badge.level).map do |n|%>
+                    <span class="star <%= (person_badge && person_badge.level >= n) ? 'earned' : 'not-earned' %>" >★</span>
+                  <% end %>
+                </ul>
+                <div class="title"><%= badge.title %></div>
+              </div>
+            </li>
+          <% end %>
+        </ul>
       <% end %>
-    </ul>
   </div>
   <% end %>
 </div>
@@ -29,24 +29,31 @@
     <%= f.label :level %><br />
     <%= f.text_field :level %>
   </div>
-  <h4><%= _('Actions') %></h4>
-  <%= f.fields_for :custom_fields do |c| %>
-    <% rules.each do |name, settings| %>
-      <div class='controller-actions <%= "name_#{name}" %>'>
-        <% settings.each do |setting| %>
-          <%= c.label _(setting[:action]) %>
-          <%= c.fields_for setting[:action]  do |d| %>
-            <% action = (@gamification_plugin_badge.custom_fields || {}).fetch(setting[:action], {}) %>
-            <div class="field">
-              <%= d.label :threshold %><br />
-              <%= d.text_field :threshold, {value: action.fetch('threshold', "")} %>
-            </div>
-            <br>
+  <div class="field">
+    <%= f.label :profile_owner %><br />
+    <% tokenized_owner = @gamification_plugin_badge.owner.present? && @gamification_plugin_badge.owner.kind_of?(Organization) ? prepare_to_token_input([@gamification_plugin_badge.owner]) : nil %>
+    <%= token_input_field_tag('gamification_plugin_badge[owner_id]', 'badge-owner', {:action => 'search_owners'}, {:focus => false, :hint_text => _('Choose a profile or leave it blank for a global badge'), :token_limit => 1, :pre_populate => tokenized_owner}) %>
+  </div>
+  <div class="action-fields">
+    <h4><%= _('Actions') %></h4>
+    <%= f.fields_for :custom_fields do |c| %>
+      <% rules.each do |name, settings| %>
+        <div class='controller-actions <%= "name_#{name}" %>'>
+          <% settings.select {|s| s[:action].present?}.each do |setting| %>
+            <%= c.label _(setting[:action]) %>
+            <%= c.fields_for setting[:action]  do |d| %>
+              <% action = (@gamification_plugin_badge.custom_fields || {}).fetch(setting[:action], {}) %>
+              <div class="field">
+                <%= d.label :threshold %><br />
+                <%= d.text_field :threshold, {value: action.fetch('threshold', "")} %>
+              </div>
+              <br>
+            <% end %>
           <% end %>
-        <% end %>
-      </div>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
+<%= stylesheet_link_tag 'plugins/gamification/admin.css' %>
+
 <h1><%= _('Gamification Settings: Listing Badges') %></h1>
  
-<table>
+<table class="gamification-plugin-badges">
   <tr>
     <th>Name</th>
     <th>Title</th>
@@ -10,7 +12,11 @@
     <th></th>
   </tr>
  
-<% @gamification_plugin_badges.each do |gamification_plugin_badge| %>
+<% @gamification_plugin_badges.each do |owner, badges| %>
+  <% if owner.present? %>
+    <tr><td class="badge-owner-group" colspan="6"><%= _("Badges for:") %> <%= owner.name %></td></tr>
+  <% end %>
+  <% badges.each do |gamification_plugin_badge| %>
   <tr>
     <td><%= gamification_plugin_badge.name %></td>
     <td><%= gamification_plugin_badge.title %></td>
@@ -19,6 +25,7 @@
     <td><%= link_to 'Edit', :action => :edit, :id => gamification_plugin_badge.id %></td>
     <td><%= button_without_text :delete, _('Remove'), {:action => :destroy, :id => gamification_plugin_badge.id}, :method => :post, :confirm => _('Are you sure?') %></td>
   </tr>
+  <% end %>
 <% end %>
 </table>
  
@@ -22,6 +22,13 @@
   <%= @gamification_plugin_badge.level %>
 </p>
  
+<% if @gamification_plugin_badge.owner.kind_of?(Organization) %>
+<p>
+  <b><%= _('Profile owner:') %></b>
+  <%= @gamification_plugin_badge.owner.name %>
+  </p>
+<% end %>
+
 <p>
   <b>Threshold:</b>
   <% if @gamification_plugin_badge.custom_fields.is_a? Hash %>
1	1	class GamificationPluginBadgesController < PluginAdminController
2	2
3	3	def index
4		- @gamification_plugin_badges = environment.gamification_plugin_badges
	4	+ @gamification_plugin_badges = environment.gamification_plugin_badges.group_by(&:owner)
5	5	end
6	6
7	7	def show
...	...	@@ -17,8 +17,13 @@ class GamificationPluginBadgesController < PluginAdminController
17	17	end
18	18
19	19	def create
	20	+ owner_id = params[:gamification_plugin_badge].delete(:owner_id)
20	21	@gamification_plugin_badge = GamificationPlugin::Badge.new(params[:gamification_plugin_badge])
21		- @gamification_plugin_badge.owner = environment
	22	+ if owner_id.present?
	23	+ @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
	24	+ else
	25	+ @gamification_plugin_badge.owner = environment
	26	+ end
22	27
23	28	if @gamification_plugin_badge.save
24	29	session[:notice] = _('Badge was successfully created.')
...	...	@@ -31,6 +36,14 @@ class GamificationPluginBadgesController < PluginAdminController
31	36	def update
32	37	@gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
33	38
	39	+ # FIXME avoid code duplication
	40	+ owner_id = params[:gamification_plugin_badge].delete(:owner_id)
	41	+ if owner_id.present?
	42	+ @gamification_plugin_badge.owner = environment.organizations.find(owner_id)
	43	+ else
	44	+ @gamification_plugin_badge.owner = environment
	45	+ end
	46	+
34	47	if @gamification_plugin_badge.update_attributes(params[:gamification_plugin_badge])
35	48	session[:notice] = _('Badge was successfully updated.')
36	49	redirect_to :action => :index
...	...	@@ -39,6 +52,10 @@ class GamificationPluginBadgesController < PluginAdminController
39	52	end
40	53	end
41	54
	55	+ def search_owners
	56	+ render :text => prepare_to_token_input(environment.organizations).to_json
	57	+ end
	58	+
42	59	def destroy
43	60	@gamification_plugin_badge = environment.gamification_plugin_badges.find(params[:id])
44	61	@gamification_plugin_badge.destroy
...	...
...	...	@@ -2,6 +2,11 @@ require_dependency 'environment'
2	2
3	3	class Environment
4	4
5		- has_many :gamification_plugin_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
	5	+ has_many :gamification_plugin_environment_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
	6	+ has_many :gamification_plugin_organization_badges, :through => :organizations
	7	+
	8	+ def gamification_plugin_badges
	9	+ GamificationPlugin::Badge.joins('left join profiles on profiles.id = owner_id').where(['owner_id = ? or profiles.environment_id = ?', self.id, self.id])
	10	+ end
6	11
7	12	end
...	...
...	...	@@ -0,0 +1,7 @@
	1	+require_dependency 'organization'
	2	+
	3	+class Organization
	4	+
	5	+ has_many :gamification_plugin_organization_badges, :class_name => 'GamificationPlugin::Badge', :foreign_key => 'owner_id', :source => :owner
	6	+
	7	+end
...	...
...	...	@@ -3,7 +3,7 @@ class GamificationPlugin::API < Grape::API
3	3	resource :gamification_plugin do
4	4
5	5	get 'badges' do
6		- environment.gamification_plugin_badges.group(:name).count
	6	+ environment.gamification_plugin_badges.group('gamification_plugin_badges.name').count
7	7	end
8	8
9	9	resource :my do
...	...	@@ -57,7 +57,7 @@ class GamificationPlugin::API < Grape::API
57	57	get ':id/points_by_profile' do
58	58	person = environment.people.visible_for_person(current_person).find_by_id(params[:id])
59	59	return not_found! if person.blank?
60		- {points: person.points_by_type(params[:profile]) }
	60	+ {points: person.points_by_profile(params[:profile]) }
61	61	end
62	62
63	63	get ':id/points_out_of_profiles' do
...	...	@@ -75,4 +75,3 @@ class GamificationPlugin::API < Grape::API
75	75	end
76	76	end
77	77	end
78		-
...	...
1		-class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
	1	+class GamificationPlugin::Badge < ActiveRecord::Base
2	2
3	3	belongs_to :owner, :polymorphic => true
4	4
...	...
...	...	@@ -12,13 +12,22 @@ module GamificationPlugin::DashboardHelper
12	12	end
13	13
14	14	def score_point_category(point)
15		- point = GamificationPlugin::PointsType.where(name: point.score.category).first
	15	+ point = GamificationPlugin::PointsType.where(id: point.score.category).first
16	16	point.nil? ? '' : point.description
17	17	end
18	18
	19	+ def score_point_target_link(point, text)
	20	+ url = Merit::PointRules.target_url(point)
	21	+ url.present? ? link_to(text, url) : text
	22	+ end
	23	+
	24	+ def score_point_action_class(point)
	25	+ point.undo_rule? ? 'undo_action':'do_action'
	26	+ end
	27	+
19	28	def ranking(target, from_date=nil, limit=10)
20	29	# FIXME move these queries to profile model
21		- ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).order('sum(num_points) DESC').group('profiles.id')
	30	+ ranking = Profile.select('profiles.*, sum(num_points) as gamification_points, ROW_NUMBER() OVER(order by sum(num_points) DESC) as gamification_position').joins(:sash => {:scores => :score_points}).where(:type => target.class).reorder('sum(num_points) DESC').group('profiles.id')
22	31	ranking = ranking.where("merit_score_points.created_at >= ?", from_date) if from_date.present?
23	32	target_ranking = Profile.from("(#{ranking.to_sql}) profiles").where('profiles.id' => target.id).first
24	33
...	...	@@ -35,4 +44,15 @@ module GamificationPlugin::DashboardHelper
35	44	(context_ranking.blank? ? '' : render(:partial => 'gamification/ranking', :locals => {:ranking => context_ranking, :target_ranking => target_ranking, :ranking_class => 'context'}))
36	45	end
37	46
	47	+ def badges_title(owner)
	48	+ return _('Badges for %s' % owner.name) if owner.kind_of?(Organization)
	49	+ _('Badges')
	50	+ end
	51	+
	52	+ def grouped_badges
	53	+ environment.gamification_plugin_badges.all.group_by(&:owner).sort do \|a, b\|
	54	+ a.first.kind_of?(Environment) ? -1 : a.first.name <=> b.first.name
	55	+ end
	56	+ end
	57	+
38	58	end
...	...
...	...	@@ -14,6 +14,7 @@ module Merit
14	14	action: 'comment#create',
15	15	default_threshold: 5,
16	16	to: :author,
	17	+ target_profile: lambda {\|comment\| comment.profile },
17	18	value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
18	19	}
19	20	],
...	...	@@ -22,6 +23,7 @@ module Merit
22	23	action: 'comment#create',
23	24	default_threshold: 5,
24	25	to: lambda {\|comment\| comment.source.author},
	26	+ target_profile: lambda {\|comment\| comment.profile },
25	27	value: lambda { \|comment, author\| author.present? ? Comment.where(source_id: Article.where(author_id: author.id)).count : 0 }
26	28	}
27	29	],
...	...	@@ -30,6 +32,7 @@ module Merit
30	32	action: 'article#create',
31	33	default_threshold: 5,
32	34	to: :author,
	35	+ target_profile: lambda {\|article\| article.profile },
33	36	value: lambda { \|article, author\| author.present? ? TextArticle.where(author_id: author.id).count : 0 }
34	37	},
35	38	],
...	...	@@ -38,6 +41,7 @@ module Merit
38	41	action: 'vote#create',
39	42	default_threshold: 5,
40	43	to: lambda {\|vote\| vote.voteable.author},
	44	+ target_profile: lambda {\|vote\| vote.voteable.profile },
41	45	value: lambda { \|vote, author\| vote.voteable ? Vote.for_voteable(vote.voteable).where('vote > 0').count : 0}
42	46	}
43	47	],
...	...	@@ -46,6 +50,7 @@ module Merit
46	50	action: 'vote#create',
47	51	default_threshold: 5,
48	52	to: lambda {\|vote\| vote.voteable.author},
	53	+ target_profile: lambda {\|vote\| vote.voteable.profile },
49	54	value: lambda { \|vote, author\| Vote.for_voteable(vote.voteable).where('vote < 0').count }
50	55	}
51	56	],
...	...	@@ -54,6 +59,7 @@ module Merit
54	59	action: 'vote#create',
55	60	default_threshold: 5,
56	61	to: lambda {\|vote\| vote.voter},
	62	+ target_profile: lambda {\|vote\| vote.voteable.profile },
57	63	value: lambda { \|vote, voter\| voter ? Vote.for_voter(voter).count : 0 }
58	64	}
59	65	],
...	...	@@ -65,6 +71,7 @@ module Merit
65	71	value: lambda { \|friendship, person\| person.friends.count }
66	72	}
67	73	],
	74	+ manual: [],
68	75
69	76	#FIXME review the name of the badges and see a way to make it generic
70	77	creative: [
...	...	@@ -72,12 +79,14 @@ module Merit
72	79	action: 'comment#create',
73	80	default_threshold: 5,
74	81	to: :author,
	82	+ target_profile: lambda {\|comment\| comment.profile },
75	83	value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
76	84	},
77	85	{
78	86	action: 'article#create',
79	87	default_threshold: 5,
80	88	to: :author,
	89	+ target_profile: lambda {\|article\| article.profile },
81	90	value: lambda { \|article, author\| author.present? ? author.articles.count : 0 }
82	91	},
83	92	],
...	...	@@ -86,6 +95,7 @@ module Merit
86	95	action: 'articlefollower#create',
87	96	default_threshold: 5,
88	97	to: lambda {\|article\| article.person },
	98	+ target_profile: lambda {\|article_follower\| article_follower.article.profile },
89	99	model: 'ArticleFollower',
90	100	value: lambda { \|article, person\| person.present? ? person.article_followers.count : 0 }
91	101	}
...	...	@@ -95,12 +105,14 @@ module Merit
95	105	action: 'Vote#create',
96	106	default_threshold: 5,
97	107	to: lambda { \|vote\| vote.voter },
	108	+ target_profile: lambda {\|vote\| vote.voteable.profile },
98	109	value: lambda { \|vote, voter\| Vote.for_voter(voter).count }
99	110	},
100	111	{
101	112	action: 'Event#create',
102	113	default_threshold: 5,
103	114	to: lambda { \|article\| article.author },
	115	+ target_profile: lambda {\|article\| article.profile },
104	116	value: lambda { \|event, author\| author.events.count }
105	117	},
106	118	],
...	...	@@ -109,12 +121,14 @@ module Merit
109	121	action: 'vote#create',
110	122	default_threshold: 5,
111	123	to: lambda {\|vote\| vote.voter},
	124	+ target_profile: lambda {\|vote\| vote.voteable.profile },
112	125	value: lambda { \|vote, voter\| voter ? voter.votes.where('vote > 0').count : 0 }
113	126	},
114	127	{
115	128	action: 'comment#create',
116	129	default_threshold: 5,
117	130	to: :author,
	131	+ target_profile: lambda {\|comment\| comment.profile },
118	132	value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
119	133	}
120	134	],
...	...	@@ -123,6 +137,7 @@ module Merit
123	137	action: 'articlefollower#create',
124	138	default_threshold: 5,
125	139	to: :person,
	140	+ target_profile: lambda {\|article_follower\| article_follower.article.profile },
126	141	model: 'ArticleFollower',
127	142	value: lambda { \|article_follower, person\| person.present? ? person.article_followers.count : 0 }
128	143	},
...	...	@@ -130,11 +145,28 @@ module Merit
130	145	action: 'comment#create',
131	146	default_threshold: 5,
132	147	to: :author,
	148	+ target_profile: lambda {\|comment\| comment.profile },
133	149	value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
134	150	},
135	151	]
136	152	}
137	153
	154	+ def target_author(source, setting)
	155	+ if setting[:to].is_a? Symbol
	156	+ source.send(setting[:to])
	157	+ else
	158	+ setting[:to].call(source) rescue nil
	159	+ end
	160	+ end
	161	+
	162	+ def target_profile(source, setting)
	163	+ setting[:target_profile].present? ? setting[:target_profile].call(source) : nil
	164	+ end
	165	+
	166	+ def check_organization_badge(badge, source, setting)
	167	+ !badge.owner.kind_of?(Organization) \|\| badge.owner == target_profile(source, setting)
	168	+ end
	169	+
138	170	def initialize(environment=nil)
139	171	return if environment.nil?
140	172	@environment = environment
...	...	@@ -142,7 +174,7 @@ module Merit
142	174	rules = AVAILABLE_RULES
143	175	rules.merge! CONFERENCE_RULES if defined? CONFERENCE_RULES
144	176
145		- environment.gamification_plugin_badges.all.each do \|badge\|
	177	+ environment.gamification_plugin_badges.each do \|badge\|
146	178	next if rules[badge.name.to_sym].nil?
147	179	rules[badge.name.to_sym].each do \|setting\|
148	180	options = {badge: badge.name, level: badge.level, to: setting[:to]}
...	...	@@ -150,18 +182,11 @@ module Merit
150	182	grant_on setting[:action], options do \|source\|
151	183	can_be_granted = true
152	184	rules[badge.name.to_sym].each do \|s\|
153		- if setting[:to].is_a? Symbol
154		- to = source.send(setting[:to])
155		- else
156		- begin
157		- to = setting[:to].call(source)
158		- rescue
159		- to = nil
160		- end
161		- end
162		- # pass source and to for different situations
	185	+ to = target_author(source, setting)
	186	+ # pass source and to for different situations
163	187	action = (badge.custom_fields \|\| {}).fetch(s[:action], {})
164	188	can_be_granted &= s[:value].call(source, to) >= action.fetch(:threshold, s[:default_threshold]).to_i
	189	+ can_be_granted &= check_organization_badge(badge, source, setting)
165	190	end
166	191	can_be_granted
167	192	end
...	...
...	...	@@ -11,6 +11,7 @@ module Merit
11	11	description: _('Comment author'),
12	12	default_weight: 40,
13	13	target_profile: lambda {\|comment\| comment.source.profile },
	14	+ target_url: lambda {\|comment\| comment.url},
14	15	},
15	16	comment_article_author: {
16	17	action: 'comment#create',
...	...	@@ -20,6 +21,7 @@ module Merit
20	21	description: _('Article author of a comment'),
21	22	default_weight: 50,
22	23	target_profile: lambda {\|comment\| comment.source.profile },
	24	+ target_url: lambda {\|comment\| comment.url},
23	25	},
24	26	comment_article: {
25	27	action: 'comment#create',
...	...	@@ -29,6 +31,7 @@ module Merit
29	31	description: _('Source article of a comment'),
30	32	default_weight: 50,
31	33	target_profile: lambda {\|comment\| comment.source.profile },
	34	+ target_url: lambda {\|comment\| comment.url},
32	35	},
33	36	comment_community: {
34	37	action: 'comment#create',
...	...	@@ -38,7 +41,8 @@ module Merit
38	41	description: _('Article community of a comment'),
39	42	default_weight: 50,
40	43	target_profile: lambda {\|comment\| comment.source.profile },
41		- condition: lambda {\|comment, profile\| comment.profile.community?}
	44	+ condition: lambda {\|comment, profile\| comment.profile.community?},
	45	+ target_url: lambda {\|comment\| comment.url},
42	46	},
43	47	article_author: {
44	48	action: 'article#create',
...	...	@@ -48,6 +52,7 @@ module Merit
48	52	description: _('Article author'),
49	53	default_weight: 50,
50	54	target_profile: lambda {\|article\| article.profile },
	55	+ target_url: lambda {\|article\| article.url},
51	56	},
52	57	article_community: {
53	58	action: 'article#create',
...	...	@@ -57,7 +62,8 @@ module Merit
57	62	description: _('Article community'),
58	63	default_weight: 10,
59	64	target_profile: lambda {\|article\| article.profile },
60		- condition: lambda {\|article, profile\| article.profile.present? and article.profile.community? }
	65	+ condition: lambda {\|article, profile\| article.profile.present? and article.profile.community? },
	66	+ target_url: lambda {\|article\| article.url},
61	67	},
62	68	vote_voteable_author: {
63	69	action: 'vote#create',
...	...	@@ -67,6 +73,7 @@ module Merit
67	73	description: _('Author of a voted content'),
68	74	default_weight: 20,
69	75	target_profile: lambda {\|vote\| vote.voteable.present? ? vote.voteable.profile : nil },
	76	+ target_url: lambda {\|vote\| vote.voteable.url},
70	77	},
71	78	vote_voteable: {
72	79	action: 'vote#create',
...	...	@@ -76,6 +83,7 @@ module Merit
76	83	description: _('Voted content'),
77	84	default_weight: 30,
78	85	target_profile: lambda {\|vote\| vote.voteable.present? ? vote.voteable.profile : nil },
	86	+ target_url: lambda {\|vote\| vote.voteable.url},
79	87	},
80	88	vote_voter: {
81	89	action: 'vote#create',
...	...	@@ -85,6 +93,7 @@ module Merit
85	93	description: _('Voter'),
86	94	default_weight: 10,
87	95	target_profile: lambda {\|vote\| vote.voteable.present? ? vote.voteable.profile : nil },
	96	+ target_url: lambda {\|vote\| vote.voteable.url},
88	97	},
89	98	friends: {
90	99	action: 'friendship#create',
...	...	@@ -150,6 +159,7 @@ module Merit
150	159	end
151	160
152	161	def profile_condition(setting, target, profile)
	162	+ return false if target == true
153	163	profile.nil? \|\| setting[:target_profile].blank? \|\| setting[:target_profile].call(target) == profile
154	164	end
155	165
...	...	@@ -163,6 +173,15 @@ module Merit
163	173	end
164	174	end
165	175
	176	+ def self.target_url(point)
	177	+ rule_name = point.point_type.present? ? point.point_type.name : point.score.category
	178	+ target_url = AVAILABLE_RULES[rule_name.to_sym][:target_url]
	179	+ return nil if target_url.blank? \|\| point.action.blank?
	180	+
	181	+ model = BaseTargetFinder.new(Merit::Rule.new, point.action).get_target_from_database
	182	+ model.present? ? target_url.call(model) : nil
	183	+ end
	184	+
166	185	def initialize(environment=nil)
167	186	return if environment.nil?
168	187	@environment = environment
...	...
...	...	@@ -17,6 +17,15 @@ module Merit
17	17	class Score
18	18	class Point
19	19	belongs_to :action
	20	+
	21	+ def point_type
	22	+ @point_type \|\|= GamificationPlugin::PointsType.where(id: score.category).first
	23	+ end
	24	+
	25	+ def undo_rule?
	26	+ rule = Merit::PointRules::AVAILABLE_RULES[point_type.name.to_sym]
	27	+ rule[:undo_action] == "#{action.target_model}##{action.action_method}"
	28	+ end
20	29	end
21	30	end
22	31
...	...	@@ -34,7 +43,7 @@ module Merit
34	43	module ClassMethods
35	44
36	45	def has_merit_actions(options = {})
37		- after_create { \|obj\| obj.new_merit_action(:create, options) }
	46	+ after_create { \|obj\| obj.delay.new_merit_action(:create, options) }
38	47	before_destroy { \|obj\| obj.new_merit_action(:destroy, options) }
39	48	end
40	49
...	...
1		-class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord
	1	+class GamificationPlugin::PointsCategorization < ActiveRecord::Base
2	2	belongs_to :profile
3	3	belongs_to :point_type, class_name: 'GamificationPlugin::PointsType', foreign_key: :point_type_id
4	4	attr_accessible :profile_id, :profile, :point_type_id, :weight
...	...	@@ -10,5 +10,5 @@ class GamificationPlugin::PointsCategorization < Noosfero::Plugin::ActiveRecord
10	10	scope :for_type, lambda { \|p_type\| joins(:point_type).where(gamification_plugin_points_types: {name: p_type}) }
11	11	scope :for_profile, lambda { \|p_profile\| joins(:profile).where(profiles: {identifier: p_profile}) }
12	12
13		- scope :grouped_profiles, select(:profile_id).group(:profile_id).includes(:profile)
	13	+ scope :grouped_profiles, -> { select(:profile_id).group(:profile_id).includes(:profile) }
14	14	end
...	...