gmaps4rails 1.5.0.pre → 1.5.0.pre2

data/Gemfile

@@ -6,4 +6,6 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'growl'
+gem 'growl'
+gem 'jquery-rails'
+gem 'jasmine'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (1.5.0.pre)
+    gmaps4rails (1.5.0.pre2)
 
 GEM
   remote: http://rubygems.org/

data/Guardfile

@@ -1,6 +1,3 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
 guard 'spork', :rspec_env => { 'RAILS_ENV' => 'test' } do
   watch('config/application.rb')
   watch('config/environment.rb')
@@ -10,12 +7,11 @@ guard 'spork', :rspec_env => { 'RAILS_ENV' => 'test' } do
   watch('Gemfile.lock')
   watch('spec/spec_helper.rb') { :rspec }
 end
-
  
 guard 'rspec', :cli => "-c -f d", :all_on_start => false, :all_after_pass => false do
   watch(%r{^spec/.+_spec\.rb$})
   watch('spec/launchers/all_specs.rb')         { "spec" }
-  watch('spec/launchers/all_but_requests.rb')  { ["spec/base", "spec/helpers", "spec/models", "spec/views"] }
+  watch('spec/launchers/all_but_requests.rb')  { ["spec/base", "spec/helpers", "spec/models", "spec/views", "spec/javascripts"] }
   watch('spec/launchers/requests.rb')          { "spec/requests" }
 end
 
@@ -25,14 +21,4 @@ guard 'jasmine', :jasmine_url => 'http://localhost:8888/', :all_on_start => fals
   watch(%r{^spec/javascripts/.+_spec\.js$}) { "spec/javascripts" }
 end
 
-
-#--drb
-
-guard 'coffeescript', :input => 'app/assets/javascripts/gmaps4rails', :output => 'public/javascripts/gmaps4rails'
-
-# 
-#guard 'coffeescript', :input => 'spec/javascripts/coffee', :output => 'spec/javascripts'
-
-# do
-#  watch(/^app\/assets\/javascripts\/gmaps4rails\/(.*).coffee/)
-# end
+guard 'coffeescript', :input => 'app/assets/javascripts/gmaps4rails', :output => 'public/javascripts/gmaps4rails'

data/README.rdoc

@@ -104,6 +104,21 @@ Done!
 
 Feel free to contact us, you have your say.
 
+== Want to help?
+
+This is how you can launch the spec suite (js + ruby):
+
+* Clone the gem repository
+
+* Go to the gem's folder
+
+* run `bundle`
+
+* run `cd spec/dummy; rake db:migrate RAILS_ENV=test; cd ../..`
+
+* run `bundle exec rspec spec`
+
+
 == Copyright
 MIT license. 
 

data/app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee

@@ -18,7 +18,8 @@ class @Gmaps4Rails
 
   constructor: ->
     #map config
-    @map =  null               #contains the map we're working on
+    @map =  null               #DEPRECATED: will still contain a copy of serviceObject below as transition
+    @serviceObject = null      #contains the map we're working on
     @visibleInfoWindow = null  #contains the current opened infowindow
     @userLocation = null       #contains user's location if geolocalization was performed and successful
 
@@ -71,7 +72,8 @@ class @Gmaps4Rails
 
   #tnitializes the map
   initialize : ->
-    @map = @createMap()
+    @serviceObject = @createMap()
+    @map = @serviceObject #beware, soon deprecated
     if (@map_options.detect_location == true or @map_options.center_on_user == true)
       @findUserLocation(this)
     #resets sidebar if needed
@@ -102,7 +104,7 @@ class @Gmaps4Rails
     directionsDisplay = new google.maps.DirectionsRenderer()
     directionsService = new google.maps.DirectionsService()
 
-    directionsDisplay.setMap(@map)
+    directionsDisplay.setMap(@serviceObject)
     #display panel only if required
     if @direction_conf.display_panel
       directionsDisplay.setPanel(document.getElementById(@direction_conf.panel_id))
@@ -162,7 +164,7 @@ class @Gmaps4Rails
         radius:        circle.radius
 
       circle.serviceObject = newCircle
-      newCircle.setMap(@map)
+      newCircle.setMap(@serviceObject)
 
   # clear circles
   clear_circles : ->
@@ -184,7 +186,7 @@ class @Gmaps4Rails
       @show_circle @circle
 
   show_circle : (circle) ->
-    circle.serviceObject.setMap(@map)
+    circle.serviceObject.setMap(@serviceObject)
 
   #////////////////////////////////////////////////////
   #///////////////////// POLYGONS /////////////////////
@@ -221,7 +223,7 @@ class @Gmaps4Rails
       fillColor:      fillColor
       fillOpacity:    fillOpacity
       clickable:      clickable
-      map:            @map
+      map:            @serviceObject
 
     #save polygon in list
     polygon.serviceObject = new_poly
@@ -292,7 +294,7 @@ class @Gmaps4Rails
 
     #save polyline
     polyline.serviceObject = new_poly
-    new_poly.setMap(@map)
+    new_poly.setMap(@serviceObject)
 
   #////////////////////////////////////////////////////
   #///////////////////// MARKERS //////////////////////
@@ -450,7 +452,7 @@ class @Gmaps4Rails
         map_center = @boundsObject.getCenter()
         @map_options.center_latitude  = map_center.lat()
         @map_options.center_longitude = map_center.lng()
-        @map.setCenter(map_center)
+        @serviceObject.setCenter(map_center)
       else
         @fitBounds()
 

data/app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee

@@ -151,13 +151,13 @@ class @Gmaps4RailsBing extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   fitBounds: ->
-    @map.setView({bounds: @boundsObject})
+    @serviceObject.setView({bounds: @boundsObject})
 
   addToMap: (object)->
-    @map.entities.push(object)
+    @serviceObject.entities.push(object)
 
   removeFromMap: (object)->
-    @map.entities.remove(object)
+    @serviceObject.entities.remove(object)
 
   centerMapOnUser: ->
-    @map.setView({ center: @userLocation})
+    @serviceObject.setView({ center: @userLocation})

data/app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee

@@ -112,14 +112,14 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     markerLatLng = @createLatLng(args.Lat, args.Lng)
     #Marker sizes are expressed as a Size of X,Y
     if args.marker_picture == "" and args.rich_marker == null
-      defaultOptions = {position: markerLatLng, map: @map, title: args.marker_title, draggable: args.marker_draggable, zIndex: args.zindex}
+      defaultOptions = {position: markerLatLng, map: @serviceObject, title: args.marker_title, draggable: args.marker_draggable, zIndex: args.zindex}
       mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
       return new google.maps.Marker mergedOptions
 
     if (args.rich_marker != null)
       return new RichMarker({
         position: markerLatLng
-        map:       @map
+        map:       @serviceObject
         draggable: args.marker_draggable
         content:   args.rich_marker
         flat:      if args.marker_anchor == null then false else args.marker_anchor[1]
@@ -134,7 +134,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     #create or retrieve existing MarkerImages
     markerImage = @createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition)
     shadowImage = @createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition)
-    defaultOptions = {position: markerLatLng, map: @map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage,  zIndex: args.zindex}
+    defaultOptions = {position: markerLatLng, map: @serviceObject, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage,  zIndex: args.zindex}
     mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
     return new google.maps.Marker mergedOptions
 
@@ -192,7 +192,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   createClusterer : (markers_array) ->
-    return new MarkerClusterer( @map, markers_array, {  maxZoom: @markers_conf.clusterer_maxZoom, gridSize: @markers_conf.clusterer_gridSize, styles: @customClusterer() })
+    return new MarkerClusterer( @serviceObject, markers_array, {  maxZoom: @markers_conf.clusterer_maxZoom, gridSize: @markers_conf.clusterer_gridSize, styles: @customClusterer() })
 
   clearClusterer : ->
     @markerClusterer.clearMarkers()
@@ -236,7 +236,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     return ->
       # Close the latest selected marker before opening the current one.
       currentMap.visibleInfoWindow.close() if currentMap.visibleInfoWindow != null
-      infoWindow.open(currentMap.map, marker)
+      infoWindow.open(currentMap.serviceObject, marker)
       currentMap.visibleInfoWindow = infoWindow
 
   #////////////////////////////////////////////////////
@@ -247,7 +247,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
     kml_options = kml.options || {}
     kml_options = @mergeObjectWithDefault(kml_options, @kml_options)
     kml =  new google.maps.KmlLayer( kml.url, kml_options)
-    kml.setMap(@map)
+    kml.setMap(@serviceObject)
     return kml
 
 
@@ -256,8 +256,8 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   fitBounds : ->
-    @map.fitBounds(@boundsObject) unless @boundsObject.isEmpty()
+    @serviceObject.fitBounds(@boundsObject) unless @boundsObject.isEmpty()
 
   centerMapOnUser : ->
-    @map.setCenter(@userLocation)
+    @serviceObject.setCenter(@userLocation)
 

data/app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee

@@ -121,14 +121,14 @@ class @Gmaps4RailsMapquest extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   fitBounds: ->
-    @map.zoomToRect @boundsObject if @markers.length >=2
-    @map.setCenter @markers[0].serviceObject.latLng if @markers.length == 1 
+    @serviceObject.zoomToRect @boundsObject if @markers.length >=2
+    @serviceObject.setCenter @markers[0].serviceObject.latLng if @markers.length == 1 
 
   centerMapOnUser: -> 
-    @map.setCenter @userLocation
+    @serviceObject.setCenter @userLocation
     
   addToMap: (object) ->
-    @map.addShape object
+    @serviceObject.addShape object
 
   removeFromMap: (object)->
-    @map.removeShape object
+    @serviceObject.removeShape object

data/app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee

@@ -57,12 +57,12 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
     #//creating markers' dedicated layer 
     if (@markersLayer == null) 
       @markersLayer = new OpenLayers.Layer.Vector("Markers", null)
-      @map.addLayer(@markersLayer)
+      @serviceObject.addLayer(@markersLayer)
       #//TODO move?
       @markersLayer.events.register("featureselected", @markersLayer, @onFeatureSelect)
       @markersLayer.events.register("featureunselected", @markersLayer, @onFeatureUnselect)
       @markersControl = new OpenLayers.Control.SelectFeature(@markersLayer)
-      @map.addControl(@markersControl)
+      @serviceObject.addControl(@markersControl)
       @markersControl.activate()
     #//showing default pic if none available
     if args.marker_picture == ""  
@@ -107,7 +107,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
     @boundsObject = new OpenLayers.Bounds()
   
   clearMarkersLayerIfExists: -> 
-    @map.removeLayer(@markersLayer) if @markersLayer != null and @map.getLayer(@markersLayer.id) != null
+    @serviceObject.removeLayer(@markersLayer) if @markersLayer != null and @serviceObject.getLayer(@markersLayer.id) != null
   
   extendBoundsWithMarkers: ->
     for marker in @markers
@@ -148,7 +148,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
             strokeColor: "#32a8a9"
        
      @clearMarkersLayerIfExists()
-     @map.addLayer(clusters)
+     @serviceObject.addLayer(clusters)
      clusters.addFeatures(markers_array)
      return clusters
    
@@ -164,7 +164,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
        @markerClusterer = @createClusterer markers_array
    
    clearClusterer: ->
-     @map.removeLayer @markerClusterer
+     @serviceObject.removeLayer @markerClusterer
 
   #////////////////////////////////////////////////////
   #/////////////////// INFO WINDOW ////////////////////
@@ -187,13 +187,13 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
                                null, true, @onPopupClose)
     feature.popup = popup
     popup.feature = feature
-    @map.addPopup popup
+    @serviceObject.addPopup popup
 
   onFeatureUnselect: (evt) ->
     feature = evt.feature
     if feature.popup
       #//popup.feature = null;
-      @map.removePopup feature.popup
+      @serviceObject.removePopup feature.popup
       feature.popup.destroy()
       feature.popup = null
 
@@ -202,8 +202,8 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
   # #////////////////////////////////////////////////////
  
   fitBounds: ->
-    @map.zoomToExtent(@boundsObject, true)
+    @serviceObject.zoomToExtent(@boundsObject, true)
   
   centerMapOnUser: ->
-    @map.setCenter @userLocation
+    @serviceObject.setCenter @userLocation
     

data/gmaps4rails.gemspec

@@ -17,14 +17,13 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rails", "~> 3.2.1"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "jquery-rails"
   
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency 'database_cleaner'
   #s.add_development_dependency "capybara"
   #s.add_development_dependency 'launchy'
   
-  s.add_development_dependency "jasmine"
+  #s.add_development_dependency "jasmine"
   
   s.add_development_dependency "guard", "~> 1.0.1"
   s.add_development_dependency "guard-spork"

data/lib/gmaps4rails.rb

@@ -8,6 +8,10 @@ module Gmaps4rails
        ActionView::Base.send :include, Gmaps4railsHelper
      end
      
+     initializer "deprecation warning" do |app|
+       warn "[Gmaps4rails DEPRECATION]: Javascript Gmaps.map.map is now deprecated and will be removed in later version. Please use Gmaps.map.serviceObject instead."
+     end
+     
   end
   
   class Railtie < Rails::Railtie

data/lib/gmaps4rails/json_builder.rb

@@ -88,7 +88,7 @@ module Gmaps4rails
       model_attributes.each do |json_name, method_name|
         if @object.respond_to? method_name
           if json_name == :marker_picture
-            @json_hash.merge!(@object.send(method_name))
+            @json_hash.merge!(@object.send(method_name)) unless @json_hash.has_key? "picture"
           else
             @json_hash[json_name] = @object.send(method_name) unless @json_hash.has_key? json_name
           end

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "1.5.0.pre"
+  VERSION = "1.5.0.pre2"
 end

data/lib/gmaps4rails/view_helper.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Gmaps4rails
   
   class ViewHelper
@@ -37,7 +39,7 @@ module Gmaps4rails
     
     # outputs an object containing the basic information to fill the map's dom attributes
     def dom_attributes
-      OpenStruct.new({
+      ::OpenStruct.new({
         :map_id          => map_id,
         :map_class       => map_class,
         :container_class => container_class,

data/public/javascripts/gmaps4rails/gmaps4rails.base.js

@@ -29,6 +29,7 @@
 
     function Gmaps4Rails() {
       this.map = null;
+      this.serviceObject = null;
       this.visibleInfoWindow = null;
       this.userLocation = null;
       this.geolocationFailure = function() {
@@ -82,7 +83,8 @@
     }
 
     Gmaps4Rails.prototype.initialize = function() {
-      this.map = this.createMap();
+      this.serviceObject = this.createMap();
+      this.map = this.serviceObject;
       if (this.map_options.detect_location === true || this.map_options.center_on_user === true) {
         this.findUserLocation(this);
       }
@@ -111,7 +113,7 @@
       var directionsDisplay, directionsService, request;
       directionsDisplay = new google.maps.DirectionsRenderer();
       directionsService = new google.maps.DirectionsService();
-      directionsDisplay.setMap(this.map);
+      directionsDisplay.setMap(this.serviceObject);
       if (this.direction_conf.display_panel) {
         directionsDisplay.setPanel(document.getElementById(this.direction_conf.panel_id));
       }
@@ -182,7 +184,7 @@
           radius: circle.radius
         });
         circle.serviceObject = newCircle;
-        return newCircle.setMap(this.map);
+        return newCircle.setMap(this.serviceObject);
       }
     };
 
@@ -228,7 +230,7 @@
     };
 
     Gmaps4Rails.prototype.show_circle = function(circle) {
-      return circle.serviceObject.setMap(this.map);
+      return circle.serviceObject.setMap(this.serviceObject);
     };
 
     Gmaps4Rails.prototype.create_polygons = function() {
@@ -266,7 +268,7 @@
         fillColor: fillColor,
         fillOpacity: fillOpacity,
         clickable: clickable,
-        map: this.map
+        map: this.serviceObject
       });
       return polygon.serviceObject = new_poly;
     };
@@ -333,7 +335,7 @@
         zIndex: zIndex
       });
       polyline.serviceObject = new_poly;
-      return new_poly.setMap(this.map);
+      return new_poly.setMap(this.serviceObject);
     };
 
     Gmaps4Rails.prototype.create_markers = function() {
@@ -475,7 +477,7 @@
           map_center = this.boundsObject.getCenter();
           this.map_options.center_latitude = map_center.lat();
           this.map_options.center_longitude = map_center.lng();
-          return this.map.setCenter(map_center);
+          return this.serviceObject.setCenter(map_center);
         } else {
           return this.fitBounds();
         }

data/public/javascripts/gmaps4rails/gmaps4rails.bing.js

@@ -188,21 +188,21 @@
     };
 
     Gmaps4RailsBing.prototype.fitBounds = function() {
-      return this.map.setView({
+      return this.serviceObject.setView({
         bounds: this.boundsObject
       });
     };
 
     Gmaps4RailsBing.prototype.addToMap = function(object) {
-      return this.map.entities.push(object);
+      return this.serviceObject.entities.push(object);
     };
 
     Gmaps4RailsBing.prototype.removeFromMap = function(object) {
-      return this.map.entities.remove(object);
+      return this.serviceObject.entities.remove(object);
     };
 
     Gmaps4RailsBing.prototype.centerMapOnUser = function() {
-      return this.map.setView({
+      return this.serviceObject.setView({
         center: this.userLocation
       });
     };

data/public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js

@@ -108,7 +108,7 @@
       if (args.marker_picture === "" && args.rich_marker === null) {
         defaultOptions = {
           position: markerLatLng,
-          map: this.map,
+          map: this.serviceObject,
           title: args.marker_title,
           draggable: args.marker_draggable,
           zIndex: args.zindex
@@ -119,7 +119,7 @@
       if (args.rich_marker !== null) {
         return new RichMarker({
           position: markerLatLng,
-          map: this.map,
+          map: this.serviceObject,
           draggable: args.marker_draggable,
           content: args.rich_marker,
           flat: args.marker_anchor === null ? false : args.marker_anchor[1],
@@ -133,7 +133,7 @@
       shadowImage = this.createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition);
       defaultOptions = {
         position: markerLatLng,
-        map: this.map,
+        map: this.serviceObject,
         icon: markerImage,
         title: args.marker_title,
         draggable: args.marker_draggable,
@@ -230,7 +230,7 @@
     };
 
     Gmaps4RailsGoogle.prototype.createClusterer = function(markers_array) {
-      return new MarkerClusterer(this.map, markers_array, {
+      return new MarkerClusterer(this.serviceObject, markers_array, {
         maxZoom: this.markers_conf.clusterer_maxZoom,
         gridSize: this.markers_conf.clusterer_gridSize,
         styles: this.customClusterer()
@@ -283,7 +283,7 @@
         if (currentMap.visibleInfoWindow !== null) {
           currentMap.visibleInfoWindow.close();
         }
-        infoWindow.open(currentMap.map, marker);
+        infoWindow.open(currentMap.serviceObject, marker);
         return currentMap.visibleInfoWindow = infoWindow;
       };
     };
@@ -293,18 +293,18 @@
       kml_options = kml.options || {};
       kml_options = this.mergeObjectWithDefault(kml_options, this.kml_options);
       kml = new google.maps.KmlLayer(kml.url, kml_options);
-      kml.setMap(this.map);
+      kml.setMap(this.serviceObject);
       return kml;
     };
 
     Gmaps4RailsGoogle.prototype.fitBounds = function() {
       if (!this.boundsObject.isEmpty()) {
-        return this.map.fitBounds(this.boundsObject);
+        return this.serviceObject.fitBounds(this.boundsObject);
       }
     };
 
     Gmaps4RailsGoogle.prototype.centerMapOnUser = function() {
-      return this.map.setCenter(this.userLocation);
+      return this.serviceObject.setCenter(this.userLocation);
     };
 
     return Gmaps4RailsGoogle;

data/public/javascripts/gmaps4rails/gmaps4rails.mapquest.js

@@ -139,22 +139,24 @@
     };
 
     Gmaps4RailsMapquest.prototype.fitBounds = function() {
-      if (this.markers.length >= 2) this.map.zoomToRect(this.boundsObject);
+      if (this.markers.length >= 2) {
+        this.serviceObject.zoomToRect(this.boundsObject);
+      }
       if (this.markers.length === 1) {
-        return this.map.setCenter(this.markers[0].serviceObject.latLng);
+        return this.serviceObject.setCenter(this.markers[0].serviceObject.latLng);
       }
     };
 
     Gmaps4RailsMapquest.prototype.centerMapOnUser = function() {
-      return this.map.setCenter(this.userLocation);
+      return this.serviceObject.setCenter(this.userLocation);
     };
 
     Gmaps4RailsMapquest.prototype.addToMap = function(object) {
-      return this.map.addShape(object);
+      return this.serviceObject.addShape(object);
     };
 
     Gmaps4RailsMapquest.prototype.removeFromMap = function(object) {
-      return this.map.removeShape(object);
+      return this.serviceObject.removeShape(object);
     };
 
     return Gmaps4RailsMapquest;

data/public/javascripts/gmaps4rails/gmaps4rails.openlayers.js

@@ -50,11 +50,11 @@
       style_mark.fillOpacity = 1;
       if (this.markersLayer === null) {
         this.markersLayer = new OpenLayers.Layer.Vector("Markers", null);
-        this.map.addLayer(this.markersLayer);
+        this.serviceObject.addLayer(this.markersLayer);
         this.markersLayer.events.register("featureselected", this.markersLayer, this.onFeatureSelect);
         this.markersLayer.events.register("featureunselected", this.markersLayer, this.onFeatureUnselect);
         this.markersControl = new OpenLayers.Control.SelectFeature(this.markersLayer);
-        this.map.addControl(this.markersControl);
+        this.serviceObject.addControl(this.markersControl);
         this.markersControl.activate();
       }
       if (args.marker_picture === "") {
@@ -92,8 +92,8 @@
     };
 
     Gmaps4RailsOpenlayers.prototype.clearMarkersLayerIfExists = function() {
-      if (this.markersLayer !== null && this.map.getLayer(this.markersLayer.id) !== null) {
-        return this.map.removeLayer(this.markersLayer);
+      if (this.markersLayer !== null && this.serviceObject.getLayer(this.markersLayer.id) !== null) {
+        return this.serviceObject.removeLayer(this.markersLayer);
       }
     };
 
@@ -147,7 +147,7 @@
         })
       });
       this.clearMarkersLayerIfExists();
-      this.map.addLayer(clusters);
+      this.serviceObject.addLayer(clusters);
       clusters.addFeatures(markers_array);
       return clusters;
     };
@@ -167,7 +167,7 @@
     };
 
     Gmaps4RailsOpenlayers.prototype.clearClusterer = function() {
-      return this.map.removeLayer(this.markerClusterer);
+      return this.serviceObject.removeLayer(this.markerClusterer);
     };
 
     Gmaps4RailsOpenlayers.prototype.createInfoWindow = function(marker_container) {
@@ -186,25 +186,25 @@
       popup = new OpenLayers.Popup.FramedCloud("featurePopup", feature.geometry.getBounds().getCenterLonLat(), new OpenLayers.Size(300, 200), feature.infoWindow, null, true, this.onPopupClose);
       feature.popup = popup;
       popup.feature = feature;
-      return this.map.addPopup(popup);
+      return this.serviceObject.addPopup(popup);
     };
 
     Gmaps4RailsOpenlayers.prototype.onFeatureUnselect = function(evt) {
       var feature;
       feature = evt.feature;
       if (feature.popup) {
-        this.map.removePopup(feature.popup);
+        this.serviceObject.removePopup(feature.popup);
         feature.popup.destroy();
         return feature.popup = null;
       }
     };
 
     Gmaps4RailsOpenlayers.prototype.fitBounds = function() {
-      return this.map.zoomToExtent(this.boundsObject, true);
+      return this.serviceObject.zoomToExtent(this.boundsObject, true);
     };
 
     Gmaps4RailsOpenlayers.prototype.centerMapOnUser = function() {
-      return this.map.setCenter(this.userLocation);
+      return this.serviceObject.setCenter(this.userLocation);
     };
 
     return Gmaps4RailsOpenlayers;

data/spec/dummy/app/assets/stylesheets/application.css

@@ -11,3 +11,5 @@
  *= require_self
  *= require_tree .
 */
+
+.yellow { border: 1px solid black; margin-top: 8px; background: yellow; padding: 5px; }

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

@@ -8,6 +8,11 @@ class UsersController < ApplicationController
     @users = User.all
     @json = @users.to_gmaps4rails do |user, marker|
       marker.json({:id => user.id })
+      marker.picture({
+       "picture" => "/logo.png",
+       "width" =>  32,
+       "height" => 32})
+      marker.infowindow user.name
     end
     respond_with @json
   end

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

@@ -1,9 +1,6 @@
 class User < ActiveRecord::Base
-  acts_as_gmappable
+  acts_as_gmappable :address => :address
   
   attr_accessor :lat_test, :long_test, :bool_test
   
-  def gmaps4rails_address
-    address
-  end
 end

data/spec/dummy/app/views/users/index.html.erb

@@ -65,7 +65,7 @@ window.onload =alert('ok');
  }) %>
  <%#= gmaps( :map_options => {:auto_adjust=>true, :auto_zoom=>true}, :markers => {:data=>"[{\"lat\":43.5368851,\"lng\":-79.6849913}]"}, :circles => {:data=>"[{\"lng\":-79.6849913,\"lat\":43.5368851,\"radius\":5000.0,\"strokeColor\":\"#DD3300\"}]", :options=>{:fillOpacity=>0.35}} )
   %>
-  <%= gmaps4rails(@json) %>
+  <%#= gmaps4rails(@json) %>
   <%#= gmaps(:markers => {:data => @json}, :map_options => { :detect_location => true, :auto_zoom => false, :zoom => 15, :auto_adjust => true, :center_on_user => true}) %>
  <%#= gmaps(:map_options => { :auto_adjust => true }, 
    :markers => {
@@ -75,7 +75,7 @@ window.onload =alert('ok');
 
 <%#= gmaps( {:map_options => { :disableDefaultUI => true, :auto_adjust => true, :center_on_user => true, :detect_location => true,  :center_latitude => 41.574361,
  :center_longitude => -72.949219 }}) %>
