campfire_logic 2.0.6 → 2.0.7

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.7

data/app/models/locale.rb

@@ -28,6 +28,7 @@ class Locale
 
   # Callbacks ======================================================================================
   after_create :post_process
+  before_destroy :delete_descendants
   before_save :set_slug
 
   # Macros =========================================================================================
@@ -46,7 +47,7 @@ class Locale
   end
 
   def self.find_or_create_state_for(location)
-    Locale.states.where(:name => location.state_long_name).first || Locale.find_or_create_country_for(location).children.create(:abbreviation => location.state, :name => location.state_long_name)
+    Locale.states.where(:abbreviation => location.state).first || Locale.find_or_create_country_for(location).children.create(:abbreviation => location.state, :name => location.state_long_name)
   end
 
   # Instance methods: Initialization ===============================================================
@@ -107,7 +108,7 @@ class Locale
       Rails.logger.info "Did not destroy #{self.parent.name}: has #{self.parent.children.to_a.map{|x|x.name.to_s}.sort * ', '}"
     end
 
-    super unless self.country?
+    super if ! country? || (country? && slug.blank?)
   end
 
   def has_other_locations?

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-03-23"
+  s.date = "2012-04-16"
   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 = [
@@ -140,7 +140,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/ivanoblomov/campfire_logic"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "Rails engine that adds a location directory to your web app"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 7
+  version: 2.0.7
 platform: ruby
 authors: 
 - Roderick Monje
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-23 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails engine that adds a location directory to your web app