campfire_logic 1.2.0 → 1.2.1

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/app/controllers/directory_controller.rb

@@ -8,8 +8,7 @@ class DirectoryController < ApplicationController
   end
 
   def show
-    @locale = find_location_locale || find_city || find_state || find_country || Locale.init_root
-    @location = find_location_locale.location if find_location_locale
+    @locale = find_locale || Locale.init_root
     Rails.logger.info "Found a #{@locale.kind} locale: #{@locale.name}"
   end
 
@@ -19,20 +18,8 @@ class DirectoryController < ApplicationController
 
   private
 
-  def find_city
-    @city ||= find_state.children.to_a.detect{ |c| c.slug == params[:city] } if params[:city]
-  end
-
-  def find_country
-    @country ||= Locale.root.children.to_a.detect{ |c| c.slug == params[:country] } if params[:country]
-  end
-
-  def find_location_locale
-    @location_locale ||= find_city.children.to_a.detect{ |c| c.slug == params[:location] } if params[:location]
-  end
-
-  def find_state
-    @state ||= Locale.first(:conditions => {:slug => params[:state]}) if params[:state]
+  def find_locale
+    Locale.first(:conditions => {:slug => params[:slug]})
   end
 
   def search_by_string

data/app/helpers/application_helper.rb

@@ -7,7 +7,7 @@ module ApplicationHelper
     html << link_to( 'Locations', locations_path ) if controller?('locations')
     html << link_to( 'Search', directory_search_root_path ) if controller?('directory') && action?('search')
     html << link_to( 'Services', services_path ) if controller?('services')
-    html << @locale.non_root_ancestors_and_self.map{ |l| link_to l.name, l.to_url } if @locale && ! @locale.country?
+    html << @locale.non_root_ancestors_and_self.map{ |l| link_to l.name, l.to_param } if @locale && ! @locale.country?
     (html * ' &gt; ').html_safe
   end
 

data/app/models/locale.rb

@@ -28,6 +28,7 @@ class Locale
 
   # Callbacks ======================================================================================
   after_create :post_process
+  before_save :set_slug
 
   # Macros =========================================================================================
   attr_accessor :skip_geocoding
@@ -51,9 +52,8 @@ class Locale
   # Instance methods: Initialization ===============================================================
 
   def post_process
-    self.set_slug
-    self.geocode unless self.skip_geocoding || self.geocoding_address.blank?
     self.set_kind
+    self.geocode unless self.skip_geocoding || self.geocoding_address.blank?
     self.save
   end
 
@@ -135,12 +135,12 @@ class Locale
 
   # Sets the slug for this locale. Slugs from the locale tree are used to build this locale's URL.
   def set_slug
-    self.slug = self.root? ? nil : self.name.to_s.to_url
+    self.slug = self.root? ? nil : "#{(non_root_ancestors_and_self_names * '/').to_url.gsub('-slash-', '/')}"
   end
 
   # Returns the permalink for this locale.
-  def to_url
-    "/directory/#{(non_root_ancestors_and_self_names * '/').to_url.gsub('-slash-', '/')}"
+  def to_param
+    "/#{CampfireLogic.directory_slug}/#{slug}"
   end
 
   # Instance Methods: Typing =======================================================================

data/app/models/location.rb

@@ -38,11 +38,7 @@ class Location
   # Macros =========================================================================================
   attr_accessor :geocoder_result
   geocoded_by :geocoding_address do |location, results|
-    if geo = results.first
-      location.geocoder_result = GeocoderGoogleResult.new geo.data
-      location.country, location.country_long_name, location[:state], location.state_long_name = geo.country_code, geo.country, geo.state_code, geo.state
-      location.coordinates = [geo.longitude, geo.latitude]
-    end
+    parse_geo location, results.first if results.first
   end
 
   trimmed_fields :address1, :address2, :city, :email, :fax, :location_number, :name, :phone, :state, :zip
@@ -71,6 +67,19 @@ class Location
     end
   end
 
+  def self.parse_geo location, geo
+    if Geocoder::Configuration.lookup == :google
+      location.geocoder_result = GeocoderGoogleResult.new geo.data
+    else
+      location.address1 = geo.data['line1']
+      location.city = geo.data['city']
+      location.state = geo.data['state']
+    end
+
+    location.country, location.country_long_name, location[:state], location.state_long_name = geo.country_code, geo.country, geo.state_code, geo.state
+    location.coordinates = [geo.longitude, geo.latitude]
+  end
+
   # Instance methods: Overrides ====================================================================
   def address1=(value)
     clear_geocoding if self.address1 != value
@@ -91,7 +100,7 @@ class Location
 
   # Returns this location's address for geocoding. It omits the second address field to simplify post-processing.
   def geocoding_address
-    [address1, city, state].select{|s| ! s.blank?} * ' '
+    [address1, city, state].select{|s| ! s.blank?} * ', '
   end
 
   # Returns this location's street address, combining the two address fields with the specified delimiter. Latter defaults to a space.
@@ -105,6 +114,7 @@ class Location
   def call_geocode
     return :new if self.geocoding_address.blank?
     geocode
+    return :new unless Geocoder::Configuration.lookup == :google
     audit_address
     self.geocoder_result.try(:partial_match?) ? :partial_match : :validated
   end

data/app/views/directory/_show_children.html.erb

@@ -21,7 +21,7 @@
     <%- @locale.sorted_children.in_groups(2, false).each do |group| -%>
       <ul style="float: left; margin-right: 1em; width: 40%;">
       <%- group.each do |_child| -%>
-        <li><%= link_to _child.name, _child.to_url -%></li>
+        <li><%= link_to _child.name, _child.to_param -%></li>
       <%- end -%>
       </ul>
     <%- end -%>

data/app/views/directory/_show_location.html.erb

@@ -1,4 +1,4 @@
-<%- set_title "Location Directory - #{ @location.name }" -%>
+<%- set_title "Location Directory - #{ (@location || @locale).name }" -%>
 
 <%= render 'shared/location' -%><br style="clear: both;" />
 <br style="clear: both;" />

data/app/views/locations/index.html.erb

@@ -24,7 +24,7 @@
       <td><%= location.geocoding_address -%></td>
       <td>
         <%- if location.locale -%>
-          <%= link_to location.locale.to_url, location.locale.to_url -%>
+          <%= link_to location.locale.to_param, location.locale.to_param -%>
         <%- end -%>
       </td>
       <td class="crud_links"><%= crud_links(location, [:show, :edit, :destroy]) -%></td>

data/app/views/shared/_location.html.erb

@@ -1,18 +1,18 @@
-<div class="vcard">
-  <div class="fn org"><%= link_to @location.name, @location.locale.to_url -%></div>
-  <p class="adr">
-    <span class="street-address"><%= h @location.street_address('<br />') -%></span><br />
-    <span class="locality"><%= h @location.city -%></span>,
-    <span class="region"><%= h @location.state.upcase -%></span>
-    <span class="postal-code"><%= h @location.zip -%></span><br />
-    <span class="tel">Phone
-      <span class="type" style="display: none;">Work</span>
-      <span class="value"><%= h @location.phone -%></span>
+<div class=vcard>
+  <div class="fn org"><%= link_to @location.name, @location.locale.to_param -%></div>
+  <p class=adr>
+    <span class=street-address><%= h @location.street_address('<br/>') -%></span><br />
+    <span class=locality><%= h @location.city -%></span>,
+    <span class=region><%= h @location.state.upcase -%></span>
+    <span class=postal-code><%= h @location.zip -%></span><br />
+    <span class=tel>Phone
+      <span class=type style="display: none;">Work</span>
+      <span class=value><%= h @location.phone -%></span>
     </span><br />
     <%- if @location.fax && @location.fax.size > 3 -%>
-      <span class="tel">Fax
-      <span class="value"><%= h @location.fax -%></span>
+      <span class=tel>Fax
+      <span class=value><%= h @location.fax -%></span>
     </span><br />
     <%- end -%>
   </p>
-</div>
+</div>

data/app/views/shared/_map.html.erb

@@ -5,28 +5,28 @@
   var directionsService = new google.maps.DirectionsService();
   var locations = [
 <%- if place && place.location? && place.geocoded? -%>
-    <%= raw "['#{h(escape_javascript place.location.name)}', #{place.coordinates[0]}, #{place.coordinates[1]}, '#{h(escape_javascript place.location.name)}<br />#{h(escape_javascript place.location.address1)}<br />#{h(escape_javascript place.location.city)}, #{h(escape_javascript place.location.state)} #{h(escape_javascript place.location.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(0)\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(0)\">From here<\/a>']" -%>
+    <%= raw "['#{h(escape_javascript place.location.name)}', #{place.coordinates[1]}, #{place.coordinates[0]}, '#{h(escape_javascript place.location.name)}<br />#{h(escape_javascript place.location.address1)}<br />#{h(escape_javascript place.location.city)}, #{h(escape_javascript place.location.state)} #{h(escape_javascript place.location.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(0)\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(0)\">From here<\/a>']" -%>
 <%- else -%>
-    <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.coordinates[0]}, #{l.coordinates[1]}, '#{link_to h(escape_javascript l.name), l.locale.to_url}<br />#{h(escape_javascript l.address1)}<br />#{h(escape_javascript l.city)}, #{h(escape_javascript l.state)} #{h(escape_javascript l.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(#{i})\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(#{i})\">From here<\/a>']"; a } * ",\r" -%>
+    <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.coordinates[1]}, #{l.coordinates[0]}, '#{link_to h(escape_javascript l.name), l.locale.to_param}<br />#{h(escape_javascript l.address1)}<br />#{h(escape_javascript l.city)}, #{h(escape_javascript l.state)} #{h(escape_javascript l.zip)}<br /><br />Directions: <a href=\"javascript:showDirectionsTo(#{i})\">To here<\/a> / <a href=\"javascript:showDirectionsFrom(#{i})\">From here<\/a>']"; a } * ",\r" -%>
 <%- end -%>
   ];
   var map;
   var markers = [];
   var openWindow;
 
-  function initializeMap() {
+  function initializeMap(id) {
     var myOptions = {
       zoom: <%= place && place.zoom_level || 4 -%>,
   <%- if place && place.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.coordinates[0] -%>, <%= place.coordinates[1] -%>),
+      center: new google.maps.LatLng(<%= place.coordinates[1] -%>, <%= place.coordinates[0] -%>),
   <%- elsif place && place.parent && place.parent.geocoded? -%>
-      center: new google.maps.LatLng(<%= place.parent.coordinates[0] -%>, <%= place.parent.coordinates[1] -%>),
+      center: new google.maps.LatLng(<%= place.parent.coordinates[1] -%>, <%= place.parent.coordinates[0] -%>),
   <%- else -%>
       center: new google.maps.LatLng(37.09024, -95.712891),
   <%- end -%>
       mapTypeId: google.maps.MapTypeId.ROADMAP
     };
-    map = new google.maps.Map(document.getElementById('map_canvas'), myOptions);
+    map = new google.maps.Map(document.getElementById(id), myOptions);
     directionsDisplay.setMap(map);
     directionsDisplay.setPanel($('#directions_panel')[0]);
     for (var i = 0; i < locations.length; i++) {

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-01-29"
+  s.date = "2012-01-31"
   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/config/routes.rb

@@ -24,10 +24,7 @@ Rails.application.routes.draw do
   end
 
   constraints(LocaleConstraint.new) do
-    get "#{CampfireLogic.directory_slug}/:country" => 'directory#show', :as => 'directory_show_country'
-    get "#{CampfireLogic.directory_slug}/:country/:state" => 'directory#show', :as => 'directory_show_state'
-    get "#{CampfireLogic.directory_slug}/:country/:state/:city" => 'directory#show', :as => 'directory_show_city'
-    get "#{CampfireLogic.directory_slug}/:country/:state/:city/:location" => 'directory#show', :as => 'directory_show_location'
+    get "#{CampfireLogic.directory_slug}/*slug" => 'directory#show'
   end
 
   resources :locations do

data/spec/models/locale_spec.rb

@@ -4,7 +4,13 @@ describe Locale do
   before :all do
     Locale.delete_all
     Locale.init_root
-    location = Location.new :address1 => '450 Flatbush Avenue', :city => 'Brooklyn', :name => 'Prospect Park Zoo', :state => 'NY'
+    Location.delete_all
+#     Locale.any_instance.stubs :geocode
+#     Location.any_instance.stubs(:country_long_name).returns 'United States'
+#     Location.any_instance.stubs(:state_long_name).returns 'New York'
+#     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
   end
@@ -27,6 +33,7 @@ describe Locale do
     specify { subject.name.should == 'United States' }
     specify { subject.should be_country }
     specify { subject.geocoding_address.should == 'United States' }
+    specify { subject.geocoded?.should be_true }
   end
 
   context 'when state' do
@@ -35,6 +42,7 @@ describe Locale do
     specify { subject.should be_state }
     specify { subject.geocoding_address.should == 'New York' }
     specify { subject.friendly_name.should == 'New York' }
+    specify { subject.geocoded?.should be_true }
   end
 
   context 'when city' do
@@ -43,6 +51,7 @@ describe Locale do
     specify { subject.should be_city }
     specify { subject.geocoding_address.should == 'Brooklyn New York' }
     specify { subject.friendly_name.should == 'Brooklyn, New York' }
+    specify { subject.geocoded?.should be_true }
   end
 
   context 'when location' do
@@ -50,6 +59,7 @@ describe Locale do
     specify { subject.name.should == 'Prospect Park Zoo' }
     specify { subject.should be_location }
     specify { subject.geocoding_address.should be_nil }
-    specify { subject.to_url.should =~ /united-states\/new-york\/brooklyn\/prospect-park-zoo$/ }
+    specify { subject.to_param.should =~ /united-states\/new-york\/brooklyn\/prospect-park-zoo$/ }
+    specify { subject.geocoded?.should be_true }
   end
 end

data/spec/models/location_spec.rb

@@ -10,82 +10,151 @@ describe Location do
     Location.delete_all
   end
 
-  before(:each) do
-    @white_house = Location.new :address1 => '1600 Pennsylvania', :city => 'Washington', :name => 'White House'
-    @white_house.validate_address!
-    @white_house.localize
-
-    @tea_lounge = Location.new :address1 => ' 837 Union St ', :address2 => ' Suite 1 ', :city => ' Brooklyn ', :name => ' Tea Lounge ', :state => ' NY ', :zip => ' 11215 '
-    @tea_lounge.validate_address!
-    @tea_lounge.localize
-
-    @two_boots = Location.new(:address1 => '514 2nd Street', :city => 'Brooklyn', :name => 'Two Boots of Brooklyn', :state => 'NY')
-    @two_boots.validate_address!
-    @two_boots.localize
-
-    @new_park = Location.new(:address1 => '15671 Crossbay Boulevard', :city => 'Howard Beach', :name => 'New Park Pizza', :state => 'NY')
-    @new_park.validate_address!
-    @new_park.localize
-  end
-
-  context 'addressing' do
-    it 'returns an address for geocoding' do
-      @tea_lounge.geocoding_address.should == '837 Union St Brooklyn NY'
-      @white_house.geocoding_address.should == '1600 Pennsylvania Washington DC'
-    end
-
-    it 'returns a concatenated street address' do
-      @tea_lounge.street_address.should == '837 Union St Suite 1'
-      @white_house.street_address.should == '1600 Pennsylvania'
+  context '' do
+    before(:all) { create_locations }
+
+    context 'addressing' do
+      it 'returns an address for geocoding' do
+        @tea_lounge.geocoding_address.should == '837 Union St, Brooklyn, NY'
+        @white_house.geocoding_address.should == '1600 Pennsylvania Ave, Washington, DC'
+      end
+
+      it 'returns a concatenated street address' do
+        @tea_lounge.street_address.should == '837 Union St Suite 1'
+        @white_house.street_address.should == '1600 Pennsylvania Ave'
+      end
+
+      it 'approves user-validated addresses' do
+        if Geocoder::Configuration.lookup == :google
+          @white_house.approve_address!
+          @white_house.should be_validated
+        else
+          pending 'For address validation, you must geocode with Google'
+        end
+      end
     end
 
-    it 'approves user-validated addresses' do
-      @white_house.approve_address!
-      @white_house.should be_validated
+    context 'localization' do
+      it 'creates a locale tree for a new location' do
+        @tea_lounge.locale.name.should == 'Tea Lounge'
+        @tea_lounge.city_locale.city?.should be_true
+        @tea_lounge.city_locale.name.should == 'Brooklyn'
+        @tea_lounge.state_locale.state?.should be_true
+        @tea_lounge.state_locale.name.should == 'New York'
+        @tea_lounge.state_locale.parent.should == Locale.us.first
+      end
+
+      it 'merges a new location into a matching city tree' do
+        @two_boots.locale.name.should == 'Brooklyn Museum'
+        @two_boots.locale.sibling_of?(@tea_lounge.locale).should be_true
+        @two_boots.city_locale.should == @tea_lounge.city_locale
+        @two_boots.state_locale.should == @tea_lounge.state_locale
+        @two_boots.state_locale.parent.should == Locale.us.first
+      end
+
+      it 'merges a new location into a matching state tree' do
+        @new_park.locale.name.should == 'New Park Pizza'
+        @new_park.city_locale.city?.should be_true
+        @new_park.city_locale.name.should == 'Howard Beach'
+        @new_park.state_locale.should == @tea_lounge.state_locale
+        @new_park.state_locale.parent.should == Locale.us.first
+      end
+
+      it 'leaves the locale tree intact if other locations belong to it' do
+        @two_boots.city_locale.city?.should be_true
+        @two_boots.city_locale.name.should == 'Brooklyn'
+        @two_boots.state_locale.state?.should be_true
+        @two_boots.state_locale.name.should == 'New York'
+        @two_boots.state_locale.parent.should == Locale.us.first
+      end
+
+      it 'updates the locale tree of a modified location' do
+#         Locale.any_instance.unstub :geocode
+#         @tea_lounge.unstub :geocode
+#         @tea_lounge.unstub :geocoder_result
+        @tea_lounge.locale.to_param.should == '/directory/united-states/new-york/brooklyn/tea-lounge'
+        @tea_lounge.name = 'White House'
+        @tea_lounge.address1 = '1600 Pennsylvania Ave NW'
+        @tea_lounge.city = 'Washington'
+        @tea_lounge.state = 'DC'
+        @tea_lounge.validate_address!
+        @tea_lounge.localize
+        @tea_lounge.reload
+        @tea_lounge.locale.to_param.should == '/directory/united-states/district-of-columbia/washington/white-house'
+        @tea_lounge.city_locale.city?.should be_true
+        @tea_lounge.city_locale.name.should == 'Washington'
+        @tea_lounge.city_locale.to_param.should == '/directory/united-states/district-of-columbia/washington'
+        @tea_lounge.state_locale.state?.should be_true
+        @tea_lounge.state_locale.name.should == 'District of Columbia'
+        @tea_lounge.state_locale.to_param.should == '/directory/united-states/district-of-columbia'
+        @tea_lounge.state_locale.parent.should == Locale.us.first
+        @tea_lounge.state_locale.parent.to_param.should == '/directory/united-states'
+      end
     end
   end
 
-  context 'geocoding' do
-    it 'geocodes itself' do
-      @tea_lounge.geocoded?.should be_true
-      @white_house.geocoded?.should be_true
-    end
-
-    it 'validates addresses with Google Maps' do
-      @tea_lounge.country_long_name.should == 'United States'
-      @tea_lounge.state_long_name.should == 'New York'
-      @tea_lounge.validated_address1.should be_blank
-      @tea_lounge.validated_city.should be_blank
-      @tea_lounge.validated_zip.should be_blank
-      @tea_lounge.should be_validated
-
-      @white_house.should be_partial_match
-      @white_house.country_long_name.should == 'United States'
-      @white_house.state_long_name.should == 'District of Columbia'
-      @white_house.validated_address1.should == '1600 Pennsylvania Ave NW'
-      @white_house.validated_city.should be_blank
-      @white_house.validated_zip.should == '20500'
-    end
-
-    it 'detects matching address fields' do
-      @tea_lounge.matches_geocoder?(:address1).should be_true
-      @tea_lounge.matches_geocoder?(:city).should be_true
-      @tea_lounge.matches_geocoder?(:zip).should be_true
-    end
-
-    it 'detects mismatching address fields' do
-      @white_house.matches_geocoder?(:address1).should be_false
-      @white_house.matches_geocoder?(:zip).should be_false
+  context '' do
+    before(:each) { create_locations }
+
+    context 'geocoding' do
+      it 'geocodes itself' do
+        @tea_lounge.geocoded?.should be_true
+        @white_house.geocoded?.should be_true
+      end
+
+      it 'validates addresses with Google Maps' do
+        if Geocoder::Configuration.lookup == :google
+          @tea_lounge.country_long_name.should == 'United States'
+          @tea_lounge.state_long_name.should == 'New York'
+          @tea_lounge.validated_address1.should be_blank
+          @tea_lounge.validated_city.should be_blank
+          @tea_lounge.validated_zip.should be_blank
+          @tea_lounge.should be_validated
+
+          @white_house.should be_partial_match
+          @white_house.country_long_name.should == 'United States'
+          @white_house.state_long_name.should == 'District of Columbia'
+          @white_house.validated_address1.should == '1600 Pennsylvania Ave NW'
+          @white_house.validated_city.should be_blank
+          @white_house.validated_zip.should == '20500'
+        else
+          pending 'For address validation, you must geocode with Google'
+        end
+      end
+
+      it 'detects matching address fields' do
+        if Geocoder::Configuration.lookup == :google
+          @tea_lounge.matches_geocoder?(:address1).should be_true
+          @tea_lounge.matches_geocoder?(:city).should be_true
+          @tea_lounge.matches_geocoder?(:zip).should be_true
+        else
+          pending 'For address validation, you must geocode with Google'
+        end
+      end
+
+      it 'detects mismatching address fields' do
+        if Geocoder::Configuration.lookup == :google
+          @white_house.matches_geocoder?(:address1).should be_false
+          @white_house.matches_geocoder?(:zip).should be_false
+        else
+          pending 'For address validation, you must geocode with Google'
+        end
+      end
     end
 
     it 're-validates modified addresses with Google Maps' do
-      @white_house.address1 = ''
-      @white_house.validate_address!
-      @white_house.should be_validated
+      if Geocoder::Configuration.lookup == :google
+        @white_house.address1 = '900 Ohio Drive'
+        @white_house.validate_address!
+        @white_house.approve_address!
+        @white_house.should be_validated
+      else
+        pending 'For address validation, you must geocode with Google'
+      end
     end
 
     it 'preserves geocoding if updated with irrelevant changes' do
-      @white_house.update_attributes :name => 'The White House', :city => 'Washington'
+      @white_house.update_attributes :name => 'The White House'
       @white_house.geocoded?.should be_true
     end
 
@@ -98,88 +167,79 @@ describe Location do
       @white_house.validated_zip.should be_nil
       @white_house.should be_new
     end
-  end
 
-  context 'localization' do
-    it 'creates a locale tree for a new location' do
-      @tea_lounge.locale.name.should == 'Tea Lounge'
-      @tea_lounge.city_locale.city?.should be_true
-      @tea_lounge.city_locale.name.should == 'Brooklyn'
-      @tea_lounge.state_locale.state?.should be_true
-      @tea_lounge.state_locale.name.should == 'New York'
-      @tea_lounge.state_locale.parent.should == Locale.us.first
+    it "destroys its city when it's the only location" do
+      Locale.exists?(:conditions => {:name => 'Tea Lounge'}).should be_true
+      Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
+      Locale.exists?(:conditions => {:name => 'New York'}).should be_true
+      @tea_lounge.destroy
+      # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
+  #    Location.exists?(:conditions => {:name => 'Tea Lounge'}).should be_false
+      Locale.exists?(:conditions => {:name => 'Tea Lounge'}).should be_false
+      Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
+      Locale.exists?(:conditions => {:name => 'New York'}).should be_true
+
+      Locale.exists?(:conditions => {:name => 'Brooklyn Museum'}).should be_true
+      Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
+      Locale.exists?(:conditions => {:name => 'New York'}).should be_true
+      @two_boots.destroy
+      # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
+  #    Location.exists?(:conditions => {:name => 'Brooklyn Museum'}).should be_false
+      Locale.exists?(:conditions => {:name => 'Brooklyn Museum'}).should be_false
+      Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_false
+      Locale.exists?(:conditions => {:name => 'New York'}).should be_true
     end
 
-    it 'merges a new location into a matching city tree' do
-      @two_boots.locale.name.should == 'Two Boots of Brooklyn'
-      @two_boots.locale.sibling_of?(@tea_lounge.locale).should be_true
-      @two_boots.city_locale.should == @tea_lounge.city_locale
-      @two_boots.state_locale.should == @tea_lounge.state_locale
-      @two_boots.state_locale.parent.should == Locale.us.first
-    end
-
-    it 'merges a new location into a matching state tree' do
-      @new_park.locale.name.should == 'New Park Pizza'
-      @new_park.city_locale.city?.should be_true
-      @new_park.city_locale.name.should == 'Howard Beach'
-      @new_park.state_locale.should == @tea_lounge.state_locale
-      @new_park.state_locale.parent.should == Locale.us.first
-    end
-
-    it 'leaves the locale tree intact if other locations belong to it' do
-      @two_boots.city_locale.city?.should be_true
-      @two_boots.city_locale.name.should == 'Brooklyn'
-      @two_boots.state_locale.state?.should be_true
-      @two_boots.state_locale.name.should == 'New York'
-      @two_boots.state_locale.parent.should == Locale.us.first
-    end
-
-    it 'updates the locale tree of a modified location' do
-      @tea_lounge.name = 'White House'
-      @tea_lounge.address1 = '1600 Pennsylvania Ave NW'
-      @tea_lounge.city = 'Washington'
-      @tea_lounge.state = 'DC'
-      @tea_lounge.validate_address!
-      @tea_lounge.localize
-      @tea_lounge.city_locale.city?.should be_true
-      @tea_lounge.city_locale.name.should == 'Washington'
-      @tea_lounge.state_locale.state?.should be_true
-      @tea_lounge.state_locale.name.should == 'District of Columbia'
-      @tea_lounge.state_locale.parent.should == Locale.us.first
+    it "destroys its state when it's the only location" do
+      Locale.exists?(:conditions => {:name => 'White House'}).should be_true
+      Locale.exists?(:conditions => {:name => /Washington/}).should be_true
+      Locale.exists?(:conditions => {:name => 'District of Columbia'}).should be_true
+      @white_house.destroy
+      # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
+  #    Location.exists?(:conditions => {:name => 'White House'}).should be_false
+      Locale.exists?(:conditions => {:name => 'White House'}).should be_false
+      Locale.exists?(:conditions => {:name => 'Washington'}).should be_false
+      Locale.exists?(:conditions => {:name => 'District of Columbia'}).should be_false
     end
   end
-
-  it "destroys its city when it's the only location" do
-    Locale.exists?(:conditions => {:name => 'Tea Lounge'}).should be_true
-    Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
-    Locale.exists?(:conditions => {:name => 'New York'}).should be_true
-    @tea_lounge.destroy
-    # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
-#    Location.exists?(:conditions => {:name => 'Tea Lounge'}).should be_false
-    Locale.exists?(:conditions => {:name => 'Tea Lounge'}).should be_false
-    Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
-    Locale.exists?(:conditions => {:name => 'New York'}).should be_true
-
-    Locale.exists?(:conditions => {:name => 'Two Boots of Brooklyn'}).should be_true
-    Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_true
-    Locale.exists?(:conditions => {:name => 'New York'}).should be_true
-    @two_boots.destroy
-    # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
-#    Location.exists?(:conditions => {:name => 'Two Boots of Brooklyn'}).should be_false
-    Locale.exists?(:conditions => {:name => 'Two Boots of Brooklyn'}).should be_false
-    Locale.exists?(:conditions => {:name => 'Brooklyn'}).should be_false
-    Locale.exists?(:conditions => {:name => 'New York'}).should be_true
-  end
-
-  it "destroys its state when it's the only location" do
-    Locale.exists?(:conditions => {:name => 'White House'}).should be_true
-    Locale.exists?(:conditions => {:name => 'Washington'}).should be_true
-    Locale.exists?(:conditions => {:name => 'District of Columbia'}).should be_true
-    @white_house.destroy
-    # TODO: strangely, this assertion fails even though destroys work in the app and all subsequent assertions pass
-#    Location.exists?(:conditions => {:name => 'White House'}).should be_false
-    Locale.exists?(:conditions => {:name => 'White House'}).should be_false
-    Locale.exists?(:conditions => {:name => 'Washington'}).should be_false
-    Locale.exists?(:conditions => {:name => 'District of Columbia'}).should be_false
-  end
 end
+
+def create_locations
+  Locale.delete_all
+  Location.delete_all
+#     Locale.any_instance.stubs :geocode
+#     Location.any_instance.stubs :geocode
+#     Location.any_instance.stubs(:country_long_name).returns 'United States'
+
+  @white_house = Location.new :address1 => '1600 Pennsylvania Ave', :city => 'Washington', :name => 'White House'
+#     @white_house.stubs(:geocoder_result).returns stub('white house', :city => 'Washington', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '1600 Pennsylvania Ave NW', :formatted_street_address => '1600 Pennsylvania Ave NW', :partial_match? => true, :postal_code => '20500', :state_long_name => 'District of Columbia', :state_short_name => 'DC')
+#     @white_house.state = @white_house.geocoder_result.state_short_name
+#     @white_house.state_long_name = @white_house.geocoder_result.state_long_name
+#     @white_house.coordinates = []
+  @white_house.validate_address!
+  @white_house.localize
+
+  @tea_lounge = Location.new :address1 => '837 Union St', :address2 => ' Suite 1 ', :city => 'Brooklyn', :name => ' Tea Lounge ', :state => 'NY', :zip => ' 11215 '
+#     @tea_lounge.stubs(:geocoder_result).returns stub('tea lounge', :city => 'Brooklyn', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '837 Union St', :formatted_street_address => '837 Union St', :partial_match? => false, :postal_code => '11215', :state_long_name => 'New York', :state_short_name => 'NY')
+#     @tea_lounge.state = @tea_lounge.geocoder_result.state_short_name
+#     @tea_lounge.state_long_name = @tea_lounge.geocoder_result.state_long_name
+#     @tea_lounge.coordinates = []
+  @tea_lounge.validate_address!
+  @tea_lounge.localize
+
+  @two_boots = Location.new(:address1 => '200 Eastern Pkwy', :city => 'Brooklyn', :name => 'Brooklyn Museum', :state => 'NY')
+#     @two_boots.stubs(:geocoder_result).returns stub('tea lounge', :city => 'Brooklyn', :country_short_name => 'US', :country_long_name => 'United States', :formatted_address => '837 Union St', :formatted_street_address => '837 Union St', :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY')
+#     @two_boots.state = @two_boots.geocoder_result.state_short_name
+#     @two_boots.state_long_name = @two_boots.geocoder_result.state_long_name
+#     @two_boots.coordinates = []
+  @two_boots.validate_address!
+  @two_boots.localize
+
+  @new_park = Location.new(:address1 => '15671 Crossbay Boulevard', :city => 'Howard Beach', :name => 'New Park Pizza', :state => 'NY')
+#     @new_park.stubs(:geocoder_result).returns stub('tea lounge', :city => 'Brooklyn', :country_short_name => 'US', :country_long_name => 'United new_park', :formatted_address => '837 Union St', :formatted_street_address => '837 Union St', :partial_match? => false, :postal_code => '11217', :state_long_name => 'New York', :state_short_name => 'NY')
+#     @new_park.state = @new_park.geocoder_result.state_short_name
+#     @new_park.state_long_name = @new_park.geocoder_result.state_long_name
+#     @new_park.coordinates = []
+  @new_park.validate_address!
+  @new_park.localize
+end

metadata

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