air18n 0.1.40 → 0.1.41

data/lib/air18n/phrase_translation.rb

@@ -337,10 +337,10 @@ module Air18n
     end
 
     def self.translator_activity_data_v3 user_id=0, opts={}
-      activity_from_translation_pairs(get_translation_pairs(user_id, opts[:since], opts[:to]), opts)
+      aggregate_v3_translation_activity(compute_v3_translation_activity(user_id, opts[:since], opts[:to]), opts)
     end
 
-    def self.activity_from_translation_pairs(translation_pairs, opts={})
+    def self.aggregate_v3_translation_activity(translation_pairs, opts={})
       per_user_locale_month_year =
         Hash.new {|h, year| h[year] =
           Hash.new {|h, month| h[month] =
@@ -356,16 +356,15 @@ module Air18n
       } } } } } }
 
       translation_pairs.each do |pair|
-        words_translated, words_verified = self.word_counts_from_translation_pair(pair)
         sums = per_user_locale_month_year[
           pair[:datetime].year][
           pair[:datetime].month][
           pair[:user_id]][
           pair[:locale]][
           pair[:datetime].day]
-        sums[:words_translated] += words_translated
-        sums[:words_verified] += words_verified
-        if words_verified > 0
+        sums[:words_translated] += pair[:words_translated]
+        sums[:words_verified] += pair[:words_verified]
+        if pair[:words_verified] > 0
           sums[:keys_verified] << pair[:phrase_key]
           sums[:phrases_verified] += 1
         else
@@ -397,9 +396,6 @@ module Air18n
                       :verified_keys => sums[:keys_verified],
                     }
                   }
-                  LoggingHelper.info("keys translated: #{sums[:keys_translated]}")
-                  LoggingHelper.info("keys verified: #{sums[:keys_verified]}")
-                  LoggingHelper.info("ret now: #{ret.inspect}")
                 end
               else
                 monthly_sums = {
@@ -429,9 +425,6 @@ module Air18n
                     :verified_keys => monthly_sums[:keys_verified],
                   }
                 }
-                LoggingHelper.info("keys translated: #{monthly_sums[:keys_translated]}")
-                LoggingHelper.info("keys verified: #{monthly_sums[:keys_verified]}")
-                LoggingHelper.info("ret now: #{ret.inspect}")
               end
             end
           end
@@ -485,7 +478,7 @@ module Air18n
        (translation_pair[:source_word_count] * proportion_verified).floor]
     end
 
-    def self.get_translation_pairs(user_id, from_date, to_date)
+    def self.compute_v3_translation_activity(user_id, from_date, to_date)
       ret = []
       Phrase.select(:id).find_in_batches do |batch|
         pt_scope = PhraseTranslation.where(:phrase_id => batch)
@@ -502,32 +495,68 @@ module Air18n
         phrase_to_phrase_translations.each do |(locale, phrase_id), phrase_translations|
           phrase_translations.sort_by! { |pt| pt.created_at }
 
-          previous_translation = PhraseTranslation.where("created_at < ?", phrase_translations.first.created_at - 1.second).
-                                                   where(:locale => locale).
-                                                   where(:phrase_id => phrase_id).
-                                                   order("created_at DESC").
-                                                   first
+          previous_translation = :uncomputed
+
           phrase_translations.each do |pt|
-            if previous_translation
-              previous_translation_text = previous_translation.value
-              previous_translation_user_id = previous_translation.user_id
-              was_stale = previous_translation.source_hash != pt.source_hash
+            translation_pair = {
+              :translation => pt.value,
+              :locale => pt.locale,
+              :user_id => pt.user_id,
+              :datetime => pt.created_at,
+              :source_word_count => pt.source_word_count,
+              :phrase_key => pt.key,
+            }
+
+            if pt.payment_details.present?
+              payment_details = JSON.parse(pt.payment_details)
             else
-              previous_translation_text = ''
-              previous_translation_user_id = 0
-              was_stale = false
+              payment_details = {}
             end
-            translation_text = pt.value
-            ret << { :translation => translation_text,
-                     :previous_translation => previous_translation_text,
-                     :was_stale => was_stale,
-                     :locale => pt.locale,
-                     :user_id => pt.user_id,
-                     :previous_user_id => previous_translation_user_id,
-                     :datetime => pt.created_at,
-                     :source_word_count => pt.source_word_count,
-                     :phrase_key => pt.key,
-                   }
+
+            if !payment_details.include?('v3')
+              # If we haven't computed v3 payment details already, compute them
+              # and then save details to the PhraseTranslation itself.
+
+              if previous_translation == :uncomputed
+                previous_translation = PhraseTranslation.
+                  where("created_at < ?", phrase_translations.first.created_at - 1.second).
+                  where(:locale => locale).
+                  where(:phrase_id => phrase_id).
+                  order("created_at DESC").
+                  first
+              end
+
+              if previous_translation
+                previous_translation_text = previous_translation.value
+                previous_translation_user_id = previous_translation.user_id
+                was_stale = previous_translation.source_hash != pt.source_hash
+              else
+                previous_translation_text = ''
+                previous_translation_user_id = 0
+                was_stale = false
+              end
+
+              words_translated, words_verified = self.word_counts_from_translation_pair(
+                translation_pair.merge(
+                  :previous_translation => previous_translation_text,
+                  :was_stale => was_stale,
+                  :previous_user_id => previous_translation_user_id,
+              ))
+
+              payment_details['v3'] = {
+                't' => words_translated,
+                'v' => words_verified
+              }
+
+              pt.payment_details = payment_details.to_json
+              LoggingHelper.info "saving payment details: "
+              pt.save
+            end
+
+            translation_pair[:words_translated] = payment_details['v3']['t']
+            translation_pair[:words_verified] = payment_details['v3']['v']
+
+            ret << translation_pair
 
             previous_translation = pt
           end

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.40"
+  VERSION = "0.1.41"
 end

data/lib/generators/air18n/migration/templates/active_record/migration.rb

@@ -40,6 +40,7 @@ class Air18nMigration < ActiveRecord::Migration
       t.boolean  "is_latest",                           :default => false
       t.integer  "source_word_count",                   :default => 0
       t.string   "source_hash"
+      t.text     "payment_details"
     end
 
     add_index "phrase_translations", ["locale", "is_latest", "is_stale", "is_verification"], :name => "index_phrase_translations_on_locale_and_flags"

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -374,54 +374,133 @@ describe Air18n::PhraseTranslation do
           ##### Phrase 1
 
           # User 1 translates Phrase 1 for the first time [edit of untranslated phrase]
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'urgle burgle', :phrase => @phrase1, :user_id => @user1, :created_at => Date.new(2012, 11, 1))
+          @translation_wih_precomputed_edits = FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'urgle burgle',
+            :phrase => @phrase1,
+            :user_id => @user1,
+            :created_at => Date.new(2012, 11, 1),
+            :payment_details => '{"v3":{"t":8,"v":0}}')
 
           # User 1 tweaks his own translation of Phrase 1. [edit of own unverified translation]
-          translation_tweak = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'urgle burgle boo', :phrase => @phrase1, :user_id => @user1, :created_at => Date.new(2012, 11, 2))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'urgle burgle boo',
+            :phrase => @phrase1,
+            :user_id => @user1,
+            :created_at => Date.new(2012, 11, 2))
 
           # User 2 verifies translation of Phrase 1. [pure verification]
-          verification_by_other_user = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'urgle burgle boo', :phrase => @phrase1, :user_id => @user2, :is_verification => true, :created_at => Date.new(2012, 11, 3))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'urgle burgle boo',
+            :phrase => @phrase1,
+            :user_id => @user2,
+            :is_verification => true,
+            :created_at => Date.new(2012, 11, 3))
 
           # Phrase 1 becomes stale.
           @phrase1.value = "one two three four five six seven eight nine ten eleven twelve thirteen"
           @phrase1.save!
 
           # User 1 reedits translation of Phrase 1. [edit of other's stale translation]
-          retranslation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'oogie boogie boo', :phrase => @phrase1, :user_id => @user1, :created_at => Date.new(2012, 11, 4))
+          @phrase_without_payment_details = FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'oogie boogie boo',
+            :phrase => @phrase1,
+            :user_id => @user1,
+            :created_at => Date.new(2012, 11, 4))
 
           # User 2 pure-verifies of Phrase 1.
-          other_user_translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'oogie boogie boo', :is_verification => true, :phrase => @phrase1, :user_id => @user2, :created_at => Date.new(2012, 11, 5))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'oogie boogie boo',
+            :is_verification => true,
+            :phrase => @phrase1,
+            :user_id => @user2,
+            :created_at => Date.new(2012, 11, 5))
 
           # User 1 edits verified translation of Phrase 1. [edit of other's verified translation]
-          verification = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'oogie booooogie boo hat ogl', :phrase => @phrase1, :user_id => @user1, :is_verification => true, :created_at => Date.new(2012, 11, 6))
+          FactoryGirl.create(:phrase_translation,
+            :locale => :de,
+            :value => 'oogie booooogie boo hat ogl',
+            :phrase => @phrase1,
+            :user_id => @user1,
+            :is_verification => true,
+            :created_at => Date.new(2012, 11, 6))
 
           ##### Phrase 2
 
           # User 1 translates Phrase 2 for the first time, but earlier in the year.
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'The only verdict is vengence', :phrase => @phrase2, :user_id => @user1, :created_at => Date.new(2012, 9, 1))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'The only verdict is vengence',
+            :phrase => @phrase2,
+            :user_id => @user1,
+            :created_at => Date.new(2012, 9, 1))
 
           # User 1 tweaks their own translation later.
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'The only verdict is VENGENCE', :phrase => @phrase2, :user_id => @user1, :created_at => Date.new(2012, 11, 1))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'The only verdict is VENGENCE',
+            :phrase => @phrase2,
+            :user_id => @user1,
+            :created_at => Date.new(2012, 11, 1))
 
           # User 2 tweaks translation of Phrase 2.
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'a vendetta, held as a votive', :is_verification => true, :phrase => @phrase2, :user_id => @user2, :created_at => Date.new(2012, 11, 2))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'a vendetta, held as a votive',
+            :is_verification => true,
+            :phrase => @phrase2,
+            :user_id => @user2,
+            :created_at => Date.new(2012, 11, 2))
 
           # User 2 tweaks their own translation of Phrase 2. [edit of own verified translation]
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'a vendetta, held as a votive, not in vain', :is_verification => true, :phrase => @phrase2, :user_id => @user2, :created_at => Date.new(2012, 11, 3))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'a vendetta, held as a votive, not in vain',
+            :is_verification => true,
+            :phrase => @phrase2,
+            :user_id => @user2,
+            :created_at => Date.new(2012, 11, 3))
 
           # Phrase 2 becomes stale.
           @phrase2.value = "one two three four five six seven eight nine"
           @phrase2.save!
 
           # User 2 verifies existing translation of Phrase 2. [pure verification of own stale translation]
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'a vendetta, held as a votive, not in vain', :is_verification => true, :phrase => @phrase2, :user_id => @user2, :created_at => Date.new(2012, 11, 4))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'a vendetta, held as a votive, not in vain',
+            :is_verification => true,
+            :phrase => @phrase2,
+            :user_id => @user2,
+            :created_at => Date.new(2012, 11, 4))
 
           # Phrase 2 becomes stale again.
           @phrase2.value = "one two three"
           @phrase2.save!
 
           # User 2 tweaks translation of Phrase 2. [pure verification of own stale translation]
-          translation = FactoryGirl.create(:phrase_translation, :locale => :de, :value => 'a vendetta, held as a votive, not in vain, for the value and veracity of such shall one day vindicate the vigilant and the virtuous', :is_verification => true, :phrase => @phrase2, :user_id => @user2, :created_at => Date.new(2012, 11, 5))
+          FactoryGirl.create(
+            :phrase_translation,
+            :locale => :de,
+            :value => 'a vendetta, held as a votive, not in vain, for the value and veracity of such shall one day vindicate the vigilant and the virtuous',
+            :is_verification => true,
+            :phrase => @phrase2,
+            :user_id => @user2,
+            :created_at => Date.new(2012, 11, 5))
         end
 
         @golden_pairs =
@@ -433,6 +512,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>0,
             :datetime=>Date.new(2012, 11, 01),
             :source_word_count=>8,
+            :words_translated=>8,  # "" -> "urgle burgle", user 5
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"urgle burgle boo",
             :previous_translation=>"urgle burgle",
@@ -442,6 +523,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>5,
             :datetime=>Date.new(2012, 11, 02),
             :source_word_count=>8,
+            :words_translated=>0,  # same translator making an edit, user 5
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"urgle burgle boo",
             :previous_translation=>"urgle burgle boo",
@@ -451,6 +534,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>5,
             :datetime=>Date.new(2012, 11, 03),
             :source_word_count=>8,
+            :words_translated=>0,  # different translator verifying, user 6
+            :words_verified=>8,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"oogie boogie boo",
             :previous_translation=>"urgle burgle boo",
@@ -460,6 +545,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>6,
             :datetime=>Date.new(2012, 11, 04),
             :source_word_count=>13,
