whos_using_what 0.2.5 → 0.2.6

data/lib/whos_using_what/data_gatherers/geo_tagger.rb

@@ -6,7 +6,8 @@ require "rest-client"
 
 class GeoTagger
 
-  def initialize
+  def initialize log
+    @log = log
     @mongo_client = MongoHelper.get_mongo_connection
     @companies_coll = @mongo_client['companies']
     @coords_coll = @mongo_client['coordinates']
@@ -38,89 +39,95 @@ class GeoTagger
 
   end
 
+  def insert_new_zip_entry zip_code
 
-  def load_geolocations_into_db
+    if (zip_acceptance_predicate (zip_code))
 
-    @companies_coll.find().to_a.each do |company|
+      begin
+        #todo figure how to do this now that we are using instance variables instead of class variables
+        process_zip_closure = lambda {
 
-      if !company
-        next
-      end
+          resp_map = @locations_client.api_get_google_location_data zip_code
 
+          doc = {}
 
-      keys_arr = ['locations', 'values']
-      locations = MapDataExtractionUtil.safe_extract_helper keys_arr, company, :nil, nil
-
-      if !locations
-        next
-      end
-      locations.each do |location|
 
-        zip_code = location['address']['postalCode']
+          doc[:zip] = zip_code
 
-        #strip off anything past 5 characters, as we only want main part of zip code
-        if !zip_code || zip_code.size < 5
-          next
-        end
+          coords = @locations_client.get_coords_from_google_location_resp_helper resp_map
+          if coords[0] && coords[1]
+            doc[:loc] = {"lon" => coords[0], "lat" => coords[1]}
+          end
 
-        zip_code = zip_code[0...5]
 
-        if (zip_acceptance_predicate (zip_code))
+          keys_arr = ["AddressDetails", "Country", "AdministrativeArea", "Locality", "LocalityName"]
+          MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :city, doc
 
+          keys_arr = ["AddressDetails", "Country", "AdministrativeArea", "AdministrativeAreaName"]
+          MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :state, doc
 
-          begin
-            #todo figure how to do this now that we are using instance variables instead of class variables
-            process_zip_closure = lambda {
+          keys_arr = ["AddressDetails", "Country", "CountryNameCode"]
+          MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :country, doc
 
-              resp_map = @locations_client.api_get_google_location_data zip_code
 
-              doc = {}
+          if (doc.size > 1 && doc[:country] == "US")
+            coll = @coords_coll.find(zip: zip_code).to_a
+          end
 
+          if coll && coll.size < 1
 
-              doc[:zip] = zip_code
 
-              coords = @locations_client.get_coords_from_google_location_resp_helper resp_map
-              if coords[0] && coords[1]
-                doc[:loc] = {"lon" => coords[0], "lat" => coords[1]}
-              end
+            @coords_coll.insert(doc)
 
+          end
+        }
 
-              keys_arr = ["AddressDetails", "Country", "AdministrativeArea", "Locality", "LocalityName"]
-              MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :city, doc
+        process_zip_closure.call
+      rescue Exception => e
+        puts e.message
+        puts e.backtrace
 
-              keys_arr = ["AddressDetails", "Country", "AdministrativeArea", "AdministrativeAreaName"]
-              MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :state, doc
+      end
+    end
 
-              keys_arr = ["AddressDetails", "Country", "CountryNameCode"]
-              MapDataExtractionUtil.safe_extract_helper keys_arr, resp_map, :country, doc
+  end
 
 
-              if (doc.size > 1 && doc[:country] == "US")
-                coll = @coords_coll.find(zip: zip_code).to_a
-              end
+  def load_geolocations_into_db
 
-              if coll && coll.size < 1
+    @companies_coll.find().to_a.each do |company|
 
+      if !company
+        next
+      end
 
-                @coords_coll.insert(doc)
 
-              end
-            }
+      keys_arr = ['locations', 'values']
+      locations = MapDataExtractionUtil.safe_extract_helper keys_arr, company, :nil, nil
 
+      if !locations
+        next
+      end
+      locations.each do |location|
 
-            process_zip_closure.call
-          rescue Exception => e
-            puts e.message
-            puts e.backtrace
+        zip_code = location['address']['postalCode']
 
-          end
+        #strip off anything past 5 characters, as we only want main part of zip code
+        if !zip_code || zip_code.size < 5
+          next
         end
+
+        zip_code = zip_code[0...5]
+
+        insert_new_zip_entry zip_code
       end
     end
   end
 
   def update_companies_with_latitude_longitude
 
+    @log.info "beginning updating of companies with latitude and longitude data"
+
     @companies_coll.find().to_a.each do |company|
 
 

data/lib/whos_using_what/data_searchers/companies_searcher.rb

@@ -1,12 +1,13 @@
 class CompaniesSearcher
 
-  def initialize
+  #geo_tagger = instance of GeoTagger
+  def initialize geo_tagger
 
     @mongo_client = MongoHelper.get_mongo_connection
     @companies_coll = @mongo_client['companies']
     @coords_coll = @mongo_client['coordinates']
 
-    @geo_tagger = GeoTagger.new
+    @geo_tagger = geo_tagger
 
   end
 
@@ -18,14 +19,11 @@ class CompaniesSearcher
   end
 
   def zip_code_search zip_code
+
     zip_doc = @coords_coll.find_one({:zip => zip_code})
     if zip_doc == nil
 
-      #todo consider making a method in GeoTagger class to do this instead of using closure directly here
-      #todo need to figure out how to call this from other class
-      closure = @geo_tagger.process_zip_closure zip_code
-
-      closure.call
+      @geo_tagger.insert_new_zip_entry zip_code
 
     end
     zip_doc = @coords_coll.find_one({:zip => zip_code})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whos_using_what
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors: