aloha_analyzer 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81caaf5420375cdbb424f316716b7789ffa83138
-  data.tar.gz: 5f267b646594467a59facb34c9787b20819f3325
+  metadata.gz: 0c2bc2b5fb168b92598aaf665bd052e34d6a8d0d
+  data.tar.gz: 2656ab9c6028b898d38dd6e61b3d856d43d1adb7
 SHA512:
-  metadata.gz: 45fd99434b3e05ddabc6b8a9a722421789459be9154d249d1b4909bad1b370bc3b1e9fac8f390e241261f8571eb24cfa6728dcbb85cca6f97703cf45d79a520f
-  data.tar.gz: 8de8bd977aa9179de77d1b7d38f362088a1f42ed0984168566440fcd18ff7ff2d58eaf8a692c8e5574cd6f789dd3dea56a2dbd2a0ef4bf4ac045aaf2f258c81a
+  metadata.gz: 404f72d579c02ab3bf911ead9cfe416a05442727716c2e498506bdcd3ee4bbd74bdea768cdf014470e3f6a3b5e1495f08702090941b1fff4342efd0988819e5c
+  data.tar.gz: e55890d6bd78147f23ab1e81605665bfb204e092ea0e27bd8e4fbeb2febd3305961fdafd42f507f92f258c97b23f51f2bd66f6c2022253eae74d6d334d4cc6b1

data/lib/aloha_analyzer/user.rb

@@ -4,14 +4,13 @@ module AlohaAnalyzer
     attr_reader :language, :analysis
 
     def initialize(options)
-      @language    = clean_language(options['language'].downcase)
-      @users       = clean_users(options['users'])
-      @analysis    = (options['analysis'] || boilerplate).clone
-      @options     = options
+      @language = clean_language(options['language'].downcase)
+      @analysis = (options['analysis'] || boilerplate).clone
+      @options  = options
     end
 
-    def analyze
-      @users.each do |user|
+    def analyze(users)
+      clean_users(users).each do |user|
         if user['lang'] == @language
           add_account_language_user(user)
           @analysis['account_language']['count'] += 1

data/lib/aloha_analyzer/version.rb

@@ -1,3 +1,3 @@
 module AlohaAnalyzer
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/aloha_analyzer/user_spec.rb

@@ -6,15 +6,13 @@ describe AlohaAnalyzer::User do
   let(:options) do
     {
       'language' => language,
-      'analysis' => analysis,
-      'users'    => users
+      'analysis' => analysis
     }
   end
 
   let(:analysis) { nil }
 
   describe '#new' do
-    let(:users) { [] }
     context 'when language is british' do
       let(:language) { 'en-gb' }
 
@@ -65,28 +63,29 @@ describe AlohaAnalyzer::User do
   end
 
   describe '#analyze' do
+    subject(:results) { described_class.new(options).analyze(users) }
     context 'when no users' do
       let(:users) { [] }
 
       it 'returns a hash' do
-        subject.analyze.should be_a Hash
+        subject.should be_a Hash
       end
 
       it 'includes the total count' do
-        subject.analyze['count'].should eq 0
+        subject['count'].should eq 0
       end
 
       it 'has no results with the user language' do
-        subject.analyze['account_language']['count'].should eq 0
+        subject['account_language']['count'].should eq 0
       end
 
       it 'has no results without the user language' do
-        subject.analyze['foreign_languages'].should eq({})
-        subject.analyze['foreign_languages_count'].should eq 0
+        subject['foreign_languages'].should eq({})
+        subject['foreign_languages_count'].should eq 0
       end
 
       it 'includes the user lanugage' do
-        subject.analyze['account_language']['language'].should eq(
+        subject['account_language']['language'].should eq(
           'abbreviation'=>'en', 'greeting' => 'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia'
           )
       end
@@ -104,15 +103,15 @@ describe AlohaAnalyzer::User do
         }
 
         it 'returns a hash' do
-          subject.analyze.should be_a Hash
+          subject.should be_a Hash
         end
 
         it 'includes the total count' do
-          subject.analyze['count'].should eq 4
+          subject['count'].should eq 4
         end
 
         it 'includes the user lanugage' do
-          subject.analyze['account_language'].should eq(
+          subject['account_language'].should eq(
             'count'    => 2,
             'language' => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia', 'greeting'=>'hello!'},
             'users'    => [{'id' => '1', 'lang' => 'en'}, {'id' => '3', 'lang' => 'en'}]
@@ -120,11 +119,11 @@ describe AlohaAnalyzer::User do
         end
 
         it 'includs the foreign followers count' do
-          subject.analyze['foreign_languages_count'].should eq 2
+          subject['foreign_languages_count'].should eq 2
         end
 
         it 'returns results based on the user language' do
-          subject.analyze['foreign_languages'].should == {
+          subject['foreign_languages'].should == {
             'fr' => {
               'count'    => 1,
               'language' => {'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries'=>'France, Canada, Belgium, Switzerland'},
@@ -148,21 +147,21 @@ describe AlohaAnalyzer::User do
           }
 
           it 'returns a hash' do
-            subject.analyze.should be_a Hash
+            subject.should be_a Hash
           end
 
           it 'includes the total count' do
-            subject.analyze['count'].should eq 2
+            subject['count'].should eq 2
           end
 
           it 'includes the user lanugage' do
-            subject.analyze['account_language']['language'].should eq(
+            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.analyze['account_language'].should == {
+            subject['account_language'].should == {
               'count'      => 2,
               'language'   => {'abbreviation'=>'en', 'name'=>'English', 'population'=>238000000, 'countries' => 'USA, UK, Canada, Ireland, Australia', 'greeting'=>'hello!'},
               'users'      => [{'id' => '1', 'lang' => 'en'}, {'id' => '2', 'lang' => 'en'}]
@@ -170,8 +169,8 @@ describe AlohaAnalyzer::User do
           end
 
           it 'returns results results based on the non user language' do
-            subject.analyze['foreign_languages'].should == {}
-            subject.analyze['foreign_languages_count'].should eq 0
+            subject['foreign_languages'].should == {}
+            subject['foreign_languages_count'].should eq 0
           end
         end
 
@@ -185,15 +184,15 @@ describe AlohaAnalyzer::User do
           }
 
           it 'returns a hash' do
-            subject.analyze.should be_a Hash
+            subject.should be_a Hash
           end
 
           it 'includes the total count' do
-            subject.analyze['count'].should eq 3
+            subject['count'].should eq 3
           end
 
           it 'returns results based on the user language' do
-            subject.analyze['account_language'].should == {
+            subject['account_language'].should == {
               'count'      => 0,
               'language'   => {'abbreviation'=>'en', 'greeting' => 'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia'},
               'users'      => []
@@ -201,11 +200,11 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the correct foreign_languages_count' do
-            subject.analyze['foreign_languages_count'].should eq 3
+            subject['foreign_languages_count'].should eq 3
           end
 
           it 'returns results results based on the non user language' do
-            subject.analyze['foreign_languages'].should eq(
+            subject['foreign_languages'].should eq(
               'fr' => {
                 'count'      => 2,
                 'language' => { 'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland' },
@@ -230,11 +229,11 @@ describe AlohaAnalyzer::User do
           }
 
           it 'includes the total count' do
-            subject.analyze['count'].should eq 3
+            subject['count'].should eq 3
           end
 
           it 'includes the user lanugage' do
-            subject.analyze['account_language'].should == {
+            subject['account_language'].should == {
               'count'      => 2,
               'language'   => { 'abbreviation'=>'en', 'greeting' => 'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia' },
               'users'      => [{'id' => '1', 'lang' => 'en'}, {'id' => '3', 'lang' => 'en'}]
@@ -242,11 +241,11 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the correct foreign_languages_count' do
-            subject.analyze['foreign_languages_count'].should eq 1
+            subject['foreign_languages_count'].should eq 1
           end
 
           it 'merges english and british' do
-            subject.analyze['foreign_languages'].should eq(
+            subject['foreign_languages'].should eq(
               'fr' => {
                 'count'      => 1,
                 'language'   => {'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland'},
@@ -262,7 +261,6 @@ describe AlohaAnalyzer::User do
           {
             'language'  => language,
             'analysis'  => analysis,
-            'users'     => users,
             'max_users' => 1
           }
         end
@@ -277,27 +275,27 @@ describe AlohaAnalyzer::User do
         }
 
         it 'limits the number of account language users to 1' do
-          subject.analyze['account_language']['users'].size.should eq 1
+          subject['account_language']['users'].size.should eq 1
         end
 
         it 'limits the number of foreign languages users to 1' do
-          subject.analyze['foreign_languages']['fr']['users'].size.should eq 1
+          subject['foreign_languages']['fr']['users'].size.should eq 1
         end
 
         it 'does not affect the account language count' do
-          subject.analyze['account_language']['count'].should eq 2
+          subject['account_language']['count'].should eq 2
         end
 
         it 'does not affect the foreign_languages_count' do
-          subject.analyze['foreign_languages_count'].should eq 3
+          subject['foreign_languages_count'].should eq 3
         end
 
         it 'does not affect the total count' do
-          subject.analyze['count'].should eq 5
+          subject['count'].should eq 5
         end
 
         it 'does not affect a foreign language count' do
-          subject.analyze['foreign_languages']['fr']['count'].should eq 3
+          subject['foreign_languages']['fr']['count'].should eq 3
         end
       end
 
@@ -329,7 +327,7 @@ describe AlohaAnalyzer::User do
         end
 
         it 'starts from the existing analysis' do
-          subject.analyze.should eq(
+          subject.should eq(
             'account_language' => {
               'count'    => 3,
               'language' => {'abbreviation'=>'en', 'greeting'=>'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia'},

metadata

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