-<%#= gmaps(:markers => {:data => @json, :options => {:do_clustering => false, "custom_infowindow_class" => "yellow", :raw => "{ flat: true, draggable: true}" } },
+<%= gmaps(:markers => {:data => @json, :options => {:do_clustering => false, "custom_infowindow_class" => "yellow", :raw => "{ flat: true, draggable: true}" } },
           :polygons => {:data =>  '[[
   {"lng": 5.190262, "lat": 25.774252},
   {"lng": 7.118292, "lat": 45.466465},
@@ -130,89 +130,88 @@ window.onload =alert('ok');
 // Gmaps.map.jsTemplate = function(marker_container){
 //   return "ok";
 // }
-    // function HomeControl(controlDiv, map) {
-    //   var chicago = new google.maps.LatLng(41.850033, -87.6500523);
-    // 
-    //   // Set CSS styles for the DIV containing the control
-    //   // Setting padding to 5 px will offset the control
-    //   // from the edge of the map.
-    //   controlDiv.style.padding = '5px';
-    // 
-    //   // Set CSS for the control border.
-    //   var controlUI = document.createElement('DIV');
-    //   controlUI.style.backgroundColor = 'white';
-    //   controlUI.style.borderStyle = 'solid';
-    //   controlUI.style.borderWidth = '2px';
-    //   controlUI.style.cursor = 'pointer';
-    //   controlUI.style.textAlign = 'center';
-    //   controlUI.title = 'Click to set the map to Home';
-    //   controlDiv.appendChild(controlUI);
-    // 
-    //   // Set CSS for the control interior.
-    //   var controlText = document.createElement('DIV');
-    //   controlText.style.fontFamily = 'Arial,sans-serif';
-    //   controlText.style.fontSize = '12px';
-    //   controlText.style.paddingLeft = '4px';
-    //   controlText.style.paddingRight = '4px';
-    //   controlText.innerHTML = 'Home';
-    //   controlUI.appendChild(controlText);
-    // 
-    //   // Setup the click event listeners: simply set the map to Chicago.
-    //   google.maps.event.addDomListener(controlUI, 'click', function() {
-    //     map.setCenter(chicago)
-    //   });
-    // }
-    // 
-    // Gmaps.map.callback = function(){
-    //   // Create the DIV to hold the control and call the HomeControl() constructor
-    //   // passing in this DIV.
-    //   var homeControlDiv = document.createElement('DIV');
-    //   var homeControl = new HomeControl(homeControlDiv, Gmaps.map.map);
-    // 
-    //   homeControlDiv.index = 1;
-    //   Gmaps.map.map.controls[google.maps.ControlPosition.TOP_RIGHT].push(homeControlDiv);
-    // };
-    // 
-    // 
-    // var pinkParksStyles = [
-    //   {
-    //     featureType: "all",
-    //     stylers: [
-    //       { saturation: -80 }
-    //     ]
-    //   },
-    //   {
-    //     featureType: "poi.park",
-    //     stylers: [
-    //       { hue: "#ff0023" },
-    //       { saturation: 40 }
-    //     ]
-    //   }
-    // ];
-  // 
-//   
-//   
-// }
-// 
-// Gmaps.map.infobox = function(boxText) {
-//  return {
-//     content: boxText
-//    ,disableAutoPan: false
-//    ,maxWidth: 0
-//    ,pixelOffset: new google.maps.Size(-140, 0)
-//    ,zIndex: null
-//    ,boxStyle: { 
-//      background: "url('http://google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.5/examples/tipbox.gif') no-repeat"
-//      ,opacity: 0.75
-//      ,width: "280px"
-//       }
-//    ,closeBoxMargin: "10px 2px 2px 2px"
-//    ,closeBoxURL: "http://www.google.com/intl/en_us/mapfiles/close.gif"
-//    ,infoBoxClearance: new google.maps.Size(1, 1)
-//    ,isHidden: false
-//    ,pane: "floatPane"
-//    ,enableEventPropagation: false
-// }};
+
+    function HomeControl(controlDiv, map) {
+       var chicago = new google.maps.LatLng(41.850033, -87.6500523);
+     
+       // Set CSS styles for the DIV containing the control
+       // Setting padding to 5 px will offset the control
+       // from the edge of the map.
+       controlDiv.style.padding = '5px';
+     
+       // Set CSS for the control border.
+       var controlUI = document.createElement('DIV');
+       controlUI.style.backgroundColor = 'white';
+       controlUI.style.borderStyle = 'solid';
+       controlUI.style.borderWidth = '2px';
+       controlUI.style.cursor = 'pointer';
+       controlUI.style.textAlign = 'center';
+       controlUI.title = 'Click to set the map to Home';
+       controlDiv.appendChild(controlUI);
+     
+       // Set CSS for the control interior.
+       var controlText = document.createElement('DIV');
+       controlText.style.fontFamily = 'Arial,sans-serif';
+       controlText.style.fontSize = '12px';
+       controlText.style.paddingLeft = '4px';
+       controlText.style.paddingRight = '4px';
+       controlText.innerHTML = 'Home';
+       controlUI.appendChild(controlText);
+     
+       // Setup the click event listeners: simply set the map to Chicago.
+       google.maps.event.addDomListener(controlUI, 'click', function() {
+         map.setCenter(chicago)
+       });
+     }
+     
+     Gmaps.map.callback = function(){
+       // Create the DIV to hold the control and call the HomeControl() constructor
+       // passing in this DIV.
+       var homeControlDiv = document.createElement('DIV');
+       var homeControl = new HomeControl(homeControlDiv, Gmaps.map.map);
+     
+       homeControlDiv.index = 1;
+       Gmaps.map.map.controls[google.maps.ControlPosition.TOP_RIGHT].push(homeControlDiv);
+     };
+     
+     
+     var pinkParksStyles = [
+       {
+         featureType: "all",
+         stylers: [
+           { saturation: -80 }
+         ]
+       },
+       {
+         featureType: "poi.park",
+         stylers: [
+           { hue: "#ff0023" },
+           { saturation: 40 }
+         ]
+       }
+     ];
+   
+
+
+Gmaps.map.infobox = function(boxText) {
+ return {
+    content: boxText
+   ,disableAutoPan: false
+   ,maxWidth: 0
+   ,pixelOffset: new google.maps.Size(-140, 0)
+   ,zIndex: null
+   ,boxStyle: { 
+     background: "url('http://google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.5/examples/tipbox.gif') no-repeat"
+     ,opacity: 0.75
+     ,width: "280px"
+      }
+   ,closeBoxMargin: "10px 2px 2px 2px"
+   ,closeBoxURL: "http://www.google.com/intl/en_us/mapfiles/close.gif"
+   ,infoBoxClearance: new google.maps.Size(1, 1)
+   ,isHidden: false
+   ,pane: "floatPane"
+   ,enableEventPropagation: false
+}};
 
 </script>
  <script type="text/javascript" charset="utf-8">

data/spec/javascripts/basic_methods_spec.js

@@ -80,7 +80,7 @@ describe("Gmaps4Rails", function() {
         for (var i = 0; i < 100; ++i) {
           var x = gmap.randomize(0,0);
           var distanceInMeters = geoHelpers.getDistanceFromO(x[0], x[1])/1000;
-          //this test coul seem weird, but because latitude AND longitude could be moved by 100m, the highest diagonal is 142m
+          //this test could seem weird, but because latitude AND longitude could be moved by 100m, the highest diagonal is 142m
           expect(distanceInMeters).toBeLessThan(142);
         }
       });

data/spec/javascripts/markers_methods_spec.js

@@ -110,13 +110,13 @@ describe("createServiceMarkersFromMarkers full stack", function() {
   
   afterEach(function() {
     clearMarkerTraces();
-    gmap.map = null;
+    gmap.serviceObject = null;
   });
   
   it("should process all attributes from a marker (without default values)", function() {
     var marker = getFullMarker();
     gmap.markers = [marker];
-    gmap.map = "map";
+    gmap.serviceObject = "map";
 
     spyOn(gmap, "createMarker");
     
@@ -145,7 +145,7 @@ describe("createServiceMarkersFromMarkers full stack", function() {
   it("should process all attributes from a marker (with default values)", function() {
     var marker = getEmptyMarker();
     gmap.markers = [marker];
-    gmap.map = "map";
+    gmap.serviceObject = "map";
 
     spyOn(gmap, "createMarker");
     

data/spec/javascripts/support/jasmine.yml

@@ -1,76 +1,10 @@
-# src_files
-#
-# Return an array of filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# src_files:
-#   - lib/source1.js
-#   - lib/source2.js
-#   - dist/**/*.js
-#
 src_files:
   - public/javascripts/**/*.js
 
-# stylesheets
-#
-# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# stylesheets:
-#   - css/style.css
-#   - stylesheets/*.css
-#
-stylesheets:
-  - stylesheets/**/*.css
-
-# helpers
-#
-# Return an array of filepaths relative to spec_dir to include before jasmine specs.
-# Default: ["helpers/**/*.js"]
-#
-# EXAMPLE:
-#
-# helpers:
-#   - helpers/**/*.js
-#
 helpers:
   - helpers/**/*.js
 
-# spec_files
-#
-# Return an array of filepaths relative to spec_dir to include.
-# Default: ["**/*[sS]pec.js"]
-#
-# EXAMPLE:
-#
-# spec_files:
-#   - **/*[sS]pec.js
-#
 spec_files:
-  - '**/*[sS]pec.js'
-
-# src_dir
-#
-# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
-# Default: project root
-#
-# EXAMPLE:
-#
-# src_dir: public
-#
-src_dir:
+  - '**/*spec.js'
 
-# spec_dir
-#
-# Spec directory path. Your spec_files must be returned relative to this path.
-# Default: spec/javascripts
-#
-# EXAMPLE:
-#
-# spec_dir: spec/javascripts
-#
 spec_dir: spec/javascripts

data/spec/models/user_spec.rb

@@ -9,7 +9,7 @@ DEFAULT_CONFIG_HASH = {
   :checker        => "gmaps",
   :msg            => "Address invalid",
   :validation     => true,
-  :address        => "gmaps4rails_address",
+  :address        => "address",
   :language       => "en",
   :protocol       => "http",
   :process_geocoding => true
@@ -231,7 +231,7 @@ describe Gmaps4rails::ActsAsGmappable do
       it "should display the proper error message when address is invalid" do
         set_gmaps4rails_options!({ :msg => "Custom Address invalid"})
         invalid_user.should_not be_valid
-        invalid_user.errors[:gmaps4rails_address].should include("Custom Address invalid")
+        invalid_user.errors[:address].should include("Custom Address invalid")
       end
 
       it "should not raise an error if validation option is turned off" do
@@ -396,6 +396,26 @@ describe Gmaps4rails::ActsAsGmappable do
       result.should_not include "defined in model"
     end
     
+    it "block info should take precedence over model methods, particular case: picture" do
+      user.instance_eval do 
+        def gmaps4rails_marker_picture
+          {
+           "picture" => "/model.png",
+           "width" =>  32,
+           "height" => 32}
+        end
+      end
+      user.to_gmaps4rails.should include "model.png"
+      result = user.to_gmaps4rails do |u, marker|
+        marker.picture({
+         "picture" => "/block.png",
+         "width" =>  32,
+         "height" => 32})
+      end
+      result.should     include "block.png"
+      result.should_not include "model.png"
+    end
+    
   end
   
   describe "eval conditions" do

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ Spork.prefork do
   
  Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each   {|f| require f }
  FactoryGirl.definition_file_paths = [ File.join(Rails.root, '../factories') ]
- FactoryGirl.find_definitions
  
   RSpec.configure do |config|
     config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre
+  version: 1.5.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,22 +76,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jasmine
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -283,10 +251,6 @@ files:
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/users/_form.html.erb
-- spec/dummy/app/views/users/_my_template.html.erb
-- spec/dummy/app/views/users/_my_template2.html.erb
-- spec/dummy/app/views/users/ajax_data.js.erb
-- spec/dummy/app/views/users/ajax_test.html.erb
 - spec/dummy/app/views/users/edit.html.erb
 - spec/dummy/app/views/users/index.html.erb
 - spec/dummy/app/views/users/new.html.erb
@@ -317,6 +281,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/javascripts/Player.js
 - spec/dummy/public/javascripts/Song.js
+- spec/dummy/public/logo.png
 - spec/dummy/script/rails
 - spec/factories/user_factory.rb
 - spec/javascripts/basic_methods_spec.js
@@ -347,6 +312,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2295245058499168094
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -377,10 +345,6 @@ test_files:
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/users/_form.html.erb
-- spec/dummy/app/views/users/_my_template.html.erb
-- spec/dummy/app/views/users/_my_template2.html.erb
-- spec/dummy/app/views/users/ajax_data.js.erb
-- spec/dummy/app/views/users/ajax_test.html.erb
 - spec/dummy/app/views/users/edit.html.erb
 - spec/dummy/app/views/users/index.html.erb
 - spec/dummy/app/views/users/new.html.erb
@@ -411,6 +375,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/javascripts/Player.js
 - spec/dummy/public/javascripts/Song.js
+- spec/dummy/public/logo.png
 - spec/dummy/script/rails
 - spec/factories/user_factory.rb
 - spec/javascripts/basic_methods_spec.js

data/spec/dummy/app/views/users/_my_template.html.erb

@@ -1,2 +0,0 @@
-<p><%= object.name %></p>
-<%= render :partial => "/users/my_template2" %>

data/spec/dummy/app/views/users/_my_template2.html.erb

@@ -1 +0,0 @@
-<b>"ok man"</b>

data/spec/dummy/app/views/users/ajax_data.js.erb

@@ -1,2 +0,0 @@
-$('#joe').html("<%= escape_javascript(gmaps({})) %>");
-<%= {:markers => {:data => @json }}.to_gmaps4rails %>

data/spec/dummy/app/views/users/ajax_test.html.erb

@@ -1,22 +0,0 @@
-<%= gmaps({:last_map => false}) %>
-
-
-<button type="button" id="ajax">Replace Markers</button>
-
-<script type="text/javascript" charset="utf-8">
-$(function() {
-  
-  $(".map_container").hide();
-  
-  
-$("#ajax").click(function(){  
-  $.getJSON('/users', function(response){
-    $(".map_container").show();
-    Gmaps.map.initialize();
-    Gmaps.map.addMarkers(response);
-  })
-  
-})
-});</script>
-
-<!--  -->