gmaps4rails 0.8.7 → 0.8.8

data/lib/acts_as_gmappable/base.rb

@@ -34,11 +34,11 @@ module Gmaps4rails
     return ", \"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\", \"width\": \"#{object.gmaps4rails_marker_picture['width']}\", \"height\": \"#{object.gmaps4rails_marker_picture['height']}\"" if object.respond_to?("gmaps4rails_marker_picture")
   end
   
-  def Gmaps4rails.geocode(address, raw = false)
+  def Gmaps4rails.geocode(address, lang="en", raw = false)
    if address.nil? || address.empty?
      raise Gmaps4rails::GeocodeInvalidQuery, "You must provide an address"
    else #coordinates are valid
-     geocoder = "http://maps.googleapis.com/maps/api/geocode/json?address="
+     geocoder = "http://maps.googleapis.com/maps/api/geocode/json?language=#{lang}&address="
      output = "&sensor=false"
      #send request to the google api to get the lat/lng
      request = geocoder + address + output
@@ -58,7 +58,8 @@ module Gmaps4rails
                       :lat => result["geometry"]["location"]["lat"], 
                       :lng => result["geometry"]["location"]["lng"],
                       :matched_address => result["formatted_address"],
-                      :bounds => result["geometry"]["bounds"]
+                      :bounds => result["geometry"]["bounds"],
+                      :full_data => result
                      }
          end
          return array
@@ -139,7 +140,7 @@ module Gmaps4rails
         #to prevent geocoding each time a save is made
         return true if gmaps4rails_options[:check_process] == true && self.send(gmaps4rails_options[:checker]) == true
         begin
-          coordinates = Gmaps4rails.geocode(self.send(gmaps4rails_options[:address]))
+          coordinates = Gmaps4rails.geocode(self.send(gmaps4rails_options[:address]), gmaps4rails_options[:language])
         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.
@@ -151,6 +152,8 @@ module Gmaps4rails
           unless gmaps4rails_options[:normalized_address].nil?
             self.send(gmaps4rails_options[:normalized_address].to_s+"=", coordinates.first[:matched_address])
           end
+          # Call the callback method to let the user do what he wants with the data
+          self.send(gmaps4rails_options[:callback], coordinates.first[:full_data]) unless gmaps4rails_options[:callback].nil?
           if gmaps4rails_options[:check_process] == true
             self[gmaps4rails_options[:checker]] = true
           end
@@ -182,7 +185,9 @@ module Gmaps4rails
             :msg                => args[:msg]                    || "Address invalid",
             :validation         => args[:validation].nil?        ?   true  : args[:validation],
             :normalized_address => args[:normalized_address],
-            :address            => args[:address]                || "gmaps4rails_address"
+            :address            => args[:address]                || "gmaps4rails_address",
+            :callback           => args[:callback],
+            :language           => args[:language]               || "en"
             #TODO: address as a proc?
           }
         end

data/public/javascripts/gmaps4rails.js

@@ -42,6 +42,7 @@ var Gmaps4Rails = {
 		list_container: null,     // id of the ul that will host links to all markers
 		custom_cluster_pictures: null,
 		custom_infowindow_class: null,
+		offset: 0                //used when adding_markers to an existing map. Because new markers are concated with previous one, offset is here to avoid the existing are re-created.
 	},
 	
 	//Stored variables
@@ -362,7 +363,7 @@ var Gmaps4Rails = {
 	
 	//create google.maps Markers from data provided by user
 	create_google_markers_from_markers: function() {
-		for (var i = 0; i < this.markers.length; ++i) {
+		for (var i = this.markers_conf.offset; i < this.markers.length; ++i) {
 		  //check if the marker has not already been created
 			if (!this.exists(this.markers[i].google_object)) {
 			   //test if value passed or use default 
@@ -404,6 +405,7 @@ var Gmaps4Rails = {
 				 this.create_sidebar(this.markers[i]);
 			 }
 		  }
+		this.markers_conf.offset = this.markers.length;
 		},
 		
 		// calculate anchor point for MarkerImage	
@@ -453,9 +455,10 @@ var Gmaps4Rails = {
 
   // clear markers
   clear_markers: function() {
-    if (this.markerClusterer !== null){
-			this.markerClusterer.clearMarkers();
-		}
+		// 	  //clear clusterer first
+		//     if (this.markerClusterer !== null){
+		// 	this.markerClusterer.clearMarkers();
+		// }
 		for (var i = 0; i < this.markers.length; ++i) {
       this.clear_marker(this.markers[i]);
     }
@@ -488,6 +491,8 @@ var Gmaps4Rails = {
 	
   // replace old markers with new markers on an existing map
   replace_markers: function(new_markers){
+	  //reset the offset
+	  this.markers_conf.offset = 0;
 	  //reset previous markers
 		this.markers = new Array;
 		//reset current bounds
@@ -501,7 +506,7 @@ var Gmaps4Rails = {
 	//add new markers to on an existing map
   add_markers: function(new_markers){
 	  //clear the whole map
-	  this.clear_markers();
+	  //this.clear_markers();
 	  //update the list of markers to take into account
     this.markers = this.markers.concat(new_markers);
     //put markers on the map
@@ -513,6 +518,11 @@ var Gmaps4Rails = {
 	{
 		if (this.markers_conf.do_clustering === true)
 		{
+			//first clear the existing clusterer if any
+			if (this.markerClusterer !== null) {
+				this.markerClusterer.clearMarkers();
+			}
+			
 			var gmarkers_array = new Array;
 			for (var i = 0; i <  this.markers.length; ++i) {
        gmarkers_array.push(this.markers[i].google_object);

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

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

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Geocode" do
 
   it "should geocode properly an address" do
-    Gmaps4rails.geocode("alaska").should == [{:matched_address=>"Alaska, USA", :bounds=>{"northeast"=>{"lng"=>-129.979511, "lat"=>71.441059}, "southwest"=>{"lng"=>172.347846, "lat"=>51.175092}}, :lat=>63.588753, :lng=>-154.4930619}] 
+    Gmaps4rails.geocode("alaska").should be_an(Array)
   end
   
   it "should raise an error when address invalid" do

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

@@ -13,10 +13,13 @@ describe "Acts as gmappable" do
           :checker        => "gmaps",
           :msg            => "Address invalid",
           :validation     => true,
-          :address    => "gmaps4rails_address"
+          :address    => "gmaps4rails_address",
+          :language   => "en"
         }
       end
     end
+    @toulon = { :latitude => 43.124228, :longitude => 5.928}
+    @paris = { :latitude => 48.856614, :longitude => 2.3522219}
   end
   
   describe "standard configuration, valid user" do
@@ -25,8 +28,8 @@ describe "Acts as gmappable" do
     end
     
     it "should have a geocoded position" do
-      @user.latitude.should  == 43.1251606
-      @user.longitude.should == 5.9311119
+      @user.latitude.should  == @toulon[:latitude]
+      @user.longitude.should == @toulon[:longitude]
     end
   
     it "should set boolean to true once user is created" do
@@ -35,26 +38,26 @@ 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 == "[{\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"},\n{\"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\"}]"
+      User.all.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"},\n{\"longitude\": \"" + @paris[:longitude].to_s + "\", \"latitude\": \"" + @paris[:latitude].to_s + "\"}]"
     end
   
     it "should render a valid json from a single object" do
-      @user.to_gmaps4rails.should == "[{\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
     end
     
     it "should not geocode again after address changes if checker is true" do
       @user.sec_address = "paris, France"
       @user.save
-      @user.latitude.should  == 43.1251606
-      @user.longitude.should == 5.9311119
+      @user.latitude.should  == @toulon[:latitude]
+      @user.longitude.should == @toulon[:longitude]
     end
     
     it "should geocode after address changes if checker is false" do
       @user.sec_address = "paris, France"
       @user.gmaps = false
       @user.save
-      @user.latitude.should  == 48.8566667
-      @user.longitude.should == 2.3509871
+      @user.latitude.should  == @paris[:latitude]
+      @user.longitude.should == @paris[:longitude]
     end
   end
   
@@ -90,13 +93,14 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Address invalid",
             :validation     => true,
-            :address    => "sec_address"
+            :address    => "sec_address",
+            :language   => "en"
           }
         end
       end
       @user = Factory(:user)
-      @user.latitude.should  == 43.1251606
-      @user.longitude.should == 5.9311119
+      @user.latitude.should  == @toulon[:latitude]
+      @user.longitude.should == @toulon[:longitude]
     end
     
     it "should save the normalized address if requested" do
@@ -110,7 +114,8 @@ describe "Acts as gmappable" do
             :msg            => "Address invalid",
             :validation     => true,
             :normalized_address => "norm_address",
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -129,7 +134,8 @@ describe "Acts as gmappable" do
             :msg            => "Custom Address invalid",
             :validation     => true,
             :normalized_address => "sec_address",
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -147,7 +153,8 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Custom Address invalid",
             :validation     => true,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -165,7 +172,8 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Address invalid",
             :validation     => false,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -183,13 +191,14 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Address invalid",
             :validation     => true,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
       @user = Factory(:user)
-      @user.lat_test.should  == 43.1251606
-      @user.long_test.should == 5.9311119
+      @user.lat_test.should  == @toulon[:latitude]
+      @user.long_test.should == @toulon[:longitude]
       @user.longitude.should == nil
       @user.latitude.should  == nil
     end
@@ -204,7 +213,8 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Address invalid",
             :validation     => true,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -222,15 +232,16 @@ describe "Acts as gmappable" do
             :checker        => "gmaps",
             :msg            => "Address invalid",
             :validation     => true,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
       @user = Factory(:user)
       @user.sec_address = "paris, France"
       @user.save
-      @user.latitude.should  == 48.8566667
-      @user.longitude.should == 2.3509871
+      @user.latitude.should  == @paris[:latitude]
+      @user.longitude.should == @paris[:longitude]
     end
     
     it "should save to the proper boolean checker set in checker" do
@@ -243,7 +254,8 @@ describe "Acts as gmappable" do
             :checker        => "bool_test",
             :msg            => "Address invalid",
             :validation     => true,
-            :address    => "gmaps4rails_address"
+            :address    => "gmaps4rails_address",
+            :language   => "en"
           }
         end
       end
@@ -259,7 +271,7 @@ describe "Acts as gmappable" do
           "My Beautiful Picture: #{picture}"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
     end
     
     it "should take into account the picture provided in the model" do
@@ -273,7 +285,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user.to_gmaps4rails.should == "[{\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
+      @user.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
     end
     
     it "should take into account the title provided in the model" do
@@ -283,7 +295,7 @@ describe "Acts as gmappable" do
           "Sweet Title"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
     end
     
     it "should take into account the sidebar content provided in the model" do
@@ -293,7 +305,7 @@ describe "Acts as gmappable" do
           "sidebar content"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"sidebar\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"sidebar\": \"sidebar content\",\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
     end
     
     it "should take into account all additional data provided in the model" do
@@ -320,7 +332,53 @@ describe "Acts as gmappable" do
           "sidebar content"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: \", \"title\": \"Sweet Title\", \"sidebar\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
+      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: \", \"title\": \"Sweet Title\", \"sidebar\": \"sidebar content\",\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
+    end
+    
+    it "should call a callback in the model if asked to" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "latitude",
+            :lng_column     => "longitude",
+            :check_process  => true,
+            :checker        => "gmaps",
+            :msg            => "Address invalid",
+            :validation     => true,
+            :address    => "gmaps4rails_address",
+            :language   => "en",
+            :callback   => "save_callback"
+          }
+        end
+        
+        def save_callback(data)
+          self.called_back = true
+        end
+        
+        attr_accessor :called_back
+      end
+      @user = Factory(:user)
+      @user.called_back.should == true
+    end
+    
+    it "should return results in the specified language" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "latitude",
+            :lng_column     => "longitude",
+            :check_process  => true,
+            :checker        => "gmaps",
+            :msg            => "Address invalid",
+            :validation     => true,
+            :address    => "gmaps4rails_address",
+            :language   => "de",
+            :normalized_address => "norm_address"
+          }
+        end
+      end
+      @user = Factory(:user)
+      @user.norm_address.should == "Toulon, Frankreich"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 8
+  version: 0.8.8
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 +02:00
+date: 2011-06-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency