From e69cd18fe150ddc81fcccb6b2e5f92e6496816c8 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Mon, 28 Oct 2013 22:32:58 -0500
Subject: [PATCH] vrfs-774:  fixed tests

---
 ruby/lib/jam_ruby/models/max_mind_geo.rb | 36 ++++++++++++++++++++++--
 ruby/lib/jam_ruby/models/max_mind_isp.rb |  2 --
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/max_mind_geo.rb b/ruby/lib/jam_ruby/models/max_mind_geo.rb
index 9cdde962f..e534a5b7b 100644
--- a/ruby/lib/jam_ruby/models/max_mind_geo.rb
+++ b/ruby/lib/jam_ruby/models/max_mind_geo.rb
@@ -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
 
diff --git a/ruby/lib/jam_ruby/models/max_mind_isp.rb b/ruby/lib/jam_ruby/models/max_mind_isp.rb
index 3bb7b15bc..cab07f862 100644
--- a/ruby/lib/jam_ruby/models/max_mind_isp.rb
+++ b/ruby/lib/jam_ruby/models/max_mind_isp.rb
@@ -27,8 +27,6 @@ module JamRuby
       end
     end
 
-    private
-
     def self.strip_quotes str
       return nil if str.nil?