aloha_analyzer 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407dc91bb62ef288b0953321564d81cf29de4af6
-  data.tar.gz: 5acd3d9de60973db79022d7748ac31e920f2f19e
+  metadata.gz: 0acae8c2641f6d9abb0c3eff036d9863851b6e47
+  data.tar.gz: cc9494f19bb86b46feb22ce5aa2412ead5e1851e
 SHA512:
-  metadata.gz: 194d513ba723ff46c88af6838f1e17e5e8486d9e0e39382375a9ca92fd654867193919613b874bbad70a7c7044f275b46b1a313d08fc5e6204d71269df28f780
-  data.tar.gz: bb930a6597f41b582f8105122bd0b4681c69c46ed9bee8914dda1de0523980a282c2c799f5e584c8b8cb04589a0857fd003ec720d5ec287966d158897cc3723e
+  metadata.gz: 050ee0fd56f108a7acfec808ccc0dbf2bf7262410e59e7c4c3c2222df7dcda6e9ba67ce24e3d600ff36706db12e07eb13acbb348b768eec8313759bf4dba027d
+  data.tar.gz: 790123f96c672f8327c78f646989cb1c1d710e8be2ae805669a38cf56e3f8e31c892095c08c35925f553ed10bbe1fc49357d71a9e7707b2d9c3b5054cacd3e19

data/lib/aloha_analyzer/user.rb

@@ -16,20 +16,20 @@ module AlohaAnalyzer
         @users.each do |user|
           abbreviation = user['lang']
           if abbreviation == @language
-            analysys[:user_language][:count] += 1
-            analysys[:user_language][:users].push user
+            analysys[:account_language][:count] += 1
+            analysys[:account_language][:users].push user
           else
-            if analysys[:foreign_languages][abbreviation]
-              analysys[:foreign_languages][abbreviation][:count] += 1
-              analysys[:foreign_languages][abbreviation][:users].push user
+            if analysys[:non_account_languages][abbreviation]
+              analysys[:non_account_languages][abbreviation][:count] += 1
+              analysys[:non_account_languages][abbreviation][:users].push user
             else
