mongoid_traffic 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c00bbcb80356f2546b251e0f48a2863dd8bfcc
-  data.tar.gz: b8ee6c7cece3700d385118cbb0f3fbd925065047
+  metadata.gz: 48c3eb9a025f842258ed056e4ef1b435bc99c260
+  data.tar.gz: 78ccd5f6083cec8c081d217a0265e34c8abf3819
 SHA512:
-  metadata.gz: a2026efe6cee6b0f1e491d914daf4d6c8f32b73edb5da304398148643865b5b193b8c4c97a0a8f33462c74c467c94108be8add4cf6b6aab724f665b105d2c387
-  data.tar.gz: be0c1960d5d52002398e556ff397480dfac95dceb8c64c0a7aae4624208d1c2e67c06c439367fa27538858b6a2ecc48e0c6b77e6b7ee3ee2c64bd7059a831c96
+  metadata.gz: da181545b24d5cfd258d21bc71c44f28cd9ffcf0a693c9abee7bb43811c83315492a11f77ddf5ce8ccbaf53b1084d4316141b137d3e144bed06f9ad60b2451a3
+  data.tar.gz: 815f3e65d468f5a271f2bb1190e0bd373513356770606441f4e303f5c48a6aa3851571bf5395971f9a5372c10089b150962d1c1a44b24366f5ac921dab5e058f

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 cache: bundler
 script: 'bundle exec rake'
+sudo: false
 rvm:
-  - 2.1.2
+  - 2.2.2
 services:
   - mongodb
 
@@ -11,4 +12,4 @@ notifications:
     recipients:
       - tomas.celizna@gmail.com
     on_failure: change
-    on_success: never
+    on_success: never

data/Gemfile

@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in mongoid_permalink_extension.gemspec
 gemspec
 
-# TEMP
-group :test do
-  gem 'database_cleaner', git: 'https://github.com/DatabaseCleaner/database_cleaner.git'
-end
+gem 'database_cleaner', git: 'https://github.com/DatabaseCleaner/database_cleaner.git'

data/Gemfile.lock

@@ -1,103 +1,104 @@
 GIT
   remote: https://github.com/DatabaseCleaner/database_cleaner.git
-  revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
+  revision: f318781a77228f5999f5f2371c12f59089c141f3
   specs:
     database_cleaner (1.5.1)
 
 PATH
   remote: .
   specs:
-    mongoid_traffic (0.2.0)
+    mongoid_traffic (0.2.1)
       geoip
-      mongoid (~> 5.0)
+      mongoid (~> 5.1)
       nokogiri
-      useragent (~> 0.10.0)
+      useragent
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
+    activemodel (4.2.6)
+      activesupport (= 4.2.6)
       builder (~> 3.1)
-    activesupport (4.2.4)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    bson (3.2.4)
+    bson (4.0.4)
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    coderay (1.1.0)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coderay (1.1.1)
+    coveralls (0.8.13)
+      json (~> 1.8)
+      simplecov (~> 0.11.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6.0)
     docile (1.1.5)
-    ffi (1.9.3)
+    ffi (1.9.10)
     formatador (0.2.5)
     geoip (1.6.1)
-    guard (2.6.1)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
       pry (>= 0.9.12)
+      shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-minitest (2.3.1)
-      guard (~> 2.0)
+    guard-compat (1.2.1)
+    guard-minitest (2.4.4)
+      guard-compat (~> 1.2)
       minitest (>= 3.0)
     i18n (0.7.0)
     json (1.8.3)
-    listen (2.7.9)
-      celluloid (>= 0.15.2)
+    listen (3.0.6)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+      rb-inotify (>= 0.9.7)
+    lumberjack (1.0.10)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    minitest (5.4.0)
-    mongo (2.1.1)
-      bson (~> 3.0)
-    mongoid (5.0.0)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    minitest-around (0.3.2)
+      minitest (~> 5.0)
+    mongo (2.2.4)
+      bson (~> 4.0)
+    mongoid (5.1.1)
       activemodel (~> 4.0)
       mongo (~> 2.1)
-      origin (~> 2.1)
+      origin (~> 2.2)
       tzinfo (>= 0.3.37)
