overlord 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/app/helpers/overlord_google_helper.rb

@@ -126,17 +126,21 @@ module OverlordGoogleHelper
   end
 
   # Generate a google map that includes the location of each item in 
-  # mapped_objects.  Each object in mapped_objects must define a lat and lng attribute.
-  # 
-  # mapped_objects:  Collection of objects to be mapped.
+  #
+  # center_on:       An object that defines a lat and lng attribute that will be used to center the map
+  # mapped_objects:  An array of object each of which must define a lat and lng attribute.
   # content_id: Name of the div that will hold the widget google generates.
   #             If this method is called more than once on a given page then you will need to 
   #             specify different content_ids for each call.
-  # options:    A hash containing the values to pass to the Google widget.
-  def google_map(mapped_objects,
-                content_id = 'map_content',
-                options = {})
-    render :partial => 'google/map', :locals => { :mapped_objects => mapped_objects, :content_id => content_id, :options => options }
+  # options:    A hash containing optional values to pass to the Google widget.
+  #             For example:
+  #                :zoom => 10  # Values from 1-20 that indicate how far to zoom into the map.  Smaller values zoom further out.
+  #                :map_control => 'LargeMapControl'  # LargeMapControl or SmallMapControl depending on what size of map you want to display
+  def google_map(center_on,
+                 mapped_objects,
+                 content_id = 'map_content',
+                 options = {})
+    render :partial => 'google/map', :locals => { :center_on => center_on, :mapped_objects => mapped_objects, :content_id => content_id, :options => options }
   end
   
   # Given a feed attempts to assign an appropriate class

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

@@ -6,8 +6,8 @@
 google.setOnLoadCallback(function() {
   if (google.maps.BrowserIsCompatible()) {
     var map = new google.maps.Map2(document.getElementById("<%=content_id%>"));
-    map.setCenter(new google.maps.LatLng(37.4419, -122.1419), 13);
-    map.addControl(new google.maps.SmallMapControl());
+    map.setCenter(new google.maps.LatLng(<%=center_on.lat%>, <%=center_on.lng%>), <%= options[:zoom] || 13 %>);
+    map.addControl(new google.maps.<%=options[:MapControl] || 'LargeMapControl'%>());
     map.addControl(new google.maps.MapTypeControl());
 
     // Create a base icon for all of our markers that specifies the
@@ -50,7 +50,7 @@ google.setOnLoadCallback(function() {
     }
   }
 });
+jQuery(window).unload( function () { GUnload(); } );
 </script>
 
-onunload="google.maps.Unload()"
 <div id="<%=content_id%>" style="width: 500px; height: 300px"></div>

data/lib/overlord/google_base.rb

@@ -33,7 +33,7 @@ module Overlord
     # options:  Options to be sent
     #           :query - query
     #           :headers - headers 
-    def self.get(uri, options)
+    def self.get(uri, options = {})
       header_params = { "UserAgent" => "Ruby/#{RUBY_VERSION}" }
       ref = self.referer || GlobalConfig.request_referer rescue nil
       header_params["Referer"] = ref if ref

data/overlord.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{overlord}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2010-01-14}
   s.description = %q{Code to interact with the google ajax apis on the server and the client.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: overlord
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -07:00
+date: 2010-01-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency