gmaps4rails 0.8.6 → 0.8.7

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

@@ -7,6 +7,8 @@ if enable_css == true %>
 
 <% content_for :scripts do %>
 <% if enable_js == true %>
+  <script type="text/javascript" src='http://maps.google.com/maps/api/js?sensor=false&libraries=geometry'></script>
+	<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.5/src/infobox.js'></script>
 	<%=javascript_include_tag 'gmaps4rails' %>
 	<script type="text/javascript" src='http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_compiled.js'></script>
 <% end  %>
@@ -15,15 +17,8 @@ function gmaps4rails_init() {
 	<% #true is passed here to trigger map initialization %>
 	<%=raw options.to_gmaps4rails(true) %>
 }
-  
-function gmaps4rails_loadScript() {
-  var script = document.createElement("script");
-  script.type = "text/javascript";
-  script.src = "http://maps.google.com/maps/api/js?sensor=false&libraries=geometry&callback=gmaps4rails_init";
-  document.body.appendChild(script);
-}
-  
-window.onload = gmaps4rails_loadScript;
+
+window.onload = gmaps4rails_init;
 
 </script>
 <% end %>

data/lib/acts_as_gmappable/base.rb

@@ -140,7 +140,7 @@ module Gmaps4rails
         return true if gmaps4rails_options[:check_process] == true && self.send(gmaps4rails_options[:checker]) == true
         begin
           coordinates = Gmaps4rails.geocode(self.send(gmaps4rails_options[:address]))
-        rescue GeocodeStatus #address was invalid, add error to base.
+        rescue GeocodeStatus, GeocodeInvalidQuery  #address was invalid, add error to base.
           errors[gmaps4rails_options[:address]] << gmaps4rails_options[:msg] if gmaps4rails_options[:validation]
         rescue GeocodeNetStatus => e #connection error, No need to prevent save.
           logger.warn(e)

data/public/javascripts/gmaps4rails.js

@@ -31,6 +31,7 @@ var Gmaps4Rails = {
 	  picture : "",
 		width: 22,
 		length: 32,
+    draggable: false,         // how to modify: <%= gmaps( "markers" => { "data" => @object.to_gmaps4rails, "options" => { "draggable" => true }}) %>
 		anchor: null,             // centeranchor position of the marker image. Default is null <=> center, you can set options: top_left, top_center, top_right, center_left, center, center_right, bottom_right, bottom_center, bottom_left
 		//clustering config
 	  do_clustering: true,			// do clustering if set to true
@@ -39,7 +40,8 @@ var Gmaps4Rails = {
 		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
 		list_container: null,     // id of the ul that will host links to all markers
-		custom_cluster_pictures: null
+		custom_cluster_pictures: null,
+		custom_infowindow_class: null,
 	},
 	
 	//Stored variables
@@ -116,17 +118,22 @@ var Gmaps4Rails = {
 	
 	findUserLocation: function() {
 		if(navigator.geolocation) {
+			//try to retrieve user's position
 	    navigator.geolocation.getCurrentPosition(function(position) {
+				//saves the position in the userLocation variable
 	      Gmaps4Rails.userLocation = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
-	    	//change map's center to focus on user's geoloc
+	    	//change map's center to focus on user's geoloc if asked
 				if(Gmaps4Rails.map_options.center_on_user === true) {
 					Gmaps4Rails.map.setCenter(Gmaps4Rails.userLocation);
 				}
 	    },
 	    function() {
+		    //if failure, triggers the function if defined
 			  if(this.fnSet("gmaps4rails_geolocation_failure")) { gmaps4rails_geolocation_failure(true); }
-		});
-	  } else {
+			});
+	  }
+	  else {
+		  //if failure, triggers the function if defined
 		  if(this.fnSet("gmaps4rails_geolocation_failure")) { gmaps4rails_geolocation_failure(false); }
 	  }
 	},
@@ -364,12 +371,13 @@ var Gmaps4Rails = {
 			   var marker_height 	= this.exists(this.markers[i].height)  ? this.markers[i].height  : this.markers_conf.length;
 				 var marker_anchor	= this.exists(this.markers[i].anchor)	 ? this.markers[i].anchor  : this.markers_conf.anchor;
 			   var marker_title 	= this.exists(this.markers[i].title)   ? this.markers[i].title 	 : null;
+			   var marker_draggable 	= this.exists(this.markers[i].draggable)   ? this.markers[i].draggable 	 : this.markers_conf.draggable;
       	 var Lat = this.markers[i].latitude;
 				 var Lng = this.markers[i].longitude;
 				 var imageAnchorPosition = null;
 				 // calculate MarkerImage anchor location
 				 if (this.exists(this.markers[i].width) && this.exists(this.markers[i].height) && marker_anchor !== null) {
-				 		imageAnchorPosition = getImageAnchorPosition(marker_width, marker_height, marker_anchor);
+				 		imageAnchorPosition = this.getImageAnchorPosition(marker_width, marker_height, marker_anchor);
 				 }
 				
 				 //alter coordinates if randomize is true
@@ -383,10 +391,10 @@ var Gmaps4Rails = {
 				 var thisMarker;
 				 // Marker sizes are expressed as a Size of X,Y
 		 		 if (marker_picture === "") { 
-						thisMarker = new google.maps.Marker({position: markerLatLng, map: this.map, title: marker_title});	
+						thisMarker = new google.maps.Marker({position: markerLatLng, map: this.map, title: marker_title, draggable: marker_draggable});
 				 } else {
 						var image = new google.maps.MarkerImage(marker_picture, new google.maps.Size(marker_width, marker_height), null, imageAnchorPosition, null );
-					  thisMarker = new google.maps.Marker({position: markerLatLng, map: this.map, icon: image, title: marker_title});
+					  thisMarker = new google.maps.Marker({position: markerLatLng, map: this.map, icon: image, title: marker_title, draggable: marker_draggable});
 				 }
 				 //save object
 				 this.markers[i].google_object = thisMarker; 
@@ -395,10 +403,11 @@ var Gmaps4Rails = {
 				 //create sidebar if enabled
 				 this.create_sidebar(this.markers[i]);
 			 }
-		}
+		  }
+		},
 		
 		// calculate anchor point for MarkerImage	
-		function getImageAnchorPosition(markerWidth, markerHeight, anchorLocation) {
+	getImageAnchorPosition: function(markerWidth, markerHeight, anchorLocation) {
 			var x;
 			var y;
 			switch (anchorLocation) {
@@ -439,8 +448,7 @@ var Gmaps4Rails = {
 					y = markerHeight;
 					break;		
 			}
-			return new google.maps.Point(x,y);
-		}
+		return new google.maps.Point(x,y);
 	},
 
   // clear markers
@@ -526,10 +534,22 @@ var Gmaps4Rails = {
 
 	// creates infowindows
 	create_info_window: function(marker_container){
+		var info_window;
+		if (this.markers_conf.custom_infowindow_class === null) {
 		//create the infowindow
-		var info_window = new google.maps.InfoWindow({content: marker_container.description });
+		info_window = new google.maps.InfoWindow({content: marker_container.description });
 		//add the listener associated
 		google.maps.event.addListener(marker_container.google_object, 'click', this.openInfoWindow(info_window, marker_container.google_object));
+		}
+		else { //creating custom infowindow
+			if (this.exists(marker_container.description)) {
+				var boxText = document.createElement("div");
+				boxText.setAttribute("class", this.markers_conf.custom_infowindow_class); //to customize
+				boxText.innerHTML = marker_container.description;	
+				info_window = new InfoBox(gmaps4rails_infobox(boxText));
+				google.maps.event.addListener(marker_container.google_object, 'click', this.openInfoWindow(info_window, marker_container.google_object));
+			}
+		}
 	},
 
 	openInfoWindow: function(infoWindow, marker) {

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

@@ -7,10 +7,10 @@ class User < ActiveRecord::Base
   end
   
     # 
-  # def gmaps4rails_infowindow
-  #   "My Beautiful Name: #{name}"
-  # end
-  # 
+  def gmaps4rails_infowindow
+    "My Beautiful Name: #{name}"
+  end
+  
   # def gmaps4rails_marker_picture
   #   {
   #   "picture" => "http://www.blankdots.com/img/github-32x32.png",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 8
-  - 6
-  version: 0.8.6
+  - 7
+  version: 0.8.7
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-22 00:00:00 +02:00
+date: 2011-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,12 +53,6 @@ files:
 - lib/gmaps4rails.rb
 - lib/gmaps4rails_helper.rb
 - lib/hash.rb
-- lib/rails/generators/gmaps4rails/gmaps4rails_generator.rb
-- lib/rails/generators/gmaps4rails/templates/initializer.rb
-- lib/rails/generators/gmaps4rails/templates/migration.rb
-- lib/rails/generators/gmaps4rails/templates/schema.rb
-- lib/rails/railties/tasks.rake
-- lib/tasks/install.rake
 - public/images/marker.png
 - public/javascripts/gmaps4rails.js
 - public/stylesheets/gmaps4rails.css

data/lib/rails/generators/gmaps4rails/gmaps4rails_generator.rb

@@ -1,75 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Gmaps4railsGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-
-  def self.source_root
-    File.join(File.dirname(__FILE__), 'templates')
-  end
-   
-  def self.next_migration_number(dirname) #:nodoc:
-    if ActiveRecord::Base.timestamped_migrations
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
-    else
-      "%.3d" % (current_migration_number(dirname) + 1)
-    end
-  end
-
-
-  # Every method that is declared below will be automatically executed when the generator is run
-  
-  def create_migration_file
-    f = File.open File.join(File.dirname(__FILE__), 'templates', 'schema.rb')
-    schema = f.read; f.close
-    
-    schema.gsub!(/ActiveRecord::Schema.*\n/, '')
-    schema.gsub!(/^end\n*$/, '')
-
-    f = File.open File.join(File.dirname(__FILE__), 'templates', 'migration.rb')
-    migration = f.read; f.close
-    migration.gsub!(/SCHEMA_AUTO_INSERTED_HERE/, schema)
-    
-    tmp = File.open "tmp/~migration_ready.rb", "w"
-    tmp.write migration
-    tmp.close
-
-    migration_template  '../../../tmp/~migration_ready.rb',
-                        'db/migrate/create_gmaps4rails_tables.rb'
-    remove_file 'tmp/~migration_ready.rb'
-  end
-
-  def copy_initializer_file
-    copy_file 'initializer.rb', 'config/initializers/gmaps4rails.rb'
-  end
-
-  def update_application_template
-    f = File.open "app/views/layouts/application.html.erb"
-    layout = f.read; f.close
-    
-    if layout =~ /<%=[ ]+yield[ ]+%>/
-      print "    \e[1m\e[34mquestion\e[0m  Your layouts/application.html.erb layout currently has the line <%= yield %>. This gem needs to change this line to <%= content_for?(:content) ? yield(:content) : yield %> to support its nested layouts. This change should not affect any of your existing layouts or views. Is this okay? [y/n] "
-      begin
-        answer = gets.chomp
-      end while not answer =~ /[yn]/i
-      
-      if answer =~ /y/i
-        
-        layout.gsub!(/<%=[ ]+yield[ ]+%>/, '<%= content_for?(:content) ? yield(:content) : yield %>')
-
-        tmp = File.open "tmp/~application.html.erb", "w"
-        tmp.write layout; tmp.close
-
-        remove_file 'app/views/layouts/application.html.erb'
-        copy_file '../../../tmp/~application.html.erb', 
-                  'app/views/layouts/application.html.erb'
-        remove_file 'tmp/~application.html.erb'
-      end
-    elsif layout =~ /<%=[ ]+content_for\?\(:content\) \? yield\(:content\) : yield[ ]+%>/
-      puts "    \e[1m\e[33mskipping\e[0m  layouts/application.html.erb modification is already done."
-    else
-      puts "    \e[1m\e[31mconflict\e[0m  The gem is confused by your layouts/application.html.erb. It does not contain the default line <%= yield %>, you may need to make manual changes to get this gem's nested layouts working. Visit ###### for details."
-    end
-  end
-  
-end

data/lib/rails/generators/gmaps4rails/templates/initializer.rb

@@ -1,8 +0,0 @@
-module Gmaps4rails
-  class Engine < Rails::Engine
-
-    config.mount_at = '/gmaps4rails'
-    config.widget_factory_name = 'Factory Name'
-        
-  end
-end

data/lib/rails/generators/gmaps4rails/templates/migration.rb

@@ -1,9 +0,0 @@
-class CreateGmaps4railsTables < ActiveRecord::Migration
-  def self.up
-    SCHEMA_AUTO_INSERTED_HERE
-  end
-
-  def self.down
-    drop_table :gmaps4rails_widgets
-  end
-end

data/lib/rails/generators/gmaps4rails/templates/schema.rb

@@ -1,11 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-
-    create_table :gmaps4rails_widgets, :force => true do |t|
-      t.string    :title
-      t.datetime  :created_at
-      t.datetime  :updated_at
-    end
-
-    add_index :gmaps4rails_widgets, [:title]
-
-end

data/lib/rails/railties/tasks.rake

@@ -1,8 +0,0 @@
-namespace :gmaps4rails do
-  
-  desc "example gem rake task"
-  task :report => :environment do
-    puts "you just ran the example gem rake task"
-  end
-
-end

data/lib/tasks/install.rake

@@ -1,9 +0,0 @@
-namespace :gmaps4rails do
-  desc "Copies all migrations and assets (NOTE: This will be obsolete with Rails 3.1)"
-  task :install do
-    source = File.join(File.dirname(__FILE__), '..', '..', 'public')
-    destination = File.join(Rails.root, 'public')
-    puts "INFO: Mirroring assets from #{source} to #{destination}"
-    Spree::FileUtilz.mirror_files(source, destination)
-  end
-end