From ab87b7c95f5d82ac3239761827f3508119d6fd5c Mon Sep 17 00:00:00 2001 From: Tomas Celizna Date: Thu, 24 Mar 2016 18:41:53 +0100 Subject: [PATCH] fix paths --- Guardfile | 4 ++-- lib/mongoid_traffic.rb | 8 ++++---- lib/mongoid_traffic/logger/bots.rb | 2 +- lib/mongoid_traffic/logger/geo_ip.rb | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Guardfile b/Guardfile index e357d46..ca0dca6 100644 --- a/Guardfile +++ b/Guardfile @@ -2,7 +2,7 @@ # More info at https://github.com/guard/guard#readme guard :minitest do - watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^lib/(.+)\.rb$}) { |m| "test/#{m[1]}_test.rb" } watch(%r{^test/.+_test\.rb$}) - watch(%r{^test/test_helper\.rb$}) { 'test' } + watch(%r{^test/test_helper\.rb$}) { 'test' } end diff --git a/lib/mongoid_traffic.rb b/lib/mongoid_traffic.rb index 38c3ce4..4f00e1a 100644 --- a/lib/mongoid_traffic.rb +++ b/lib/mongoid_traffic.rb @@ -1,5 +1,5 @@ -require "mongoid_traffic/version" +require 'mongoid_traffic/version' -require "mongoid_traffic/controller_additions" -require "mongoid_traffic/log" -require "mongoid_traffic/logger" \ No newline at end of file +require 'mongoid_traffic/controller_additions' +require 'mongoid_traffic/log' +require 'mongoid_traffic/logger' diff --git a/lib/mongoid_traffic/logger/bots.rb b/lib/mongoid_traffic/logger/bots.rb index 44a79a9..b5f2878 100644 --- a/lib/mongoid_traffic/logger/bots.rb +++ b/lib/mongoid_traffic/logger/bots.rb @@ -6,7 +6,7 @@ module MongoidTraffic class Logger class Bots DATA_URL = 'http://www.user-agents.org/allagents.xml'.freeze - FILE_PATH = 'vendor/mongoid_traffic/allagents.xml'.freeze + FILE_PATH = File.join(File.dirname(__dir__), '..', '..', 'vendor', 'mongoid_traffic', 'allagents.xml') class << self def list diff --git a/lib/mongoid_traffic/logger/geo_ip.rb b/lib/mongoid_traffic/logger/geo_ip.rb index d383441..eb4491d 100644 --- a/lib/mongoid_traffic/logger/geo_ip.rb +++ b/lib/mongoid_traffic/logger/geo_ip.rb @@ -4,11 +4,11 @@ module MongoidTraffic class Logger class GeoIp DATA_URL = 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz'.freeze - FILE_URL = 'vendor/mongoid_traffic/GeoIP.dat'.freeze + FILE_PATH = File.join(File.dirname(__dir__), '..', '..', 'vendor', 'mongoid_traffic', 'GeoIP.dat') class << self def geoip - @geoip ||= ::GeoIP.new(FILE_URL) + @geoip ||= ::GeoIP.new(FILE_PATH) end def country_code2(str)