mongoid_traffic 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 260b37762762b8a339f5d105b27669f02f334aa7
-  data.tar.gz: 1d88427a3c295874d9919c6e82c2c2dbbf63db9e
+  metadata.gz: f2c00bbcb80356f2546b251e0f48a2863dd8bfcc
+  data.tar.gz: b8ee6c7cece3700d385118cbb0f3fbd925065047
 SHA512:
-  metadata.gz: 6529fe616f86a44d7b2d52b5e7cea49ff117408b9e8ad013f46cecfcad4f042a7b9fa202c60fdef8222b0ff66addd75afa021e05d5fb17a51d4f9b382383ca4a
-  data.tar.gz: 484d9a993fe2e1c11cc89ddb077f84c7935f03dbd861a024f63ab4f72179171e99297c6e681cc87ca02cf224d497baa4afb15e49508150021b9ac32b7a1c78a7
+  metadata.gz: a2026efe6cee6b0f1e491d914daf4d6c8f32b73edb5da304398148643865b5b193b8c4c97a0a8f33462c74c467c94108be8add4cf6b6aab724f665b105d2c387
+  data.tar.gz: be0c1960d5d52002398e556ff397480dfac95dceb8c64c0a7aae4624208d1c2e67c06c439367fa27538858b6a2ecc48e0c6b77e6b7ee3ee2c64bd7059a831c96

data/Gemfile

@@ -2,3 +2,8 @@ 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

data/Gemfile.lock

@@ -1,41 +1,45 @@
+GIT
+  remote: https://github.com/DatabaseCleaner/database_cleaner.git
+  revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
+  specs:
+    database_cleaner (1.5.1)
+
 PATH
   remote: .
   specs:
-    mongoid_traffic (0.1.0)
+    mongoid_traffic (0.2.0)
       geoip
-      mongoid (~> 4.0)
+      mongoid (~> 5.0)
       nokogiri
       useragent (~> 0.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activesupport (4.2.0)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    bson (2.3.0)
+    bson (3.2.4)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     coderay (1.1.0)
-    connection_pool (2.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    database_cleaner (1.3.0)
     docile (1.1.5)
     ffi (1.9.3)
     formatador (0.2.5)
-    geoip (1.4.0)
+    geoip (1.6.1)
     guard (2.6.1)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -46,7 +50,7 @@ GEM
       guard (~> 2.0)
       minitest (>= 3.0)
     i18n (0.7.0)
-    json (1.8.1)
+    json (1.8.3)
     listen (2.7.9)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -54,22 +58,19 @@ GEM
     lumberjack (1.0.9)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     minitest (5.4.0)
-    mongoid (4.0.0)
+    mongo (2.1.1)
+      bson (~> 3.0)
+    mongoid (5.0.0)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.2)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
     multi_json (1.10.1)
     netrc (0.7.7)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    optionable (0.2.0)
     origin (2.1.1)
     pry (0.10.0)
       coderay (~> 1.1.0)
@@ -91,7 +92,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     timers (1.1.0)
     tins (1.3.1)
     tzinfo (1.2.2)
@@ -104,7 +105,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   coveralls
-  database_cleaner
+  database_cleaner!
   guard
   guard-minitest
   minitest

data/lib/mongoid_traffic/logger.rb

@@ -13,14 +13,14 @@ module MongoidTraffic
     TIME_SCOPE_OPTIONS = %i(year month week day)
 
     # ---------------------------------------------------------------------
-    
+
     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
@@ -35,14 +35,14 @@ module MongoidTraffic
       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) ).upsert( upsert_query )
+        @log_cls.collection.find( find_query(ts) ).update_many( upsert_query, upsert: true )
       end
     end
 
     # ---------------------------------------------------------------------
 
     def upsert_query
-      { 
+      {
         '$inc' => access_count_query.
           merge(browser_query).
           merge(country_query).
@@ -84,7 +84,7 @@ module MongoidTraffic
     end
 
     # ---------------------------------------------------------------------
-    
+
     def escape_key key
       CGI::escape(key).gsub('.', '%2E')
     end
@@ -110,7 +110,7 @@ module MongoidTraffic
     end
 
     private # =============================================================
-    
+
     def browser
       return unless @user_agent_string.present?
       @browser ||= Browser.new(@user_agent_string)

data/lib/mongoid_traffic/version.rb

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

data/mongoid_traffic.gemspec

@@ -6,7 +6,7 @@ require 'mongoid_traffic/version'
 Gem::Specification.new do |spec|
   spec.name          = "mongoid_traffic"
   spec.version       = MongoidTraffic::VERSION
-  spec.authors       = ["Tomas Celizna"]
+  spec.authors       = ["Tomáš Celizna"]
   spec.email         = ["tomas.celizna@gmail.com"]
   spec.description   = %q{Aggregated traffic logs stored in MongoDB.}
   spec.summary       = %q{Aggregated traffic logs stored in MongoDB.}
@@ -19,15 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "geoip"
-  spec.add_dependency "mongoid", "~> 4.0"
+  spec.add_dependency "mongoid", "~> 5.0"
   spec.add_dependency "nokogiri"
   spec.add_dependency "useragent", "~> 0.10.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "database_cleaner"
+  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 "rake"
-end
+end

data/test/test_helper.rb

@@ -11,27 +11,8 @@ if ENV["CI"]
   Coveralls.wear!
 end
 
-ENV["MONGOID_TEST_HOST"] ||= "localhost"
-ENV["MONGOID_TEST_PORT"] ||= "27017"
-
-HOST = ENV["MONGOID_TEST_HOST"]
-PORT = ENV["MONGOID_TEST_PORT"].to_i
-
-def database_id
-  "mongoid_traffic_test"
-end
-
-CONFIG = {
-  sessions: {
-    default: {
-      database: database_id,
-      hosts: [ "#{HOST}:#{PORT}" ]
-    }
-  }
-}
-
 Mongoid.configure do |config|
-  config.load_configuration(CONFIG)
+  config.connect_to('mongoid_traffic_test')
 end
 
 DatabaseCleaner.orm = :mongoid

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_traffic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
-- Tomas Celizna
+- Tomáš Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geoip
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Aggregated traffic logs stored in MongoDB.