gmaps4rails 2.0.3 → 2.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f3f77b5d1875cbe806f725f554e7f63209da6da3
+  data.tar.gz: 3f53c193d0df201cfcb9ab94fdca200c5daa9e2f
+SHA512:
+  metadata.gz: d7242c6c3ac10947e0e11b3bc27fa46cefbb7d50e7685e465cc90924b89406905b7e9e9b42bd257d93728500aaad0910211f1046d7f5459a2a0ec47ff65eccd8
+  data.tar.gz: 401280be6d9ed24d82b075df6ee4f07bfa7950334853ccbdd462fe6e1b15773b4e7db709864587fa550f16ed385c5fd4ac2a61dd4814703c3336d776ecd581e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (2.0.3)
+    gmaps4rails (2.0.4)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -1,4 +1,5 @@
 == Google Maps for Rails 
+
 {<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]
@@ -9,6 +10,13 @@ Yet it's backed on a very flexible codebase which could be prone to accept other
 
 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].
+
+== A note for < 2.x users
+
+Google-Maps-for-Rails-2.0 is an important rewrite to keep the minimum code and features. If
+you're migrating from previous versions, you may want to read the {rational about it}[https://github.com/apneadiving/Google-Maps-for-Rails/wiki/Why-but-why%3F].
+
 == Requirements
 
 1) Gemfile
@@ -39,7 +47,7 @@ If you have the asset pipeline, add this:
     //= require underscore
     //= require gmaps/google
 
-If you don't have aset pipeline, you'll need to import the js OR coffee files:
+If you don't have asset pipeline, you'll need to import the js OR coffee files:
 
     rails g gmaps4rails:copy_js
 
