gmaps4rails 1.5.5 → 1.5.6

data/.gitignore

@@ -6,7 +6,7 @@
 .DS_Store
 test/dummy/tmp/**/*
 test/dummy/log/**/*
-test/dummy/.rvmrc
 pkg
 .idea
-.redcar
+.redcar
+.rvmrc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (1.5.5)
+    gmaps4rails (1.5.6)
 
 GEM
   remote: http://rubygems.org/
@@ -91,7 +91,14 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.7.1)
     mime-types (1.18)
+    mongoid (3.0.6)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+    moped (1.2.5)
     multi_json (1.2.0)
+    origin (1.0.9)
     polyglot (0.3.3)
     pry (0.9.8.4)
       coderay (~> 1.0.5)
@@ -172,6 +179,7 @@ DEPENDENCIES
   guard-spork
   jasmine
   jquery-rails
+  mongoid (~> 3)
   pry
   rails (~> 3.2.1)
   rspec-rails

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

@@ -24,6 +24,7 @@ class @Gmaps4Rails
     @userLocation = null       #contains user's location if geolocalization was performed and successful
 
     #empty slots
+    @geolocationSuccess = -> false  #triggered when geolocation succeeds. Can be customized.
     @geolocationFailure = -> false  #triggered when geolocation fails. If customized, must be like= function(navigator_handles_geolocation){} where 'navigator_handles_geolocation' is a boolean
     @callback           = -> false  #to let user set a custom callback function
     @customClusterer    = -> false  #to let user set custom clusterer pictures
@@ -95,6 +96,7 @@ class @Gmaps4Rails
         #change map's center to focus on user's geoloc if asked
         if(map_object.map_options.center_on_user == true)
           map_object.centerMapOnUser()
+        map_object.geolocationSuccess()
       positionFailure = ->
         map_object.geolocationFailure(true)
 
@@ -296,25 +298,25 @@ class @Gmaps4Rails
 
 
   #replace old markers with new markers on an existing map
-  replaceMarkers : (new_markers) ->
+  replaceMarkers : (new_markers, adjustBounds = true) ->
     @clearMarkers()
     #reset previous markers
     @markers = new Array
     #reset current bounds
-    @boundsObject = @createLatLngBounds()
+    @boundsObject = @createLatLngBounds() if adjustBounds
     #reset sidebar content if exists
     @resetSidebarContent()
     #add new markers
     @markers_conf.offset = 0
-    @addMarkers(new_markers)
+    @addMarkers(new_markers, adjustBounds)
 
   #add new markers to on an existing map
-  addMarkers : (new_markers) ->
+  addMarkers : (new_markers, adjustBounds = true) ->
     #update the list of markers to take into account
     @markers = @markers.concat(new_markers)
     #put markers on the map
     @create_markers()
-    @adjustMapToBounds()
+    @adjustMapToBounds() if adjustBounds
 
   #////////////////////////////////////////////////////
   #///////////////////// SIDEBAR //////////////////////

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

@@ -89,7 +89,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
           style_mark.backgroundXOffset = args.shadow_anchor[0]
           style_mark.backgroundYOffset = args.shadow_anchor[1]
       
-    style_mark.graphicTitle = args.title
+    style_mark.graphicTitle = args.marker_title
     marker = new OpenLayers.Feature.Vector(
                new OpenLayers.Geometry.Point(args.Lng, args.Lat),
                null,

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

data/lib/gmaps4rails/view_helper.rb

@@ -66,9 +66,9 @@ module Gmaps4rails
       when "mapquest"    then @js_array << "#{MAPQUEST}?key=#{provider_key}"
       when "bing"        then @js_array << BING
       else #case googlemaps which is the default
-        @js_array << "#{GOOGLE}&sensor=false&key=#{provider_key}&libraries=geometry#{google_libraries}&#{google_map_i18n}"
+        @js_array << "#{GOOGLE}&sensor=false&client=#{client}&key=#{provider_key}&libraries=geometry#{google_libraries}&#{google_map_i18n}"
         @js_array << "#{GOOGLE_EXT}tags/infobox/1.1.9/src/infobox_packed.js"                      if custom_infowindow_class
-        @js_array << "#{GOOGLE_EXT}tags/markerclustererplus/2.0.9/src/markerclusterer_packed.js"  if do_clustering
+        @js_array << "#{GOOGLE_EXT}tags/markerclustererplus/2.0.14/src/markerclusterer_packed.js" if do_clustering
         @js_array << "#{GOOGLE_EXT}trunk/richmarker/src/richmarker-compiled.js"                   if rich_marker
       end
     end
@@ -111,6 +111,10 @@ module Gmaps4rails
     def provider_key
       map_options.try(:[], :provider_key)
     end
+
+    def client
+      map_options.try(:[], :client)
+    end
     
     # when custom_infowindow_class is added in the marker_options,
     #it means user wants to use the InfoBox googlemap's plugin
@@ -168,4 +172,4 @@ module Gmaps4rails
 
   end  
   
-end
+end

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

@@ -9,7 +9,7 @@ class UsersController < ApplicationController
     @json = @users.to_gmaps4rails do |user, marker|
       marker.json({:id => user.id })
       marker.picture({
-       "picture" => "/logo.png",
+       "picture" => "http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=A|FF0000|000000",
        "width" =>  32,
        "height" => 32})
       marker.infowindow user.name

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

@@ -0,0 +1,5 @@
+<%#= gmaps(:markers => {:data => json, :options => {:do_clustering => false, "custom_infowindow_class" => "yellow"}}, 
+          :map_options => {:auto_adjust => true, :raw => "{styles: styles}" },
+          :last_map => true) %>
+
+<%= gmaps4rails json %>

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

@@ -85,10 +85,10 @@
                         :options => {"list_container" => "markers_list" }
                        })%>
 <div id="markers_list"></div>
-<%#= gmaps(:map_options => { :auto_adjust => true },
-      :markers => { :data => '[{"lat":42.3124,"lng":71.1712}]', :options => {:do_clustering => true} }) %>
 
-<%= gmaps(:markers => {:data => @json, :options => {:do_clustering => false, "custom_infowindow_class" => "yellow", :raw => "{ flat: true, draggable: true}" } },
+<%= render :partial => 'map', :locals => {:json => @json} %>
+
+<%#= 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},
@@ -178,18 +178,26 @@
  //        });
  //      }
  //      
-      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);
-        //Gmaps.map.serviceObject.setZoom(1);
-      };
+      // 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);
+      //   //Gmaps.map.serviceObject.setZoom(1);
+      // };
  //      
  //      
+ var styles = [
+        {
+          featureType: "all",
+          stylers: [
+            { "hue": "#ff1a00" }
+          ]
+        }
+      ];
       var pinkParksStyles = [
         {
           featureType: "all",

data/spec/models/place_spec.rb

@@ -25,7 +25,7 @@ if RUBY_VERSION == "1.9.3"
     
     context "standard configuration, valid place" do
       it "should save longitude and latitude to the customized position array" do
-        set_gmaps4rails_options!(:position  => 'location')
+        set_gmaps4rails_options!(:position  => 'pos')
         place.pos.should_not be_nil
         place.should have_same_position_as TOULON
       end

data/spec/models/user_spec.rb

@@ -2,13 +2,15 @@ require 'spec_helper'
 
 include Geocoding
 
-set_gmaps4rails_options!
-
 describe Gmaps4rails::ActsAsGmappable do
 
   let(:user)         { Factory(:user) }
   let(:invalid_user) { FactoryGirl.build(:invalid_user) }
   
+  before(:all) do
+    set_gmaps4rails_options!
+  end
+
   before(:each) do
     Geocoding.stub_geocoding
   end

data/spec/support/geocoding.rb

@@ -10,7 +10,8 @@ module Geocoding
     :address        => "address",
     :language       => "en",
     :protocol       => "http",
-    :process_geocoding => true
+    :process_geocoding => true,
+    :position       => nil
   }
 
   PARIS  = { :latitude => 48.856614, :longitude => 2.3522219 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +317,7 @@ 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/_map.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
@@ -377,7 +394,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 371063818464557253
+      hash: 412283854871812775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -386,7 +403,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 371063818464557253
+      hash: 412283854871812775
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -410,6 +427,7 @@ 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/_map.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