-    multi_json (1.10.1)
-    netrc (0.7.7)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    origin (2.1.1)
-    pry (0.10.0)
+    nenv (0.3.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    origin (2.2.0)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
+    rake (11.1.1)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    simplecov (0.9.0)
+    shellany (0.0.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    timers (1.1.0)
-    tins (1.3.1)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    useragent (0.10.0)
+    useragent (0.16.5)
 
 PLATFORMS
   ruby
@@ -109,5 +110,9 @@ DEPENDENCIES
   guard
   guard-minitest
   minitest
+  minitest-around
   mongoid_traffic!
   rake
+
+BUNDLED WITH
+   1.11.2

data/lib/mongoid_traffic/controller_additions.rb

@@ -1,7 +1,6 @@
 module MongoidTraffic
   module ControllerAdditions
-
-    def log_traffic log_cls, scope: nil
+    def log_traffic(log_cls, scope: nil)
       MongoidTraffic::Logger.log(
         log_cls,
         ip_address: request.remote_ip,
@@ -10,19 +9,18 @@ module MongoidTraffic
         user_agent: request.headers['User-Agent']
       )
     end
-    
-    def log_scoped_traffic log_cls, scope: nil
+
+    def log_scoped_traffic(_log_cls, scope: nil)
       log_traffic(scope: (scope || request.fullpath.split('?').first))
     end
 
     # ---------------------------------------------------------------------
-    
-    def self.included base
+
+    def self.included(base)
       base.extend ClassMethods
       base.helper_method :log_traffic
       base.helper_method :log_scoped_traffic
     end
-
   end
 end
 
@@ -30,4 +28,4 @@ if defined? ActionController::Base
   ActionController::Base.class_eval do
     include MongoidTraffic::ControllerAdditions
   end
-end
+end

data/lib/mongoid_traffic/log.rb

@@ -2,8 +2,7 @@ require 'logger'
 
 module MongoidTraffic
   module Log
-
-    def self.included base
+    def self.included(base)
       base.extend ClassMethods
       base.class_eval do
         field :s, as: :scope, type: String
@@ -31,36 +30,36 @@ module MongoidTraffic
 
         default_scope -> { where(scope: nil) }
 
-        scope :for_dates, -> date_from, date_to { where(date_from: date_from, date_to: date_to) }
+        scope :for_dates, -> (date_from, date_to) { where(date_from: date_from, date_to: date_to) }
 
-        scope :yearly, -> year { self.for_dates(Date.parse("01/01/#{year}"), Date.parse("01/01/#{year}").at_end_of_year) }
-        scope :monthly, -> month, year { self.for_dates(Date.parse("01/#{month}/#{year}"), Date.parse("01/#{month}/#{year}").at_end_of_month) }
-        scope :weekly, -> week, year { self.for_dates(Date.commercial(year, week), Date.commercial(year, week).at_end_of_week) }
-        scope :daily, -> date { self.for_dates(date, date) }
+        scope :yearly, -> (year) { for_dates(Date.parse("01/01/#{year}"), Date.parse("01/01/#{year}").at_end_of_year) }
+        scope :monthly, -> (month, year) { for_dates(Date.parse("01/#{month}/#{year}"), Date.parse("01/#{month}/#{year}").at_end_of_month) }
+        scope :weekly, -> (week, year) { for_dates(Date.commercial(year, week), Date.commercial(year, week).at_end_of_week) }
+        scope :daily, -> (date) { for_dates(date, date) }
 
-        scope :scoped_to, -> scope { where(scope: scope) }
+        scope :scoped_to, -> (scope) { where(scope: scope) }
 
         # ---------------------------------------------------------------------
 
-        index({ scope: 1, date_from: 1, date_to: 1 })
+        index(scope: 1, date_from: 1, date_to: 1)
       end
     end
 
     # =====================================================================
 
     module ClassMethods
-      def log *args
+      def log(*args)
         MongoidTraffic::Logger.log(self, *args)
       end
 
-      def aggregate_on att
+      def aggregate_on(att)
         case find_field_by_name(att).type.to_s
         when 'Integer' then sum(att)
         when 'Hash' then sum_hash(att)
         end
       end
 
-      def sum att
+      def sum(att)
         if att.to_sym == :unique_ids
           aggregate_on(:unique_ids).keys.count
         else
@@ -68,26 +67,23 @@ module MongoidTraffic
         end
       end
 
-      def find_field_by_name field_name
-        return unless f = fields.detect{ |k,v| k == field_name.to_s or v.options[:as].to_s == field_name.to_s }
+      def find_field_by_name(field_name)
+        return unless f = fields.detect { |k, v| k == field_name.to_s || v.options[:as].to_s == field_name.to_s }
         f.last
       end
 
-      def sum_hash field_name
-        self.pluck(field_name).inject({}) do |res, h|
-          merger = proc { |key, v1, v2|
-            if Hash === v1 && Hash === v2
-              v1.merge(v2, &merger)
-            elsif Hash === v2
-              v2
-            else
-              v1.to_i + v2.to_i
+      def sum_hash(field_name)
+        pluck(field_name).inject({}) do |res, h|
+          merger = proc do |_key, v1, v2|
+            case
+            when Hash === v1 && Hash === v2 then v1.merge(v2, &merger)
+            when Hash === v2 then v2
+            else v1.to_i + v2.to_i
             end
-          }
+          end
           res = res.merge(h, &merger)
         end
       end
     end
-
   end
 end

data/lib/mongoid_traffic/logger/bots.rb

@@ -5,30 +5,27 @@ require 'nokogiri'
 module MongoidTraffic
   class Logger
     class Bots
+      DATA_URL = 'http://www.user-agents.org/allagents.xml'.freeze
+      FILE_PATH = 'vendor/mongoid_traffic/allagents.xml'.freeze
 
-      DATA_URL = "http://www.user-agents.org/allagents.xml"
-      FILE_PATH = "vendor/mongoid_traffic/allagents.xml"
-      
       class << self
         def list
           @list ||= begin
             response = File.open(FILE_PATH).read
             doc = Nokogiri::XML(response)
-            list = []
-            doc.xpath('//user-agent').each do |agent|
-              type = agent.xpath("Type").text
-              list << agent.xpath('String').text.gsub("&lt;","<") if %w(R S).include?(type)
+            doc.xpath('//user-agent').inject([]) do |res, agent|
+              type = agent.xpath('Type').text
+              res << agent.xpath('String').text.gsub('&lt;', '<') if %w(R S).include?(type)
+              res
             end
-            list
           end
         end
 
-        def is_a_bot? referer
+        def is_a_bot?(referer)
           return false unless referer.present?
           list.include?(referer)
         end
       end
-
     end
   end
-end
+end

data/lib/mongoid_traffic/logger/browser.rb

@@ -3,13 +3,10 @@ require 'user_agent'
 module MongoidTraffic
   class Logger
     class Browser
-
-      def initialize user_agent_string
+      def initialize(user_agent_string)
         @user_agent_string = user_agent_string
       end
 
-      # ---------------------------------------------------------------------
-      
       def platform
         user_agent.platform
       end
@@ -27,7 +24,6 @@ module MongoidTraffic
       def user_agent
         @user_agent ||= ::UserAgent.parse(@user_agent_string)
       end
-
     end
   end
 end

data/lib/mongoid_traffic/logger/geo_ip.rb

@@ -3,20 +3,18 @@ require 'geoip'
 module MongoidTraffic
   class Logger
     class GeoIp
-
-      DATA_URL = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"
-      FILE_URL = "vendor/mongoid_traffic/GeoIP.dat"
+      DATA_URL = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz'.freeze
+      FILE_URL = 'vendor/mongoid_traffic/GeoIP.dat'.freeze
 
       class << self
         def geoip
           @geoip ||= ::GeoIP.new(FILE_URL)
         end
 
-        def country_code2 str
+        def country_code2(str)
           geoip.country(str).country_code2
         end
       end
-
     end
   end
-end
+end

data/lib/mongoid_traffic/logger/referer.rb

@@ -3,8 +3,7 @@ require 'uri'
 module MongoidTraffic
   class Logger
     class Referer
-
-      def initialize referer_string
+      def initialize(referer_string)
         @referer_string = referer_string
       end
 
@@ -17,11 +16,10 @@ module MongoidTraffic
       end
 
       private # =============================================================
-      
+
       def uri
         URI.parse(@referer_string)
       end
-
     end
   end
 end

data/lib/mongoid_traffic/logger.rb

@@ -9,18 +9,17 @@ require_relative './logger/referer'
 
 module MongoidTraffic
   class Logger
-
-    TIME_SCOPE_OPTIONS = %i(year month week day)
+    TIME_SCOPE_OPTIONS = %i(year month week day).freeze
 
     # ---------------------------------------------------------------------
 
-    def self.log log_cls, *args
+    def self.log(log_cls, *args)
       new(log_cls, *args).log
     end
 
     # ---------------------------------------------------------------------
 
-    def initialize log_cls, ip_address: nil, referer: nil, scope: nil, time_scope: %i(month day), unique_id: nil, user_agent: nil
+    def initialize(log_cls, ip_address: nil, referer: nil, scope: nil, time_scope: %i(month day), unique_id: nil, user_agent: nil)
       @log_cls = log_cls
       @ip_address = ip_address
       @referer_string = referer
@@ -32,10 +31,10 @@ module MongoidTraffic
 
     def log
       return if Bots.is_a_bot?(@referer_string)
-      raise "Invalid time scope definition: #{@time_scope}" unless @time_scope.all?{ |ts| TIME_SCOPE_OPTIONS.include?(ts) }
+      raise "Invalid time scope definition: #{@time_scope}" unless @time_scope.all? { |ts| TIME_SCOPE_OPTIONS.include?(ts) }
 
       @time_scope.each do |ts|
-        @log_cls.collection.find( find_query(ts) ).update_many( upsert_query, upsert: true )
+        @log_cls.collection.find(find_query(ts)).update_many(upsert_query, upsert: true)
       end
     end
 
@@ -43,11 +42,11 @@ module MongoidTraffic
 
     def upsert_query
       {
-        '$inc' => access_count_query.
-          merge(browser_query).
-          merge(country_query).
-          merge(referer_query).
-          merge(unique_id_query),
+        '$inc' => access_count_query
+          .merge(browser_query)
+          .merge(country_query)
+          .merge(referer_query)
+          .merge(unique_id_query),
         '$set' => { uat: Time.now }
       }
     end
@@ -60,7 +59,7 @@ module MongoidTraffic
 
     def browser_query
       return {} unless browser.present?
-      browser_path = [browser.platform, browser.name, browser.version].map{ |s| escape_key(s) }.join('.')
+      browser_path = [browser.platform, browser.name, browser.version].map { |s| escape_key(s) }.join('.')
       { "b.#{browser_path}" => 1 }
     end
 
@@ -85,13 +84,13 @@ module MongoidTraffic
 
     # ---------------------------------------------------------------------
 
-    def escape_key key
-      CGI::escape(key).gsub('.', '%2E')
+    def escape_key(key)
+      CGI.escape(key).gsub('.', '%2E')
     end
 
     # ---------------------------------------------------------------------
 
-    def find_query ts
+    def find_query(ts)
       res = time_query(ts)
       res = res.merge(scope_query) if @scope.present?
       res
@@ -101,7 +100,7 @@ module MongoidTraffic
       { s: @scope }
     end
 
-    def time_query ts
+    def time_query(ts)
       date = Date.today
       case ts
       when :day then { df: date, dt: date }
@@ -120,6 +119,5 @@ module MongoidTraffic
       return unless @referer_string.present?
       @referer ||= Referer.new(@referer_string)
     end
-
   end
 end

data/lib/mongoid_traffic/version.rb

@@ -1,3 +1,3 @@
 module MongoidTraffic
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/mongoid_traffic.gemspec

@@ -19,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "geoip"
-  spec.add_dependency "mongoid", "~> 5.0"
+  spec.add_dependency "mongoid", "~> 5.1"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "useragent", "~> 0.10.0"
+  spec.add_dependency "useragent"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "database_cleaner", ">= 1.5.1"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "rake"
 end

data/test/mongoid_traffic/controller_additions_test.rb

@@ -4,11 +4,10 @@ require_relative '../../lib/mongoid_traffic/controller_additions'
 
 module MongoidTraffic
   describe 'ControllerAdditions' do
-
     before(:each) do
       @controller_class = Class.new
       @controller = @controller_class.new
-      def @controller_class.helper_method(name); end
+      def @controller_class.helper_method(_name); end
       @controller_class.send(:include, MongoidTraffic::ControllerAdditions)
     end
 
@@ -22,6 +21,5 @@ module MongoidTraffic
     describe '.log_scoped_traffic' do
       it 'infers scope from request path'
     end
-
   end
 end