gmaps4rails 0.6.5 → 0.7.0

data/README.rdoc

@@ -45,6 +45,8 @@ Done!
 
 * Markers with Info window, Custom Picture
 
+* Automatic sidebar with list of markers
+
 * Circles, Polylines, Polygons
 
 * Geocode directly your address and retrieve coordinates. 

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -6,9 +6,14 @@
 <% end %>
 
 <% content_for :scripts do %>
-<script src="http://www.google.com/jsapi"></script>
-<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer.js'></script>
-<%=javascript_include_tag 'gmaps4rails' %>
+<% if enable_js == true %>
+	<script src="http://www.google.com/jsapi"></script>
+	<%=javascript_include_tag 'gmaps4rails' %>
+	<% debugger %>
+	<% unless options["markers"].nil? or (!options["markers"]["options"].nil? and options["markers"]["options"]["do_clustering"] == false) %>
+		<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer.js'></script>
+	<% end %>
+<% end  %>
 <script type="text/javascript" charset="utf-8">
 
 window.onload = function() {
@@ -19,5 +24,5 @@ window.onload = function() {
 <% end %>
 
 <div id="<%= options["map_options"].nil? || options['map_options']['container_id'].nil? ? "map_container" : options['map_options']['container_id'] %>"> 
-  <div id="<%= options["map_options"].nil? || options['map_options']['id'].nil? ? "gmaps4rails_map" : options['map_options']['id'] %>"></div> 
+  <div id="<%= options["map_options"].nil? || options['map_options']['id'].nil? ? "gmaps4rails_map" : options['map_options']['id'] %>"></div>
 </div>

data/lib/acts_as_gmappable/base.rb

@@ -15,7 +15,7 @@ module Gmaps4rails
   def Gmaps4rails.create_json(object)
     unless object[object.gmaps4rails_options[:lat_column]].blank? && object[object.gmaps4rails_options[:lng_column]].blank?
 "{
-\"description\": \"#{object.gmaps4rails_infowindow}\", \"title\": \"#{object.gmaps4rails_title}\",
+\"description\": \"#{object.gmaps4rails_infowindow}\", \"title\": \"#{object.gmaps4rails_title}\", \"sidebar\": \"#{object.gmaps4rails_sidebar}\",
 \"longitude\": \"#{object[object.gmaps4rails_options[:lng_column]]}\", \"latitude\": \"#{object[object.gmaps4rails_options[:lat_column]]}\", \"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\", \"width\": \"#{object.gmaps4rails_marker_picture['width']}\", \"height\": \"#{object.gmaps4rails_marker_picture['height']}\"
 } ,"
     end
@@ -116,88 +116,95 @@ module Gmaps4rails
   
   module ActsAsGmappable
 
-    module Base
-      def self.included(klass)
-        klass.class_eval do
-          extend Config
-        end
+    extend ActiveSupport::Concern
+    
+    module InstanceMethods
+      def gmaps4rails_infowindow
+      end
+        
+      def gmaps4rails_title
       end
       
-      module Config
-        def acts_as_gmappable args = {}          
-         unless args[:process_geocoding] == false
-            validate :process_geocoding
-         end
-          
-          #instance method
-          define_method "gmaps4rails_options" do
-            {
-              :lat_column     => args[:lat]                 || "latitude",
-              :lng_column     => args[:lng]                 || "longitude",
-              :check_process  => args[:check_process].nil?  ?   true : args[:check_process],
-              :checker        => args[:checker]             || "gmaps",
-              :msg            => args[:msg]                 || "Address invalid",
-              :validation     => args[:validation].nil?     ?   true : args[:validation]
-              #TODO: address as a proc?
-            }
+      def gmaps4rails_sidebar
+      end
+        
+      def process_geocoding
+        #to prevent geocoding each time a save is made
+        return true if gmaps4rails_options[:check_process] == true && self[gmaps4rails_options[:checker]] == true
+        
+        begin
+          coordinates = Gmaps4rails.geocode(self.gmaps4rails_address)
+        rescue GeocodeStatus #adress was invalid, add error to base.
+          errors[:base] << gmaps4rails_options[:msg] if gmaps4rails_options[:validation]
+        rescue GeocodeNetStatus => e #connection error, No need to prevent save.
+          logger.warn(e)
+          #TODO add customization here?
+        else #if no exception
+          self[gmaps4rails_options[:lng_column]] = coordinates.first[:lng]
+          self[gmaps4rails_options[:lat_column]] = coordinates.first[:lat]
+          if gmaps4rails_options[:check_process] == true
+            self[gmaps4rails_options[:checker]] = true
           end
-                 
-          include Gmaps4rails::ActsAsGmappable::Base::InstanceMethods
         end
       end
-      
-      module InstanceMethods
         
-        def gmaps4rails_infowindow
-        end
+      def gmaps4rails_marker_picture
+        {
+          "picture" => "",
+          "width" => "",
+          "height" => ""
+        }
+      end
         
-        def gmaps4rails_title
-        end
+      def self.gmaps4rails_trusted_scopes
+        []
+      end
         
-        def process_geocoding
-          #to prevent geocoding each time a save is made
-          return true if gmaps4rails_options[:check_process] == true && self[gmaps4rails_options[:checker]] == true
-          
-          begin
-            coordinates = Gmaps4rails.geocode(self.gmaps4rails_address)
-          rescue GeocodeStatus #adress was invalid, add error to base.
-            errors[:base] << gmaps4rails_options[:msg] if gmaps4rails_options[:validation]
-          rescue GeocodeNetStatus => e #connection error, No need to prevent save.
-            logger.warn(e)
-            #TODO add customization here?
-          else #if no exception
-            self[gmaps4rails_options[:lng_column]] = coordinates.first[:lng]
-            self[gmaps4rails_options[:lat_column]] = coordinates.first[:lat]
-            if gmaps4rails_options[:check_process] == true
-              self[gmaps4rails_options[:checker]] = true
-            end
-          end
-        end
+      def to_gmaps4rails
+        json = "["
+        json += Gmaps4rails.create_json(self).to_s.chop #removes the extra comma
+        json += "]"
+      end
         
-        def gmaps4rails_marker_picture
-          {
-            "picture" => "",
-            "width" => "",
-            "height" => ""
-          }
+    end
+    
+    module ClassMethods
+      mattr_accessor :gmaps4rails_options
+      
+      def acts_as_gmappable args = {}          
+        unless args[:process_geocoding] == false
+          validate :process_geocoding
         end
+
+        # [:lat, :lng, :check_process, :checker, :msg, :validation].each do |sym|
+        #   Gmaps4rails::ActsAsGmappable.gmaps4rails_options[sym] = args[sym] unless args[sym].nil?
+        # end
         
-        def self.gmaps4rails_trusted_scopes
-          []
-        end
+        Gmaps4rails::ActsAsGmappable::ClassMethods.gmaps4rails_options = args        
         
-        def to_gmaps4rails
-          json = "["
-          json += Gmaps4rails.create_json(self).to_s.chop #removes the extra comma
-          json += "]"
+        #instance method
+        define_method "gmaps4rails_options" do
+          {
+            :lat_column     => args[:lat]                 || "latitude",
+            :lng_column     => args[:lng]                 || "longitude",
+            :check_process  => args[:check_process].nil?  ?   true : args[:check_process],
+            :checker        => args[:checker]             || "gmaps",
+            :msg            => args[:msg]                 || "Address invalid",
+            :validation     => args[:validation].nil?     ?   true : args[:validation]
+            #TODO: address as a proc?
+          }
         end
-        
-      end # InstanceMethods      
+      end
+      include InstanceMethods
     end
-  end
+    
+  end #ActsAsGmappable
 end
 
-::ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable::Base
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
+end
+#::ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable
 # Mongoid::Document::ClassMethods.class_eval do
 #   include Gmaps4rails::ActsAsGmappable::Base
 # end

data/lib/application_helper.rb

@@ -1,15 +1,15 @@
 module ApplicationHelper
   
-  def gmaps4rails(builder, enable_css = true )
+  def gmaps4rails(builder, enable_css = true, enable_js = true )
     options = {
       "map_options" => { "auto_adjust" => true},
       "markers"     => { "data" => builder }
     }
-    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css }
+    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css, :enable_js => enable_js }
   end
   
-  def gmaps(options, enable_css = true )
-    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css }
+  def gmaps(options, enable_css = true, enable_js = true )
+    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :options => options, :enable_css => enable_css, :enable_js => enable_js }
   end
 
 end

data/public/javascripts/gmaps4rails.js

@@ -3,7 +3,8 @@ google.load('maps', '3', { other_params: 'libraries=geometry&sensor=false' });
 var Gmaps4Rails = {
 	//map config
 	map: null,									//contains the map we're working on
-	
+	visibleInfoWindow: null,
+  
 	//Map settings
 	map_options: {
 	  id: 'gmaps4rails_map',
@@ -27,11 +28,12 @@ var Gmaps4Rails = {
 	  clusterer_gridSize: 50,		//the more the quicker but the less precise
 		clusterer_maxZoom:  5,		//removes clusterer  at this zoom level
 		randomize: false,         //Google maps can't display two markers which have the same coordinates. This randomizer enables to prevent this situation from happening.
-		max_random_distance: 100  //in meters. Each marker coordinate could be altered by this distance in a random direction
+		max_random_distance: 100, //in meters. Each marker coordinate could be altered by this distance in a random direction
+		list_container : null     //id of the ul that will host links to all markers
 		},
 	
 	//Stored variables
-	marker_objects: null,				//contains markers LatLng
+	marker_objects: [],				  //contains markers LatLng
 	markers : [],							  //contains raw markers
 	bounds: null,								//contains current bounds
 	polygons: null, 						//contains raw data, array of arrays (first element cold be a hash containing options)
@@ -304,11 +306,11 @@ var Gmaps4Rails = {
 
   // clear markers
   clear_markers: function(){
-    if (this.marker_objects) {
+    if (this.marker_objects.size() > 0) {
       for (i in this.marker_objects) {
         this.marker_objects[i].setMap(null);
       }
-      this.marker_objects = null;
+      this.marker_objects = new Array;
     }
   },
 
@@ -329,10 +331,7 @@ var Gmaps4Rails = {
   },
 	
   //Creates Marker from the markers passed + markerClusterer
-  setup_Markers: function () {		
-		//variable used for Marker Clusterer
-		var marker_objects = [];
-		
+  setup_Markers: function () {		    
 		//resets Clusterer if needed
 		if (this.markerClusterer) {
 			this.markerClusterer.clearMarkers();
@@ -368,34 +367,57 @@ var Gmaps4Rails = {
 					}
 					//save object for later use, basically, to get back the text to display when clicking it
 					this.markers[i].marker_object = ThisMarker; 
+					//add infowindowstuff + list creation if enabled
+					this.handle_info_window(this.markers[i]);
 					//save the marker in a list
-					marker_objects.push(ThisMarker);		
-					//add click listener
-		  	  google.maps.event.addListener(Gmaps4Rails.markers[i].marker_object, 'click', function() { if (Gmaps4Rails.info_window!=null) {Gmaps4Rails.info_window.close();}; Gmaps4Rails.getInfoWindow(this);});
-		 }
-		this.setup_Clusterer(marker_objects);
+					this.marker_objects.push(ThisMarker);
+		}
+		this.setup_Clusterer();
 	},
 	
-	//get info_window content when listener calls it
-	getInfoWindow: function(which)
-	{	
-	  for ( var m = 0; m < this.markers.length; ++m )
-	  {
-	    var markerInfo = this.markers[m].marker_object;
-	    if ( markerInfo == which && this.markers[m].description != "") 
-	    {
-	        this.info_window = new google.maps.InfoWindow({content: this.markers[m].description });
-	        this.info_window.open( this.map, which );
-	        return;
-	    }
-	  }
+	handle_info_window: function(marker_container){
+		//create the infowindow
+		var info_window = new google.maps.InfoWindow({content: marker_container.description });
+		//add the listener associated
+		google.maps.event.addListener(marker_container.marker_object, 'click', this.openInfoWindow(info_window, marker_container.marker_object));
+		if (this.markers_conf.list_container)
+		{
+			var ul = document.getElementById(this.markers_conf.list_container);
+			var li = document.createElement('li');
+	    var aSel = document.createElement('a');
+	    aSel.href = 'javascript:void(0);';
+	    var html = this.exists(marker_container.sidebar) ? marker_container.sidebar : "Marker";
+	    aSel.innerHTML = html;
+	    aSel.onclick = this.generateTriggerCallback(marker_container.marker_object, 'click');
+	    li.appendChild(aSel);
+	    ul.appendChild(li);
+		}
 	},
 	
-	setup_Clusterer: function(marker_objects)
+	openInfoWindow: function(infoWindow, marker) {
+    return function() {
+      // Close the latest selected marker before opening the current one.
+      if (Gmaps4Rails.visibleInfoWindow) {
+        Gmaps4Rails.visibleInfoWindow.close();
+      }
+   
+      infoWindow.open(Gmaps4Rails.map, marker);
+      Gmaps4Rails.visibleInfoWindow = infoWindow;
+    };
+  },
+
+  generateTriggerCallback: function(marker, eventType) {
+    return function() {
+			Gmaps4Rails.map.panTo(marker.position);
+      google.maps.event.trigger(marker, eventType);
+    };
+  },
+	
+	setup_Clusterer: function()
 	{
 		if (this.markers_conf.do_clustering == true)
 		{
-			this.markerClusterer = new MarkerClusterer(this.map, marker_objects, {	maxZoom: this.markers_conf.clusterer_maxZoom,
+			this.markerClusterer = new MarkerClusterer(this.map, this.marker_objects, {	maxZoom: this.markers_conf.clusterer_maxZoom,
 																																			   gridSize: this.markers_conf.clusterer_gridSize,
 																																			   //styles: styles TODO: offer clusterer customization
 																																	  	   });

data/test/dummy/app/controllers/users_controller.rb

@@ -39,4 +39,8 @@ class UsersController < ApplicationController
     @user.destroy
     redirect_to users_url, :notice => "Successfully destroyed user."
   end
+  
+  def test_list
+    @json  = User.all.to_gmaps4rails
+  end
 end

data/test/dummy/app/models/user.rb

@@ -4,5 +4,12 @@ class User < ActiveRecord::Base
   def gmaps4rails_address
     address
   end
- 
+  
+  # def gmaps4rails_sidebar
+  #   "<b>#{name}</b>"
+  # end
+  #  
+  def gmaps4rails_infowindow
+    "je suis l'infowindow"
+  end
 end

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Dummy::Application.routes.draw do
+  match "users/test_list" => "users#test_list", :as => "test_list"
   resources :users
   root :to => "users#index"
 end

data/test/dummy/spec/base/base_spec.rb

@@ -81,6 +81,46 @@ describe "JS creation from hash" do
   end
 end
 
+describe "Hash extension" do
+  
+  it "should create the proper text (used as js)" do
+     @options = {
+            "map_options" => { "type" => "SATELLITE", "center_longitude" => 180, "zoom" => 3, "auto_adjust" => true},
+            "markers"     => { "data" => '[{ "description": "", "title": "", "longitude": "5.9311119", "latitude": "43.1251606", "picture": "", "width": "", "height": "" } ,{ "description": "", "title": "", "longitude": "2.3509871", "latitude": "48.8566667", "picture": "", "width": "", "height": "" } ]',
+      											   "options" => { "do_clustering" => false, "list_container" => "makers_list" } 
+      											 },
+            "polylines"   => { "data" => '[[
+    {"longitude": -122.214897, "latitude": 37.772323},
+    {"longitude": -157.821856, "latitude": 21.291982},
+    {"longitude": 178.431, "latitude": -18.142599},
+    {"longitude": 153.027892, "latitude": -27.46758}
+    ],
+    [
+    {"longitude": -120.214897, "latitude": 30.772323, "strokeColor": "#000", "strokeWeight" : 2 },
+    {"longitude": -10.821856, "latitude": 50.291982}
+    ]]' },
+             "polygons"    => { "data" => '[[
+    {"longitude": -80.190262, "latitude": 25.774252},
+    {"longitude": -66.118292, "latitude": 18.466465},
+    {"longitude": -64.75737, "latitude": 32.321384}
+    ]]' },
+             "circles"     => { "data" => '[
+    {"longitude": -122.214897, "latitude": 37.772323, "radius": 1000000},
+    {"longitude": 122.214897, "latitude": 37.772323, "radius": 1000000, "strokeColor": "#FF0000"}
+    ]',
+             									},
+   "direction"   => { 
+                      "data"    => { "from" => "toulon, france", "to" => "paris, france"} , 
+                      "options" => {"waypoints" => ["toulouse, france", "brest, france"], "travelMode" => "DRIVING", "display_panel" => true, "panel_id" => "instructions"}
+                    }
+    }
+  
+    @options.to_gmaps4rails.should == "Gmaps4Rails.polylines = [[\n    {\"longitude\": -122.214897, \"latitude\": 37.772323},\n    {\"longitude\": -157.821856, \"latitude\": 21.291982},\n    {\"longitude\": 178.431, \"latitude\": -18.142599},\n    {\"longitude\": 153.027892, \"latitude\": -27.46758}\n    ],\n    [\n    {\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },\n    {\"longitude\": -10.821856, \"latitude\": 50.291982}\n    ]];\nGmaps4Rails.create_polylines();\nGmaps4Rails.circles = [\n    {\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},\n    {\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}\n    ];\nGmaps4Rails.create_circles();\nGmaps4Rails.polygons = [[\n    {\"longitude\": -80.190262, \"latitude\": 25.774252},\n    {\"longitude\": -66.118292, \"latitude\": 18.466465},\n    {\"longitude\": -64.75737, \"latitude\": 32.321384}\n    ]];\nGmaps4Rails.create_polygons();\nGmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];\nGmaps4Rails.markers_conf.list_container = 'makers_list';\nGmaps4Rails.markers_conf.do_clustering = false;\nGmaps4Rails.create_markers();\nGmaps4Rails.direction_conf.origin = 'toulon, france';\nGmaps4Rails.direction_conf.destination = 'paris, france';\nGmaps4Rails.direction_conf.display_panel = true;\nGmaps4Rails.direction_conf.panel_id = 'instructions';\nGmaps4Rails.direction_conf.travelMode = 'DRIVING';\nGmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];\nGmaps4Rails.create_direction();"
+    @options.to_gmaps4rails(true).should include "Gmaps4Rails.initialize();"
+  end
+
+end
+
 describe "Destination" do
   it "should render info from only start_end args"
   it "should accept all options properly"

data/test/dummy/spec/models/user_spec.rb

@@ -2,6 +2,43 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Acts as gmappable" do
   
+  before(:each) do 
+    #reset all configuration to default or nil
+    User.class_eval do
+      def gmaps4rails_options
+        {
+          :lat_column     => "latitude",
+          :lng_column     => "longitude",
+          :check_process  => true,
+          :checker        => "gmaps",
+          :msg            => "Address invalid",
+          :validation     => true
+        }
+      end
+      
+      def gmaps4rails_address
+        address
+      end     
+      
+      def gmaps4rails_sidebar
+      end
+       
+      def gmaps4rails_infowindow
+      end
+      
+      def gmaps4rails_title
+      end
+      
+      def gmaps4rails_marker_picture
+        {
+          "picture" => "",
+          "width" => "",
+          "height" => ""
+        }
+      end
+    end
+  end
+  
   describe "standard configuration, valid user" do
     before(:each) do
       @user = Factory(:user)
@@ -18,11 +55,11 @@ describe "Acts as gmappable" do
   
     it "should render a valid json from an array of ojects" do
       @user2 = Factory(:user_paris)
-      User.all.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ,{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
+      User.all.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ,{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
   
     it "should render a valid json from a single object" do
-      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should not geocode again after address changes if checker is true" do
@@ -57,7 +94,8 @@ describe "Acts as gmappable" do
   end
   
   
-  describe "model customization" do  
+  describe "model customization" do 
+    
     it "should render a valid json even if there is no instance in the db" do
       User.all.to_gmaps4rails.should == "[]"
     end
@@ -114,7 +152,7 @@ describe "Acts as gmappable" do
       @user.long_test.should == 5.9311119
       @user.longitude.should == nil
       @user.latitude.should  == nil
-      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should not save the boolean if check_process is false" do
@@ -179,14 +217,11 @@ describe "Acts as gmappable" do
         end
       end
       @user = Factory(:user_with_pic)
-      @user.to_gmaps4rails.should == "[{\n\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
     it "should take into account the picture provided in the model" do 
       User.class_eval do
-        def gmaps4rails_infowindow
-          #to reset the former declaration
-        end
         def gmaps4rails_marker_picture
           {
           "picture" => "http://www.blankdots.com/img/github-32x32.png",
@@ -196,7 +231,7 @@ describe "Acts as gmappable" do
         end
       end
       @user = Factory(:user)
-      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
     end
     
     it "should take into account the title provided in the model" do
@@ -206,7 +241,17 @@ describe "Acts as gmappable" do
         end
       end
       @user = Factory(:user)
-      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"Sweet Title\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"Sweet Title\", \"sidebar\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
+    end
+    
+    it "should take into account the sidebar content provided in the model" do
+      User.class_eval do
+        def gmaps4rails_sidebar
+          "sidebar content"
+        end
+      end
+      @user = Factory(:user)
+      @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\", \"sidebar\": \"sidebar content\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
   end
 

data/test/dummy/spec/requests/users_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "list creation", :js => true do
+  
+  it "should create the sidebar with list of users" do
+    
+    #first setup what the list should display    
+    User.class_eval do
+      def gmaps4rails_sidebar
+        name
+      end
+    end
+    
+    Factory(:user, :name => "User1")
+    Factory(:user, :name => "User2")
+    
+    visit test_list_path
+    page.should have_content("User1")
+    page.should have_content("User2")
+  end
+  
+end
+

data/test/dummy/spec/spec_helper.rb

@@ -2,10 +2,12 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'capybara/rspec'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Capybara.server_boot_timeout = 50
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -23,5 +25,17 @@ RSpec.configure do |config|
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
+  
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,6 @@ files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/users_helper.rb
 - test/dummy/app/models/user.rb
-- test/dummy/app/views/users/test.rb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/environment.rb
@@ -88,6 +87,7 @@ files:
 - test/dummy/spec/controllers/users_controller_spec.rb
 - test/dummy/spec/factories.rb
 - test/dummy/spec/models/user_spec.rb
+- test/dummy/spec/requests/users_spec.rb
 - test/dummy/spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
@@ -129,7 +129,6 @@ test_files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/users_helper.rb
 - test/dummy/app/models/user.rb
-- test/dummy/app/views/users/test.rb
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/environment.rb
@@ -149,4 +148,5 @@ test_files:
 - test/dummy/spec/controllers/users_controller_spec.rb
 - test/dummy/spec/factories.rb
 - test/dummy/spec/models/user_spec.rb
+- test/dummy/spec/requests/users_spec.rb
 - test/dummy/spec/spec_helper.rb

data/test/dummy/app/views/users/test.rb

@@ -1,35 +0,0 @@
-Gmaps4Rails.map_options.center_longitude = 180;
-Gmaps4Rails.map_options.type = 'SATELLITE';
-Gmaps4Rails.map_options.zoom = 3;
-Gmaps4Rails.initialize();
-Gmaps4Rails.polylines = [[
-{\"longitude\": -122.214897, \"latitude\": 37.772323},
-{\"longitude\": -157.821856, \"latitude\": 21.291982},
-{\"longitude\": 178.431, \"latitude\": -18.142599},
-{\"longitude\": 153.027892, \"latitude\": -27.46758}
-],
-[
-{\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },
-{\"longitude\": -10.821856, \"latitude\": 50.291982}
-]];
-Gmaps4Rails.create_polylines();
-Gmaps4Rails.circles = [
-{\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},
-{\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}
-];
-Gmaps4Rails.create_circles();
-Gmaps4Rails.polygons = [[
-{\"longitude\": -80.190262, \"latitude\": 25.774252},
-{\"longitude\": -66.118292, \"latitude\": 18.466465},
-{\"longitude\": -64.75737, \"latitude\": 32.321384}
-]];
-Gmaps4Rails.create_polygons();
-Gmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];
-Gmaps4Rails.create_markers();
-Gmaps4Rails.direction_conf.origin = 'toulon, france';
-Gmaps4Rails.direction_conf.destination = 'paris, france';
-Gmaps4Rails.direction_conf.display_panel = 'true';
-Gmaps4Rails.direction_conf.panel_id = 'instructions';
-Gmaps4Rails.direction_conf.travelMode = 'DRIVING';
-Gmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];
-Gmaps4Rails.create_direction();