Remove badges when destroy a badge

Victor Costa
1 parent bc5f17aa
Showing 5 changed files with 52 additions and 2 deletions Show diff stats
lib/gamification_plugin.rb
lib/gamification_plugin/badge.rb
lib/merit_badge.rb
test/unit/badge_test.rb
views/gamification/display_achievements.html.erb
@@ -29,6 +29,10 @@ class GamificationPlugin &lt; Noosfero::Plugin
     }]
   end
  
+  def body_ending
+    proc { render :file => 'gamification/display_achievements' }
+  end
+
   ActionDispatch::Reloader.to_prepare do
     Merit.setup do |config|
       config.checks_on_each_request = false
@@ -10,4 +10,10 @@ class GamificationPlugin::Badge &lt; Noosfero::Plugin::ActiveRecord
     (custom_fields || {}).fetch(:threshold, '')
   end
  
+  before_destroy :remove_badges
+
+  def remove_badges
+    Merit::BadgesSash.where(:badge_id => self.id).destroy_all
+  end
+
 end
@@ -5,8 +5,10 @@ module Merit
   # Delegate find methods to GamificationPlugin::Badge
   class Badge
     class << self
-      [:find_by_name_and_level, :find].each do |method|
-        delegate method, :to => 'GamificationPlugin::Badge'
+      delegate :find_by_name_and_level, :to => 'GamificationPlugin::Badge'
+
+      def find(id)
+        GamificationPlugin::Badge.find_by_id(id)
       end
     end
   end
@@ -0,0 +1,31 @@
+require_relative "../test_helper"
+
+class BadgeTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('testuser').person
+    @environment = Environment.default
+  end
+
+  attr_accessor :person, :environment
+
+  should 'add badge to person' do
+    badge = GamificationPlugin::Badge.create!(:owner => environment)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+  end
+
+  should 'remove badge from person when destroy a badge' do
+    badge = GamificationPlugin::Badge.create!(:owner => environment)
+    person.add_badge(badge.id)
+    assert_equal [badge], person.badges
+    badge.destroy
+    assert_equal [], person.reload.badges
+  end
+
+  should 'not fail when a person has an undefined badge' do
+    person.add_badge(1235)
+    assert_equal [], person.reload.badges.compact
+  end
+
+end
@@ -0,0 +1,7 @@
+<script>
+<% if current_person.present? %>
+  <% current_person.badges.each do |badge| %>
+    <%= "console.log(#{badge.name})" %>
+  <% end %>
+<% end %>
+</script>
...	...	@@ -29,6 +29,10 @@ class GamificationPlugin < Noosfero::Plugin
29	29	}]
30	30	end
31	31
	32	+ def body_ending
	33	+ proc { render :file => 'gamification/display_achievements' }
	34	+ end
	35	+
32	36	ActionDispatch::Reloader.to_prepare do
33	37	Merit.setup do \|config\|
34	38	config.checks_on_each_request = false
...	...
...	...	@@ -10,4 +10,10 @@ class GamificationPlugin::Badge < Noosfero::Plugin::ActiveRecord
10	10	(custom_fields \|\| {}).fetch(:threshold, '')
11	11	end
12	12
	13	+ before_destroy :remove_badges
	14	+
	15	+ def remove_badges
	16	+ Merit::BadgesSash.where(:badge_id => self.id).destroy_all
	17	+ end
	18	+
13	19	end
...	...
...	...	@@ -5,8 +5,10 @@ module Merit
5	5	# Delegate find methods to GamificationPlugin::Badge
6	6	class Badge
7	7	class << self
8		- [:find_by_name_and_level, :find].each do \|method\|
9		- delegate method, :to => 'GamificationPlugin::Badge'
	8	+ delegate :find_by_name_and_level, :to => 'GamificationPlugin::Badge'
	9	+
	10	+ def find(id)
	11	+ GamificationPlugin::Badge.find_by_id(id)
10	12	end
11	13	end
12	14	end
...	...
...	...	@@ -0,0 +1,31 @@
	1	+require_relative "../test_helper"
	2	+
	3	+class BadgeTest < ActiveSupport::TestCase
	4	+
	5	+ def setup
	6	+ @person = create_user('testuser').person
	7	+ @environment = Environment.default
	8	+ end
	9	+
	10	+ attr_accessor :person, :environment
	11	+
	12	+ should 'add badge to person' do
	13	+ badge = GamificationPlugin::Badge.create!(:owner => environment)
	14	+ person.add_badge(badge.id)
	15	+ assert_equal [badge], person.badges
	16	+ end
	17	+
	18	+ should 'remove badge from person when destroy a badge' do
	19	+ badge = GamificationPlugin::Badge.create!(:owner => environment)
	20	+ person.add_badge(badge.id)
	21	+ assert_equal [badge], person.badges
	22	+ badge.destroy
	23	+ assert_equal [], person.reload.badges
	24	+ end
	25	+
	26	+ should 'not fail when a person has an undefined badge' do
	27	+ person.add_badge(1235)
	28	+ assert_equal [], person.reload.badges.compact
	29	+ end
	30	+
	31	+end
...	...
...	...	@@ -0,0 +1,7 @@
	1	+<script>
	2	+<% if current_person.present? %>
	3	+ <% current_person.badges.each do \|badge\| %>
	4	+ <%= "console.log(#{badge.name})" %>
	5	+ <% end %>
	6	+<% end %>
	7	+</script>
...	...