seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

vrfs-774: fixed tests

This commit is contained in:
Jonathan Kolyer 2013-10-28 22:32:58 -05:00
parent 9f09674d77
commit e69cd18fe1
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ruby/lib/jam_ruby/models/max_mind_geo.rb
View File

@ -1,3 +1,4 @@
require 'csv'
module JamRuby
class MaxMindGeo < ActiveRecord::Base
@ -10,12 +11,41 @@ module JamRuby
# startIpNum,endIpNum,country,region,city,postalCode,latitude,longitude,dmaCode,areaCode
MaxMindGeo.transaction do
cols = [:startIpNum, :endIpNum, :country, :region, :city, :latitude, :longitude]
MaxMindGeo.delete_all
File.open(file, 'r:ISO-8859-1') do |io|
MaxMindGeo.pg_copy_from io, :map => { 'startIpNum' => 'ip_start', 'endIpNum' => 'ip_end', 'country' => 'country', 'region' => 'region', 'city' => 'city', 'latitude' => 'lat', 'longitude' => 'lng'}, :columns => [:startIpNum, :endIpNum, :country, :region, :city, :latitude, :longitude]
CSV.foreach(file, :encoding => 'ISO-8859-1') do |startIpNum,endIpNum,country,region,city,postalCode,latitude,longitude,dmaCode,areaCode|
next if startIpNum == 'startIpNum'
mmg = MaxMindGeo.new
mmg.ip_start = startIpNum
mmg.ip_end = endIpNum
mmg.country = MaxMindIsp.strip_quotes(country)
mmg.region = MaxMindIsp.strip_quotes(region)
mmg.city = MaxMindIsp.strip_quotes(city)
mmg.lat = latitude
mmg.lng = longitude
mmg.save!
end
# File.open(file, 'r:ISO-8859-1') do |io|
# MaxMindGeo.pg_copy_from(io, :map => {
# 'startIpNum' => 'ip_start',
# 'endIpNum' => 'ip_end',
# 'country' => 'country',
# 'region' => 'region',
# 'city' => 'city',
# 'latitude' => 'lat',
# 'longitude' => 'lng'},
# :columns => cols) do |row|
# # byebug
# row[0] = row[0]
# row[1] = row[1]
# row[2] = MaxMindIsp.strip_quotes(row[2])
# row[3] = MaxMindIsp.strip_quotes(row[3])
# row[4] = MaxMindIsp.strip_quotes(row[4])
# row[5] = row[5]
# row[6] = row[6]
# end
# end
end
byebug
User.find_each { |usr| usr.update_lat_lng }
end

2
ruby/lib/jam_ruby/models/max_mind_isp.rb
View File

@ -27,8 +27,6 @@ module JamRuby
end
end
private
def self.strip_quotes str
return nil if str.nil?