aloha_analyzer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36b2f48d7da6a71e6ee989066f3ecdd0cf52415c
-  data.tar.gz: 13836892ac1a676e5c86e9115f0b638e88e7a2f6
+  metadata.gz: d289f940c1715018a7e9108125f9759b4ba59324
+  data.tar.gz: 30b91b3430356376349099aceafedfc5c8ae463a
 SHA512:
-  metadata.gz: eea341593848177dd6e5aa52696f2fc0cddedf4ac7979075172ba9e4d1c76cc593c831a342b39d4b2043a4be5ace24324ddfa0784159dce95f95fd752b0df7e7
-  data.tar.gz: 248eec547e964eea2e6f603fae70343e4f88028a8c996495a71a9036cc63d1db05c9edb0834e4f82a08626b4191f3dba6a5dce7e656ea86ab6eac7d69a92da80
+  metadata.gz: 5bbb88cf518745ef0b3c8f84638444ca075806f730f6160f60dc6554edfb20db5a43a24d39e1bfd2222d4321838711953cbcc70552d7c9e62870e03930f4ca33
+  data.tar.gz: ae83dcf4cf74ab222ed8275c3e008d01102915e533899945cbe7aa19358b928988eb5ea0fa4b4220f4342422b71cf75a029078092fe15c24c01858772903a1ae

data/lib/aloha_analyzer/facebook_page.rb

@@ -23,13 +23,15 @@ module AlohaAnalyzer
     end
 
     def clean_languages(languages)
-      languages.each do |language_key, count|
-        if Language.aliases.keys.include?(language_key.downcase)
-          if languages[Language.aliases[language_key.downcase]]
-            languages[Language.aliases[language_key.downcase]] = languages[Language.aliases[language_key.downcase]] + count
-            languages.delete language_key
+      Hash.new.tap do |cleaned_languages|
+        languages.each do |language_key, count|
+          abbreviation = Language.aliases[language_key.downcase]
+          abbreviation = Language.find_by_abbreviation(language_key.downcase, network_name)['abbreviation'] if abbreviation.nil?
+
+          if cleaned_languages[abbreviation]
+            cleaned_languages[abbreviation] += count
           else
-            languages[Language.aliases[language_key.downcase]] = languages.delete language_key
+            cleaned_languages[abbreviation] = count
           end
         end
       end

data/lib/aloha_analyzer/version.rb

@@ -1,3 +1,3 @@
 module AlohaAnalyzer
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/aloha_analyzer/yaml/languages.yml

@@ -24,7 +24,6 @@ languages:
     abbreviation:        'ja'
     name:                Japanese
     twitter_population:  106_580_000
-    facebook_population: 0
     countries:           'Japan, Brazil'
     greeting:            '今日は!'
   'es':
@@ -66,7 +65,6 @@ languages:
     abbreviation:        'ko'
     name:                Korean
     twitter_population:  7_000_000
-    facebook_population: 0
     countries:           'South Korea'
     greeting:            '안녕하세요!'
   'tr':
@@ -80,14 +78,12 @@ languages:
     abbreviation:        'ru'
     name:                Russian
     twitter_population:  5_000_000
-    facebook_population: 0
     countries:           'Russia, Belarus, Kazakhstan, Kyrgyzstan'
     greeting:            'привет!'
   'nl':
     abbreviation:        'nl'
     name:                Dutch
     twitter_population:  8_000_000
-    facebook_population: 0
     countries:           'Netherlands, Belgium'
     greeting:            'hallo!'
   'fil':
@@ -108,7 +104,6 @@ languages:
     abbreviation:        'ms'
     name:                Malay
     twitter_population:  50_000_000
-    facebook_population: 0
     countries:           'Malaysia, Singapore, Brunei'
     greeting:            'hello!'
   'zh':
@@ -122,174 +117,148 @@ languages:
     abbreviation:        'hi'
     name:                Hindi
     twitter_population:  12_000_000
-    facebook_population: 0
     countries:           'India, Pakistan, Fiji'
     greeting:            'नमस्ते!'
   'no':
     abbreviation:        'no'
     name:                Norwegian
     twitter_population:  300_000
