geo_seeder 1.0.0 → 1.0.1

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 keys.yml
+.DS_Store

data/README.md

@@ -58,7 +58,7 @@ def set_coordinates
   if location.lat && location.lng
     lat, lng = location.lat, location.lng
   else
-    errors[:base] << "Unable to determine geo data based on provided address."
+    errors[:base] << "Unable to determine geo data from provided address."
   end
 end
 ```
@@ -71,8 +71,18 @@ location.formatted_address
 # => "77-11 37th Avenue, Jackson Heights, NY 11372"
 ```
 
+### .all
+Instance method if you want all Location object attributes in hash form.
+```ruby
+location = GeoSeeder::Location.random.first
+location.all
+# => {:formatted_address=>"2467 Bedford Avenue, Brooklyn, NY 11226, USA",
+#     :lat=>40.643426,
+#     :lng=>-73.95428,
+#     :city=>"Brooklyn", ...}
+```
+
 ### Comming Soon!
-* .all instance method - returns a hash containing all of a locations object's attributes. 
 * output option - call any class method with the option - output: ["attribute1", "attribute2", ...] - and it will return a hash/array of hashes with only those attributes, all ready for your merging pleasure.
 
 ## Contributing

data/lib/geo_seeder/version.rb

@@ -1,3 +1,3 @@
 module GeoSeeder
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/geo_seeder.rb

@@ -7,9 +7,21 @@ module GeoSeeder
   class Location
     
     API_KEY = ENV["GOOGLE_KEY"]
-    
+    ADDRESS_COMPONENT_TYPES = {
+      "street_number" => "@street_number",
+      "route" => "@street",
+      "neighborhood" => "@neighborhood",
+      "administrative_area_level_1" => "@state",
+      "administrative_area_level_2" =>  "@county",
+      "locality" => "@city",
+      "administrative_area_level_3" => "@city",
+      "sublocality" => "@city",
+      "postal_code" => "@zip_code",
+      "country" => "@country"
+    }
+
     attr_reader :formatted_address, :street_number, :street, :neighborhood, 
-                :city, :state, :state_abrv, :zip_code, :county, 
+                :city, :state, :zip_code, :county, :region,
                 :country, :lat, :lng
                 
     def initialize(options)
@@ -18,28 +30,11 @@ module GeoSeeder
       @lng = options["geometry"]["location"]["lng"]
       
       options["address_components"].each do |comp|
-        types = comp["types"]
+        type = comp["types"].first
         ln = comp["long_name"]
-        sn = comp["short_name"]
         
-        if types.include?("street_number")
-          @street_number = ln
-        elsif types.include?("route")
-          @street = ln
-        elsif types.include?("administrative_area_level_1")
-          @state = ln
-          @state_abrv = sn
-        elsif types.include?("administrative_area_level_2")
-          @county = ln
-        elsif types.include?("sublocality") ||
-              types.include?("administrative_area_level_3")
-          @city = ln
-        elsif types.include?("postal_code")
-          @zip_code = ln
-        elsif types.include?("neighborhood")
-          @neighborhood = ln
-        elsif types.include?("country")
-          @country = ln
+        unless eval(ADDRESS_COMPONENT_TYPES[type])
+          eval("#{ADDRESS_COMPONENT_TYPES[type]} = '#{ln}'")
         end
       end
     end
@@ -66,18 +61,10 @@ module GeoSeeder
         radius: 1
       }.merge(defaults)
       
-      center_point = latlng(options[:center])
-      center_lat = center_point.lat
-      center_lng = center_point.lng
-      diff = options[:radius] * 1.0 / 70.0
-      
       results = []
       
       while results.count < options[:quantity]
-        rand_lat = (center_lat + rand(-diff..diff)).round(7)
-        rand_lng = (center_lng + rand(-diff..diff)).round(7)
-        
-        rand_address = address([rand_lat, rand_lng])
+        rand_address = address(rand_coords(options[:center], options[:radius]))
         
         if rand_address && rand_address.street_number
           results << rand_address
@@ -87,6 +74,7 @@ module GeoSeeder
       results
     end
     
+    
     def self.address(latlng)
       response = api_request({latlng: latlng})
       location = response.count > 0 ? GeoSeeder::Location.new(response.first) : nil
@@ -103,6 +91,18 @@ module GeoSeeder
     end
     
     protected
+    def self.rand_coords(center, radius)
+      center_pt = nil
+      until center_pt
+        center_pt = latlng(center)
+      end
+      center_coords = [center_pt.lat, center_pt.lng]
+      diff = radius * 1.0 / 70.0
+      center_coords.map do |coord|
+        (coord + rand(-diff..diff)).round(7)
+      end
+    end
+    
     def self.api_request(options = {})
       # options must either contain an address string or a latlng array
       if options[:latlng]
@@ -121,7 +121,6 @@ module GeoSeeder
         :query_values => q_vals
       ).to_s
  
-    
       JSON.parse(RestClient.get(query_string))["results"]
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_seeder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable