Merge branch '100_add_badges_with_more_than_one_element' into gamification_test

Conflicts: lib/gamification_plugin/api.rb

Merge branch '100_add_badges_with_more_than_one_element' into gamification_test
Conflicts: lib/gamification_plugin/api.rb
Hugo Melo
2 parents bdf09ff4 5125e5a8
Showing 6 changed files with 213 additions and 52 deletions Show diff stats
db/migrate/20151003000212_move_badge_threshold_to_action_key.rb
lib/ext/article_follower.rb
lib/gamification_plugin.rb
lib/merit/badge_rules.rb
public/admin.js
views/gamification_plugin_badges/_form.html.erb
@@ -0,0 +1,26 @@
+class MoveBadgeThresholdToActionKey < ActiveRecord::Migration
+  def up
+    change_table :gamification_plugin_badges do |t|
+      t.change :custom_fields, :text
+    end
+    GamificationPlugin::Badge.all.each do |badge|
+      next if Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].nil?
+      Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].each do |setting|
+        badge.custom_fields[setting[:action]] = {threshold: badge.custom_fields[:threshold]} unless badge.custom_fields[:threshold].nil?
+        badge.save
+      end
+    end
+  end
+
+  def down
+    GamificationPlugin::Badge.all.each do |badge|
+      next if Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].nil?
+      setting = Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first
+      badge.custom_fields = {threshold: badge.custom_fields.fetch(setting[:action], {}).fetch(:threshold, "")}
+      badge.save
+    end
+    change_table :gamification_plugin_badges do |t|
+      t.change :custom_fields, :string
+    end
+  end
+end
@@ -0,0 +1,8 @@
+require_dependency 'article_follower'
+
+class ArticleFollower
+
+  has_merit
+  has_merit_actions
+
+end
@@ -50,7 +50,7 @@ class GamificationPlugin &lt; Noosfero::Plugin
   end
   def js_files
-    ['jquery.noty.packaged.min.js', 'jquery.easypiechart.min.js', 'main.js']
+    ['jquery.noty.packaged.min.js', 'jquery.easypiechart.min.js', 'main.js', 'admin.js']
   end