-    facebook_population: 0
     countries:           'Norway'
     greeting:            'goddag!'
   'sv':
     abbreviation:        'sv'
     name:                Swedish
     twitter_population:  500_000
-    facebook_population: 0
     countries:           'Sweden'
     greeting:            'god dag!'
   'fi':
     abbreviation:        'fi'
     name:                Finnish
     twitter_population:  100_000
-    facebook_population: 0
     countries:           'Finnish'
     greeting:            ' terve!'
   'da':
     abbreviation:        'da'
     name:                Danish
     twitter_population:  200_000
-    facebook_population: 0
     countries:           'Danish'
     greeting:            'hej!'
   'pl':
     abbreviation:        'pl'
     name:                Polish
     twitter_population:  300_000
-    facebook_population: 0
     countries:           'Poland'
     greeting:            'cześć!'
   'hu':
     abbreviation:        'hu'
     name:                Hungarian
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Hungary'
     greeting:            ' jó napot kívánok!'
   'fa':
     abbreviation:        'fa'
     name:                Farsi
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Iran, Afghanistan, Tajikistan'
     greeting:            ' سلام!'
   'he':
     abbreviation:        'he'
     name:                Hebrew
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Israel'
     greeting:            'שלום!'
   'ur':
     abbreviation:        'ur'
     name:                Urdu
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'India, Pakistan, Fiji'
     greeting:            'لسلام علیکم!'
   'th':
     abbreviation:        'th'
     name:                Thai
     twitter_population:  4_500_000
-    facebook_population: 0
     countries:           'Thailand'
     greeting:            'วัสดี!'
   'uk':
     abbreviation:        'uk'
     name:                Ukrainian
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Ukraine'
     greeting:            'вітаю!'
   'el':
     abbreviation:        'el'
     name:                Greek
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Greece, Cyprus'
     greeting:            'γειά!'
   'cs':
     abbreviation:        'cs'
     name:                Czech
     twitter_population:  800_000
-    facebook_population: 0
     countries:           'Czech Republic'
     greeting:            'ahoj!'
   'ro':
     abbreviation:        'ro'
     name:                Romanian
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Romania, Serbia, Moldova'
     greeting:            'salut!'
   'km':
     abbreviation:        'km'
     name:                Khmer
     twitter_population:  100_000
-    facebook_population: 0
     countries:           'Cambodia'
     greeting:            'chomreabsuor!'
   'is':
     abbreviation:        'is'
     name:                Icelandic
     twitter_population:  50_000
-    facebook_population: 0
     countries:           'Iceland'
     greeting:            'halló!'
   'sr':
     abbreviation:        'sr'
     name:                Serbian
     twitter_population:  1_000_000
-    facebook_population: 0
     countries:           'Serbia, Bosnia & Herzegovina'
     greeting:            'здраво!'
   'lt':
     abbreviation:        'lt'
     name:                Lithuanian
     twitter_population:  100_000
-    facebook_population: 0
     countries:           'Lithuania, Belarus, Latvia, Poland'
     greeting:            'sveiki!'
   'vi':
     abbreviation:        'vi'
     name:                'Vietnamese'
     twitter_population:  7_000_000
-    facebook_population: 0
     countries:           'Vietnam'
     greeting:            'chào!'
   'sl':
     abbreviation:        'sl'
     name:                'Slovenian'
     twitter_population:  50_000
-    facebook_population: 0
     countries:           'Slovenia'
     greeting:            'pozdravi!'
   'bg':
     abbreviation:        'bg'
     name:                'Bulgarian'
     twitter_population:  500_000
-    facebook_population: 0
     countries:           'Bulgaria'
     greeting:            'здравей!'
   'lv':
     abbreviation:        'lv'
     name:                'Latvian'
     twitter_population:  50_000
-    facebook_population: 0
     countries:           'Latvia'
     greeting:            'sveiki!'
   'mk':
     abbreviation:        'mk'
     name:                'Macedonian'
     twitter_population:  50_000
-    facebook_population: 0
     countries:           'Macedonia, Albania, Romania, Serbia'
     greeting:            'Здраво!'
   'other':
     abbreviation:        'other'
     name:                'Other'