-              analysys[:foreign_languages][abbreviation] = {
+              analysys[:non_account_languages][abbreviation] = {
                 :count    => 1,
                 :language => Language.find_by_abbreviation(abbreviation),
                 :users    => [user]
               }
             end
-            analysys[:foreign_languages_count] += 1
+            analysys[:non_account_languages_count] += 1
           end
           analysys[:count] += 1
         end
@@ -41,14 +41,14 @@ module AlohaAnalyzer
 
     def boilerplate_analysis
       Hash.new.tap do |analysys|
-        analysys[:user_language] = {
+        analysys[:account_language] = {
           count:    0,
           language: Language.find_by_abbreviation(@language),
           users: []
         }
-        analysys[:foreign_languages_count] = 0
+        analysys[:non_account_languages_count] = 0
         analysys[:count]                   = 0
-        analysys[:foreign_languages]       = Hash.new
+        analysys[:non_account_languages]       = Hash.new
       end
     end
 

data/lib/aloha_analyzer/version.rb

@@ -1,3 +1,3 @@
 module AlohaAnalyzer
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/lib/aloha_analyzer/yaml/language.yml

@@ -6,7 +6,7 @@
 - abbreviation: en
   name:       English
   population: 238_000_000
-  countries: 'USA, Canada, UK, Ireland, Australia'
+  countries: 'USA, UK, Canada, Ireland, Australia'
   greeting: 'hello!'
 - abbreviation: ar
   name:       Arabic

data/spec/aloha_analyzer/user_spec.rb

@@ -53,17 +53,17 @@ describe AlohaAnalyzer::User do
       end
 
       it 'has no results with the user language' do
-        subject[:user_language][:count].should eq 0
+        subject[:account_language][:count].should eq 0
       end
 
       it 'has no results without the user language' do
-        subject[:foreign_languages].should eq({})
-        subject[:foreign_languages_count].should eq 0
+        subject[:non_account_languages].should eq({})
+        subject[:non_account_languages_count].should eq 0
       end
 
       it 'includes the user lanugage' do
-        subject[:user_language][:language].should eq(
-          "abbreviation"=>"en", "name"=>"English", "population"=>238000000, "countries"=>"USA, Canada, UK, Ireland, Australia"
+        subject[:account_language][:language].should eq(
+          "abbreviation"=>"en", "greeting" => "hello!", "name"=>"English", "population"=>238000000, "countries"=>"USA, UK, Canada, Ireland, Australia"
           )
       end
     end
@@ -88,27 +88,27 @@ describe AlohaAnalyzer::User do
         end
 
         it 'includes the user lanugage' do
-          subject[:user_language].should eq(
+          subject[:account_language].should eq(
             :count      => 2,
-            :language   => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, "countries"=>"USA, Canada, UK, Ireland, Australia"},
+            :language   => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, "countries"=>"USA, UK, Canada, Ireland, Australia", "greeting"=>"hello!"},
             :users      => [{'id' => '1', 'lang' => 'en'}, {'id' => '3', 'lang' => 'en'}]
             )
         end
 
         it 'includs the foreign followers count' do
-          subject[:foreign_languages_count].should eq 2
+          subject[:non_account_languages_count].should eq 2
         end
 
         it 'returns results based on the user language' do
-          subject[:foreign_languages].should == {
+          subject[:non_account_languages].should == {
             'fr' => {
               count: 1,
-              language: {'abbreviation'=>'fr', 'name'=>'French', 'population'=>14000000, "countries"=>"France, Canada, Belgium, Switzerland"},
+              language: {'abbreviation'=>'fr', 'name'=>'French', "greeting"=>"bonjour!", 'population'=>14000000, "countries"=>"France, Canada, Belgium, Switzerland"},
               users: [{'id' => '2', 'lang' => 'fr'}]
               },
               'de' => {
                 count:       1,
-                language:  {'abbreviation'=>'de', 'name'=>'German', 'population'=>5000000, "countries"=>"Germany, Austria, Switzerland, Belgium"},
+                language:  {'abbreviation'=>'de', 'name'=>'German', "greeting"=>"hallo!", 'population'=>5000000, "countries"=>"Germany, Austria, Switzerland, Belgium"},
                 users:      [{'id' => '4', 'lang' => 'de'}]
               }
             }
@@ -132,22 +132,22 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the user lanugage' do
-            subject[:user_language][:language].should eq(
-              "abbreviation"=>"en", "name"=>"English", "population"=>238000000, "countries"=>"USA, Canada, UK, Ireland, Australia"
+            subject[:account_language][:language].should eq(
+              "abbreviation"=>"en", "greeting" => "hello!", "name"=>"English", "population"=>238000000, "countries"=>"USA, UK, Canada, Ireland, Australia"
               )
           end
 
           it 'returns results based on the user language' do
-            subject[:user_language].should == {
+            subject[:account_language].should == {
               :count      => 2,
-              :language   => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, 'countries' => 'USA, Canada, UK, Ireland, Australia'},
+              :language   => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, 'countries' => 'USA, UK, Canada, Ireland, Australia', "greeting"=>"hello!"},
               :users      => [{'id' => '1', 'lang' => 'en'}, {'id' => '2', 'lang' => 'en'}]
             }
           end
 
           it 'returns results results based on the non user language' do
-            subject[:foreign_languages].should == {}
-            subject[:foreign_languages_count].should eq 0
+            subject[:non_account_languages].should == {}
+            subject[:non_account_languages_count].should eq 0
           end
         end
 
@@ -169,27 +169,27 @@ describe AlohaAnalyzer::User do
           end
 
           it 'returns results based on the user language' do
-            subject[:user_language].should == {
+            subject[:account_language].should == {
               :count      => 0,
-              :language   => {"abbreviation"=>"en", "name"=>"English", "population"=>238000000, "countries"=>"USA, Canada, UK, Ireland, Australia"},
+              :language   => {"abbreviation"=>"en", "greeting" => "hello!", "name"=>"English", "population"=>238000000, "countries"=>"USA, UK, Canada, Ireland, Australia"},
               :users      => []
             }
           end
 
-          it 'includes the correct foreign_languages_count' do
-            subject[:foreign_languages_count].should eq 3
+          it 'includes the correct non_account_languages_count' do
+            subject[:non_account_languages_count].should eq 3
           end
 
           it 'returns results results based on the non user language' do
-            subject[:foreign_languages].should eq(
+            subject[:non_account_languages].should eq(
               'fr' => {
                 :count      => 2,
-                :language => { 'abbreviation'=>'fr', 'name'=>'French', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland' },
+                :language => { 'abbreviation'=>'fr', 'name'=>'French', "greeting"=>"bonjour!", 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland' },
                 :users => [{'id' => '2', 'lang' => 'fr'}, {'id' => '3', 'lang' => 'fr'}]
                 },
                 'de' => {
                   :count      => 1,
-                  :language => {'abbreviation'=>'de', 'name'=>'German', 'population'=>5000000, 'countries' => 'Germany, Austria, Switzerland, Belgium' },
+                  :language => {'abbreviation'=>'de', 'name'=>'German', "greeting"=>"hallo!", 'population'=>5000000, 'countries' => 'Germany, Austria, Switzerland, Belgium' },
                   :users      => [{'id' => '1', 'lang' => 'de'}]
                 }
                 )
@@ -210,22 +210,22 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the user lanugage' do
-            subject[:user_language].should == {
+            subject[:account_language].should == {
               :count      => 2,
-              :language   => { "abbreviation"=>"en", "name"=>"English", "population"=>238000000, "countries"=>"USA, Canada, UK, Ireland, Australia" },
+              :language   => { "abbreviation"=>"en", "greeting" => "hello!", "name"=>"English", "population"=>238000000, "countries"=>"USA, UK, Canada, Ireland, Australia" },
               :users      => [{'id' => '1', 'lang' => 'en'}, {'id' => '3', 'lang' => 'en'}]
             }
           end
 
-          it 'includes the correct foreign_languages_count' do
-            subject[:foreign_languages_count].should eq 1
+          it 'includes the correct non_account_languages_count' do
+            subject[:non_account_languages_count].should eq 1
           end
 
           it 'merges english and british' do
-            subject[:foreign_languages].should eq(
+            subject[:non_account_languages].should eq(
               'fr' => {
                 :count      => 1,
-                :language   => {'abbreviation'=>'fr', 'name'=>'French', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland'},
+                :language   => {'abbreviation'=>'fr', 'name'=>'French', "greeting"=>"bonjour!", 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland'},
                 :users      => [{'id' => '2', 'lang' => 'fr'}]
               }
             )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aloha_analyzer
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Matthieu Aussaguel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler