campfire_logic 2.0.4 → 2.0.5

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/app/models/locale.rb

@@ -14,6 +14,8 @@ class Locale
   field :accuracy, :type => Integer
   field :coordinates, :type => Array
   field :kind
+  index :kind
+  index :name
   index [[ :coordinates, Mongo::GEO2D ]], :min => -200, :max => 200
 
   # Scopes =========================================================================================
@@ -108,6 +110,10 @@ class Locale
     super unless self.country?
   end
 
+  def has_other_locations?
+    location_locales.count > 1
+  end
+
   # Returns location-locales found within this locale.
   def location_locales
     self.descendants.valid_location

data/app/models/location.rb

@@ -161,6 +161,16 @@ class Location
     self.locale.parent
   end
 
+  def fix_duplicate_city
+    duplicate_city = city_locale
+    valid_city = Locale.cities.where(:name => duplicate_city.name).first
+
+    if valid_city && valid_city.has_other_locations?
+      self.locale.parent = valid_city
+      self.locale.save
+    end
+  end
+
   # Returns this location's state locale.
   def state_locale
     self.city_locale.parent
@@ -184,6 +194,10 @@ class Location
     end
   end
 
+  def city_renamed?
+    city != city_locale.name
+  end
+
   # Clears all addressing data set by the geocoder.
   def clear_geocoding
     self.geocoder_result = nil
@@ -212,8 +226,7 @@ class Location
     self.locale.name = name
     self.locale.save
 
-    # does its city locale have other locations?
-    if self.city_locale.children.count > 1
+    if city_renamed? && city_locale.has_other_locations?
       # create a new city
       self.locale.parent = self.state_locale.children.create(:name => self.city)
     else

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-02-21"
+  s.date = "2012-02-29"
   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/location_spec.rb

@@ -63,6 +63,11 @@ describe Location do
         @two_boots.state_locale.parent.should == Locale.us.first
       end
 
+      it "doesn't create duplicate cities after re-localization" do
+        @two_boots.validate_address_and_localize
+        Locale.where(:name => 'Brooklyn').count.should == 1
+      end
+
       it 'updates the locale tree of a modified location' do
 #         Locale.any_instance.unstub :geocode
 #         @tea_lounge.unstub :geocode

metadata

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