air18n 0.1.0 → 0.1.1

data/lib/air18n/phrase_translation.rb

@@ -33,9 +33,6 @@ module Air18n
       end
     end
 
-    COST_PER_WORD_TRANSLATION = 0.07
-    COST_PER_WORD_VERIFICATION = 0.05
-
     # Provides a complete set of latest translations for specified locales, in nested hash format.
     # filter_opts are passed to keep_key? for optional filtering, like throwing
     # away user-generated content.
@@ -132,7 +129,6 @@ module Air18n
       {}.tap do |activity|
         activity[:num_translations], activity[:word_count_translations] = translation_word_count(phrase_ids_values_by_type[false])
         activity[:num_verifications], activity[:word_count_verifications] = translation_word_count(phrase_ids_values_by_type[true])
-        activity[:payment] = activity[:word_count_translations] * COST_PER_WORD_TRANSLATION + activity[:word_count_verifications] * COST_PER_WORD_VERIFICATION
       end
     end
 
@@ -176,7 +172,7 @@ module Air18n
       rich_memory.save!
     end
 
-    def self.translator_payment_data
+    def self.translator_payment_data(compute_payment_method)
       today_last_month = 1.month.ago
       ret = []
       PhraseTranslation.translator_activity_data(0, :since => 2.months.ago).each do |stats|
@@ -187,7 +183,9 @@ module Air18n
           stats[:currency] = 'EUR'
           stats[:is_admin] = user.try(:role_admin?)
           stats[:is_paid] = !stats[:is_admin] && !fetch_unpaid_nonadmin_translator_list.include?(stats[:user_id])
-          stats[:usd_amount] = Currency.convert(stats[:activity][:payment], stats[:currency], "USD").round
+          payment = compute_payment_method.call(stats[:activity][:word_count_translations], stats[:activity][:word_count_verifications], stats[:user_id], stats[:locale].to_sym)
+          stats[:native_amount] = payment
+          stats[:usd_amount] = Currency.convert(payment, stats[:currency], "USD").round
           if stats[:is_paid] && stats[:usd_amount] > 0
             stats[:description] = "Translator payout "
             stats[:description] << "for #{Date::MONTHNAMES[today_last_month.month]} #{today_last_month.year}. "

data/lib/air18n/screenshot.rb

@@ -25,7 +25,9 @@ module Air18n
       if all_unreviewed_screenshots.empty?
         nil
       else
-        Screenshot.find_by_id(all_unreviewed_screenshots.choice.id)
+        # Array#choice was renamed to Array#sample in Ruby 1.9.
+        random_sample = all_unreviewed_screenshots.respond_to?(:choice) ? all_unreviewed_screenshots.choice : all_unreviewed_screenshots.sample
+        Screenshot.find_by_id(random_sample.id)
       end
     end
 

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/make_gem

@@ -1,5 +1,5 @@
 # Run this to push the new version of the gem to rubygems!
-v=0.1.0
+v=0.1.1
 gem build air18n.gemspec
 gem push air18n-${v}.gem
 

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -22,59 +22,4 @@ describe Air18n::PhraseTranslation do
     end
   end
 
-  describe 'compute monthly translator payments' do
-    before do
-      # TODO(jason) Stub out User.
-      # @user1 = FactoryGirl.create(:user)
-      # @user2 = FactoryGirl.create(:user)
-      @phrase1 = FactoryGirl.create(:phrase, :value => 'two words')
-      @phrase2 = FactoryGirl.create(:phrase, :value => 'three long words')
-    end
-
-    it "should pay for only last month's translation" do
-      pending "Stub out User class"
-      without_timestamping_of Air18n::PhraseTranslation do
-        translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user => @user1, :created_at => 1.month.ago)
-        other_phrase_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase2, :user => @user1, :created_at => 1.month.ago)
-        other_user_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user => @user2, :created_at => 1.month.ago)
-        older_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user => @user1, :created_at => 2.months.ago)
-
-        data = Air18n::PhraseTranslation.translator_payment_data
-
-        data[0].should include(
-          {:locale => "es", :is_paid => true, :currency => "EUR", :usd_amount => 1, :smart_name => @user1.smart_name, :user_id => @user1.id, :month => 1.month.ago.month, :is_admin => false, :year => 1.month.ago.year })
-        data[0][:activity].should include(
-          { :payment => 5 * Air18n::PhraseTranslation::COST_PER_WORD_TRANSLATION, :num_translations => 2, :num_phrases_prev_translated => 1, :word_count_translations => 5 })
-
-        data[1].should include(
-          { :locale => "es", :is_paid => true, :currency => "EUR", :usd_amount => 0, :smart_name => @user2.smart_name, :user_id => @user2.id, :is_admin => false })
-        data[1][:activity].should include(
-          { :payment => 2 * Air18n::PhraseTranslation::COST_PER_WORD_TRANSLATION, :num_translations => 1, :num_phrases_prev_translated => 0, :word_count_translations => 2 })
-      end
-    end
-
-    it 'should pay less for verification' do
-      pending "Stub out User class"
-      without_timestamping_of Air18n::PhraseTranslation do
-        translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user => @user1, :created_at => 1.month.ago)
-        other_phrase_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase2, :user => @user1, :created_at => 1.month.ago)
-        other_user_translation = FactoryGirl.create(:phrase_translation, :phrase => @phrase1, :user => @user2, :created_at => 1.month.ago)
-        phrase_verification = FactoryGirl.create(:phrase_translation, :phrase => @phrase2, :user => @user2, :is_verification => true, :created_at => 1.month.ago)
-
-
-        data = Air18n::PhraseTranslation.translator_payment_data
-
-        data[0].should include(
-          {:locale => "es", :is_paid => true, :currency => "EUR", :usd_amount => 1, :smart_name => @user1.smart_name, :user_id => @user1.id, :month => 1.month.ago.month, :is_admin => false, :year => 1.month.ago.year })
-        data[0][:activity].should include(
-          { :payment => 5 * Air18n::PhraseTranslation::COST_PER_WORD_TRANSLATION, :num_translations => 2, :word_count_translations => 5 })
-
-        data[1].should include(
-          { :locale => "es", :is_paid => true, :currency => "EUR", :usd_amount => 0, :smart_name => @user2.smart_name, :user_id => @user2.id, :is_admin => false })
-        data[1][:activity].should include(
-          { :payment => 2 * Air18n::PhraseTranslation::COST_PER_WORD_TRANSLATION + 3 * Air18n::PhraseTranslation::COST_PER_WORD_VERIFICATION, :num_translations => 1, :num_verifications => 1, :word_count_translations => 2, :word_count_verifications => 3 })
-      end
-    end
-  end
-
 end

metadata

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