-    twitter_population:  0
-    facebook_population: 0
     countries:           ''
     greeting:            ''

data/spec/aloha_analyzer/facebook_page_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe AlohaAnalyzer::FacebookPage do
-  # {"tr_TR"=>3677, "en_US"=>89, "ka_GE"=>49, "en_GB"=>44, "az_AZ"=>39, "fr_FR"=>35, "bg_BG"=>28, "ru_RU"=>20, "de_DE"=>19, "ar_AR"=>8, "fr_CA"=>6, "es_LA"=>6, "nl_NL"=>4, "sq_AL"=>3, "pl_PL"=>2, "pt_BR"=>2, "es_ES"=>2, "it_IT"=>2, "lt_LT"=>1, "da_DK"=>1, "cs_CZ"=>1, "el_GR"=>1, "sr_RS"=>1, "et_EE"=>1, "mk_MK"=>1, "en_IN"=>1, "pt_PT"=>1, "jv_ID"=>1}
   subject(:facebook_page) { described_class.new(options) }
   let(:language)     { 'en' }
   let(:options) do
@@ -12,6 +11,11 @@ describe AlohaAnalyzer::FacebookPage do
   end
   let(:analysis) { nil }
 
+  it 'returns a returns' do
+    languages = {"tr_TR"=>3677, "en_US"=>89, "ka_GE"=>49, "en_GB"=>44, "az_AZ"=>39, "fr_FR"=>35, "bg_BG"=>28, "ru_RU"=>20, "de_DE"=>19, "ar_AR"=>8, "fr_CA"=>6, "es_LA"=>6, "nl_NL"=>4, "sq_AL"=>3, "pl_PL"=>2, "pt_BR"=>2, "es_ES"=>2, "it_IT"=>2, "lt_LT"=>1, "da_DK"=>1, "cs_CZ"=>1, "el_GR"=>1, "sr_RS"=>1, "et_EE"=>1, "mk_MK"=>1, "en_IN"=>1, "pt_PT"=>1, "jv_ID"=>1}
+    expect(subject.analyze(languages)).to be_a Hash
+  end
+
   describe '#new' do
     context 'when language is british' do
       let(:language) { 'en-gb' }
@@ -173,6 +177,43 @@ describe AlohaAnalyzer::FacebookPage do
           end
         end
 
+        context 'when unknown language' do
+          let(:users) do
+            {
+              'unknown'   => 1,
+              'something' => 1,
+              'fr'        => 2
+            }
+          end
+
+          it 'returns a hash' do
+            expect(subject).to be_a Hash
+          end
+
+          it 'includes the total count' do
+            expect(subject['count']).to eq 4
+          end
+
+          it 'includes the correct foreign_languages_count' do
+            expect(subject['foreign_languages_count']).to eq 4
+          end
+
+          it 'returns results results based on the non user language' do
+            expect(subject['foreign_languages']).to eq(
+              'fr' => {
+                'count'      => 2,
+                'language' => { 'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>45000000, 'countries' => 'France, Canada, Belgium, Switzerland' },
+                'users' => []
+                },
+                'other' => {
+                  'count'    => 2,
+                  'language' => {'abbreviation'=>'other', 'name'=>'Other', 'greeting'=>'', 'population'=>nil, 'countries' => '' },
+                  'users'    => []
+                }
+                )
+          end
+        end
+
         context 'when no users language users' do
           let(:users) do
             {
@@ -222,7 +263,7 @@ describe AlohaAnalyzer::FacebookPage do
             {
               'en'    => 1,
               'en_US' => 1,
-              'fr'    => 1
+              'fr_CA' => 1
             }
           end
 

data/spec/aloha_analyzer/language_spec.rb

@@ -45,8 +45,7 @@ describe AlohaAnalyzer::Language do
       end
 
       it 'has no population' do
-        expect(subject['population']).to be_a Fixnum
-        expect(subject['population']).to eq 0
+        expect(subject['population']).to be_nil
       end
 
       it 'other as a name' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aloha_analyzer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matthieu Aussaguel