app/models/tr8n/translator_metric.rb in tr8n-3.1.1 vs app/models/tr8n/translator_metric.rb in tr8n-3.1.2

@@ -1,7 +1,7 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich, tr8n.net
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
@@ -25,55 +25,49 @@
   set_table_name :tr8n_translator_metrics
 
   belongs_to :translator, :class_name => "Tr8n::Translator"
   belongs_to :language, :class_name => "Tr8n::Language"
   
-  def self.find_or_create(translator, language)
-    if language
-      tm = find(:first, :conditions => ["translator_id = ? and language_id = ?", translator.id, language.id])
-    else
-      tm = find(:first, :conditions => ["translator_id = ? and language_id is null", translator.id])
-    end
+  def self.find_or_create(translator, language = nil)
+    tm = where("translator_id = ?", translator.id)
+    tm = where("language_id = ?", language.id) if language
+    return tm.first if tm.first
     
-    return tm if tm
     create(:translator => translator, :language => language, :total_translations => 0, :total_votes => 0, :positive_votes => 0, :negative_votes => 0)
   end
   
   # updated when an action is done by the translator
   def update_metrics!
     if language
-      self.total_translations = Tr8n::Translation.count(:conditions=>["translator_id = ? and language_id = ?", translator.id, language.id])
-      self.total_votes = Tr8n::TranslationVote.count(:conditions=>["tr8n_translation_votes.translator_id = ? and tr8n_translations.language_id = ?", translator.id, language.id], 
-                                               :joins => "INNER JOIN tr8n_translations ON tr8n_translations.id = tr8n_translation_votes.translation_id")
-      self.positive_votes = Tr8n::TranslationVote.count(:conditions=>["tr8n_translation_votes.translator_id = ? and tr8n_translation_votes.vote > 0 and tr8n_translations.language_id = ?", translator.id, language.id],
-                                               :joins => "INNER JOIN tr8n_translations ON tr8n_translations.id = tr8n_translation_votes.translation_id")
+      self.total_translations = Tr8n::Translation.where("translator_id = ? and language_id = ?", translator.id, language.id).count
+      self.total_votes = Tr8n::TranslationVote.where("tr8n_translation_votes.translator_id = ? and tr8n_translations.language_id = ?", translator.id, language.id).joins(:translation).count
+      self.positive_votes = Tr8n::TranslationVote.where("tr8n_translation_votes.translator_id = ? and tr8n_translation_votes.vote > 0 and tr8n_translations.language_id = ?", translator.id, language.id).joins(:translation).count
       self.negative_votes = self.total_votes - self.positive_votes
     else
-      self.total_translations = Tr8n::Translation.count(:conditions=>["translator_id = ?", translator.id])
-      self.total_votes = Tr8n::TranslationVote.count(:conditions=>["translator_id = ?", translator.id])
-      self.positive_votes = Tr8n::TranslationVote.count(:conditions=>["translator_id = ? and vote > 0", translator.id])
+      self.total_translations = Tr8n::Translation.where("translator_id = ?", translator.id).count
+      self.total_votes = Tr8n::TranslationVote.where("translator_id = ?", translator.id).count
+      self.positive_votes = Tr8n::TranslationVote.where("translator_id = ? and vote > 0", translator.id).count
       self.negative_votes = self.total_votes - self.positive_votes
     end
     
     save
   end
   
   # updated when an action is done to the translator's translations
   def update_rank!
     if language
-      self.accepted_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and language_id = ? and rank >= ?", translator.id, language.id, Tr8n::Config.translation_threshold])
-      self.rejected_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and language_id = ? and rank < ?", translator.id, language.id, 0])
+      self.accepted_translations = Tr8n::Translation.where("translator_id = ? and language_id = ? and rank >= ?", translator.id, language.id, Tr8n::Config.translation_threshold).count
+      self.rejected_translations = Tr8n::Translation.where("translator_id = ? and language_id = ? and rank < ?", translator.id, language.id, 0).count
     else
-      self.accepted_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and rank >= ?", translator.id, Tr8n::Config.translation_threshold])
-      self.rejected_translations = Tr8n::Translation.count(:conditions => ["translator_id = ? and rank < ?", translator.id, 0])
+      self.accepted_translations = Tr8n::Translation.where("translator_id = ? and rank >= ?", translator.id, Tr8n::Config.translation_threshold).count
+      self.rejected_translations = Tr8n::Translation.where("translator_id = ? and rank < ?", translator.id, 0).count
     end
     
     save
   end  
   
   def rank 
     return 0 unless total_translations and accepted_translations
-    
     total_translations == 0 ? 0 : (accepted_translations * 100.0/total_translations)
   end
   
   def pending_vote_translations
     return total_translations unless accepted_translations and rejected_translations