Merge branch 'working' into 'master'

Avoid recursive loop saving profile See merge request !12

Merge branch 'working' into 'master'
Avoid recursive loop saving profile See merge request !12
Victor Costa
2 parents faf2e1ac 048f746d
Showing 4 changed files with 21 additions and 9 deletions Show diff stats
lib/merit/point_rules.rb
lib/merit/rank_observer.rb
test/unit/profile_test.rb
views/gamification_plugin_badges/show.html.erb
@@ -61,7 +61,6 @@ module Merit
         action: 'vote#create',
         undo_action: 'vote#destroy',
         to: lambda {|vote| vote.voteable.author},
-        profile: lambda {|vote| vote.voteable.profile},
         value: lambda {|vote| vote.vote},
         description: _('Author of a voted content'),
         default_weight: 20,
@@ -71,7 +70,6 @@ module Merit
         action: 'vote#create',
         undo_action: 'vote#destroy',
         to: lambda {|vote| vote.voteable},
-        profile: lambda {|vote| vote.voteable.profile},
         value: lambda {|vote| vote.vote},
         description: _('Voted content'),
         default_weight: 30,
@@ -101,7 +99,6 @@ module Merit
         value: 1,
         description: _('Profile Completion'),
         default_weight: 100,
-        model_name: "User",
         condition: lambda {|person, profile| person.person? and person.profile_completion_score_condition },
       },
       follower: {
@@ -159,8 +156,10 @@ module Merit
           [setting[:action], setting[:undo_action]].compact.zip([1, -1]).each do |action, signal|
             options = {on: action, to: setting[:to], category: categorization.id.to_s}
             options[:model_name] = setting[:model] unless setting[:model].nil?
-            score lambda {|target| signal * calculate_score(target, categorization.weight, setting[:value])}, options do |target|
-              condition(setting, target, categorization.profile)
+            weight = categorization.weight
+            profile = categorization.profile
+            score lambda {|target| signal * calculate_score(target, weight, setting[:value])}, options do |target|
+              condition(setting, target, profile)
             end
           end
         end
@@ -5,7 +5,7 @@ module Merit
       merit = changed_data[:merit_object]
       if merit.kind_of?(Merit::Score::Point)
         profile = merit.score.sash.profile
-        profile.update_attribute(:level, profile.gamification_plugin_calculate_level) if profile.present?
+        profile.update_column(:level, profile.gamification_plugin_calculate_level) if profile.present?
       end
     end
   end
@@ -44,6 +44,18 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal 1, profile.gamification_plugin_calculate_level
   end
+  should 'update profile level when a profile action makes a score with zero point' do
+    #avoid loop when the score changes by zero and
+    person = create_user('testuser').person
+    Person.any_instance.stubs(:is_profile_complete?).returns(true)
+    create_point_rule_definition('profile_completion', nil, {value: 0})
+    GamificationPlugin.gamification_set_rules(environment)
+    assert_equal 0, person.level
+     assert_nothing_raised do
+       person.save
+     end
+  end
+
   should 'update profile level when the score changes' do
     create_point_rule_definition('article_author')
     community = fast_create(Community)
@@ -24,9 +24,10 @@
 <p>
   <b>Threshold:</b>
-  <% @gamification_plugin_badge.custom_fields.is_a? Hash %>
-  <% @gamification_plugin_badge.custom_fields.keys.each do |key| %>
-    <div><%= _(key) + ': ' + @gamification_plugin_badge.custom_fields[key].fetch("threshold", "")  %></div>
+  <% if @gamification_plugin_badge.custom_fields.is_a? Hash %>
+    <% @gamification_plugin_badge.custom_fields.keys.each do |key| %>
+      <div><%= _(key) + ': ' + @gamification_plugin_badge.custom_fields[key].fetch("threshold", "")  %></div>
+    <% end %>
   <% end %>
 </p>
	@@ -5,7 +5,7 @@ module Merit		@@ -5,7 +5,7 @@ module Merit
5	merit = changed_data[:merit_object]	5	merit = changed_data[:merit_object]
6	if merit.kind_of?(Merit::Score::Point)	6	if merit.kind_of?(Merit::Score::Point)
7	profile = merit.score.sash.profile	7	profile = merit.score.sash.profile
8	- profile.update_attribute(:level, profile.gamification_plugin_calculate_level) if profile.present?	8	+ profile.update_column(:level, profile.gamification_plugin_calculate_level) if profile.present?
9	end	9	end
10	end	10	end
11	end	11	end
	@@ -44,6 +44,18 @@ class ProfileTest < ActiveSupport::TestCase		@@ -44,6 +44,18 @@ class ProfileTest < ActiveSupport::TestCase
44	assert_equal 1, profile.gamification_plugin_calculate_level	44	assert_equal 1, profile.gamification_plugin_calculate_level
45	end	45	end
46		46
		47	+ should 'update profile level when a profile action makes a score with zero point' do
		48	+ #avoid loop when the score changes by zero and
		49	+ person = create_user('testuser').person
		50	+ Person.any_instance.stubs(:is_profile_complete?).returns(true)
		51	+ create_point_rule_definition('profile_completion', nil, {value: 0})
		52	+ GamificationPlugin.gamification_set_rules(environment)
		53	+ assert_equal 0, person.level
		54	+ assert_nothing_raised do
		55	+ person.save
		56	+ end
		57	+ end
		58	+
47	should 'update profile level when the score changes' do	59	should 'update profile level when the score changes' do
48	create_point_rule_definition('article_author')	60	create_point_rule_definition('article_author')
49	community = fast_create(Community)	61	community = fast_create(Community)