+            :words_translated=>9,  # edit of stale phrase; 2/3 words changed, 2/3*13=8.66; ceils to 9, user 5
+            :words_verified=>4,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"oogie boogie boo",
             :previous_translation=>"oogie boogie boo",
@@ -469,6 +556,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>5,
             :datetime=>Date.new(2012, 11, 05),
             :source_word_count=>13,
+            :words_translated=>0,  # verification, user 6
+            :words_verified=>13,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"oogie booooogie boo hat ogl",
             :previous_translation=>"oogie boogie boo",
@@ -478,6 +567,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>6,
             :datetime=>Date.new(2012, 11, 06),
             :source_word_count=>13,
+            :words_translated=>13,  # 3 new words; 3/3 words changed, 3/3*13=13, user 5
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 1'},
            {:translation=>"The only verdict is VENGENCE",
             :previous_translation=>"The only verdict is vengence",
@@ -487,6 +578,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>5,
             :datetime=>Date.new(2012, 11, 01),
             :source_word_count=>6,
+            :words_translated=>0,  # Tweak of a translation that was done in past by same person, user 5
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 2'},
            {:translation=>"a vendetta, held as a votive",
             :previous_translation=>"The only verdict is VENGENCE",
@@ -496,6 +589,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>5,
             :datetime=>Date.new(2012, 11, 02),
             :source_word_count=>6,
+            :words_translated=>6,  # Rewrite of translation by other person, user 6
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 2'},
            {:translation=>"a vendetta, held as a votive, not in vain",
             :previous_translation=>"a vendetta, held as a votive",
@@ -505,6 +600,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>6,
             :datetime=>Date.new(2012, 11, 03),
             :source_word_count=>6,
+            :words_translated=>0,  # Tweak by same person, user 6
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 2'},
            {:translation=>"a vendetta, held as a votive, not in vain",
             :previous_translation=>"a vendetta, held as a votive, not in vain",
@@ -514,6 +611,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>6,
             :datetime=>Date.new(2012, 11, 04),
             :source_word_count=>9,
+            :words_translated=>0,  # Pure verification of stale, user 6
+            :words_verified=>9,
             :phrase_key=>'v3 regime payments key 2'},
            {:translation=>
              "a vendetta, held as a votive, not in vain, for the value and veracity of such shall one day vindicate the vigilant and the virtuous",
@@ -524,6 +623,8 @@ describe Air18n::PhraseTranslation do
             :previous_user_id=>6,
             :datetime=>Date.new(2012, 11, 05),
             :source_word_count=>3,
+            :words_translated=>3,  # Edit of stale, user 6
+            :words_verified=>0,
             :phrase_key=>'v3 regime payments key 2'}]
 
         @golden_word_counts =
@@ -572,10 +673,16 @@ describe Air18n::PhraseTranslation do
       end
 
       it 'should be able to enumerate pairs of translations' do
-        pairs = Air18n::PhraseTranslation.get_translation_pairs(0, Date.new(2012, 11, 1), Date.new(2012, 12, 1))
+        pairs = Air18n::PhraseTranslation.compute_v3_translation_activity(0, Date.new(2012, 11, 1), Date.new(2012, 12, 1))
         pairs = pairs.select { |pair| pair[:locale] == 'de' }
 
-        pairs.should == @golden_pairs
+        (0...@golden_pairs.size).each do |i|
+          # Check that @golden_pairs[i] includes all keys/values in pairs[i].
+          pairs[i].should == @golden_pairs[i].slice(*pairs[i].keys)
+        end
+
+        # Check that it stores computed payment details in the database.
+        @phrase_without_payment_details.reload.payment_details.should == '{"v3":{"t":9,"v":4}}'
       end
 
       it 'should be able to count words proportional to amount of translation edited' do
@@ -682,13 +789,13 @@ describe Air18n::PhraseTranslation do
       end
 
       it 'should compute correct monthly activities' do
-        data = Air18n::PhraseTranslation.activity_from_translation_pairs(@golden_pairs, :daily => false)
+        data = Air18n::PhraseTranslation.aggregate_v3_translation_activity(@golden_pairs, :daily => false)
 
         data.should == @golden_monthly_activity
       end
 
       it 'should compute correct daily activities' do
-        data = Air18n::PhraseTranslation.activity_from_translation_pairs(@golden_pairs, :daily => true)
+        data = Air18n::PhraseTranslation.aggregate_v3_translation_activity(@golden_pairs, :daily => true)
 
         data.first.should ==
           {:year=>2012,

metadata

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