@@ -90,18 +98,10 @@ You can change almost everything with a few lines of code. {See details here}[ht
 
 * Markers with Info window, Custom Picture, RichMarkers (make your own markers with custom html)
 
-* Circles, Polylines, Polygons
-
-* Geocode directly your address and retrieve coordinates.
-
-* Auto-adjust the map to your markers
+* Circles, Polylines, Polygons, Kml
 
 * Refresh your map on the fly with Javascript (and Ajax)
 
-* KML support
-
-* Easy multimap
-
 * {More details in the Wiki}[https://github.com/apneadiving/Google-Maps-for-Rails/wiki]
 
 == Todo?
@@ -112,6 +112,6 @@ Feel free to contact us, you have your say.
 == Copyright
 MIT license.
 
-Authors: Benjamin Roth, David Ruyer
+Author: Benjamin Roth
 
 {Contributors}[https://github.com/apneadiving/Google-Maps-for-Rails/graphs/contributors]

data/js_compilation/gmaps_google.js

@@ -124,7 +124,7 @@
       if (onMapLoad == null) {
         onMapLoad = function() {};
       }
-      return this.map = this._map_builder().build(options, function() {
+      return this.map = this._builder('Map').build(options, function() {
         _this._createClusterer();
         return onMapLoad();
       });
@@ -139,7 +139,7 @@
 
     Handler.prototype.addMarker = function(marker_data, provider_options) {
       var marker;
-      marker = this._marker_builder().build(marker_data, provider_options, this.marker_options);
+      marker = this._builder('Marker').build(marker_data, provider_options, this.marker_options);
       marker.setMap(this.getMap());
       this.clusterer.addMarker(marker);
       return marker;
@@ -189,6 +189,18 @@
       return this._addResource('kml', kml_data, provider_options);
     };
 
+    Handler.prototype.removeMarkers = function(gem_markers) {
+      var _this = this;
+      return _.map(gem_markers, function(gem_marker) {
+        return _this.removeMarker(gem_marker);
+      });
+    };
+
+    Handler.prototype.removeMarker = function(gem_marker) {
+      gem_marker.clear();
+      return this.clusterer.removeMarker(gem_marker);
+    };
+
     Handler.prototype.fitMapToBounds = function() {
       return this.map.fitToBounds(this.bounds.getServiceObject());
     };
@@ -204,7 +216,7 @@
     };
 
     Handler.prototype.resetBounds = function() {
-      return this.bounds = this._bound_builder().build();
+      return this.bounds = this._builder('Bound').build();
     };
 
     Handler.prototype.setPrimitives = function(options) {
@@ -217,7 +229,7 @@
 
     Handler.prototype._addResource = function(resource_name, resource_data, provider_options) {
       var resource;
-      resource = this["_" + resource_name + "_builder"]().build(resource_data, provider_options);
+      resource = this._builder(resource_name).build(resource_data, provider_options);
       resource.setMap(this.getMap());
       return resource;
     };
@@ -227,7 +239,7 @@
     };
 
     Handler.prototype._createClusterer = function() {
-      return this.clusterer = this._clusterer_builder().build({
+      return this.clusterer = this._builder('Clusterer').build({
         map: this.getMap()
       }, this.marker_options.clusterer);
     };
@@ -243,40 +255,9 @@
       };
     };
 
-    Handler.prototype._bound_builder = function() {
-      return this._builder('Bound');
-    };
-
-    Handler.prototype._clusterer_builder = function() {
-      return this._builder('Clusterer');
-    };
-
-    Handler.prototype._marker_builder = function() {
-      return this._builder('Marker');
-    };
-
-    Handler.prototype._map_builder = function() {
-      return this._builder('Map');
-    };
-
-    Handler.prototype._kml_builder = function() {
-      return this._builder('Kml');
-    };
-
-    Handler.prototype._circle_builder = function() {
-      return this._builder('Circle');
-    };
-
-    Handler.prototype._polyline_builder = function() {
-      return this._builder('Polyline');
-    };
-
-    Handler.prototype._polygon_builder = function() {
-      return this._builder('Polygon');
-    };
-
     Handler.prototype._builder = function(name) {
       var _name;
+      name = this._capitalize(name);
       if (this[_name = "__builder" + name] == null) {
         this[_name] = Gmaps.Objects.Builders(this.builders[name], this.models[name], this.primitives);
       }
@@ -294,6 +275,10 @@
       }
     };
 
+    Handler.prototype._capitalize = function(string) {
+      return string.charAt(0).toUpperCase() + string.slice(1);
+    };
+
     Handler.prototype._default_builders = function() {
       return this._rootModule().Builders;
     };
@@ -320,6 +305,8 @@
 
     NullClusterer.prototype.clear = function() {};
 
+    NullClusterer.prototype.removeMarker = function() {};
+
     return NullClusterer;
 
   })();
@@ -334,17 +321,16 @@
       return this.getServiceObject().setMap(map);
     },
     clear: function() {
-      this.serviceObject.setMap(null);
-      return this.serviceObject = null;
+      return this.getServiceObject().setMap(null);
     },
     show: function() {
-      return this.serviceObject.setVisible(true);
+      return this.getServiceObject().setVisible(true);
     },
     hide: function() {
-      return this.serviceObject.setVisible(false);
+      return this.getServiceObject().setVisible(false);
     },
     isVisible: function() {
-      return this.serviceObject.getVisible();
+      return this.getServiceObject().getVisible();
     },
     primitives: function() {
       return this.constructor.PRIMITIVES;
@@ -749,14 +735,9 @@
 
 }).call(this);
 (function() {
-  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
-
   this.Gmaps.Google.Objects.Clusterer = (function() {
     function Clusterer(serviceObject) {
       this.serviceObject = serviceObject;
-      this.clear = __bind(this.clear, this);
-      this.addMarker = __bind(this.addMarker, this);
-      this.addMarkers = __bind(this.addMarkers, this);
     }
 
     Clusterer.prototype.addMarkers = function(markers) {
@@ -767,11 +748,19 @@
     };
 
     Clusterer.prototype.addMarker = function(marker) {
-      return this.serviceObject.addMarker(marker.serviceObject);
+      return this.getServiceObject().addMarker(marker.getServiceObject());
     };
 
     Clusterer.prototype.clear = function() {
-      return this.serviceObject.clearMarkers();
+      return this.getServiceObject().clearMarkers();
+    };
+
+    Clusterer.prototype.removeMarker = function(marker) {
+      return this.getServiceObject().removeMarker(marker.getServiceObject());
+    };
+
+    Clusterer.prototype.getServiceObject = function() {
+      return this.serviceObject;
     };
 
     return Clusterer;

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/javascripts/objects/handler_spec.js

@@ -315,6 +315,46 @@ describe("Gmaps.Objects.Handler", function() {
         });
       });
     });
+
+    describe("remove collection", function() {
+      beforeEach(function() {
+        build_subject()
+      });
+      describe("removeMarkers", function() {
+        it("loops and delegates to removeMarker", function() {
+          spyOn(subject, 'removeMarker');
+
+          marker_to_suppress = jasmine.createSpy('marker');
+
+          subject.removeMarkers([ marker_to_suppress ]);
+
+          expect(subject.removeMarker).toHaveBeenCalledWith(marker_to_suppress);
+        });
+      });
+    });
+
+    describe("remove single item", function() {
+      beforeEach(function() {
+        build_subject();
+      });
+      describe("removeMarker", function() {
+        beforeEach(function() {
+          subject.clusterer = { removeMarker: function(){} };
+          spyOn(subject.clusterer, 'removeMarker');
+        });
+
+        it("deletes marker", function() {
+          spy_clear_fn = jasmine.createSpy('marker_fn');
+          marker_to_suppress = { clear: spy_clear_fn };
+
+          subject.removeMarker(marker_to_suppress);
+
+          expect(spy_clear_fn).toHaveBeenCalled();
+          expect(subject.clusterer.removeMarker).toHaveBeenCalledWith(marker_to_suppress);
+        });
+      });
+    });
+
   });
 
 });

data/vendor/assets/javascripts/gmaps/google/objects/clusterer.coffee

@@ -2,12 +2,19 @@ class @Gmaps.Google.Objects.Clusterer
 
   constructor: (@serviceObject)->
 
-  addMarkers: (markers)=>
+  addMarkers: (markers)->
     _.each markers, (marker)=>
       @addMarker(marker)
 
-  addMarker: (marker)=>
-    @serviceObject.addMarker(marker.serviceObject)
+  addMarker: (marker)->
+    @getServiceObject().addMarker(marker.getServiceObject())
+
+  clear: ->
+    @getServiceObject().clearMarkers()
+
+  removeMarker: (marker)->
+    @getServiceObject().removeMarker marker.getServiceObject()
+
+  getServiceObject: ->
+    @serviceObject
 
-  clear: =>
-    @serviceObject.clearMarkers()

data/vendor/assets/javascripts/gmaps/google/objects/common.coffee

@@ -7,17 +7,16 @@
     @getServiceObject().setMap map
 
   clear: ->
-    @serviceObject.setMap(null)
-    @serviceObject = null
+    @getServiceObject().setMap(null)
 
   show: ->
-    @serviceObject.setVisible(true)
+    @getServiceObject().setVisible(true)
 
   hide: ->
-    @serviceObject.setVisible(false)
+    @getServiceObject().setVisible(false)
 
   isVisible: ->
-    @serviceObject.getVisible()
+    @getServiceObject().getVisible()
 
   primitives: ->
     @constructor.PRIMITIVES

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

@@ -14,7 +14,7 @@ class @Gmaps.Objects.Handler
     @resetBounds()
 
   buildMap: (options, onMapLoad = ->)->
-    @map = @_map_builder().build options, =>
+    @map = @_builder('Map').build options, =>
       @_createClusterer()
       onMapLoad()
 
@@ -25,7 +25,7 @@ class @Gmaps.Objects.Handler
 
   # return marker object
   addMarker: (marker_data, provider_options)->
-    marker = @_marker_builder().build(marker_data, provider_options, @marker_options)
+    marker = @_builder('Marker').build(marker_data, provider_options, @marker_options)
     marker.setMap(@getMap())
     @clusterer.addMarker marker
     marker
@@ -66,6 +66,16 @@ class @Gmaps.Objects.Handler
   addKml: (kml_data, provider_options)->
     @_addResource('kml', kml_data, provider_options)
 
+  # removes markers from map
+  removeMarkers: (gem_markers)->
+    _.map gem_markers, (gem_marker)=>
+      @removeMarker gem_marker
+
+  # removes marker from map
+  removeMarker: (gem_marker)->
+    gem_marker.clear()
+    @clusterer.removeMarker(gem_marker)
+
   fitMapToBounds: ->
     @map.fitToBounds @bounds.getServiceObject()
 
@@ -78,7 +88,7 @@ class @Gmaps.Objects.Handler
     @models         = _.extend @_default_models(),         options.models
 
   resetBounds: ->
-    @bounds = @_bound_builder().build()
+    @bounds = @_builder('Bound').build()
 
   setPrimitives: (options)->
     @primitives = if options.primitives is undefined
@@ -90,7 +100,7 @@ class @Gmaps.Objects.Handler
     @builders.Marker.CURRENT_INFOWINDOW
 
   _addResource: (resource_name, resource_data, provider_options)->
-    resource = @["_#{ resource_name }_builder"]().build(resource_data, provider_options)
+    resource = @_builder(resource_name).build(resource_data, provider_options)
     resource.setMap(@getMap())
     resource
 
@@ -98,7 +108,7 @@ class @Gmaps.Objects.Handler
     _.isObject @marker_options.clusterer
 
   _createClusterer: ->
-    @clusterer = @_clusterer_builder().build({ map: @getMap() }, @marker_options.clusterer )
+    @clusterer = @_builder('Clusterer').build({ map: @getMap() }, @marker_options.clusterer )
 
   _default_marker_options: ->
     {
@@ -109,31 +119,8 @@ class @Gmaps.Objects.Handler
         gridSize: 50
     }
 
-  _bound_builder: ->
-    @_builder('Bound')
-
-  _clusterer_builder: ->
-    @_builder('Clusterer')
-
-  _marker_builder: ->
-    @_builder('Marker')
-
-  _map_builder: ->
-    @_builder('Map')
-
-  _kml_builder: ->
-    @_builder('Kml')
-
-  _circle_builder: ->
-    @_builder('Circle')
-
-  _polyline_builder: ->
-    @_builder('Polyline')
-
-  _polygon_builder: ->
-    @_builder('Polygon')
-
   _builder: (name)->
+    name = @_capitalize(name)
     @["__builder#{name}"] ?= Gmaps.Objects.Builders(@builders[name], @models[name], @primitives)
     @["__builder#{name}"]
 
@@ -145,6 +132,9 @@ class @Gmaps.Objects.Handler
       models.Clusterer = Gmaps.Objects.NullClusterer
       models
 
+  _capitalize: (string)->
+    string.charAt(0).toUpperCase() + string.slice(1)
+
   _default_builders: ->
     @_rootModule().Builders
 

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

@@ -2,3 +2,4 @@ class @Gmaps.Objects.NullClusterer
   addMarkers: ->
   addMarker: ->
   clear: ->
+  removeMarker: ->

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 2.0.4
 platform: ruby
 authors:
 - Benjamin Roth
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -47,49 +42,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   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: sprockets
   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: pry
   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'
 description: Enables easy Google map + overlays creation.
@@ -154,27 +143,26 @@ files:
 - vendor/assets/javascripts/gmaps/objects/null_clusterer.coffee
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Maps made easy for Ruby apps
 test_files:
 - spec/javascripts/google/builders/marker_spec.js