activerecord-reputation-system 2.0.2 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 357cba79dc17693f888aa559b94301e9cc6a0c39
+  data.tar.gz: 86542de25746208e733f163c661ec9b7be90ba2c
+SHA512:
+  metadata.gz: 9656e9ca24b2a70661ef53336b6c96af676c1aa5d2d556267d223caf57aae0ff49fd79aa5e9feacda5ec0f16a1f2d80d7f1fc20d3c3e167023263e385c33d0c5
+  data.tar.gz: acc3482e4ea8e3d485d605fd711eecd7f7a70920049cb638472f4a532acb11f183dce97e374e32ec8e4e3c3c24e08c311c113648eb7f112543209ec210a00234

data/README.md

@@ -91,6 +91,38 @@ You can get target records that have been evaluated by a given source record:
 Question.evaluated_by(:votes, @user) #=> [@question]
 ```
 
+You can use a custom aggregation function, which is a feature available on this fork, but not on the original implementation.
+You just need to provide the name of the method on the :aggregated_by option, and implement this method on the model.
+On the example below, our aggregation function sums all values and multiply by ten:
+```ruby
+class Answer < ActiveRecord::Base
+  belongs_to :author, :class_name => 'User'
+  belongs_to :question
+
+  has_reputation :custom_rating,
+    :source => :user,
+    :aggregated_by => :custom_aggregation
+
+  def custom_aggregation(*args)
+    rep, source, weight = args[0..2]
+    
+    # Ruby doesn't support method overloading, so let's handle parameters on a condition
+    
+    # For a new source, these are the input parameters:
+    # rep, source, weight
+    if args.length === 3
+      rep.value + weight * source.value * 10
+    
+    # For an updated source, these are the input parameters:
+    # rep, source, weight, oldValue, newSize
+    elsif args.length === 5
+      oldValue, newSize = args[3..4]
+      rep.value + (source.value - oldValue) * 10
+    end
+  end
+end
+```
+
 ## Documentation
 
 Please refer [Wiki](https://github.com/twitter/activerecord-reputation-system/wiki) for available APIs and more information.
@@ -106,6 +138,7 @@ Katsuya Noguchi
 1. [NARKOZ (Nihad Abbasov)](https://github.com/NARKOZ) - 4 commits
 2. [elitheeli (Eli Fox-Epstein)](https://github.com/elitheeli) - 1 commit
 3. [amrnt (Amr Tamimi)](https://github.com/amrnt) - 1 commit
+4. [caiosba (Caio Almeida)](https://github.com/caiosba) - 1 commit
 
 ## Related Links
 

data/lib/generators/reputation_system/reputation_system_generator.rb

@@ -37,6 +37,8 @@ class ReputationSystemGenerator < Rails::Generators::Base
     create_migration_file_if_not_exist 'change_evaluations_index_to_unique'
     create_migration_file_if_not_exist 'change_reputation_messages_index_to_unique'
     create_migration_file_if_not_exist 'change_reputations_index_to_unique'
+    create_migration_file_if_not_exist 'add_data_to_reputations'
+    create_migration_file_if_not_exist 'add_data_to_evaluations'
   end
 
   private

data/lib/generators/reputation_system/templates/add_data_to_evaluations.rb

@@ -0,0 +1,9 @@
+class AddDataToEvaluations < ActiveRecord::Migration
+  def self.up
+    add_column :rs_evaluations, :data, :text
+  end
+
+  def self.down
+    remove_column :rs_evaluations, :data
+  end
+end

data/lib/generators/reputation_system/templates/add_data_to_reputations.rb

@@ -0,0 +1,9 @@
+class AddDataToReputations < ActiveRecord::Migration
+  def self.up
+    add_column :rs_reputations, :data, :text
+  end
+
+  def self.down
+    remove_column :rs_reputations, :data
+  end
+end

data/lib/reputation_system.rb

@@ -14,6 +14,7 @@
 #  limitations under the License.
 ##
 
+require 'protected_attributes'
 require 'reputation_system/base'
 require 'reputation_system/query_methods'
 require 'reputation_system/finder_methods'

data/lib/reputation_system/base.rb

@@ -22,7 +22,8 @@ module ReputationSystem
 
     def get_attributes_of(reputation)
       of = reputation[:of]
-      attrs = reputation[:of] == :self ? self : self.instance_eval(of.to_s) if of.is_a?(String) || of.is_a?(Symbol)
+      attrs = (of == :self) ? self : self.instance_eval(of.to_s) if of.is_a?(String) || of.is_a?(Symbol)
+      attrs = attrs.to_a if attrs.is_a?(ActiveRecord::Associations::CollectionProxy)
       attrs = self.instance_exec(self, &of) if of.is_a?(Proc)
       attrs = [attrs] unless attrs.is_a? Array
       attrs.compact

data/lib/reputation_system/evaluation_methods.rb

@@ -25,7 +25,7 @@ module ReputationSystem
         options[:select] ||= sanitize_sql_array(["%s.*", self.table_name])
         options[:joins] = sanitize_sql_array(["JOIN rs_evaluations ON %s.id = rs_evaluations.target_id AND rs_evaluations.target_type = ? AND rs_evaluations.reputation_name = ? AND rs_evaluations.source_id = ? AND rs_evaluations.source_type = ?", self.name, srn.to_s, source.id, source_type])
         options[:joins] = sanitize_sql_array([options[:joins], self.table_name])
-        find(:all, options) 
+        joins(options[:joins]).select(options[:select])
       end
     end
 

data/lib/reputation_system/finder_methods.rb

@@ -27,7 +27,7 @@ module FinderMethods
         options[:select] = build_select_statement(table_name, reputation_name, options[:select])
         options[:joins] = build_join_statement(table_name, name, srn, options[:joins])
         options[:conditions] = build_condition_statement(reputation_name, options[:conditions])
-        find(find_scope, options)
+        joins(options[:joins]).select(options[:select]).where(options[:conditions]).send(find_scope)
       end
 
       def count_with_reputation(*args)
@@ -35,7 +35,7 @@ module FinderMethods
         options[:joins] = build_join_statement(table_name, name, srn, options[:joins])
         options[:conditions] = build_condition_statement(reputation_name, options[:conditions])
         options[:conditions][0].gsub!(reputation_name.to_s, "COALESCE(rs_reputations.value, 0)")
-        count(find_scope, options)
+        joins(options[:joins]).select(options[:select]).where(options[:conditions]).send(find_scope).count
       end
 
       def find_with_normalized_reputation(*args)
@@ -43,7 +43,7 @@ module FinderMethods
         options[:select] = build_select_statement(table_name, reputation_name, options[:select], srn, true)
         options[:joins] = build_join_statement(table_name, name, srn, options[:joins])
         options[:conditions] = build_condition_statement(reputation_name, options[:conditions], srn, true)
-        find(find_scope, options)
+        joins(options[:joins]).select(options[:select]).where(options[:conditions]).send(find_scope)
       end
 
       def find_with_reputation_sql(*args)
@@ -53,8 +53,10 @@ module FinderMethods
         options[:conditions] = build_condition_statement(reputation_name, options[:conditions])
         if respond_to?(:construct_finder_sql, true)
           construct_finder_sql(options)
-        else
+        elsif respond_to?(:construct_finder_arel, true)
           construct_finder_arel(options).to_sql
+        else
+          joins(options[:joins]).select(options[:select]).where(options[:conditions]).send(find_scope).to_sql
         end
       end
 

data/lib/reputation_system/models/evaluation.rb

@@ -31,15 +31,17 @@ module ReputationSystem
     validates_uniqueness_of :source_id, :scope => [:reputation_name, :source_type, :target_id, :target_type]
     validate :source_must_be_defined_for_reputation_in_network
 
+    serialize :data, Hash
+
     def self.find_by_reputation_name_and_source_and_target(reputation_name, source, target)
       source_type = get_source_type_for_sti(source.class.name, target.class.name, reputation_name)
-      ReputationSystem::Evaluation.find(:first,
-                        :conditions => {:reputation_name => reputation_name.to_s,
-                                        :source_id => source.id,
-                                        :source_type => source_type,
-                                        :target_id => target.id,
-                                        :target_type => target.class.name
-                                        })
+      ReputationSystem::Evaluation.where(
+        :reputation_name => reputation_name.to_s,
+        :source_id => source.id,
+        :source_type => source_type,
+        :target_id => target.id,
+        :target_type => target.class.name
+      ).first
     end
 
     def self.create_evaluation(reputation_name, value, source, target)

data/lib/reputation_system/models/reputation.rb

@@ -31,10 +31,10 @@ module ReputationSystem
     before_validation :set_target_type_for_sti
     before_save :change_zero_value_in_case_of_product_process
 
-    VALID_PROCESSES = ['sum', 'average', 'product']
-    validates_inclusion_of :aggregated_by, :in => VALID_PROCESSES, :message => "Value chosen for aggregated_by is not valid process"
     validates_uniqueness_of :reputation_name, :scope => [:target_id, :target_type]
 
+    serialize :data, Hash
+
     def self.find_by_reputation_name_and_target(reputation_name, target)
       target_type = get_target_type_for_sti(target, reputation_name)
       ReputationSystem::Reputation.find_by_reputation_name_and_target_id_and_target_type(reputation_name.to_s, target.id, target_type)
@@ -66,7 +66,11 @@ module ReputationSystem
       when :product
         rep.value *= (newValue * weight)
       else
-        raise ArgumentError, "#{process} process is not supported yet"
+        if source.target.respond_to?(process)
+          rep.value = source.target.send(process, rep, source, weight)
+        else
+          raise ArgumentError, "#{process} process is not supported yet"
+        end
       end
       save_succeeded = rep.save
       ReputationSystem::ReputationMessage.add_reputation_message_if_not_exist(source, rep)
@@ -90,7 +94,11 @@ module ReputationSystem
         when :product
           rep.value = (rep.value * newValue) / oldValue
         else
-          raise ArgumentError, "#{process} process is not supported yet"
+          if source.target.respond_to?(process)
+            rep.value = source.target.send(process, rep, source, weight, oldValue, newSize)
+          else
+            raise ArgumentError, "#{process} process is not supported yet"
+          end
         end
       end
       save_succeeded = rep.save
@@ -175,13 +183,11 @@ module ReputationSystem
       end
 
       def self.max(reputation_name, target_type)
-        ReputationSystem::Reputation.maximum(:value,
-                             :conditions => {:reputation_name => reputation_name.to_s, :target_type => target_type, :active => true})
+        ReputationSystem::Reputation.where(:reputation_name => reputation_name.to_s, :target_type => target_type, :active => true).maximum(:value)
       end
 
       def self.min(reputation_name, target_type)
-        ReputationSystem::Reputation.minimum(:value,
-                             :conditions => {:reputation_name => reputation_name.to_s, :target_type => target_type, :active => true})
+        ReputationSystem::Reputation.where(:reputation_name => reputation_name.to_s, :target_type => target_type, :active => true).minimum(:value)
       end
 
       def self.get_target_type_for_sti(target, reputation_name)

data/lib/reputation_system/models/reputation_message.rb

@@ -44,6 +44,6 @@ module ReputationSystem
           errors.add(:sender, "must be an evaluation or a reputation")
         end
       end
-        
+
   end
 end

data/lib/reputation_system/reputation_methods.rb

@@ -25,21 +25,21 @@ module ReputationSystem
     end
 
     def activate_all_reputations
-      ReputationSystem::Reputation.find(:all, :conditions => {:target_id => self.id, :target_type => self.class.name, :active => false}).each do |r|
+      ReputationSystem::Reputation.where(:target_id => self.id, :target_type => self.class.name, :active => false).each do |r|
         r.active = true
         r.save!
       end
     end
 
     def deactivate_all_reputations
-      ReputationSystem::Reputation.find(:all, :conditions => {:target_id => self.id, :target_type => self.class.name, :active => true}).each do |r|
+      ReputationSystem::Reputation.where(:target_id => self.id, :target_type => self.class.name, :active => true).each do |r|
         r.active = false
         r.save!
       end
     end
 
     def reputations_activated?(reputation_name)
-      r = ReputationSystem::Reputation.find(:first, :conditions => {:reputation_name => reputation_name.to_s, :target_id => self.id, :target_type => self.class.name})
+      r = ReputationSystem::Reputation.where(:reputation_name => reputation_name.to_s, :target_id => self.id, :target_type => self.class.name).first
       r ? r.active : false
     end
 

data/lib/reputation_system/version.rb

@@ -15,5 +15,5 @@
 ##
 
 module ReputationSystem
-  VERSION = "2.0.2"
+  VERSION = "3.0.0"
 end

data/spec/reputation_system/evaluation_methods_spec.rb

@@ -30,20 +30,20 @@ describe ReputationSystem::EvaluationMethods do
       it "should return false if it has not already been evaluated by a given source" do
         user = User.create! :name => 'katsuya'
         @question.add_evaluation(:total_votes, 3, user)
-        @question.has_evaluation?(:total_votes, @user).should be_false
+        @question.has_evaluation?(:total_votes, @user).should be false
       end
       it "should return true if it has been evaluated by a given source" do
         @question.add_evaluation(:total_votes, 3, @user)
-        @question.has_evaluation?(:total_votes, @user).should be_true
+        @question.has_evaluation?(:total_votes, @user).should be true
       end
       context "With Scopes" do
         it "should return false if it has not already been evaluated by a given source" do
           @phrase.add_evaluation(:difficulty_with_scope, 3, @user, :s1)
-          @phrase.has_evaluation?(:difficulty_with_scope, @user, :s2).should be_false
+          @phrase.has_evaluation?(:difficulty_with_scope, @user, :s2).should be false
         end
         it "should return true if it has been evaluated by a given source" do
           @phrase.add_evaluation(:difficulty_with_scope, 3, @user, :s1)
-          @phrase.has_evaluation?(:difficulty_with_scope, @user, :s1).should be_true
+          @phrase.has_evaluation?(:difficulty_with_scope, @user, :s1).should be true
         end
       end
     end
@@ -57,9 +57,9 @@ describe ReputationSystem::EvaluationMethods do
         user2 = User.create!(:name => 'katsuya')
         question2 = Question.create!(:text => 'Question 2', :author_id => @user.id)
         question3 = Question.create!(:text => 'Question 3', :author_id => @user.id)
-        @question.add_evaluation(:total_votes, 1, @user).should be_true
-        question2.add_evaluation(:total_votes, 2, user2).should be_true
-        question3.add_evaluation(:total_votes, 3, @user).should be_true
+        @question.add_evaluation(:total_votes, 1, @user).should be true
+        question2.add_evaluation(:total_votes, 2, user2).should be true
+        question3.add_evaluation(:total_votes, 3, @user).should be true
         Question.evaluated_by(:total_votes, @user).should == [@question, question3]
         Question.evaluated_by(:total_votes, user2).should == [question2]
       end
@@ -68,14 +68,14 @@ describe ReputationSystem::EvaluationMethods do
         it "should return an array of targets evaluated by a given source on appropriate scope" do
           user2 = User.create!(:name => 'katsuya')
           phrase2 = Phrase.create!(:text => "Two")
-          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 3, user2, :s2).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 4, user2, :s3).should be_true
-          phrase2.add_evaluation(:difficulty_with_scope, 1, user2, :s1).should be_true
-          phrase2.add_evaluation(:difficulty_with_scope, 2, user2, :s2).should be_true
-          phrase2.add_evaluation(:difficulty_with_scope, 3, @user, :s2).should be_true
-          phrase2.add_evaluation(:difficulty_with_scope, 4, @user, :s3).should be_true
+          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 3, user2, :s2).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 4, user2, :s3).should be true
+          phrase2.add_evaluation(:difficulty_with_scope, 1, user2, :s1).should be true
+          phrase2.add_evaluation(:difficulty_with_scope, 2, user2, :s2).should be true
+          phrase2.add_evaluation(:difficulty_with_scope, 3, @user, :s2).should be true
+          phrase2.add_evaluation(:difficulty_with_scope, 4, @user, :s3).should be true
           Phrase.evaluated_by(:difficulty_with_scope, @user, :s1).should == [@phrase]
           Phrase.evaluated_by(:difficulty_with_scope, user2, :s1).should == [phrase2]
           Phrase.evaluated_by(:difficulty_with_scope, @user, :s2).should == [@phrase, phrase2]
@@ -94,9 +94,9 @@ describe ReputationSystem::EvaluationMethods do
       it "should return an array of sources evaluated the target" do
         user2 = User.create!(:name => 'katsuya')
         question2 = Question.create!(:text => 'Question 2', :author_id => @user.id)
-        @question.add_evaluation(:total_votes, 1, @user).should be_true
-        question2.add_evaluation(:total_votes, 1, @user).should be_true
-        question2.add_evaluation(:total_votes, 2, user2).should be_true
+        @question.add_evaluation(:total_votes, 1, @user).should be true
+        question2.add_evaluation(:total_votes, 1, @user).should be true
+        question2.add_evaluation(:total_votes, 2, user2).should be true
         @question.evaluators_for(:total_votes).should == [@user]
         question2.evaluators_for(:total_votes).should == [@user, user2]
       end
@@ -104,10 +104,10 @@ describe ReputationSystem::EvaluationMethods do
       context "With Scopes" do
         it "should return an array of targets evaluated by a given source on appropriate scope" do
           user2 = User.create!(:name => 'katsuya')
-          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 3, user2, :s2).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 4, user2, :s3).should be_true
+          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 3, user2, :s2).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 4, user2, :s3).should be true
           @phrase.evaluators_for(:difficulty_with_scope, :s1).should == [@user]
           @phrase.evaluators_for(:difficulty_with_scope, :s2).should == [@user, user2]
           @phrase.evaluators_for(:difficulty_with_scope, :s3).should == [user2]
@@ -117,7 +117,7 @@ describe ReputationSystem::EvaluationMethods do
 
     describe "#add_evaluation" do
       it "should create evaluation in case of valid input" do
-        @question.add_evaluation(:total_votes, 1, @user).should be_true
+        @question.add_evaluation(:total_votes, 1, @user).should be true
         @question.reputation_for(:total_votes).should == 1
       end
 
@@ -142,8 +142,8 @@ describe ReputationSystem::EvaluationMethods do
 
       context "with scopes" do
         it "should add evaluation on appropriate scope" do
-          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
+          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 1
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 2
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
@@ -161,30 +161,30 @@ describe ReputationSystem::EvaluationMethods do
 
     describe "#add_or_update_evaluation" do
       it "should create evaluation if it does not exist" do
-        @question.add_or_update_evaluation(:total_votes, 1, @user).should be_true
+        @question.add_or_update_evaluation(:total_votes, 1, @user).should be true
         @question.reputation_for(:total_votes).should == 1
       end
 
       it "should update evaluation if it exists already" do
         @question.add_evaluation(:total_votes, 1, @user)
-        @question.add_or_update_evaluation(:total_votes, 2, @user).should be_true
+        @question.add_or_update_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == 2
       end
 
       context "with scopes" do
         it "should add evaluation on appropriate scope if it does not exist" do
-          @phrase.add_or_update_evaluation(:difficulty_with_scope, 1, @user, :s1).should be_true
-          @phrase.add_or_update_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
+          @phrase.add_or_update_evaluation(:difficulty_with_scope, 1, @user, :s1).should be true
+          @phrase.add_or_update_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 1
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 2
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
         end
 
         it "should update evaluation on appropriate scope if it exists already" do
-          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be_true
-          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
-          @phrase.add_or_update_evaluation(:difficulty_with_scope, 3, @user, :s1).should be_true
-          @phrase.add_or_update_evaluation(:difficulty_with_scope, 5, @user, :s2).should be_true
+          @phrase.add_evaluation(:difficulty_with_scope, 1, @user, :s1).should be true
+          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
+          @phrase.add_or_update_evaluation(:difficulty_with_scope, 3, @user, :s1).should be true
+          @phrase.add_or_update_evaluation(:difficulty_with_scope, 5, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 3
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 5
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
@@ -208,7 +208,7 @@ describe ReputationSystem::EvaluationMethods do
       end
 
       it "should update evaluation in case of valid input" do
-        @question.update_evaluation(:total_votes, 2, @user).should be_true
+        @question.update_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == 2
       end
 
@@ -226,11 +226,11 @@ describe ReputationSystem::EvaluationMethods do
 
       context "With Scopes" do
         before :each do
-          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be_true
+          @phrase.add_evaluation(:difficulty_with_scope, 2, @user, :s2).should be true
         end
 
         it "should update evaluation on appropriate scope" do
-          @phrase.update_evaluation(:difficulty_with_scope, 5, @user, :s2).should be_true
+          @phrase.update_evaluation(:difficulty_with_scope, 5, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 0
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 5
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
@@ -296,7 +296,7 @@ describe ReputationSystem::EvaluationMethods do
       end
 
       it "should delete evaluation in case of valid input" do
-        @question.delete_evaluation(:total_votes, @user).should be_true
+        @question.delete_evaluation(:total_votes, @user).should be true
         @question.reputation_for(:total_votes).should == 0
       end
 
@@ -305,7 +305,7 @@ describe ReputationSystem::EvaluationMethods do
       end
 
       it "should return false if evaluation does not exist" do
-        @answer.delete_evaluation(:avg_rating, @user).should be_false
+        @answer.delete_evaluation(:avg_rating, @user).should be false
       end
 
       context "With Scopes" do
@@ -314,7 +314,7 @@ describe ReputationSystem::EvaluationMethods do
         end
 
         it "should delete evaluation on appropriate scope" do
-          @phrase.delete_evaluation(:difficulty_with_scope, @user, :s2).should be_true
+          @phrase.delete_evaluation(:difficulty_with_scope, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 0
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 0
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
@@ -332,13 +332,13 @@ describe ReputationSystem::EvaluationMethods do
 
     describe "#increase_evaluation" do
       it "should add evaluation if it does not exist" do
-        @question.increase_evaluation(:total_votes, 2, @user).should be_true
+        @question.increase_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == 2
       end
 
       it "should increase evaluation if it exists already" do
         @question.add_evaluation(:total_votes, 1, @user)
-        @question.increase_evaluation(:total_votes, 2, @user).should be_true
+        @question.increase_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == 3
       end
 
@@ -348,7 +348,7 @@ describe ReputationSystem::EvaluationMethods do
         end
 
         it "should increase evaluation on appropriate scope" do
-          @phrase.increase_evaluation(:difficulty_with_scope, 5, @user, :s2).should be_true
+          @phrase.increase_evaluation(:difficulty_with_scope, 5, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 0
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == 7
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0
@@ -358,13 +358,13 @@ describe ReputationSystem::EvaluationMethods do
 
     describe "#decrease_evaluation" do
       it "should add evaluation if it does not exist" do
-        @question.decrease_evaluation(:total_votes, 2, @user).should be_true
+        @question.decrease_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == -2
       end
 
       it "should increase evaluation if it exists already" do
         @question.add_evaluation(:total_votes, 1, @user)
-        @question.decrease_evaluation(:total_votes, 2, @user).should be_true
+        @question.decrease_evaluation(:total_votes, 2, @user).should be true
         @question.reputation_for(:total_votes).should == -1
       end
 
@@ -374,7 +374,7 @@ describe ReputationSystem::EvaluationMethods do
         end
 
         it "should decrease evaluation on appropriate scope" do
-          @phrase.decrease_evaluation(:difficulty_with_scope, 5, @user, :s2).should be_true
+          @phrase.decrease_evaluation(:difficulty_with_scope, 5, @user, :s2).should be true
           @phrase.reputation_for(:difficulty_with_scope, :s1).should == 0
           @phrase.reputation_for(:difficulty_with_scope, :s2).should == -3
           @phrase.reputation_for(:difficulty_with_scope, :s3).should == 0

data/spec/reputation_system/finder_methods_spec.rb

@@ -177,6 +177,7 @@ describe ReputationSystem::FinderMethods do
         "FROM \"questions\" JOIN users ON questions.author_id = users.id "\
         "LEFT JOIN rs_reputations ON questions.id = rs_reputations.target_id AND rs_reputations.target_type = 'Question' AND rs_reputations.reputation_name = 'total_votes' AND rs_reputations.active = 't' "\
         "WHERE (COALESCE(rs_reputations.value, 0) > 0.6) "\
+        " " if ActiveRecord::VERSION::STRING >= '4' \
         "ORDER BY total_votes"
     end
   end

data/spec/reputation_system/models/evaluation_spec.rb

@@ -59,4 +59,12 @@ describe ReputationSystem::Evaluation do
       ReputationSystem::ReputationMessage.find_by_sender_id_and_sender_type(evaluation.id, evaluation.class.name).should be_nil
     end
   end
+
+  context "Additional Data" do
+    it "should have data as a serialized field" do
+      @attributes = {:reputation_name => 'total_votes', :source => @user, :target => @question, :value => 1}
+      e = ReputationSystem::Evaluation.create!(@attributes)
+      e.data.should be_a(Hash)
+    end
+  end
 end

data/spec/reputation_system/models/reputation_spec.rb

@@ -46,8 +46,12 @@ describe ReputationSystem::Reputation do
       ReputationSystem::Reputation.create(:reputation_name => "karma3", :target_id => @user.id, :target_type => @user.class.to_s, :aggregated_by => 'product').should be_valid
     end
 
-    it "should not be able to create reputation with process other than 'sum', 'average' and 'product'" do
-      ReputationSystem::Reputation.create(:reputation_name => "karma", :target_id => @user.id, :target_type => @user.class.to_s, :aggregated_by => 'invalid').should_not be_valid
+    it "should be able to create reputation with custom process" do
+      ReputationSystem::Reputation.create(:reputation_name => "karma", :target_id => @user.id, :target_type => @user.class.to_s, :aggregated_by => 'custom_process').should be_valid
+    end
+
+   it "should be able to create reputation with custom process from source" do
+      ReputationSystem::Reputation.create(:reputation_name => "custom_rating", :target_id => @user.id, :target_type => @user.class.to_s, :aggregated_by => 'custom_rating').should be_valid
     end
 
     it "should not be able to create reputation of the same name for the same target" do
@@ -133,4 +137,31 @@ describe ReputationSystem::Reputation do
       answer.reputation_for(:avg_rating).should be_within(DELTA).of(3)
     end
   end
+
+  describe "custom aggregation function" do
+    it "should calculate based on a custom function for new source" do
+      user1 = User.create! :name => 'dick'
+      user2 = User.create! :name => 'katsuya'
+      answer = Answer.create!
+      answer.add_or_update_evaluation(:custom_rating, 3, user1)
+      answer.add_or_update_evaluation(:custom_rating, 2, user2)
+      answer.reputation_for(:custom_rating).should be_within(DELTA).of(50)
+    end
+
+    it "should calculate based on a custom function for updated source" do
+      user1 = User.create! :name => 'dick'
+      user2 = User.create! :name => 'katsuya'
+      answer = Answer.create!
+      answer.add_or_update_evaluation(:custom_rating, 3, user1)
+      answer.add_or_update_evaluation(:custom_rating, 2, user1)
+      answer.reputation_for(:custom_rating).should be_within(DELTA).of(20)
+    end
+  end
+
+  describe "additional data" do
+    it "should have data as a serialized field" do
+      r = ReputationSystem::Reputation.create!(:reputation_name => "karma", :target_id => @user.id, :target_type => @user.class.to_s, :aggregated_by => 'sum')
+      r.data.should be_a(Hash)
+    end
+  end
 end

data/spec/reputation_system/reputation_methods_spec.rb

@@ -153,9 +153,9 @@ describe ReputationSystem::ReputationMethods do
         @question2.add_evaluation(:total_votes, 70, @user)
         @question.add_evaluation(:total_votes, 100, @user)
         @question.deactivate_all_reputations
-        ReputationSystem::Reputation.maximum(:value, :conditions => {:reputation_name => 'total_votes', :active => true}).should == 70
+        ReputationSystem::Reputation.where(:reputation_name => 'total_votes', :active => true).maximum(:value).should == 70
         @question.activate_all_reputations
-        ReputationSystem::Reputation.maximum(:value, :conditions => {:reputation_name => 'total_votes', :active => true}).should == 100
+        ReputationSystem::Reputation.where(:reputation_name => 'total_votes', :active => true).maximum(:value).should == 100
       end
     end
   end

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ ActiveRecord::Schema.define do
     t.references  :source, :polymorphic => true
     t.references  :target, :polymorphic => true
     t.float       :value, :default => 0
+    t.text        :data
     t.timestamps
   end
 
@@ -56,6 +57,7 @@ ActiveRecord::Schema.define do
     t.string      :aggregated_by
     t.references  :target, :polymorphic => true
     t.boolean     :active, :default => true
+    t.text        :data
     t.timestamps
   end
 
@@ -132,6 +134,14 @@ class User < ActiveRecord::Base
   has_reputation :answer_karma,
     :source => { :reputation => :weighted_avg_rating, :of => :answers },
     :aggregated_by => :average
+
+  has_reputation :custom_rating,
+    :source => { :reputation => :custom_rating, :of => :answers },
+    :aggregated_by => :custom_rating
+
+  def custom_process
+    123
+  end
 end
 
 class Question < ActiveRecord::Base
@@ -161,12 +171,29 @@ class Answer < ActiveRecord::Base
   has_reputation :avg_rating,
     :source => :user,
     :aggregated_by => :average
+
+  has_reputation :custom_rating,
+    :source => :user,
+    :aggregated_by => :custom_aggregation,
+    :source_of => { :reputation => :custom_rating, :of => :author }
+
+  def custom_aggregation(*args)
+    rep, source, weight = args[0..2]
+    # rep, source, weight
+    if args.length === 3
+      rep.value + weight * source.value * 10
+    # rep, source, weight, oldValue, newSize
+    elsif args.length === 5
+      oldValue, newSize = args[3..4]
+      rep.value + (source.value - oldValue) * 10
+    end
+  end
 end
 
 class Phrase < ActiveRecord::Base
   has_many :translations do
     def for(locale)
-      self.find_all_by_locale(locale.to_s)
+      self.where(:locale => locale.to_s).to_a
     end
   end
 

metadata

@@ -1,52 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-reputation-system
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Katsuya Noguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,39 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -120,6 +121,8 @@ files:
 - Rakefile
 - lib/activerecord-reputation-system.rb
 - lib/generators/reputation_system/reputation_system_generator.rb
+- lib/generators/reputation_system/templates/add_data_to_evaluations.rb
+- lib/generators/reputation_system/templates/add_data_to_reputations.rb
 - lib/generators/reputation_system/templates/add_evaluations_index.rb
 - lib/generators/reputation_system/templates/add_reputation_messages_index.rb
 - lib/generators/reputation_system/templates/add_reputations_index.rb
@@ -127,6 +130,7 @@ files:
 - lib/generators/reputation_system/templates/change_reputation_messages_index_to_unique.rb
 - lib/generators/reputation_system/templates/change_reputations_index_to_unique.rb
 - lib/generators/reputation_system/templates/create_reputation_system.rb
+- lib/reputation_system.rb
 - lib/reputation_system/base.rb
 - lib/reputation_system/evaluation_methods.rb
 - lib/reputation_system/finder_methods.rb
@@ -139,7 +143,6 @@ files:
 - lib/reputation_system/reputation_methods.rb
 - lib/reputation_system/scope_methods.rb
 - lib/reputation_system/version.rb
-- lib/reputation_system.rb
 - spec/reputation_system/base_spec.rb
 - spec/reputation_system/evaluation_methods_spec.rb
 - spec/reputation_system/finder_methods_spec.rb
@@ -152,27 +155,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/twitter/activerecord-reputation-system
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord Reputation System gem allows rails apps to compute and publish
   reputation scores for active record models
 test_files: []