campfire_logic 2.0.0 → 2.0.1

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/app/controllers/directory_controller.rb

@@ -9,6 +9,7 @@ class DirectoryController < ApplicationController
 
   def show
     @locale = find_locale || Locale.init_root
+    @location = @locale.location
     Rails.logger.info "Found a #{@locale.kind} locale: #{@locale.name}"
   end
 

data/app/models/location.rb

@@ -91,6 +91,10 @@ class Location
     self[:city] = value
   end
 
+  def phone= value
+    self[:phone] = value.gsub /[a-z\.\(\) -]+/,'' if value.present?
+  end
+
   def state=(value)
     clear_geocoding if self.state != value
     self[:state] = value
@@ -113,7 +117,7 @@ class Location
   # Geocodes this location.
   def call_geocode
     return :new if self.geocoding_address.blank?
-    geocode
+    geocode unless geocoded?
     return :new unless Geocoder::Configuration.lookup == :google
     audit_address
     self.geocoder_result.try(:partial_match?) ? :partial_match : :validated
@@ -129,14 +133,10 @@ class Location
     geocoder_result.blank? || self.send(attribute) == geocoder_result.send(GOOGLE_MAPS_GEOCODER_FIELDS_BY_LOCATION_FIELD[attribute])
   end
 
-  # Returns the n nearest locations.
-  def nearby_locations(n = 5)
-    Location.near(:coordinates => self.coordinates).limit(n + 1).select{ |l| l != self }
-  end
-
   # Instance methods: Locales ======================================================================
 
   def localize
+    return if geocoding_address.blank?
     self.save
     self.locale ? update_locales : create_locales
     self.save

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

@@ -1,4 +1,4 @@
-<%= form_tag "/#{CampfireLogic.directory_slug}/search", :method => :get, :id => 'search-form' do -%>
-  <%= text_field_tag 'criteria', params[:criteria], :id => 'search-input', :maxlength => 40 -%>
-  <%= submit_tag 'Search' -%>
-<%- end -%>
+<%= form_tag "/#{CampfireLogic.directory_slug}/search", :method => :get, :id => 'search-form' do %>
+  <%= text_field_tag 'criteria', params[:criteria], :id => 'search-input', :maxlength => 40 %>
+  <%= submit_tag 'Search' %>
+<% end %>

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

@@ -1,29 +1,29 @@
-<%-
+<%
   subtitle = " - #{@locale.location ? @locale.location.name : @locale.name}" unless @locale.planet?
   set_title "Location Directory#{subtitle}"
--%>
+%>
 
 <br style="clear: both;" />
 <br style="clear: both;" />
 
-<%- unless @locale.children.blank? -%>
-  <%- if @locale.root? -%>
+<% unless @locale.children.blank? %>
+  <% if @locale.root? %>
     <h2>Select a State/Province</h2>
-  <%- elsif @locale.country? -%>
+  <% elsif @locale.country? %>
     <h2>Select a State</h2>
-  <%- elsif @locale.state? -%>
+  <% elsif @locale.state? %>
     <h2>Select a City</h2>
-  <%- else -%>
+  <% else %>
     <h2>Select a Location</h2>
-  <%- end -%>
+  <% end %>
 
   <div>
-    <%- @locale.sorted_children.in_groups(2, false).each do |group| -%>
+    <% @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_param -%></li>
-      <%- end -%>
+      <% group.each do |_child| %>
+        <li><%= link_to _child.name, _child.to_param %></li>
+      <% end %>
       </ul>
-    <%- end -%>
+    <% end %>
   </div><br style="clear: both;" />
-<%- end -%>
+<% end %>

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

@@ -1,14 +1,12 @@
-<%- set_title "Location Directory - #{ (@location || @locale).name }" -%>
+<% set_title "Location Directory - #{ @location.name }" %>
 
-<%= render 'shared/location' -%><br style="clear: both;" />
+<%= render 'shared/location' %><br style="clear: both;" />
 <br style="clear: both;" />
 
 <h2>Nearby Locations</h2>
 
-<%- @location.nearby_locations.in_groups(2, false).each do |group| -%>
-  <ul style="float: left; margin-right: 1em; width: 40%;">
-    <% group.each do |@location| %>
-      <li><%= render 'shared/location' -%></li>
-    <% end %>
-  </ul>
-<%- end -%>
+<ul style="float: left; margin-right: 1em; width: 40%;">
+<% @location.nearbys(100).limit(5).each do |@location| %>
+  <li><%= render 'shared/location' %></li>
+<% end %>
+</ul>

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

@@ -1,31 +1,31 @@
-<%- set_title 'Location Directory - Search' -%>
+<% set_title 'Location Directory - Search' %>
 
 <div id="map_canvas" style="border: solid black 1px; width: 100%; height: 300px"></div><br />
 
-<%= render 'search_form' -%><br style="clear: both;" />
+<%= render 'search_form' %><br style="clear: both;" />
 <br style="clear: both;" />
 
 <div id="directions_panel"></div>
 
-<%- if @locations.empty? -%>
+<% if @locations.empty? %>
   <p>No matching locations found. Please try again.</p>
 </em></p>
-<%- else -%>
-  <h2><%= controller.searching_by_zip? ? 'Locations nearest' : "#{@locations.size} locations match" -%> "<%= params[:criteria] -%>"</h2>
+<% else %>
+  <h2><%= controller.searching_by_zip? ? 'Locations nearest' : "#{@locations.size} locations match" %> "<%= params[:criteria] %>"</h2>
 
-  <%- for @location in @locations -%>
-    <%= render 'shared/location' -%>
-  <%- end -%>
-<%- end -%>
+  <% for @location in @locations %>
+    <%= render 'shared/location' %>
+  <% end %>
+<% end %>
 
 <br style="clear: both;" />
 
-<%= render :partial => 'shared/map', :locals => {:locations => @locations, :place => Locale.us.first} -%>
+<%= render :partial => 'shared/map', :locals => {:locations => @locations, :place => Locale.us.first} %>
 
 <script type="text/javascript">
   initializeMap();
 
   $('#search-form')[0].addEventListener('submit', function (e) {
-    window.location = '<%= directory_search_root_url -%>/' + $('#search-input')[0].value;
+    window.location = '<%= directory_search_root_url %>/' + $('#search-input')[0].value;
   }, false);
 </script>

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

@@ -1,24 +1,24 @@
 <div id="map_canvas" style="border: solid black 1px; width: 100%; height: 300px"></div><br />
 
-<%= render 'search_form' -%>
+<%= render 'search_form' %>
 
 <div id="directions_panel" style="margin-bottom: 1em;"></div>
 
-<%- if Locale.count <= 1 -%>
-  <%- set_title 'Location Directory' -%>
+<% if Locale.count <= 1 %>
+  <% set_title 'Location Directory' %>
 
-  <p>No locations found. Why don't you <%= link_to 'import', import_locations_path -%> some?</p>
-<%- else -%>
-  <%- if @locale.location? -%>
-    <%= render :partial => 'show_location' -%>
-  <%- else -%>
-    <%= render :partial => 'show_children' -%>
-  <%- end -%>
-<%- end -%>
+  <p>No locations found. Why don't you <%= link_to 'import', import_locations_path %> some?</p>
+<% else %>
+  <% if @locale.location? %>
+    <%= render :partial => 'show_location' %>
+  <% else %>
+    <%= render :partial => 'show_children' %>
+  <% end %>
+<% end %>
 
 <br style="clear: both;" />
 
-<%= render :partial => 'shared/map', :locals => {:locations => @locale.locations, :place => @locale.root? ? Locale.us.first : @locale} -%>
+<%= render :partial => 'shared/map', :locals => {:locations => @locale.locations, :place => @locale.root? ? Locale.us.first : @locale} %>
 
 <script type="text/javascript">
   initializeMap();
@@ -27,6 +27,6 @@
   $('#search-form')[0].action = 'javascript:return(false);';
 
   $('#search-form')[0].addEventListener('submit', function (e) {
-    window.location = '<%= directory_search_root_url -%>/' + $('#search-input')[0].value;
+    window.location = '<%= directory_search_root_url %>/' + $('#search-input')[0].value;
   }, false);
 </script>

data/app/views/layouts/application.html.erb

@@ -1,48 +1,48 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title><%= yield(:title) -%></title>
+    <title><%= yield(:title) %></title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="description" content="" />
     <meta name="keywords" content="" />
-    <link rel="canonical" href="<%= request.url -%>" />
+    <link rel="canonical" href="<%= request.url %>" />
     <link rel="shortcut icon" href="/favicon.ico" />
-    <%= stylesheet_link_tag 'core', 'application', :cache => true -%>
+    <%= stylesheet_link_tag 'core', 'application', :cache => true %>
     <!--[if IE]>
-      <%= stylesheet_link_tag 'core_ie', :media => :all -%>
+      <%= stylesheet_link_tag 'core_ie', :media => :all %>
     <![endif]-->
-    <%= csrf_meta_tag -%>
+    <%= csrf_meta_tag %>
   </head>
   <body>
     <div id="container">
       <div id="header">
         <div id="branding"></div>
-        <div id="navigation"><%= render :partial => 'shared/nav_tabs' -%></div>
+        <div id="navigation"><%= render :partial => 'shared/nav_tabs' %></div>
       </div>
       <div id="page_header">
-        <h1><%= yield(:page_title) -%></h1>
-        <div id="breadcrumbs"><%= breadcrumbs -%></div>
+        <h1><%= yield(:page_title) %></h1>
+        <div id="breadcrumbs"><%= breadcrumbs %></div>
       </div>
       <div id="content_area">
       <div id="washout" style="display:none;"></div>
 
-      <%- flash.each do |name, msg| -%>
-        <%- if name == :notice -%>
-          <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}", :style => "display:none;" -%>
+      <% flash.each do |name, msg| %>
+        <% if name == :notice %>
+          <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}", :style => "display:none;" %>
            <script type="text/javascript">
             $('washout').toggle();
             $('flash_notice').toggle();
-            <%= visual_effect(:fade, 'flash_notice', :duration => 1.0, :delay => 1.0).html_safe -%>
-            <%= visual_effect(:fade, 'washout', :duration => 1.0, :delay => 1.0).html_safe -%>
+            <%= visual_effect(:fade, 'flash_notice', :duration => 1.0, :delay => 1.0).html_safe %>
+            <%= visual_effect(:fade, 'washout', :duration => 1.0, :delay => 1.0).html_safe %>
           </script>
-        <%- else -%>
-          <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}" -%>
-        <%- end -%>
-      <%- end -%>
-        <%= yield -%>
+        <% else %>
+          <%= content_tag :div, msg, :id => "flash_#{name}", :class => "flash_#{name}" %>
+        <% end %>
+      <% end %>
+        <%= yield %>
         <br style="clear: both;" />
       </div>
-      <div id="footer"><p>&copy; <%= Time.zone.now.year -%> SEO Logic. All rights reserved.</p></div>
+      <div id="footer"><p>&copy; <%= Time.zone.now.year %> SEO Logic. All rights reserved.</p></div>
     </div>
   </body>
 </html>

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

@@ -1,24 +1,24 @@
-<%= form_for(@location) do |f| -%>
-  <%- if @location.errors.any? -%>
+<%= form_for(@location) do |f| %>
+  <% if @location.errors.any? %>
     <div id="error_explanation">
       <h2>Please correct the following errors:</h2>
-      <%- @location.errors.to_a.in_groups(2, false).each do |group| -%>
+      <% @location.errors.to_a.in_groups(2, false).each do |group| %>
       <ul>
-        <%- group.each do |msg| -%>
-        <li><%= msg -%></li>
-        <%- end -%>
+        <% group.each do |msg| %>
+        <li><%= msg %></li>
+        <% end %>
       </ul>
-      <%- end -%>
+      <% end %>
       <br style="clear: both;" />
     </div>
     <br style="clear: both;" />
-  <%- end -%>
+  <% end %>
 
   <fieldset class="form_container">
-    <%= legend_tag 'About This Location' -%>
+    <%= legend_tag 'About This Location' %>
     <div class="form_column">
-      <%= f.text_field :name -%>
-      <%= f.check_box :active, :inline_label => 'Yes' -%>
+      <%= f.text_field :name %>
+      <%= f.check_box :active, :inline_label => 'Yes' %>
     </div>
 
     <div class="form_column">
@@ -27,42 +27,42 @@
   </fieldset>
 
   <fieldset class="form_container">
-    <%= legend_tag 'Address' -%>
+    <%= legend_tag 'Address' %>
     <div class="form_column">
-      <%= f.text_field :address1 -%>
-      <%= f.text_field :address2 -%>
-      <%= f.text_field :city -%>
-      <%= f.text_field :state -%>
-      <%= f.text_field :zip -%>
+      <%= f.text_field :address1 %>
+      <%= f.text_field :address2 %>
+      <%= f.text_field :city %>
+      <%= f.text_field :state %>
+      <%= f.text_field :zip %>
     </div>
     <div class="form_column">
-      <%= f.text_field :phone -%>
-      <%= f.text_field :fax -%>
-      <%= f.text_field :email -%>
+      <%= f.text_field :phone %>
+      <%= f.text_field :fax %>
+      <%= f.text_field :email %>
     </div>
   </fieldset>
 
   <fieldset class="form_container">
-    <%= legend_tag 'Services Offered' -%>
-    <%- i = 0 -%>
-    <%- Service.all.to_a.in_groups(2, false) do |column| -%>
+    <%= legend_tag 'Services Offered' %>
+    <% i = 0 %>
+    <% Service.all.to_a.in_groups(2, false) do |column| %>
       <div class="form_column">
-        <%- column.each do |service| -%>
+        <% column.each do |service| %>
           <fieldset>
-            <%= check_box_tag 'location[service_ids][]', service.id, @location.services.include?(service), :id => "service_#{i}" -%>
-            <%= service.name -%>
+            <%= check_box_tag 'location[service_ids][]', service.id, @location.services.include?(service), :id => "service_#{i}" %>
+            <%= service.name %>
           </fieldset>
-          <%- i += 1 -%>
-        <%- end -%>
+          <% i += 1 %>
+        <% end %>
       </div>
-    <%- end -%>
+    <% end %>
   </fieldset>
 
-<%= f.submit 'Save', :class => 'button' -%>
-  <%= link_to 'Cancel', @location, :class => 'button' -%>
-<%- end -%>
+<%= f.submit 'Save', :class => 'button' %>
+  <%= link_to 'Cancel', @location, :class => 'button' %>
+<% end %>
 
-<%= render :partial => 'shared/map', :locals => {:place => @location.locale} -%>
+<%= render :partial => 'shared/map', :locals => {:place => @location.locale} %>
 
 <script type="text/javascript">
   initializeMap();

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

@@ -1,3 +1,3 @@
-<%- set_title "Editing #{@location.name}" -%>
+<% set_title "Editing #{@location.name}" %>
 
-<%= render :partial => 'form' -%>
+<%= render :partial => 'form' %>

data/app/views/locations/export.erb

@@ -1,4 +1,4 @@
 Location #	Name	Address 1	Address 2	City	State	Postal Code	Country Code	Phone	Email	Description
-<%- @locations.each do |l| -%>
-<%= l.location_number -%>	<%= l.name -%>	<%= l.address1 -%>	<%= l.address2 -%>	<%= l.city -%>	<%= l.state -%>	<%= l.zip -%>	<%= l.country -%>	<%= l.phone -%>	<%= l.email -%>	<%= l.meta_description %>
-<%- end -%>
+<% @locations.each do |l| %>
+<%= l.location_number %>	<%= l.name %>	<%= l.address1 %>	<%= l.address2 %>	<%= l.city %>	<%= l.state %>	<%= l.zip %>	<%= l.country %>	<%= l.phone %>	<%= l.email %>	<%= l.meta_description %>
+<% end %>

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

@@ -1,13 +1,13 @@
-<%- set_title 'Import Locations' -%>
+<% set_title 'Import Locations' %>
 
-<%= form_tag upload_locations_path, :method => :post, :multipart => true do -%>
+<%= form_tag upload_locations_path, :method => :post, :multipart => true do %>
   <fieldset class="form_container">
-    <p>To import locations, upload the import file below. Make sure the file follows this <%= link_to 'format', '/sample-locations.xls' -%>: it must be tab-delimited and the column names must match exactly. Otherwise, your data won't be processed correctly.</p>
+    <p>To import locations, upload the import file below. Make sure the file follows this <%= link_to 'format', '/sample-locations.xls' %>: it must be tab-delimited and the column names must match exactly. Otherwise, your data won't be processed correctly.</p>
 
     <fieldset>
-      <%= file_field 'upload', 'datafile' -%>
+      <%= file_field 'upload', 'datafile' %>
     </fieldset>
   </fieldset>
 
-  <%= submit_tag 'Upload', :class => 'button' -%>
-<%- end -%>
+  <%= submit_tag 'Upload', :class => 'button' %>
+<% end %>

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

@@ -1,37 +1,37 @@
-<%- set_title 'Locations' -%>
+<% set_title 'Locations' %>
 
-<%- unless @errors.blank? -%>
-  <%= @errors * '<br />' -%>
-<%- end -%>
+<% unless @errors.blank? %>
+  <%= @errors * '<br />' %>
+<% end %>
 
-<%- if @locations.empty? -%>
-  <p><em>No locations found. Why don't you <%= link_to 'import', import_locations_path -%> some?
+<% if @locations.empty? %>
+  <p><em>No locations found. Why don't you <%= link_to 'import', import_locations_path %> some?
 </em></p>
-<%- else -%>
+<% else %>
   <table class="standard">
     <tr>
-      <th><%= sort_link('locations', 'location_number', params) -%></th>
-      <th><%= sort_link('locations', 'name', params) -%></th>
+      <th><%= sort_link('locations', 'location_number', params) %></th>
+      <th><%= sort_link('locations', 'name', params) %></th>
       <th>Address</th>
       <th>URL</th>
       <th> </th>
     </tr>
 
-  <%- for location in @locations -%>
-    <tr class="<%= cycle('odd', 'even') -%>">
-      <td><%= link_to location.location_number, location -%></td>
-      <td><%= link_to location.name, location -%></td>
-      <td><%= location.geocoding_address -%></td>
+  <% for location in @locations %>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <td><%= link_to location.location_number, location %></td>
+      <td><%= link_to location.name, location %></td>
+      <td><%= location.geocoding_address %></td>
       <td>
-        <%- if location.locale -%>
-          <%= link_to location.locale.to_param, location.locale.to_param -%>
-        <%- end -%>
+        <% if location.locale %>
+          <%= link_to location.locale.to_param, location.locale.to_param %>
+        <% end %>
       </td>
-      <td class="crud_links"><%= crud_links(location, [:show, :edit, :destroy]) -%></td>
+      <td class="crud_links"><%= crud_links(location, [:show, :edit, :destroy]) %></td>
     </tr>
-  <%- end -%>
+  <% end %>
   </table>
-<%- end -%>
+<% end %>
 
-<%= link_to 'Import', import_locations_path, :class => 'button' -%>
-<%= link_to 'Export', export_locations_path, :class => 'button' -%>
+<%= link_to 'Import', import_locations_path, :class => 'button' %>
+<%= link_to 'Export', export_locations_path, :class => 'button' %>

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

@@ -1,3 +1,3 @@
-<%- set_title 'Create a New Location' -%>
+<% set_title 'Create a New Location' %>
 
-<%= render :partial => 'form' -%>
+<%= render :partial => 'form' %>

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

@@ -1,16 +1,16 @@
-<%- set_title "Location: #{@location.name}" -%>
+<% set_title "Location: #{@location.name}" %>
 
 <fieldset class="form_container">
-  <%= legend_tag "About This Location" -%>
+  <%= legend_tag "About This Location" %>
 
   <div class="form_column">
     <fieldset>
       <label>Name:</label><br />
-      <div class="faux_field"><%=h @location.name -%></div>
+      <div class="faux_field"><%=h @location.name %></div>
     </fieldset>
     <fieldset>
       <label>Status:</label><br />
-      <div class="faux_field"><%=h @location.active? ? "Active" : "Inactive" -%></div>
+      <div class="faux_field"><%=h @location.active? ? "Active" : "Inactive" %></div>
     </fieldset>
   </div>
 
@@ -20,50 +20,50 @@
 </fieldset>
 
 <fieldset class="form_container">
-  <%= legend_tag "Address" -%>
+  <%= legend_tag "Address" %>
   <div class="form_column">
     <fieldset>
       <label>Address 1:</label><br />
-      <div class="faux_field"><%=h @location.address1 -%></div>
+      <div class="faux_field"><%=h @location.address1 %></div>
     </fieldset>
     <fieldset>
       <label>Address 2:</label><br />
-      <div class="faux_field"><%=h @location.address2 -%></div>
+      <div class="faux_field"><%=h @location.address2 %></div>
     </fieldset>
     <fieldset>
       <label>City:</label><br />
-      <div class="faux_field"><%=h @location.city -%></div>
+      <div class="faux_field"><%=h @location.city %></div>
     </fieldset>
     <fieldset>
       <label>State:</label><br />
-      <div class="faux_field"><%=h @location.state -%></div>
+      <div class="faux_field"><%=h @location.state %></div>
     </fieldset>
     <fieldset>
       <label>Zip:</label><br />
-      <div class="faux_field"><%=h @location.zip -%></div>
+      <div class="faux_field"><%=h @location.zip %></div>
     </fieldset>
   </div>
 
   <div class="form_column">
     <fieldset>
       <label>Phone:</label><br />
-      <div class="faux_field"><%=h @location.phone -%></div>
+      <div class="faux_field"><%=h @location.phone %></div>
     </fieldset>
     <fieldset>
       <label>Fax:</label><br />
-      <div class="faux_field"><%=h @location.fax -%></div>
+      <div class="faux_field"><%=h @location.fax %></div>
     </fieldset>
     <fieldset>
       <label>Email:</label><br />
-      <div class="faux_field"><%=h @location.email -%></div>
+      <div class="faux_field"><%=h @location.email %></div>
     </fieldset>
   </div>
 </fieldset>
 
-<%= link_to 'Edit', edit_location_path(@location), :class => 'button' -%>
-<%= link_to 'Back to Locations', locations_path, :class => 'button' -%>
+<%= link_to 'Edit', edit_location_path(@location), :class => 'button' %>
+<%= link_to 'Back to Locations', locations_path, :class => 'button' %>
 
-<%= render :partial => 'shared/map', :locals => {:place => @location.locale} -%>
+<%= render :partial => 'shared/map', :locals => {:place => @location.locale} %>
 
 <script type="text/javascript">
   initializeMap();

data/app/views/services/_form.html.erb

@@ -1,29 +1,29 @@
-<%= form_for @service do |f| -%>
-  <%- if @service.errors.any? -%>
+<%= form_for @service do |f| %>
+  <% if @service.errors.any? %>
     <div id="error_explanation">
       <h2>Please correct the following errors:</h2>
-      <%- @service.errors.to_a.in_groups(2, false).each do |group| -%>
+      <% @service.errors.to_a.in_groups(2, false).each do |group| %>
       <ul>
-        <%- group.each do |msg| -%>
-        <li><%= msg -%></li>
-        <%- end -%>
+        <% group.each do |msg| %>
+        <li><%= msg %></li>
+        <% end %>
       </ul>
-      <%- end -%>
+      <% end %>
       <br style="clear: both;" />
     </div>
     <br style="clear: both;" />
-  <%- end -%>
+  <% end %>
 
   <fieldset class="form_container">
-    <%= legend_tag 'About This Service' -%>
+    <%= legend_tag 'About This Service' %>
 
     <div class="form_column">
-      <%= f.text_field :name -%>
-      <%= f.text_area :description -%>
+      <%= f.text_field :name %>
+      <%= f.text_area :description %>
     </div>
   </fieldset>
 
-  <%= f.submit 'Save', :class => 'button' -%>
-  <%= link_to 'Cancel', services_path, :class => 'button' -%>
+  <%= f.submit 'Save', :class => 'button' %>
+  <%= link_to 'Cancel', services_path, :class => 'button' %>
   <br style="clear: both;" />
-<%- end -%>
+<% end %>

data/app/views/services/edit.html.erb

@@ -1,3 +1,3 @@
-<%- set_title 'Edit a Service' -%>
+<% set_title 'Edit a Service' %>
 
-<%= render 'form' -%>
+<%= render 'form' %>

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

@@ -1,25 +1,25 @@
-<%- set_title 'Services' -%>
+<% set_title 'Services' %>
 
-<%- if @services.empty? -%>
+<% if @services.empty? %>
   <p><em>No services have been created yet.</em></p>
-<%- else -%>
+<% else %>
   <table class="standard">
     <tr>
-      <th><%= sort_link('services', 'name', params) -%></th>
-      <th><%= sort_link('services', 'description', params) -%></th>
+      <th><%= sort_link('services', 'name', params) %></th>
+      <th><%= sort_link('services', 'description', params) %></th>
       <th> </th>
     </tr>
 
-  <%- @services.each do |service| -%>
-    <tr class="<%= cycle('odd', 'even') -%>">
-      <td><%= service.name -%></td>
-      <td><%= service.description -%></td>
-      <td class="crud_links"><%= crud_links(service, [:show, :edit, :destroy]) -%></td>
+  <% @services.each do |service| %>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <td><%= service.name %></td>
+      <td><%= service.description %></td>
+      <td class="crud_links"><%= crud_links(service, [:show, :edit, :destroy]) %></td>
     </tr>
-  <%- end -%>
+  <% end %>
   </table>
-<%- end -%>
+<% end %>
 
 <br />
 
-<%= link_to 'New Service', new_service_path, :class => 'button' -%>
+<%= link_to 'New Service', new_service_path, :class => 'button' %>

data/app/views/services/new.html.erb

@@ -1,3 +1,3 @@
-<%- set_title 'Create a Service' -%>
+<% set_title 'Create a Service' %>
 
-<%= render 'form' -%>
+<%= render 'form' %>

data/app/views/services/show.html.erb

@@ -1,15 +1,15 @@
-<%- set_title 'Service Details' -%>
+<% set_title 'Service Details' %>
 
 <fieldset class="form_container">
-  <%= legend_tag 'About This Service' -%>
+  <%= legend_tag 'About This Service' %>
 
   <div class="form_column">
-    <%= faux_field 'Name', @service.name -%>
+    <%= faux_field 'Name', @service.name %>
   </div>
   <div class="form_column">
-    <%= faux_field 'Description', @service.description -%>
+    <%= faux_field 'Description', @service.description %>
   </div>
 </fieldset>
 
-<%= link_to 'Edit', edit_service_path(@service), :class => 'button' -%>
-<%= link_to 'Back', services_path, :class => 'button' -%>
+<%= link_to 'Edit', edit_service_path(@service), :class => 'button' %>
+<%= link_to 'Back', services_path, :class => 'button' %>

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_param -%></div>
+  <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=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 class=value><%= h @location.phone %></span>
     </span><br />
-    <%- if @location.fax && @location.fax.size > 3 -%>
+    <% if @location.fax && @location.fax.size > 3 %>
       <span class=tel>Fax
-      <span class=value><%= h @location.fax -%></span>
+      <span class=value><%= h @location.fax %></span>
     </span><br />
-    <%- end -%>
+    <% end %>
   </p>
 </div>

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

@@ -1,14 +1,19 @@
-<%# requires local variables: locations AND place (but latter can be nil); Adapted from http://code.google.com/apis/maps/documentation/javascript/examples/icon-complex.html -%>
-<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
-<script>
+<%#
+  requires:
+
+  * local variables: locations AND place (but latter can be nil)
+  * <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+
+  Adapted from http://code.google.com/apis/maps/documentation/javascript/examples/icon-complex.html
+%><script>
   var directionsDisplay = new google.maps.DirectionsRenderer();
   var directionsService = new google.maps.DirectionsService();
   var locations = [
-<%- if place && place.location? && place.geocoded? -%>
-    <%= 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[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 -%>
+<% if place && place.location? && place.geocoded? %>
+    <%= 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[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 = [];

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

@@ -1,5 +1,5 @@
 <ul>
-  <%= tab_for( root_path, 'Home', 'home' ).html_safe -%>
-  <%= tab_for( locations_path, 'Locations', 'locations' ).html_safe -%>
-  <%= tab_for( services_path, 'Services', 'services' ).html_safe -%>
+  <%= tab_for( root_path, 'Home', 'home' ).html_safe %>
+  <%= tab_for( locations_path, 'Locations', 'locations' ).html_safe %>
+  <%= tab_for( services_path, 'Services', 'services' ).html_safe %>
 </ul>

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-01-31"
+  s.date = "2012-02-18"
   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_import_spec.rb

@@ -23,7 +23,7 @@ describe LocationImport do
     @location.city.should == 'Commack'
     @location.state_long_name.should == 'New York'
     @location.zip.should == '11725'
-    @location.phone.should == '(877) 300-0059'
+    @location.phone.should == '8773000059'
     @location.email.should == 'sales@mobilemini.com'
     @location.meta_description.should == 'Long Island portable storage rentals. Secure mobile storage units or pods, shipping container rentals, and custom mobile office trailers shipped to your home or construction site.'
   end

metadata

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