campfire_logic 2.0.3 → 2.0.4

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/app/models/locale.rb

@@ -48,20 +48,12 @@ class Locale
   end
 
   # Instance methods: Initialization ===============================================================
-
   def post_process
-    self.set_kind
-#     self.geocode unless self.skip_geocoding || self.geocoding_address.blank?
-    self.save
+    set_kind
+    save
   end
 
   # Instance methods: Overrides ====================================================================
-
-  # Returns this locale's latitude/longitude, delegating to location as needed (to prevent duplicate/conflicting coordinates).
-  def coordinates
-    self.location ? self.location.coordinates : self[:coordinates]
-  end
-
   def friendly_name
     self.city? ? "#{self.name}, #{self.parent.name}" : self.name
   end

data/app/models/location.rb

@@ -81,6 +81,12 @@ class Location
     location.coordinates = [geo.longitude, geo.latitude]
   end
 
+  def self.geocode
+    p "Total not-geocoded locations: #{Location.not_geocoded.count}"
+    Location.not_geocoded.each{ |l| l.validate_address_and_localize }
+    "Not-geocoded locations remaining: #{Location.not_geocoded.count}"
+  end
+
   # Instance methods: Overrides ====================================================================
   def address1=(value)
     clear_geocoding if self.address1 != value
@@ -134,6 +140,13 @@ class Location
     geocoder_result.blank? || self.send(attribute) == geocoder_result.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[attribute])
   end
 
+  def validate_address_and_localize
+    if self.geocode
+      self.validate_address!
+      self.localize
+    end
+  end
+
   # Instance methods: Locales ======================================================================
 
   def localize
@@ -184,17 +197,19 @@ class Location
     _state = Locale.find_or_create_state_for(self)
 
     # Find or create a city locale for this location
-    _city = _state.children.to_a.detect{ |c| c.name =~ /#{self.city}/i } || (sleep 0.25; _state.children.create(:name => self.city))
+    _city = _state.children.to_a.detect{ |c| c.name =~ /#{self.city}/i } || (_state.children.create(:name => self.city))
 
     # Find or create a locale for this location
-    self.locale = _city.children.to_a.detect{ |c| c.name =~ /#{self.name}/i } || (sleep 0.25; _city.children.create(:name => self.name, :skip_geocoding => true))
+    self.locale = _city.children.to_a.detect{ |c| c.name =~ /#{self.name}/i } || (_city.children.create(:name => self.name, :skip_geocoding => true))
+    self.locale.coordinates = coordinates
     self.locale.save
   end
 
   # Updates the locale tree for this location.
   def update_locales
     # update location
-    self.locale.name = self.name
+    self.locale.coordinates = coordinates
+    self.locale.name = name
     self.locale.save
 
     # does its city locale have other locations?

data/app/models/location_import.rb

@@ -24,7 +24,6 @@ class LocationImport < ScaffoldLogic::DataImport
 
       _location.validate_address!
       _location.localize
-      sleep 0.33
     else
       @errors << "Row #{@row_index}: Missing at least one required field: #{@required_fields * ', '}!"
     end

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-02-18"
+  s.date = "2012-02-21"
   s.description = "Users can browse locations by country, city, and state and search locations by string or zip code. Administrators can manage locations and the services they offer."
   s.email = "rod@seologic.com"
   s.extra_rdoc_files = [

data/spec/models/locale_spec.rb

@@ -11,8 +11,7 @@ describe Locale do
 #     Location.any_instance.stubs :geocode
 #     GeocoderGoogleResult.stubs(:new).returns stub('prospect park zoo', :city => 'Brooklyn', :country_long_name => 'United States', :country_short_name => 'US', :formatted_address => '450 Flatbush Avenue', :formatted_street_address => '450 Flatbush Avenue', :lat => 1, :lng => 1, :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY')
     location = Location.new :address1 => '25 Columbia Heights', :city => 'Brooklyn', :name => 'Prospect Park Zoo', :state => 'NY'
-    location.validate_address!
-    location.localize
+    location.validate_address_and_localize
   end
 
   it 'can skip geocoding on creation' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 0
-  - 3
-  version: 2.0.3
+  - 4
+  version: 2.0.4
 platform: ruby
 authors: 
 - Roderick Monje
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-18 00:00:00 Z
+date: 2012-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext