campfire_logic 1.1.9 → 1.1.10

data/Gemfile

@@ -3,9 +3,9 @@ source 'http://rubygems.org'
 gem 'bson_ext'
 gem 'fastercsv'
 gem 'google_maps_geocoder'
-gem 'mongoid', '< 2.4'
+gem 'mongoid'
 gem 'mongoid-tree'
-gem 'rails', '~> 3.1'
+gem 'rails', '~> 3.0.0'
 gem 'scaffold_logic'
 gem 'stateflow'
 gem 'stringex'

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

data/app/models/locale.rb

@@ -24,6 +24,7 @@ class Locale
   # Scopes =========================================================================================
   scope :canada, :where => {:name => 'Canada'}
   scope :cities, :where => {:kind => 'city' }
+  scope :countries, :where => {:kind => 'country'}
   scope :locations, :where => {:kind => 'location'}
   scope :states, :where => {:kind => 'state'}
   scope :us, :where => {:name => 'United States'}

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

@@ -25,7 +25,7 @@
 <script type="text/javascript">
   initializeMap();
 
-  $('search-form').addEventListener('submit', function (e) {
-    window.location = '<%= directory_search_root_url -%>/' + $('search-input').value;
+  $('#search-form')[0].addEventListener('submit', function (e) {
+    window.location = '<%= directory_search_root_url -%>/' + $('#search-input')[0].value;
   }, false);
 </script>

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

@@ -24,9 +24,9 @@
   initializeMap();
 
   // change search-form's action so its query string can be converted to a URL
-  $('search-form').action = 'javascript:return(false);';
+  $('#search-form')[0].action = 'javascript:return(false);';
 
-  $('search-form').addEventListener('submit', function (e) {
-    window.location = '<%= directory_search_root_url -%>/' + $('search-input').value;
+  $('#search-form')[0].addEventListener('submit', function (e) {
+    window.location = '<%= directory_search_root_url -%>/' + $('#search-input')[0].value;
   }, false);
 </script>

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

@@ -1,2 +1,79 @@
-<%# requires local variables: locations AND place; 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" type="text/javascript"></script><script type="text/javascript"> //<![CDATA[
-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.lat_lng[0]}, #{place.lat_lng[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>']" -%> <%- else -%> <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.lat_lng[0]}, #{l.lat_lng[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" -%> <%- end -%> ]; var map; var markers = []; var openWindow; function initializeMap() { var myOptions = { zoom: <%= place && place.zoom_level || 4 -%>, <%- if place && place.geocoded? -%> center: new google.maps.LatLng(<%= place.lat_lng[0] -%>, <%= place.lat_lng[1] -%>), <%- elsif place && place.parent && place.parent.geocoded? -%> center: new google.maps.LatLng(<%= place.parent.lat_lng[0] -%>, <%= place.parent.lat_lng[1] -%>), <%- 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); directionsDisplay.setMap(map); directionsDisplay.setPanel($('directions_panel')); for (var i = 0; i < locations.length; i++) { markers[i] = new google.maps.Marker({ position: new google.maps.LatLng(locations[i][1], locations[i][2]), map: map }); attachBalloon(i, locations[i][3]); } } function attachBalloon(i, content) { google.maps.event.addListener(markers[i], 'click', function() { if (openWindow != undefined) { openWindow.close(); } openWindow = new google.maps.InfoWindow( {content: '<div class=\"map-balloon\" id=\"open-balloon\">' + content + '</div>'} ); openWindow.open(map, markers[i]); $('open-balloon').parentNode.style.overflow = 'visible'; }); } function calcRoute(start, end) { var request = { origin: start, destination: end, travelMode: google.maps.DirectionsTravelMode.DRIVING }; directionsService.route(request, function(response, status) { if (status == google.maps.DirectionsStatus.OK) { directionsDisplay.setDirections(response); openWindow.close(); } }); } function showAddress(i) { $('open-balloon').innerHTML = locations[i][3]; } function showDirectionsFrom(i) { $('open-balloon').innerHTML = 'Directions to:<form action="javascript:calcRoute(\'' + locations[i][1] + ' ' + locations[i][2] + '\', $(\'directions-input\').value)"><input type="text" maxlength="40" name="directions-input" id="directions-input" style="width: 100%;" /><input value="Go" type="submit" /><input value="Cancel" type="button" onclick="showAddress(' + i + ')" /></form>'; } function showDirectionsTo(i) { $('open-balloon').innerHTML = 'Directions from:<form action="javascript:calcRoute($(\'directions-input\').value, \'' + locations[i][1] + ' ' + locations[i][2] + '\')"><input type="text" maxlength="40" name="directions-input" id="directions-input" style="width: 100%;" /><input value="Go" type="submit" /><input value="Cancel" type="button" onclick="showAddress(' + i + ')" /></form>'; } //]]></script>
+<%# requires local variables: locations AND place; 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>
+  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.lat_lng[0]}, #{place.lat_lng[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>']" -%>
+<%- else -%>
+    <%= raw locations.select{ |l| l.geocoded? }.inject([]) { |a, l| i = a.size; a << "['#{h(escape_javascript l.name)}', #{l.lat_lng[0]}, #{l.lat_lng[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" -%>
+<%- end -%>
+  ];
+  var map;
+  var markers = [];
+  var openWindow;
+
+  function initializeMap() {
+    var myOptions = {
+      zoom: <%= place && place.zoom_level || 4 -%>,
+  <%- if place && place.geocoded? -%>
+      center: new google.maps.LatLng(<%= place.lat_lng[0] -%>, <%= place.lat_lng[1] -%>),
+  <%- elsif place && place.parent && place.parent.geocoded? -%>
+      center: new google.maps.LatLng(<%= place.parent.lat_lng[0] -%>, <%= place.parent.lat_lng[1] -%>),
+  <%- 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);
+    directionsDisplay.setMap(map);
+    directionsDisplay.setPanel($('#directions_panel')[0]);
+    for (var i = 0; i < locations.length; i++) {
+      markers[i] = new google.maps.Marker({
+        position: new google.maps.LatLng(locations[i][1], locations[i][2]),
+        map: map
+      });
+      attachBalloon(i, locations[i][3]);
+    }
+  }
+
+  function attachBalloon(i, content) {
+    google.maps.event.addListener(markers[i], 'click', function() {
+      if (openWindow != undefined) {
+        openWindow.close();
+      }
+      openWindow = new google.maps.InfoWindow({
+        content: '<div class=map-balloon id=open-balloon>' + content + '</div>'
+      });
+      openWindow.open(map, markers[i]);
+      $('#open-balloon')[0].parentNode.style.overflow = 'visible';
+    });
+  }
+
+  function calcRoute(start, end) {
+    var request = {
+      origin: start,
+      destination: end,
+      travelMode: google.maps.DirectionsTravelMode.DRIVING
+    };
+    directionsService.route(request, function(response, status) {
+      if (status == google.maps.DirectionsStatus.OK) {
+        directionsDisplay.setDirections(response);
+        openWindow.close();
+      }
+    });
+  }
+
+  function showAddress(i) {
+    $('#open-balloon')[0].innerHTML = locations[i][3];
+  }
+
+  function showDirectionsFrom(i) {
+    $('#open-balloon')[0].innerHTML = 'Directions to:<form action="javascript:calcRoute(\'' + locations[i][1] + ' ' + locations[i][2] + '\', $(\'#directions-input\')[0].value)"><input type=text maxlength=40 name=directions-input id=directions-input style="width: 100%;" /><input value=Go type=submit /><input value=Cancel type=button onclick="showAddress(' + i + ')" /></form>';
+  }
+
+  function showDirectionsTo(i) {
+    $('#open-balloon')[0].innerHTML = 'Directions from:<form action="javascript:calcRoute($(\'#directions-input\')[0].value, \'' + locations[i][1] + ' ' + locations[i][2] + '\')"><input type=text maxlength=40 name=directions-input id=directions-input style="width: 100%;" /><input value=Go type=submit /><input value=Cancel type=button onclick="showAddress(' + i + ')" /></form>';
+  }
+</script>

data/campfire_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "campfire_logic"
-  s.version = "1.1.9"
+  s.version = "1.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roderick Monje"]
-  s.date = "2012-01-12"
+  s.date = "2012-01-23"
   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 = [
@@ -141,7 +141,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
@@ -151,9 +151,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
       s.add_runtime_dependency(%q<google_maps_geocoder>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, ["< 2.4"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_runtime_dependency(%q<stateflow>, [">= 0"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
@@ -163,9 +163,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["< 2.4"])
+      s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
-      s.add_dependency(%q<rails>, ["~> 3.1"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
       s.add_dependency(%q<stateflow>, [">= 0"])
       s.add_dependency(%q<stringex>, [">= 0"])
@@ -176,9 +176,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<google_maps_geocoder>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["< 2.4"])
+    s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
-    s.add_dependency(%q<rails>, ["~> 3.1"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
     s.add_dependency(%q<stateflow>, [">= 0"])
     s.add_dependency(%q<stringex>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: campfire_logic
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 1
-  - 9
-  version: 1.1.9
+  - 10
+  version: 1.1.10
 platform: ruby
 authors: 
 - Roderick Monje
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -65,13 +65,12 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 2
-        - 4
-        version: "2.4"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -96,11 +95,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
         - 3
-        - 1
-        version: "3.1"
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -335,7 +335,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