Merge branch 'master' of gitlab.com:noosfero-plugins/gamification

Leandro Santos
2 parents 69df29be 7a9aa2a6
Showing 4 changed files with 28 additions and 3 deletions Show diff stats
Gemfile
lib/merit/point_rules.rb
script/process_merit_rules.rb
test/functional/gamification_plugin_profile_controller_test.rb
+source 'https://rubygems.org'
 gem 'merit', '~> 2.3.1'
@@ -61,7 +61,6 @@ module Merit
         :value => lambda {|vote| vote.vote},
         :description => _('Point weight for the author of a voted content'),
         :default_weight => 50,
-        :condition => lambda {|vote| vote.voteable.profile.community? }
       },
       :vote_voteable => {
         :action => 'vote#create',
@@ -0,0 +1,25 @@
+def create_action(obj)
+  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 "Create merit action for #{target_model} #{obj.id}"
+    obj.new_merit_action(:create)
+  end
+end
+
+Environment.all.each do |environment|
+
+  Merit::AppPointRules.clear
+  Merit::AppBadgeRules.clear
+  Merit::AppPointRules.merge!(Merit::PointRules.new(environment).defined_rules)
+  Merit::AppBadgeRules.merge!(Merit::BadgeRules.new(environment).defined_rules)
+
+  environment.articles.each do |article|
+    create_action(article)
+
+    article.comments.each do |comment|
+      create_action(comment)
+    end
+  end
+
+end
@@ -14,8 +14,8 @@ class GamificationPluginProfileControllerTest &lt; ActionController::TestCase
     person.add_points(20, :category => :comment_author)
     person.add_points(30, :category => :article_author)
     get :dashboard, :profile => person.identifier
-    assert_tag :div, :attributes => {:class => 'score article_author'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '30'}
-    assert_tag :div, :attributes => {:class => 'score comment_author'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '20'}
+    assert_tag :div, :attributes => {:class => 'score article_author'}, :child => {:tag => 'span', :attributes => {:class => 'value positive'}, :content => '30'}
+    assert_tag :div, :attributes => {:class => 'score comment_author'}, :child => {:tag => 'span', :attributes => {:class => 'value positive'}, :content => '20'}
     assert_tag :div, :attributes => {:class => 'score total'}, :child => {:tag => 'span', :attributes => {:class => 'value'}, :content => '50'}
   end
		1	+source 'https://rubygems.org'
1	gem 'merit', '~> 2.3.1'	2	gem 'merit', '~> 2.3.1'
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+def create_action(obj)
	2	+ target_model = obj.class.base_class.name.downcase
	3	+ action = Merit::Action.find_by_target_id_and_target_model_and_action_method(obj.id, target_model, 'create')
	4	+ if action.nil?
	5	+ puts "Create merit action for #{target_model} #{obj.id}"
	6	+ obj.new_merit_action(:create)
	7	+ end
	8	+end
	9	+
	10	+Environment.all.each do \|environment\|
	11	+
	12	+ Merit::AppPointRules.clear
	13	+ Merit::AppBadgeRules.clear
	14	+ Merit::AppPointRules.merge!(Merit::PointRules.new(environment).defined_rules)
	15	+ Merit::AppBadgeRules.merge!(Merit::BadgeRules.new(environment).defined_rules)
	16	+
	17	+ environment.articles.each do \|article\|
	18	+ create_action(article)
	19	+
	20	+ article.comments.each do \|comment\|
	21	+ create_action(comment)
	22	+ end
	23	+ end
	24	+
	25	+end