gmaps4rails 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e8ba074b32b4fdd7e122e2c512c50a826068b6
-  data.tar.gz: 9eca5c6b222f11266666d1e2e149558e90bf2cdb
+  metadata.gz: 992d41f8b15816f851c02b3dbdcde4b7c3a88ce5
+  data.tar.gz: c5f60c19a76862be67d4f8fe4821f937877d383f
 SHA512:
-  metadata.gz: 845a7f4fb3874697bd3f4cd58e610c5955df650cdb4ece016a07cf79bb213ddd728b10f6f47fb32edcd10ed7e62542204bd1d87a9bc23ff8db848688ed49a36e
-  data.tar.gz: 4349d5157a5b9360474ee3a79772d85bd3b4fedf12ee3ade55cdf2d4575fba16d625ba5ae4986934c1384c3c3f7980b4b2f9a2233f29425532799911c3e72181
+  metadata.gz: b8cd6797a82ec1ffaa933230de8fac1b7ecfac8b14472b1b3fbce4f06b2961293f3ad9da6f9c07ff7d2486630df25a29299c124bccd9f653cabb4f453b2723b2
+  data.tar.gz: e9a4ecc2f663bd7148473a41d065bfc6797541514bd6e5dd6c2081fd0892108d56feb81def07a7e07591b30babf943493fba703c27612755188e30b6e0a8a5ac

data/README.rdoc

@@ -1,16 +1,22 @@
-== Google Maps for Rails 
+== Google Maps for Rails  {<img src="http://www.pledgie.com/campaigns/23367.png" alt="Endorse" />}[https://pledgie.com/campaigns/23367]
 
 {<img src="https://secure.travis-ci.org/apneadiving/Google-Maps-for-Rails.png?branch=master" alt="Build Status" />}[http://travis-ci.org/apneadiving/Google-Maps-for-Rails]
 {<img src="https://codeclimate.com/github/apneadiving/Google-Maps-for-Rails.png" />}[https://codeclimate.com/github/apneadiving/Google-Maps-for-Rails]
 {<img src="https://badge.fury.io/rb/gmaps4rails.png" alt="Gem Version" />}[http://badge.fury.io/rb/gmaps4rails]
 {<img src="http://api.coderwall.com/apneadiving/endorsecount.png" alt="Endorse" />}[http://coderwall.com/apneadiving]
+{<img src="https://d2weczhvl823v0.cloudfront.net/apneadiving/google-maps-for-rails/trend.png" alt="Bitdeli Badge" />}[https://bitdeli.com/free]
 
 Gmaps4rails is developed to simply create a Google Map with overlays (markers, infowindows...).
 Yet it's backed on a very flexible codebase which could be prone to accept other map providers.
 
 Use it with any Ruby app (I guess you could simply take the js anywhere if you like).
 
-{Here is a quick tutorial on youtube}[http://www.youtube.com/watch?v=R0l-7en3dUw&feature=youtu.be].
+Here is a {quick tutorial on youtube}[http://www.youtube.com/watch?v=R0l-7en3dUw&feature=youtu.be], 
+and my {presentation on speaker deck}[https://speakerdeck.com/apneadiving/gmaps4rails].
+
+For live examples, {see here}[http://apneadiving.github.io/].
+
+
 
 == A note for < 2.x users
 
@@ -38,7 +44,7 @@ Insert google scripts in your dom:
     <script src="//maps.google.com/maps/api/js?v=3.13&amp;sensor=false&amp;libraries=geometry" type="text/javascript"></script>
     <script src='//google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.14/src/markerclusterer_packed.js' type='text/javascript'></script>
 
-You'll require underscore.js too, see here: {http://underscorejs.org/}[http://underscorejs.org/]
+You'll require underscore.js too, see here: {http://underscorejs.org/}[http://underscorejs.org/] (`lo-dash` is compatible too, your choice!).
 
 3) Javascript source code
 

data/js_compilation/gmaps_google.js

@@ -94,12 +94,12 @@
 }).call(this);
 (function() {
   this.Gmaps.Objects.Builders = function(builderClass, objectClass, primitivesProvider) {
-    objectClass.PRIMITIVES = primitivesProvider;
-    builderClass.OBJECT = objectClass;
-    builderClass.PRIMITIVES = primitivesProvider;
     return {
       build: function(args, provider_options, internal_options) {
         var builder;
+        objectClass.PRIMITIVES = primitivesProvider;
+        builderClass.OBJECT = objectClass;
+        builderClass.PRIMITIVES = primitivesProvider;
         builder = new builderClass(args, provider_options, internal_options);
         return builder.build();
       }
@@ -116,6 +116,7 @@
       }
       this.setPrimitives(options);
       this.setOptions(options);
+      this._cacheAllBuilders();
       this.resetBounds();
     }
 
@@ -234,6 +235,14 @@
       return resource;
     };
 
+    Handler.prototype._cacheAllBuilders = function() {
+      var that;
+      that = this;
+      return _.each(['Bound', 'Circle', 'Clusterer', 'Kml', 'Map', 'Marker', 'Polygon', 'Polyline'], function(kind) {
+        return that._builder(kind);
+      });
+    };
+
     Handler.prototype._clusterize = function() {
       return _.isObject(this.marker_options.clusterer);
     };
@@ -245,14 +254,14 @@
     };
 
     Handler.prototype._default_marker_options = function() {
-      return {
+      return _.clone({
         singleInfowindow: true,
-        maxRandomDistance: 100,
+        maxRandomDistance: 0,
         clusterer: {
           maxZoom: 5,
           gridSize: 50
         }
-      };
+      });
     };
 
     Handler.prototype._builder = function(name) {
@@ -266,7 +275,7 @@
 
     Handler.prototype._default_models = function() {
       var models;
-      models = this._rootModule().Objects;
+      models = _.clone(this._rootModule().Objects);
       if (this._clusterize()) {
         return models;
       } else {
@@ -280,7 +289,7 @@
     };
 
     Handler.prototype._default_builders = function() {
-      return this._rootModule().Builders;
+      return _.clone(this._rootModule().Builders);
     };
 
     Handler.prototype._rootModule = function() {
@@ -957,7 +966,11 @@
           if (_.isNumber(position.lat) && _.isNumber(position.lng)) {
             return new factory.latLng(position.lat, position.lng);
           } else {
-            return position;
+            if (_.isFunction(position.getServiceObject)) {
+              return position.getServiceObject().getPosition();
+            } else {
+              return position;
+            }
           }
         }
       }

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/javascripts/google/builders/marker_spec.js

@@ -11,13 +11,13 @@ describe("Gmaps.Google.Builders.Marker", function() {
     var serviceObject, infowindow;
     beforeEach(function() {
       spyOn(subject_klass.prototype, 'create_marker');
-      spyOn(subject_klass.prototype, 'create_infowindow');
+      spyOn(subject_klass.prototype, 'create_infowindow_on_click');
     });
 
     it("sets vars", function() {
       instance = new subject_klass();
       expect(subject_klass.prototype.create_marker).toHaveBeenCalled();
-      expect(subject_klass.prototype.create_infowindow).toHaveBeenCalled();
+      expect(subject_klass.prototype.create_infowindow_on_click).toHaveBeenCalled();
     });
 
     describe("marker_options", function() {

data/spec/javascripts/objects/handler_spec.js

@@ -38,24 +38,60 @@ describe("Gmaps.Objects.Handler", function() {
         expect(_.isEqual(subject.marker_options, subject._default_marker_options())).toBeTruthy();
       });
 
-      it("redefines builders", function() {
-        var MarkerBuilder = function(){};
-        subject = new subjectClass('Specs', {  primitives: primitives, builders: { Marker: MarkerBuilder } });
-        expect(subject.builders.Marker).toBe(MarkerBuilder);
+      describe("redefines builders", function() {
+        var MarkerBuilder = jasmine.createSpy('MarkerBuilder');
+
+        beforeEach(function() {
+          subject = new subjectClass('Specs', {  primitives: primitives, builders: { Marker: MarkerBuilder } });
+        });
+
+        it("redefines builders", function() {
+          expect(subject.builders.Marker).toBe(MarkerBuilder);
+        });
+
+        it("doesnt leak for new instance", function() {
+          var instance = new subjectClass('Specs', {  primitives: primitives });
+          expect(instance.builders.Marker).not.toBe(MarkerBuilder);
+        });
       });
 
-      it("redefines models", function() {
-        var MarkerModel = function(){};
-        subject = new subjectClass('Specs', {  primitives: primitives, models: { Marker: MarkerModel } });
-        expect(subject.models.Marker).toBe(MarkerModel);
+      describe("redefine models", function() {
+        var MarkerModel = jasmine.createSpy('MarkerModel');
+
+        beforeEach(function() {
+          subject = new subjectClass('Specs', {  primitives: primitives, models: { Marker: MarkerModel } });
+        });
+
+        it("redefines models", function() {
+          expect(subject.models.Marker).toBe(MarkerModel);
+        });
+
+        it("doesnt leak for new instance", function() {
+          var instance = new subjectClass('Specs', {  primitives: primitives });
+          expect(instance.models.Marker).not.toBe(MarkerModel);
+        });
+
       });
 
-      it("redefines marker_options", function() {
+      describe("redefines marker_options", function() {
         var marker_options = { foo: 1 };
-        subject = new subjectClass('Specs', {  primitives: primitives, markers: marker_options });
-        expect(subject.marker_options.foo).toBe(marker_options.foo);
+
+        beforeEach(function() {
+          subject = new subjectClass('Specs', {  primitives: primitives, markers: marker_options });
+        });
+
+        it("redefines marker_options", function() {
+          expect(subject.marker_options.foo).toBe(marker_options.foo);
+        });
+
+        it("doesnt leak for new instance", function() {
+          var instance = new subjectClass('Specs', {  primitives: primitives });
+          expect(instance.marker_options.foo).not.toBe(marker_options.foo);
+        });
+
       });
 
+
       it("Clusterer: default model if clusterer required", function() {
         subject = new subjectClass('Specs', {
           primitives: primitives,

data/vendor/assets/javascripts/gmaps/google/primitives.coffee

@@ -30,6 +30,7 @@
     # - [ lat, lng]
     # - { lat: , lng: }
     # - a google.maps.LatLng
+    # - a gmaps4rails object
     latLngFromPosition: (position)->
       if _.isArray(position)
         return new factory.latLng(position[0], position[1])
@@ -37,7 +38,10 @@
         if _.isNumber(position.lat) and _.isNumber(position.lng)
           return new factory.latLng(position.lat, position.lng)
         else
-          position
+          if _.isFunction position.getServiceObject
+            position.getServiceObject().getPosition()
+          else
+            position
   }
 
   factory

data/vendor/assets/javascripts/gmaps/objects/builder.coffee

@@ -1,12 +1,11 @@
 @Gmaps.Objects.Builders = (builderClass, objectClass, primitivesProvider)->
 
-  objectClass.PRIMITIVES = primitivesProvider
-
-  builderClass.OBJECT     = objectClass
-  builderClass.PRIMITIVES = primitivesProvider
-
   return {
     build: (args, provider_options, internal_options)->
+      objectClass.PRIMITIVES = primitivesProvider
+      builderClass.OBJECT     = objectClass
+      builderClass.PRIMITIVES = primitivesProvider
+
       builder = new builderClass(args, provider_options, internal_options)
       builder.build()
   }

data/vendor/assets/javascripts/gmaps/objects/handler.coffee

@@ -11,6 +11,7 @@ class @Gmaps.Objects.Handler
   constructor: (@type, options = {})->
     @setPrimitives options
     @setOptions options
+    @_cacheAllBuilders()
     @resetBounds()
 
   buildMap: (options, onMapLoad = ->)->
@@ -104,6 +105,10 @@ class @Gmaps.Objects.Handler
     resource.setMap(@getMap())
     resource
 
+  _cacheAllBuilders: ->
+    that = @
+    _.each ['Bound', 'Circle',  'Clusterer', 'Kml', 'Map', 'Marker', 'Polygon', 'Polyline'], (kind)-> that._builder(kind)
+
   _clusterize: ->
     _.isObject @marker_options.clusterer
 
@@ -111,9 +116,9 @@ class @Gmaps.Objects.Handler
     @clusterer = @_builder('Clusterer').build({ map: @getMap() }, @marker_options.clusterer )
 
   _default_marker_options: ->
-    {
+    _.clone {
       singleInfowindow:  true
-      maxRandomDistance: 100
+      maxRandomDistance: 0
       clusterer:
         maxZoom:  5
         gridSize: 50
@@ -125,7 +130,7 @@ class @Gmaps.Objects.Handler
     @["__builder#{name}"]
 
   _default_models: ->
-    models = @_rootModule().Objects
+    models = _.clone(@_rootModule().Objects)
     if @_clusterize()
       models
     else
@@ -136,7 +141,7 @@ class @Gmaps.Objects.Handler
     string.charAt(0).toUpperCase() + string.slice(1)
 
   _default_builders: ->
-    @_rootModule().Builders
+    _.clone @_rootModule().Builders
 
   _rootModule: ->
     @__rootModule ?= Gmaps[@type]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Benjamin Roth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec