aloha_analyzer 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f365ff8ea98aed30b293c506c024b2bd9cc6392e
-  data.tar.gz: 41440c2ab6bad0ddb4b3473c7cd7dd4a58cd6715
+  metadata.gz: ef74babf1f476d54991db96d7037a33b4ae682f0
+  data.tar.gz: b35b6e264346d2ad56c9d5f7df1ba276905d9212
 SHA512:
-  metadata.gz: 8f24982aee08a1063139ca71613aafcf5158c34a4a97a6078968e0038f115ef1ab92ad4e2a7bb46063707972943edbedfff02053c695ec2addadbd90996a3a5f
-  data.tar.gz: 902e781c090f5ef1711bb645987645e629f0ffa7e81904286bf23a0223ede1f5c24c2131efe86df15ee1ce3cabd1765475c6ed17fbc4b40ec2c104b153e9bb3c
+  metadata.gz: 58fa95446a8e3d340f4b1a6320e2dc1690e683982c20be6134810a8a12459618cced954822d8f25ab7d6e4a2e490f3b30212048511b60b945d1f15af96677498
+  data.tar.gz: fc197b9e40eef6c933457720b3586ecf1a52196480f0032e1d2900c7225ecf1f9c9cf4346a68463918766b61f3f89cc01f082f9d0ae7e543e9d1ce5f12c536f7

data/lib/aloha_analyzer/user.rb

@@ -3,12 +3,11 @@ module AlohaAnalyzer
 
     attr_reader :language, :analysis
 
-    def initialize(language, users, options = {}, analysis = nil)
-      @language    = clean_language(language.downcase)
-      @users       = clean_users(users)
-      @users_count = users.size
+    def initialize(options)
+      @language    = clean_language(options['language'].downcase)
+      @users       = clean_users(options['users'])
+      @analysis    = options['analysis'] || boilerplate
       @options     = options
-      @analysis    = analysis || boilerplate
     end
 
     def analyze
@@ -65,7 +64,7 @@ module AlohaAnalyzer
     end
 
     def too_many_users?(users)
-      if @options['user_limit_per_language'] && users.size >= @options['user_limit_per_language']
+      if @options['max_users'] && users.size >= @options['max_users']
         true
       else
         false

data/lib/aloha_analyzer/version.rb

@@ -1,3 +1,3 @@
 module AlohaAnalyzer
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/aloha_analyzer/user_spec.rb

@@ -1,9 +1,16 @@
 require 'spec_helper'
 
 describe AlohaAnalyzer::User do
-  subject(:user) { described_class.new(language, users, options, analysis) }
+  subject(:user) { described_class.new(options) }
   let(:language) { 'en' }
-  let(:options)  { {} }
+  let(:options) do
+    {
+      'language' => language,
+      'analysis' => analysis,
+      'users'    => users
+    }
+  end
+
   let(:analysis) { nil }
 
   describe '#new' do
@@ -42,29 +49,28 @@ describe AlohaAnalyzer::User do
   end
 
   describe '#analyze' do
-    subject(:analyze) { described_class.new(language, users, options, analysis).analyze }
     context 'when no users' do
       let(:users) { [] }
 
       it 'returns a hash' do
-        subject.should be_a Hash
+        subject.analyze.should be_a Hash
       end
 
       it 'includes the total count' do
-        subject['count'].should eq 0
+        subject.analyze['count'].should eq 0
       end
 
       it 'has no results with the user language' do
-        subject['account_language']['count'].should eq 0
+        subject.analyze['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.analyze['foreign_languages'].should eq({})
+        subject.analyze['foreign_languages_count'].should eq 0
       end
 
       it 'includes the user lanugage' do
-        subject['account_language']['language'].should eq(
+        subject.analyze['account_language']['language'].should eq(
           'abbreviation'=>'en', 'greeting' => 'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia'
           )
       end
@@ -82,15 +88,15 @@ describe AlohaAnalyzer::User do
         }
 
         it 'returns a hash' do
-          subject.should be_a Hash
+          subject.analyze.should be_a Hash
         end
 
         it 'includes the total count' do
-          subject['count'].should eq 4
+          subject.analyze['count'].should eq 4
         end
 
         it 'includes the user lanugage' do
-          subject['account_language'].should eq(
+          subject.analyze['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'}]
@@ -98,11 +104,11 @@ describe AlohaAnalyzer::User do
         end
 
         it 'includs the foreign followers count' do
-          subject['foreign_languages_count'].should eq 2
+          subject.analyze['foreign_languages_count'].should eq 2
         end
 
         it 'returns results based on the user language' do
-          subject['foreign_languages'].should == {
+          subject.analyze['foreign_languages'].should == {
             'fr' => {
               'count'    => 1,
               'language' => {'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries'=>'France, Canada, Belgium, Switzerland'},
@@ -126,21 +132,21 @@ describe AlohaAnalyzer::User do
           }
 
           it 'returns a hash' do
-            subject.should be_a Hash
+            subject.analyze.should be_a Hash
           end
 
           it 'includes the total count' do
-            subject['count'].should eq 2
+            subject.analyze['count'].should eq 2
           end
 
           it 'includes the user lanugage' do
-            subject['account_language']['language'].should eq(
+            subject.analyze['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['account_language'].should == {
+            subject.analyze['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'}]
@@ -148,8 +154,8 @@ describe AlohaAnalyzer::User do
           end
 
           it 'returns results results based on the non user language' do
-            subject['foreign_languages'].should == {}
-            subject['foreign_languages_count'].should eq 0
+            subject.analyze['foreign_languages'].should == {}
+            subject.analyze['foreign_languages_count'].should eq 0
           end
         end
 
@@ -163,15 +169,15 @@ describe AlohaAnalyzer::User do
           }
 
           it 'returns a hash' do
-            subject.should be_a Hash
+            subject.analyze.should be_a Hash
           end
 
           it 'includes the total count' do
-            subject['count'].should eq 3
+            subject.analyze['count'].should eq 3
           end
 
           it 'returns results based on the user language' do
-            subject['account_language'].should == {
+            subject.analyze['account_language'].should == {
               'count'      => 0,
               'language'   => {'abbreviation'=>'en', 'greeting' => 'hello!', 'name'=>'English', 'population'=>238000000, 'countries'=>'USA, UK, Canada, Ireland, Australia'},
               'users'      => []
@@ -179,11 +185,11 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the correct foreign_languages_count' do
-            subject['foreign_languages_count'].should eq 3
+            subject.analyze['foreign_languages_count'].should eq 3
           end
 
           it 'returns results results based on the non user language' do
-            subject['foreign_languages'].should eq(
+            subject.analyze['foreign_languages'].should eq(
               'fr' => {
                 'count'      => 2,
                 'language' => { 'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland' },
@@ -208,11 +214,11 @@ describe AlohaAnalyzer::User do
           }
 
           it 'includes the total count' do
-            subject['count'].should eq 3
+            subject.analyze['count'].should eq 3
           end
 
           it 'includes the user lanugage' do
-            subject['account_language'].should == {
+            subject.analyze['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'}]
@@ -220,11 +226,11 @@ describe AlohaAnalyzer::User do
           end
 
           it 'includes the correct foreign_languages_count' do
-            subject['foreign_languages_count'].should eq 1
+            subject.analyze['foreign_languages_count'].should eq 1
           end
 
           it 'merges english and british' do
-            subject['foreign_languages'].should eq(
+            subject.analyze['foreign_languages'].should eq(
               'fr' => {
                 'count'      => 1,
                 'language'   => {'abbreviation'=>'fr', 'name'=>'French', 'greeting'=>'bonjour!', 'population'=>14000000, 'countries' => 'France, Canada, Belgium, Switzerland'},
@@ -236,7 +242,14 @@ describe AlohaAnalyzer::User do
       end
 
       context 'when user limit per language' do
-        let(:options) { { 'user_limit_per_language' => 1} }
+        let(:options) do
+          {
+            'language'  => language,
+            'analysis'  => analysis,
+            'users'     => users,
+            'max_users' => 1
+          }
+        end
         let(:users) {
           [
             {'id' => '1', 'lang' => 'en'},
@@ -247,11 +260,28 @@ describe AlohaAnalyzer::User do
           ]
         }
 
-        it 'does not add more users per language' do
-          subject['account_language']['users'].size.should eq 1
-          subject['account_language']['count'].should eq 2
-          subject['foreign_languages']['fr']['users'].size.should eq 1
-          subject['foreign_languages']['fr']['count'].should eq 3
+        it 'limits the number of account language users to 1' do
+          subject.analyze['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
+        end
+
+        it 'does not affect the account language count' do
+          subject.analyze['account_language']['count'].should eq 2
+        end
+
+        it 'does not affect the foreign_languages_count' do
+          subject.analyze['foreign_languages_count'].should eq 3
+        end
+
+        it 'does not affect the total count' do
+          subject.analyze['count'].should eq 5
+        end
+
+        it 'does not affect a foreign language count' do
+          subject.analyze['foreign_languages']['fr']['count'].should eq 3
         end
       end
 
@@ -283,7 +313,7 @@ describe AlohaAnalyzer::User do
         end
 
         it 'starts from the existing analysis' do
-          subject.should eq(
+          subject.analyze.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.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthieu Aussaguel