@@ -9,58 +9,157 @@ module Merit
     include Merit::BadgeRulesMethods
     AVAILABLE_RULES = {
-      :comment_author => {
-        :action => 'comment#create',
-        :default_threshold => 5,
-        :to => :author,
-        :value => lambda { |comment| comment.author.present? ? comment.author.comments.count : 0 }
-      },
-      :comment_received => {
-        :action => 'comment#create',
-        :default_threshold => 5,
-        :to => lambda {|comment| comment.source.author},
-        :value => lambda { |comment| comment.source.author.present? ? Comment.where(:source_id => Article.where(:author_id => comment.source.author.id)).count : 0 }
-      },
-      :article_author => {
-        :action => 'article#create',
-        :default_threshold => 5,
-        :to => :author,
-        :value => lambda { |article| article.author.present? ? article.environment.articles.text_articles.where(:author_id => article.author.id).count : 0 }
-      },
-      :positive_votes_received => {
-        :action => 'vote#create',
-        :default_threshold => 5,
-        :to => lambda {|vote| vote.voteable.author},
-        :value => lambda { |vote| Vote.for_voteable(vote.voteable).where('vote > 0').count }
-      },
-      :negative_votes_received => {
-        :action => 'vote#create',
-        :default_threshold => 5,
-        :to => lambda {|vote| vote.voteable.author},
-        :value => lambda { |vote| Vote.for_voteable(vote.voteable).where('vote < 0').count }
-      },
-      :votes_performed => {
-        :action => 'vote#create',
-        :default_threshold => 5,
-        :to => lambda {|vote| vote.voter},
-        :value => lambda { |vote| Vote.for_voter(vote.voter).count }
-      },
-      :friendly => {
-        :action => 'friendship#create',
-        :default_threshold => 5,
-        :to => lambda {|friendship| friendship.person},
-        :value => lambda { |friendship| friendship.person.friends.count }
-      }
+      comment_author: [
+        {
+          action: 'comment#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |comment, author| author.present? ? author.conference_comments.count : 0 }
+        }
+      ],
+      comment_received: [
+        {
+          action: 'comment#create',
+          default_threshold: 5,
+          to: lambda {|comment| comment.source.author},
+          value: lambda { |comment, author| author.present? ? Comment.where(source_id: Article.conference_articles.where(author_id: author.id)).count : 0 }
+        }
+      ],
+      article_author: [
+        {
+          action: 'article#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |article, author| author.present? ? TextArticle.conference_articles.comments.where(author_id: author.id).count : 0 }
+        },
+      ],
+      positive_votes_received: [
+          {
+          action: 'vote#create',
+          default_threshold: 5,
+          to: lambda {|vote| vote.voteable.author},
+          value: lambda { |vote, author| Vote.for_voteable(vote.voteable).where('vote > 0').count }
+        }
+      ],
+      negative_votes_received: [
+        {
+          action: 'vote#create',
+          default_threshold: 5,
+          to: lambda {|vote| vote.voteable.author},
+          value: lambda { |vote, author| Vote.for_voteable(vote.voteable).where('vote < 0').count }
+        }
+      ],
+      votes_performed: [
+        {
+          action: 'vote#create',
+          default_threshold: 5,
+          to: lambda {|vote| vote.voter},
+          value: lambda { |vote, voter| Vote.for_voter(voter).count }
+        }
+      ],
+      friendly: [
+        {
+          action: 'friendship#create',
+          default_threshold: 5,
+          to: lambda {|friendship| friendship.person},
+          value: lambda { |friendship, person| person.friends.count }
+        }
+      ],
+      creative: [
+        {
+          action: 'comment#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
+        },
+        {
+          action: 'article#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |article, author| author.present? ? author.articles.count : 0 }
+        },
+      ],
+      observer: [
+        {
+          action: 'article_follower#create',
+          default_threshold: 5,
+          to: lambda {|article| article.person },
+          value: lambda { |article, person| person.present? ? person.article_followers.count : 0 }
+        }
+      ],
+      mobilizer: [
+        {
+          action: 'Vote#create',
+          default_threshold: 5,
+          to: lambda { |vote| vote.voter },
+          value: lambda { |vote, voter| Vote.for_voter(voter).count }
+        },
+        {
+          action: 'Event#create',
+          default_threshold: 5,
+          to: lambda { |article| article.author },
+          value: lambda { |event, author| author.events.count }
+        },
+      ],
+      generous: [
+        {
+          action: 'vote#create',
+          default_threshold: 5,
+          to: lambda {|vote| vote.voter},
+          value: lambda { |vote, voter| voter.votes.where('vote > 0').count }
+        },
+        {
+          action: 'comment#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
+        }
+      ],
+      articulator: [
+        {
+          action: 'article_follower#create',
+          default_threshold: 5,
+          to: :person,
+          value: lambda { |article_follower, person| person.present? ? person.article_followers.count : 0 }
+        },
+        {
+          action: 'comment#create',
+          default_threshold: 5,
+          to: :author,
+          value: lambda { |comment, author| author.present? ? author.comments.count : 0 }
+        },
+        #mobilizer#create
+      ]
     }
     def initialize(environment=nil)
       return if environment.nil?
       @environment = environment
+      rules = AVAILABLE_RULES
+      rules.merge! CONFERENCE_RULES if defined? CONFERENCE_RULES
+
       environment.gamification_plugin_badges.all.each do |badge|
-        setting = AVAILABLE_RULES[badge.name.to_sym]
-        grant_on setting[:action], :badge => badge.name, :level => badge.level, :to => setting[:to] do |source|
-          setting[:value].call(source) >= (badge.custom_fields || {}).fetch(:threshold, setting[:default_threshold]).to_i
+        next if rules[badge.name.to_sym].nil?
+        rules[badge.name.to_sym].each do |setting|
+          grant_on setting[:action], badge: badge.name, level: badge.level, to: setting[:to] 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
+              action = (badge.custom_fields || {}).fetch(s[:action], {})
+              can_be_granted &= s[:value].call(source, to) >= action.fetch(:threshold, s[:default_threshold]).to_i
+            end
+            can_be_granted
+          end
         end
       end
     end
@@ -4,5 +4,20 @@ var gamificationPluginAdmin = {
     var template = $('.gamification-plugin-rank-rules .template-level > div').clone();
     template.find('.level-value').text($('.gamification-plugin-rank-rules .rank-rules .items .level').length + 1);
     $('.gamification-plugin-rank-rules .rank-rules .items').append(template);
+  },
+
+  selectCustomFieldsOnNameChange: function() {
+  	jQuery('.controller-actions').find('input').attr('disabled', 'disabled');
+  	jQuery('.controller-actions').hide();
+  	console.log('.name_'+jQuery('#gamification-plugin-form-badge-name').val());
+  	var name = jQuery('#gamification-plugin-form-badge-name').find('option:selected').text();
+  	jQuery('.name_'+name).show();
+  	jQuery('.name_'+name).find('input').removeAttr('disabled');
   }
+
 }
+
+jQuery(function() {
+  $('#gamification-plugin-form-badge-name').on('change', gamificationPluginAdmin.selectCustomFieldsOnNameChange);
+  gamificationPluginAdmin.selectCustomFieldsOnNameChange();
+});
@@ -11,9 +11,11 @@
     </div>
   <% end %>
-  <div class="field">
+  <% rules =  Merit::BadgeRules::AVAILABLE_RULES %>
+  <% rules.merge! Merit::BadgeRules::CONFERENCE_RULES %>
+  <div class="field" id="gamification-plugin-form-badge-name">
     <%= f.label :name %><br />
-    <%= f.select :name, Merit::BadgeRules::AVAILABLE_RULES.map{ |key, rule| key } %>
+    <%= f.select :name, rules.map{ |key, rule| key } %>
   </div>
   <div class="field">
     <%= f.label :title %><br />
@@ -27,11 +29,22 @@
     <%= f.label :level %><br />
     <%= f.text_field :level %>
   </div>
+  <h4><%= _('Actions') %></h4>
   <%= f.fields_for :custom_fields do |c| %>
-  <div class="field">
-    <%= c.label :threshold %><br />
-    <%= c.text_field :threshold %>
-  </div>
+    <% 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>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
   <div class="actions">
     <%= f.submit %>
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+class MoveBadgeThresholdToActionKey < ActiveRecord::Migration
	2	+ def up
	3	+ change_table :gamification_plugin_badges do \|t\|
	4	+ t.change :custom_fields, :text
	5	+ end
	6	+ GamificationPlugin::Badge.all.each do \|badge\|
	7	+ next if Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].nil?
	8	+ Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].each do \|setting\|
	9	+ badge.custom_fields[setting[:action]] = {threshold: badge.custom_fields[:threshold]} unless badge.custom_fields[:threshold].nil?
	10	+ badge.save
	11	+ end
	12	+ end
	13	+ end
	14	+
	15	+ def down
	16	+ GamificationPlugin::Badge.all.each do \|badge\|
	17	+ next if Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].nil?
	18	+ setting = Merit::BadgeRules::AVAILABLE_RULES[badge.name.to_sym].first
	19	+ badge.custom_fields = {threshold: badge.custom_fields.fetch(setting[:action], {}).fetch(:threshold, "")}
	20	+ badge.save
	21	+ end
	22	+ change_table :gamification_plugin_badges do \|t\|
	23	+ t.change :custom_fields, :string
	24	+ end
	25	+ end
	26	+end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+require_dependency 'article_follower'
	2	+
	3	+class ArticleFollower
	4	+
	5	+ has_merit
	6	+ has_merit_actions
	7	+
	8	+end
	@@ -50,7 +50,7 @@ class GamificationPlugin < Noosfero::Plugin		@@ -50,7 +50,7 @@ class GamificationPlugin < Noosfero::Plugin
50	end	50	end
51		51
52	def js_files	52	def js_files
53	- ['jquery.noty.packaged.min.js', 'jquery.easypiechart.min.js', 'main.js']	53	+ ['jquery.noty.packaged.min.js', 'jquery.easypiechart.min.js', 'main.js', 'admin.js']
54	end	54	end
55		55
56		56
	@@ -9,58 +9,157 @@ module Merit		@@ -9,58 +9,157 @@ module Merit
9	include Merit::BadgeRulesMethods	9	include Merit::BadgeRulesMethods
10		10
11	AVAILABLE_RULES = {	11	AVAILABLE_RULES = {
12	- :comment_author => {
13	- :action => 'comment#create',
14	- :default_threshold => 5,
15	- :to => :author,
16	- :value => lambda { \|comment\| comment.author.present? ? comment.author.comments.count : 0 }
17	- },
18	- :comment_received => {
19	- :action => 'comment#create',
20	- :default_threshold => 5,
21	- :to => lambda {\|comment\| comment.source.author},
22	- :value => lambda { \|comment\| comment.source.author.present? ? Comment.where(:source_id => Article.where(:author_id => comment.source.author.id)).count : 0 }
23	- },
24	- :article_author => {
25	- :action => 'article#create',
26	- :default_threshold => 5,
27	- :to => :author,
28	- :value => lambda { \|article\| article.author.present? ? article.environment.articles.text_articles.where(:author_id => article.author.id).count : 0 }
29	- },
30	- :positive_votes_received => {
31	- :action => 'vote#create',
32	- :default_threshold => 5,
33	- :to => lambda {\|vote\| vote.voteable.author},
34	- :value => lambda { \|vote\| Vote.for_voteable(vote.voteable).where('vote > 0').count }
35	- },
36	- :negative_votes_received => {
37	- :action => 'vote#create',
38	- :default_threshold => 5,
39	- :to => lambda {\|vote\| vote.voteable.author},
40	- :value => lambda { \|vote\| Vote.for_voteable(vote.voteable).where('vote < 0').count }
41	- },
42	- :votes_performed => {
43	- :action => 'vote#create',
44	- :default_threshold => 5,
45	- :to => lambda {\|vote\| vote.voter},
46	- :value => lambda { \|vote\| Vote.for_voter(vote.voter).count }
47	- },
48	- :friendly => {
49	- :action => 'friendship#create',
50	- :default_threshold => 5,
51	- :to => lambda {\|friendship\| friendship.person},
52	- :value => lambda { \|friendship\| friendship.person.friends.count }
53	- }	12	+ comment_author: [
		13	+ {
		14	+ action: 'comment#create',
		15	+ default_threshold: 5,
		16	+ to: :author,
		17	+ value: lambda { \|comment, author\| author.present? ? author.conference_comments.count : 0 }
		18	+ }
		19	+ ],
		20	+ comment_received: [
		21	+ {
		22	+ action: 'comment#create',
		23	+ default_threshold: 5,
		24	+ to: lambda {\|comment\| comment.source.author},
		25	+ value: lambda { \|comment, author\| author.present? ? Comment.where(source_id: Article.conference_articles.where(author_id: author.id)).count : 0 }
		26	+ }
		27	+ ],
		28	+ article_author: [
		29	+ {
		30	+ action: 'article#create',
		31	+ default_threshold: 5,
		32	+ to: :author,
		33	+ value: lambda { \|article, author\| author.present? ? TextArticle.conference_articles.comments.where(author_id: author.id).count : 0 }
		34	+ },
		35	+ ],
		36	+ positive_votes_received: [
		37	+ {
		38	+ action: 'vote#create',
		39	+ default_threshold: 5,
		40	+ to: lambda {\|vote\| vote.voteable.author},
		41	+ value: lambda { \|vote, author\| Vote.for_voteable(vote.voteable).where('vote > 0').count }
		42	+ }
		43	+ ],
		44	+ negative_votes_received: [
		45	+ {
		46	+ action: 'vote#create',
		47	+ default_threshold: 5,
		48	+ to: lambda {\|vote\| vote.voteable.author},
		49	+ value: lambda { \|vote, author\| Vote.for_voteable(vote.voteable).where('vote < 0').count }
		50	+ }
		51	+ ],
		52	+ votes_performed: [
		53	+ {
		54	+ action: 'vote#create',
		55	+ default_threshold: 5,
		56	+ to: lambda {\|vote\| vote.voter},
		57	+ value: lambda { \|vote, voter\| Vote.for_voter(voter).count }
		58	+ }
		59	+ ],
		60	+ friendly: [
		61	+ {
		62	+ action: 'friendship#create',
		63	+ default_threshold: 5,
		64	+ to: lambda {\|friendship\| friendship.person},
		65	+ value: lambda { \|friendship, person\| person.friends.count }
		66	+ }
		67	+ ],
		68	+ creative: [
		69	+ {
		70	+ action: 'comment#create',
		71	+ default_threshold: 5,
		72	+ to: :author,
		73	+ value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
		74	+ },
		75	+ {
		76	+ action: 'article#create',
		77	+ default_threshold: 5,
		78	+ to: :author,
		79	+ value: lambda { \|article, author\| author.present? ? author.articles.count : 0 }
		80	+ },
		81	+ ],
		82	+ observer: [
		83	+ {
		84	+ action: 'article_follower#create',
		85	+ default_threshold: 5,
		86	+ to: lambda {\|article\| article.person },
		87	+ value: lambda { \|article, person\| person.present? ? person.article_followers.count : 0 }
		88	+ }
		89	+ ],
		90	+ mobilizer: [
		91	+ {
		92	+ action: 'Vote#create',
		93	+ default_threshold: 5,
		94	+ to: lambda { \|vote\| vote.voter },
		95	+ value: lambda { \|vote, voter\| Vote.for_voter(voter).count }
		96	+ },
		97	+ {
		98	+ action: 'Event#create',
		99	+ default_threshold: 5,
		100	+ to: lambda { \|article\| article.author },
		101	+ value: lambda { \|event, author\| author.events.count }
		102	+ },
		103	+ ],
		104	+ generous: [
		105	+ {
		106	+ action: 'vote#create',
		107	+ default_threshold: 5,
		108	+ to: lambda {\|vote\| vote.voter},
		109	+ value: lambda { \|vote, voter\| voter.votes.where('vote > 0').count }
		110	+ },
		111	+ {
		112	+ action: 'comment#create',
		113	+ default_threshold: 5,
		114	+ to: :author,
		115	+ value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
		116	+ }
		117	+ ],
		118	+ articulator: [
		119	+ {
		120	+ action: 'article_follower#create',
		121	+ default_threshold: 5,
		122	+ to: :person,
		123	+ value: lambda { \|article_follower, person\| person.present? ? person.article_followers.count : 0 }
		124	+ },
		125	+ {
		126	+ action: 'comment#create',
		127	+ default_threshold: 5,
		128	+ to: :author,
		129	+ value: lambda { \|comment, author\| author.present? ? author.comments.count : 0 }
		130	+ },
		131	+ #mobilizer#create
		132	+ ]
54	}	133	}
55		134
56	def initialize(environment=nil)	135	def initialize(environment=nil)
57	return if environment.nil?	136	return if environment.nil?
58	@environment = environment	137	@environment = environment
59		138
		139	+ rules = AVAILABLE_RULES
		140	+ rules.merge! CONFERENCE_RULES if defined? CONFERENCE_RULES
		141	+
60	environment.gamification_plugin_badges.all.each do \|badge\|	142	environment.gamification_plugin_badges.all.each do \|badge\|
61	- setting = AVAILABLE_RULES[badge.name.to_sym]
62	- grant_on setting[:action], :badge => badge.name, :level => badge.level, :to => setting[:to] do \|source\|
63	- setting[:value].call(source) >= (badge.custom_fields \|\| {}).fetch(:threshold, setting[:default_threshold]).to_i	143	+ next if rules[badge.name.to_sym].nil?
		144	+ rules[badge.name.to_sym].each do \|setting\|
		145	+ grant_on setting[:action], badge: badge.name, level: badge.level, to: setting[:to] do \|source\|
		146	+ can_be_granted = true
		147	+ rules[badge.name.to_sym].each do \|s\|
		148	+ if setting[:to].is_a? Symbol
		149	+ to = source.send(setting[:to])
		150	+ else
		151	+ begin
		152	+ to = setting[:to].call(source)
		153	+ rescue
		154	+ to = nil
		155	+ end
		156	+ end
		157	+ # pass source and to for different situations
		158	+ action = (badge.custom_fields \|\| {}).fetch(s[:action], {})
		159	+ can_be_granted &= s[:value].call(source, to) >= action.fetch(:threshold, s[:default_threshold]).to_i
		160	+ end
		161	+ can_be_granted
		162	+ end
64	end	163	end
65	end	164	end
66	end	165	end
	@@ -4,5 +4,20 @@ var gamificationPluginAdmin = {		@@ -4,5 +4,20 @@ var gamificationPluginAdmin = {
4	var template = $('.gamification-plugin-rank-rules .template-level > div').clone();	4	var template = $('.gamification-plugin-rank-rules .template-level > div').clone();
5	template.find('.level-value').text($('.gamification-plugin-rank-rules .rank-rules .items .level').length + 1);	5	template.find('.level-value').text($('.gamification-plugin-rank-rules .rank-rules .items .level').length + 1);
6	$('.gamification-plugin-rank-rules .rank-rules .items').append(template);	6	$('.gamification-plugin-rank-rules .rank-rules .items').append(template);
		7	+ },
		8	+
		9	+ selectCustomFieldsOnNameChange: function() {
		10	+ jQuery('.controller-actions').find('input').attr('disabled', 'disabled');
		11	+ jQuery('.controller-actions').hide();
		12	+ console.log('.name_'+jQuery('#gamification-plugin-form-badge-name').val());
		13	+ var name = jQuery('#gamification-plugin-form-badge-name').find('option:selected').text();
		14	+ jQuery('.name_'+name).show();
		15	+ jQuery('.name_'+name).find('input').removeAttr('disabled');
7	}	16	}
		17	+
8	}	18	}
		19	+
		20	+jQuery(function() {
		21	+ $('#gamification-plugin-form-badge-name').on('change', gamificationPluginAdmin.selectCustomFieldsOnNameChange);
		22	+ gamificationPluginAdmin.selectCustomFieldsOnNameChange();
		23	+});