gmaps4rails 1.1.6 → 1.1.7

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

@@ -4,8 +4,10 @@ Gmaps.loadMaps = ->
   #loop through all variable names.
   #there should only be maps inside so it trigger their load function
   for key, value of Gmaps
-    if key != "loadMaps"
-      window["load_" + key]()
+    searchLoadIncluded = key.search(/load/)
+    if searchLoadIncluded == -1
+      load_function_name = "load_" + key
+      Gmaps[load_function_name]()
 
 window.Gmaps = Gmaps
 

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -14,7 +14,7 @@ if enable_css == true and options[:scripts].nil? %>
   <% when "bing" %>
     <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0"></script>
   <% else %>
-    <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&amp;libraries=geometry<%= g_libraries(options[:map_options].try(:[], :libraries)) %>"></script>
+    <script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.5&sensor=false&amp;libraries=geometry<%= g_libraries(options[:map_options].try(:[], :libraries)) %>"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/infobox/1.1.5/src/infobox.js"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclustererplus/2.0.1/src/markerclusterer.js"></script>
     <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/trunk/richmarker/src/richmarker-compiled.js"></script>  

data/lib/generators/gmaps4rails/install_generator.rb

@@ -15,12 +15,12 @@ module Gmaps4rails
           copy_file '../../../public/stylesheets/gmaps4rails.css', 'app/assets/stylesheets/gmaps4rails.css'
         else
         #I don't copy manifests, kind of useless
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.base.js', 'public/javascripts/gmaps4rails.base.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js', 'public/javascripts/gmaps4rails.googlemaps.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.bing.js', 'public/javascripts/gmaps4rails.bing.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.openlayers.js', 'public/javascripts/gmaps4rails.openlayers.js'
-          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.mapquest.js', 'public/javascripts/gmaps4rails.mapquest.js'
-          copy_file '../../../public/stylesheets/gmaps4rails.css', 'public/stylesheets/gmaps4rails.css'
+          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.base.js',       'public/javascripts/gmaps4rails/gmaps4rails.base.js'
+          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js', 'public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js'
+          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.bing.js',       'public/javascripts/gmaps4rails/gmaps4rails.bing.js'
+          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.openlayers.js', 'public/javascripts/gmaps4rails/gmaps4rails.openlayers.js'
+          copy_file '../../../public/javascripts/gmaps4rails/gmaps4rails.mapquest.js',   'public/javascripts/gmaps4rails/gmaps4rails.mapquest.js'
+          copy_file '../../../public/stylesheets/gmaps4rails.css',                       'public/stylesheets/gmaps4rails.css'
         end
         copy_file '../../../public/images/marker.png', 'public/images/marker.png'
       end

data/lib/gmaps4rails/base.rb

@@ -252,7 +252,7 @@ module Gmaps4rails
 
     #means we are creating a new map
     result << "#{map_id} = new #{Gmaps4rails.get_constructor hash[:map_options] }" + ";"
-    result << "function #{Gmaps4rails.js_function_name hash }() {"
+    result << "Gmaps.#{Gmaps4rails.js_function_name hash } = function() {"
     result << Gmaps4rails.create_map_js(hash[:map_options], map_id) unless hash[:map_options].nil?
     result << "#{map_id}.initialize();"
     
@@ -270,6 +270,7 @@ module Gmaps4rails
     result << "#{map_id}.callback();"
     
     result << "};"
+    # result << "debugger;"
     if hash[:last_map].nil? || hash[:last_map] == true
       result << "window.onload = function() { Gmaps.loadMaps(); };"
     end
@@ -278,4 +279,4 @@ module Gmaps4rails
 ')
   end
 
-end
+end

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

@@ -2,11 +2,12 @@
   var Gmaps;
   Gmaps = {};
   Gmaps.loadMaps = function() {
-    var key, value, _results;
+    var key, load_function_name, searchLoadIncluded, value, _results;
     _results = [];
     for (key in Gmaps) {
       value = Gmaps[key];
-      _results.push(key !== "loadMaps" ? window["load_" + key]() : void 0);
+      searchLoadIncluded = key.search(/load/);
+      _results.push(searchLoadIncluded === -1 ? (load_function_name = "load_" + key, Gmaps[load_function_name]()) : void 0);
     }
     return _results;
   };

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

@@ -193,6 +193,7 @@
       return _results;
     };
     Gmaps4RailsGoogle.prototype.clearMarker = function(marker) {
+      console.log(marker);
       return marker.serviceObject.setMap(null);
     };
     Gmaps4RailsGoogle.prototype.showMarker = function(marker) {

metadata

@@ -1,41 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gmaps4rails
-version: !ruby/object:Gem::Version
-  version: 1.1.6
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 7
+  version: 1.1.7
 platform: ruby
-authors:
+authors: 
 - Benjamin Roth
 - David Ruyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: crack
-  requirement: &2152433280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2152433280
-description: ! 'Enables easy display of items (taken from a Rails 3 model) on a Google
-  Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
-  Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines,
-  polygons, circles etc... See wiki on github for full description and examples.'
-email:
+  version_requirements: *id001
+description: "Enables easy display of items (taken from a Rails 3 model) on a Google Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included. Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines, polygons, circles etc... See wiki on github for full description and examples."
+email: 
 - apnea.diving.deep@gmail.com
 - david.ruyer@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - app/assets/javascripts/gmaps4rails/all_apis.js
 - app/assets/javascripts/gmaps4rails/bing.js
 - app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee
@@ -66,27 +74,36 @@ files:
 - README.rdoc
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Enables easy display of items (taken from a Rails 3 model) on a Google Maps
-  (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
+summary: Enables easy display of items (taken from a Rails 3 model) on a Google Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
 test_files: []
+