mongoid_traffic 0.2.0 → 0.2.1

data/test/mongoid_traffic/log_test.rb

@@ -50,11 +50,11 @@ module MongoidTraffic
     describe '.aggregate_on' do
       let(:log_1) { MyLog.new(date_from: Date.today, date_to: Date.today) }
       let(:log_2) { MyLog.new(date_from: Date.tomorrow, date_to: Date.tomorrow) }
-      
+
       describe '.aggregate_on(:access_count)' do
         before do
-          log_1.tap{ |l| l.access_count = 1 }.save
-          log_2.tap{ |l| l.access_count = 2 }.save
+          log_1.tap { |l| l.access_count = 1 }.save
+          log_2.tap { |l| l.access_count = 2 }.save
         end
 
         it 'sums the access_counts' do
@@ -65,82 +65,80 @@ module MongoidTraffic
       describe '.aggregate_on(:browsers)' do
         # not the key names have been abbreviated
         before do
-          log_1.tap do |l| 
+          log_1.tap do |l|
             l.browsers = {
-              "Mac" => {
-                "Saf" => { "8" => 1 } 
-              }, 
-              "Win" => { 
-                "Saf" => { "7" => 5 } 
+              'Mac' => {
+                'Saf' => { '8' => 1 }
+              },
+              'Win' => {
+                'Saf' => { '7' => 5 }
               }
             }
           end.save
-          
-          log_2.tap do |l| 
-            l.browsers = { 
-              "Mac" => { 
-                "Saf" => { "8" => 10, "7" => 100 }, 
-                "Chr" => { "3" => 5 } 
-              }, 
-              "Win" => { 
-                "Saf" => { "7" => 100 }, 
-                "IE" => { "10" => 1 } 
-              } 
+
+          log_2.tap do |l|
+            l.browsers = {
+              'Mac' => {
+                'Saf' => { '8' => 10, '7' => 100 },
+                'Chr' => { '3' => 5 }
+              },
+              'Win' => {
+                'Saf' => { '7' => 100 },
+                'IE' => { '10' => 1 }
+              }
             }
           end.save
         end
 
         it 'sums the browsers' do
-          MyLog.aggregate_on(:browsers).must_equal({
-            "Mac" => { 
-              "Saf" => { "8" => 11, "7" => 100 }, 
-              "Chr" => { "3" => 5 } 
-            }, 
-            "Win" => { 
-              "Saf" => { "7" => 105 }, 
-              "IE" => { "10" => 1 } 
-            }
-          })
+          MyLog.aggregate_on(:browsers).must_equal('Mac' => {
+                                                     'Saf' => { '8' => 11, '7' => 100 },
+                                                     'Chr' => { '3' => 5 }
+                                                   },
+                                                   'Win' => {
+                                                     'Saf' => { '7' => 105 },
+                                                     'IE' => { '10' => 1 }
+                                                   })
         end
       end
 
       describe '.aggregate_on(:referers)' do
         before do
-          log_1.tap{ |l| l.referers = { 'google' => 100, 'apple' => 1000 } }.save
-          log_2.tap{ |l| l.referers = { 'google' => 10, 'apple' => 100, 'ms' => 1 } }.save
+          log_1.tap { |l| l.referers = { 'google' => 100, 'apple' => 1000 } }.save
+          log_2.tap { |l| l.referers = { 'google' => 10, 'apple' => 100, 'ms' => 1 } }.save
         end
 
         it 'sums the referers' do
-          MyLog.aggregate_on(:referers).must_equal({ 'google' => 110, 'apple' => 1100, 'ms' => 1 })
+          MyLog.aggregate_on(:referers).must_equal('google' => 110, 'apple' => 1100, 'ms' => 1)
         end
       end
 
       describe '.aggregate_on(:countries)' do
         before do
-          log_1.tap{ |l| l.countries = { 'CZ' => 100 } }.save
-          log_2.tap{ |l| l.countries = { 'DE' => 10 } }.save
+          log_1.tap { |l| l.countries = { 'CZ' => 100 } }.save
+          log_2.tap { |l| l.countries = { 'DE' => 10 } }.save
         end
 
         it 'sums the countries' do
-          MyLog.aggregate_on(:countries).must_equal({ 'CZ' => 100, 'DE' => 10 })
+          MyLog.aggregate_on(:countries).must_equal('CZ' => 100, 'DE' => 10)
         end
       end
 
       describe '.aggregate_on(:unique_ids)' do
         before do
-          log_1.tap{ |l| l.unique_ids = { '01234' => 100, '56789' => 100 } }.save
-          log_2.tap{ |l| l.unique_ids = { '56789' => 100 } }.save
+          log_1.tap { |l| l.unique_ids = { '01234' => 100, '56789' => 100 } }.save
+          log_2.tap { |l| l.unique_ids = { '56789' => 100 } }.save
         end
 
         it 'sums the unique_ids' do
-          MyLog.aggregate_on(:unique_ids).must_equal({ '01234' => 100, '56789' => 200 })
+          MyLog.aggregate_on(:unique_ids).must_equal('01234' => 100, '56789' => 200)
         end
       end
 
       describe '.sum(:unique_ids)' do
         before do
-          log_1.tap{ |l| l.unique_ids = { '01234' => 100, '56789' => 100 } }.save
-          log_2.tap{ |l| l.unique_ids = { '56789' => 100, 'ABCDE' => 1 } }.save
+          log_1.tap { |l| l.unique_ids = { '01234' => 100, '56789' => 100 } }.save
+          log_2.tap { |l| l.unique_ids = { '56789' => 100, 'ABCDE' => 1 } }.save
         end
 
         it 'sums the unique_ids' do
@@ -148,6 +146,5 @@ module MongoidTraffic
         end
       end
     end
-
   end
-end
+end

data/test/mongoid_traffic/logger/bots_test.rb

@@ -5,7 +5,6 @@ require_relative '../../../lib/mongoid_traffic/logger/bots'
 module MongoidTraffic
   class Logger
     describe 'Bots' do
-
       describe '.list' do
         it 'parses the allagents.xml and converts it into Array of referers' do
           Bots.list.must_be_kind_of Array
@@ -17,7 +16,6 @@ module MongoidTraffic
           Bots.is_a_bot?('Googlebot/Test ( http://www.googlebot.com/bot.html)').must_equal true
         end
       end
-
     end
   end
-end
+end

data/test/mongoid_traffic/logger/browser_test.rb

@@ -5,7 +5,6 @@ require_relative '../../../lib/mongoid_traffic/logger/browser'
 module MongoidTraffic
   class Logger
     describe 'Browser' do
-
       let(:user_agent_string) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10) AppleWebKit/538.46 (KHTML, like Gecko) Version/8.0 Safari/538.46' }
       subject { Browser.new(user_agent_string) }
 
@@ -20,7 +19,6 @@ module MongoidTraffic
       it 'returns :version' do
         subject.version.must_equal '8.0'
       end
-
     end
   end
-end
+end

data/test/mongoid_traffic/logger/geoip_test.rb

@@ -5,13 +5,11 @@ require_relative '../../../lib/mongoid_traffic/logger/geo_ip'
 module MongoidTraffic
   class Logger
     describe 'GeoIp' do
-
       describe '.country_code2' do
         it 'returns country code' do
           GeoIp.country_code2('github.com').must_equal 'US'
         end
       end
-
     end
   end
-end
+end

data/test/mongoid_traffic/logger/referer_test.rb

@@ -5,7 +5,6 @@ require_relative '../../../lib/mongoid_traffic/logger/referer'
 module MongoidTraffic
   class Logger
     describe 'Referer' do
-
       let(:referer_string) { 'http://www.google.com:80/path/to?foo=bar' }
       subject { Referer.new(referer_string) }
 
@@ -24,7 +23,6 @@ module MongoidTraffic
       it 'strips query params' do
         subject.host.wont_include '?foo=bar'
       end
-
     end
   end
-end
+end

data/test/mongoid_traffic/logger_test.rb

@@ -17,7 +17,7 @@ module MongoidTraffic
 
     describe 'ClassMethods' do
       describe '.log' do
-        before do 
+        before do
           MongoidTraffic::Logger.log(::MyLog, user_agent: user_agent_string, referer: referer, ip_address: ip_address, unique_id: unique_id)
           MongoidTraffic::Logger.log(::MyLog, scope: scope, user_agent: user_agent_string, referer: referer, ip_address: ip_address, unique_id: unique_id)
         end
@@ -58,6 +58,5 @@ module MongoidTraffic
         end
       end
     end
-
   end
-end
+end

data/test/support/database_cleaner.rb

@@ -0,0 +1,10 @@
+require 'database_cleaner'
+
+DatabaseCleaner.orm = :mongoid
+DatabaseCleaner.strategy = :truncation
+
+class MiniTest::Spec
+  around do |tests|
+    DatabaseCleaner.cleaning(&tests)
+  end
+end

data/test/support/mongoid.rb

@@ -0,0 +1,8 @@
+require 'mongoid'
+
+Mongoid.logger.level = Logger::INFO
+Mongo::Logger.logger.level = Logger::INFO
+
+Mongoid.configure do |config|
+  config.connect_to('mongoid_traffic_test')
+end

data/test/test_helper.rb

@@ -1,28 +1,21 @@
 require 'bundler/setup'
 require 'database_cleaner'
+
 require 'minitest'
+require 'minitest/around'
 require 'minitest/autorun'
 require 'minitest/spec'
+
 require 'mongoid'
 require 'mongoid_traffic'
 
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
 if ENV["CI"]
   require "coveralls"
   Coveralls.wear!
 end
 
-Mongoid.configure do |config|
-  config.connect_to('mongoid_traffic_test')
-end
-
-DatabaseCleaner.orm = :mongoid
-DatabaseCleaner.strategy = :truncation
-
-class MiniTest::Spec
-  before(:each) { DatabaseCleaner.start }
-  after(:each) { DatabaseCleaner.clean }
-end
-
 class MyLog
   include Mongoid::Document
   include MongoidTraffic::Log