air18n 0.1.24 → 0.1.25

data/lib/air18n/phrase_translation.rb

@@ -56,10 +56,31 @@ module Air18n
       all_locales
     end
 
+    def self.translator_activity_data_master(user_id = 0)
+      d = Date.today.beginning_of_month
+      activities = []
+
+      while true
+        if d < Date.new(2012, 8, 02)
+          activity_for_month = translator_activity_data(user_id, :since => d, :to => (d >> 1), :enumerate_keys => false)
+        else
+          activity_for_month = translator_activity_data_new(user_id, :since => d, :to => (d >> 1), :enumerate_keys => false)
+        end
+
+        break if activity_for_month.blank? && d < (Date.today - 3.years)
+
+        activities += activity_for_month
+        d = d << 1
+      end
+
+      activities
+    end
+
     def self.translator_activity_data user_id=0, opts={}
       user_criterion = user_id > 0 ? "AND pt.user_id=#{user_id}" : "AND NOT pt.user_id=0"
-      since_criterion = "AND pt.created_at >= '#{opts[:since].to_formatted_s(:db)}}'" if opts[:since]
-      sql = "SELECT year(pt.created_at) year, month(pt.created_at) month, pt.user_id user_id, pt.locale locale, day(pt.created_at) day, p.id phrase_id, p.value phrase_value, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} GROUP BY year(pt.created_at), month(pt.created_at), pt.user_id, pt.locale, pt.phrase_id"
+      since_criterion = "AND pt.created_at >= '#{opts[:since].to_formatted_s(:db)}'" if opts[:since]
+      to_criterion = "AND pt.created_at < '#{opts[:to].to_formatted_s(:db)}'" if opts[:to]
+      sql = "SELECT #{created_at_year_sql} year, #{created_at_month_sql} month, pt.user_id user_id, pt.locale locale, #{created_at_day_sql} day, p.id phrase_id, p.value phrase_value, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} #{to_criterion} GROUP BY #{created_at_year_sql}, #{created_at_month_sql}, pt.user_id, pt.locale, pt.phrase_id"
       res = self.connection.select_rows(sql)
       phrases_per_user_locale_month_year =
         Hash.new {|h, year| h[year] =
@@ -73,8 +94,8 @@ module Air18n
 
       res.each do |row|
         year, month, user_id, locale, day, phrase_id, phrase_value, is_verification = row
-        is_verification = (is_verification == 1)
-        phrases_per_user_locale_month_year[year][month][user_id][locale][day][is_verification].merge!({phrase_id => phrase_value})
+        is_verification = (is_verification == 1 || is_verification == 't')
+        phrases_per_user_locale_month_year[year.to_i][month.to_i][user_id][locale][day.to_i][is_verification].merge!({phrase_id => phrase_value})
       end
 
       activities = []
@@ -133,8 +154,9 @@ module Air18n
 
     def self.translator_activity_data_new user_id=0, opts={}
       user_criterion = user_id > 0 ? "AND pt.user_id=#{user_id}" : "AND NOT pt.user_id=0"
-      since_criterion = "AND pt.created_at >= '#{opts[:since].to_formatted_s(:db)}}'" if opts[:since]
-      sql = "SELECT year(pt.created_at) year, month(pt.created_at) month, pt.user_id user_id, pt.locale locale, day(pt.created_at) day, p.id phrase_id, pt.source_word_count source_word_count, pt.key, pt.source_hash source_hash, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} GROUP BY year(pt.created_at), month(pt.created_at), pt.user_id, pt.locale, pt.phrase_id, pt.source_hash, pt.is_verification"
+      since_criterion = "AND pt.created_at >= '#{opts[:since].to_formatted_s(:db)}'" if opts[:since]
+      to_criterion = "AND pt.created_at < '#{opts[:to].to_formatted_s(:db)}'" if opts[:to]
+      sql = "SELECT #{created_at_year_sql} year, #{created_at_month_sql} month, pt.user_id user_id, pt.locale locale, #{created_at_day_sql} day, p.id phrase_id, pt.source_word_count source_word_count, pt.key, pt.source_hash source_hash, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} #{to_criterion} GROUP BY #{created_at_year_sql}, #{created_at_month_sql}, pt.user_id, pt.locale, pt.phrase_id, pt.source_hash, pt.is_verification"
       res = self.connection.select_rows(sql)
       phrases_per_user_locale_month_year =
         Hash.new {|h, year| h[year] =
@@ -148,8 +170,8 @@ module Air18n
 
       res.each do |row|
         year, month, user_id, locale, day, phrase_id, source_word_count, key, source_hash, is_verification = row
-        is_verification = (is_verification == 1)
-        phrases_per_user_locale_month_year[year][month][user_id][locale][day][is_verification].merge!({[key, source_hash] => source_word_count})
+        is_verification = (is_verification == 1 || is_verification == 't')
+        phrases_per_user_locale_month_year[year.to_i][month.to_i][user_id][locale][day.to_i][is_verification].merge!({[key, source_hash] => source_word_count})
       end
 
       activities = []
@@ -388,7 +410,6 @@ module Air18n
 
       locales.each do |locale|
         # Output progress to console in case of running this on console.
-        puts "Resetting flags for #{locale}..."
         latest_translations = PhraseTranslation.select("max(id) as max_id").where("locale='#{locale}'").group(:phrase_id).collect{|e| e.max_id}.to_set
 
         PhraseTranslation.where(:locale => locale).find_each do |translation|
@@ -424,5 +445,17 @@ module Air18n
     def quote_vars(vars)
       vars.map { |var| "%{#{var}}" }.join(", ")
     end
+
+    def self.created_at_day_sql
+      Air18n::PhraseTranslation.connection.adapter_name.starts_with?('Mysql') ? 'DAY(pt.created_at)' : 'STRFTIME("%d", pt.created_at)'
+    end
+
+    def self.created_at_month_sql
+      Air18n::PhraseTranslation.connection.adapter_name.starts_with?('Mysql') ? 'MONTH(pt.created_at)' : 'STRFTIME("%m", pt.created_at)'
+    end
+
+    def self.created_at_year_sql
+      Air18n::PhraseTranslation.connection.adapter_name.starts_with?('Mysql') ? 'YEAR(pt.created_at)' : 'STRFTIME("%Y", pt.created_at)'
+    end
   end
 end

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -132,4 +132,113 @@ describe Air18n::PhraseTranslation do
     end
   end
 
+  context 'word counts' do
+    it 'should keep track of translated and verified word count in new regime' do
+      @user1 = 1
+      @user2 = 2
+      @phrase1 = FactoryGirl.create(:phrase, :key => 'old regime key 1', :value => 'two words')
+      @phrase2 = FactoryGirl.create(:phrase, :key => 'old regime key 2', :value => 'three long words')
+
+      without_timestamping_of Air18n::PhraseTranslation do
+        translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user_id => @user1, :created_at => Date.new(2012, 05, 01))
+        other_phrase_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase2, :user_id => @user1, :created_at => Date.new(2012, 05, 02))
+        other_user_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user_id => @user2, :created_at => Date.new(2012, 05, 03))
+        phrase_verification = FactoryGirl.create(:phrase_translation, :phrase => @phrase2, :user_id => @user2, :is_verification => true, :created_at => Date.new(2012, 05, 04))
+      end
+
+      data = Air18n::PhraseTranslation.translator_activity_data_master
+
+      data.should include(
+        {:year=>2012,
+          :month=>5,
+          :locale=>"es",
+          :user_id=>1,
+          :activity=>
+           {:num_translations=>2,
+            :word_count_translations=>5,
+            :num_verifications=>0,
+            :word_count_verifications=>0,
+            :num_phrases_prev_translated=>2}}
+      )
+
+      data.should include(
+        {:year=>2012,
+          :month=>5,
+          :locale=>"es",
+          :user_id=>2,
+          :activity=>
+           {:num_translations=>1,
+            :word_count_translations=>2,
+            :num_verifications=>1,
+            :word_count_verifications=>3,
+            :num_phrases_prev_translated=>1}}
+      )
+    end
+
+
+    it 'should keep track of translated and verified word count in new regime' do
+      @user1 = 3
+      @user2 = 4
+      @phrase1 = FactoryGirl.create(:phrase, :value => 'two words')
+      @phrase2 = FactoryGirl.create(:phrase, :value => 'three long words')
+
+      without_timestamping_of Air18n::PhraseTranslation do
+        @phrase1.value = "one two three four five six seven eight"
+        @phrase1.save!
+        translation = FactoryGirl.create(:phrase_translation, :value => 'urgle burgle', :phrase => @phrase1, :user_id => @user1, :created_at => Date.new(2012, 10, 1))
+        translation_tweak = FactoryGirl.create(:phrase_translation, :value => 'urgle burgle boo', :phrase => @phrase1, :user_id => @user1, :created_at => 1.month.ago)
+        verification_by_other_user = FactoryGirl.create(:phrase_translation, :value => 'urgle burgle boo', :phrase => @phrase1, :user_id => @user2, :is_verification => true, :created_at => Date.new(2012, 10, 2))
+        @phrase1.value = "one two three four five six seven eight nine ten eleven twelve thirteen"
+        @phrase1.save!
+        retranslation = FactoryGirl.create(:phrase_translation, :value => 'oogie boogie boo', :phrase => @phrase1, :user_id => @user1, :source_hash => 'new default text', :source_word_count => 13, :created_at => Date.new(2012, 10, 3))
+        other_user_translation = FactoryGirl.create(:phrase_translation, :value => 'oogie boogie boo', :phrase => @phrase1, :user_id => @user2, :source_hash => 'new default text', :source_word_count => 13, :created_at => Date.new(2012, 10, 4))
+        verification = FactoryGirl.create(:phrase_translation, :value => 'oogie boogie boo', :phrase => @phrase1, :user_id => @user1, :source_hash => 'new default text', :source_word_count => 13, :is_verification => true, :created_at => Date.new(2012, 10, 5))
+      end
+
+      data = Air18n::PhraseTranslation.translator_activity_data_master
+
+      # Example Scenario:
+      #   Translator A translates phrase Y when it is 8 English words
+      #   Translator A tweaks translation of phrase Y
+      #   Translator B verifies translation of phrase Y
+      #   <English text of phrase Y changes to be 13 English words and translation becomes stale>
+      #   Translator A retranslates phrase Y
+      #   Translator B tweaks translation of phrase Y
+      #   Translator A verifies translation of phrase Y
+      # Payment:
+      #   Translator A is paid for translating phrase Y -- 8 words + 13 words = 21 words
+      #   Translator B is paid for verifying phrase Y -- 8 words
+      #   Translator B is paid for translating phrase Y -- 13 words
+
+      data.should include(
+        {:year=>2012,
+         :month=>10,
+         :locale=>"es",
+         :user_id=>3,
+         :activity=>
+          {:num_translations=>2,
+           :num_verifications=>0,
+           :word_count_translations=>21,
+           :word_count_verifications=>0,
+           :translated_keys=>
+            [["example.key.4", "38a72c02b5febe4975fdcf19d32e412d"],
+             ["example.key.4", "bef8ae7ec7a9d0145615a1dd8e902e43"]],
+           :verified_keys=>[]}}
+      )
+      data.should include(
+         {:year=>2012,
+          :month=>10,
+          :locale=>"es",
+          :user_id=>4,
+          :activity=>
+           {:num_translations=>1,
+            :num_verifications=>1,
+            :word_count_translations=>13,
+            :word_count_verifications=>8,
+            :translated_keys=>[["example.key.4", "bef8ae7ec7a9d0145615a1dd8e902e43"]],
+            :verified_keys=>[["example.key.4", "38a72c02b5febe4975fdcf19d32e412d"]]}}
+      )
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n