gmaps4rails 1.1.5 → 1.1.6

data/README.rdoc

@@ -46,13 +46,13 @@ To make Rails serve the assets (javascripts, stylesheets and marker images) you
   You even don't need the `yield :head` if you include `require gmaps4rails` in your CSS manifest.
   
 - if you are using Rails 3.0:
-  if you have Rails configured to serve static assets ('config.serve_static_assets = true'; note that it is disabled by default in production environment), they'll be served directly from gem's public/ directory.
+  see para below to be sure everything will work in production.
 
 - finally you can just copy assets to your application's public/stylesheets, public/javascripts/gmaps4rails and public/images. It's recommended to do this in production so that you can let your webserver serve them rather than go through Rails each time they are requested. There's a generator to help you with that:
 
      rails generate gmaps4rails:install
      
-  This will copy the coffeescript files if you're running Rails 3.1 or the js files 
+  This will copy the coffeescript files if you're running Rails 3.1 or the js files for Rails 3.0.x
 
 == Basic configuration
 In your model, add:

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

@@ -171,6 +171,7 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
       @hideMarker marker
 
   clearMarker : (marker) ->
+    console.log marker
     marker.serviceObject.setMap(null)
 
   showMarker : (marker) ->

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

@@ -16,7 +16,7 @@ if enable_css == true and options[:scripts].nil? %>
   <% 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://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/markerclusterer/1.0/src/markerclusterer_compiled.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>  
   <% end %>
   

data/lib/generators/gmaps4rails/install_generator.rb

@@ -12,7 +12,7 @@ module Gmaps4rails
           copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee', 'app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee'
           copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee',       'app/assets/javascripts/gmaps4rails/gmaps4rails.bing.js.coffee'
           copy_file '../../../app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee',   'app/assets/javascripts/gmaps4rails/gmaps4rails.mapquest.js.coffee'        
-          copy_file '../../../app/assets/stylesheets/gmaps4rails.css', 'public/stylesheets/gmaps4rails.css'
+          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'

data/lib/gmaps4rails/base.rb

@@ -42,14 +42,6 @@ module Gmaps4rails
   def Gmaps4rails.sidebar(object)
     return "\"sidebar\": \"#{object.gmaps4rails_sidebar}\"," if object.respond_to?("gmaps4rails_sidebar")
   end
-  
-  def Gmaps4rails.get_map_id(hash)
-    hash.nil? || hash.try(:[], "id").nil? ? DEFAULT_MAP_ID : hash["id"]
-  end
-  
-  def Gmaps4rails.get_constructor(hash)
-    hash.nil? || hash.try(:[], "provider").nil? ? "Gmaps4RailsGoogle()" : "Gmaps4Rails#{hash["provider"].capitalize}()"
-  end
 
   # Returns picture options if gmaps4rails_marker_picture is defined in the model
   def Gmaps4rails.picture(object)
@@ -70,7 +62,6 @@ module Gmaps4rails
   # * address: string, mandatory
   # * lang: to set the language one wants the result to be translated (default is english)
   # * raw: to get the raw response from google, default is false
-  
   def Gmaps4rails.geocode(address, lang="en", raw = false)
    if address.nil? || address.empty?
      raise Gmaps4rails::GeocodeInvalidQuery, "You must provide an address"
@@ -89,7 +80,6 @@ module Gmaps4rails
   # * start_end: Hash { "from" => string, "to" => string}, mandatory
   # * options: details given in the github's wiki
   # * output: could be "pretty", "raw" or "clean"; filters the output from google
-   
   #output could be raw, pretty or clean
   def Gmaps4rails.destination(start_end, options={}, output="pretty")
    if start_end["from"].nil? || start_end["to"].empty?
@@ -106,7 +96,6 @@ module Gmaps4rails
   end #end destination
   
   # To create valid js, this method escapes everything but Numeric, true or false
-  
   def Gmaps4rails.filter(data)
     return data if data.is_a?(Numeric) || data.is_a?(TrueClass) || data.is_a?(FalseClass)
     "'#{data}'"
@@ -180,11 +169,74 @@ module Gmaps4rails
     end #end resp test
   end
   
+  ###### JS CREATION #######
+  
   def Gmaps4rails.js_function_name(hash)
     "load_" + Gmaps4rails.get_map_id(hash[:map_options])
   end
   
-  def Gmaps4rails.create_js_from_hash(hash, edit_map_with_id = false)
+  def Gmaps4rails.get_map_id(hash)
+    hash.nil? || hash[:id].nil? ? DEFAULT_MAP_ID : hash[:id]
+  end
+  
+  def Gmaps4rails.get_constructor(hash)
+    hash.nil? || hash[:provider].nil? ? "Gmaps4RailsGoogle()" : "Gmaps4Rails#{hash[:provider].capitalize}()"
+  end
+  
+  def Gmaps4rails.create_map_js(map_hash, map_id)
+    output = Array.new
+    skipped_keys = [:class, :container_class]
+    map_hash.each do |option_k, option_v|
+      unless skipped_keys.include? option_k.to_sym
+        case option_k.to_sym 
+        when :bounds, :raw #particular case, render the content unescaped
+          output << "#{map_id}.map_options.#{option_k} = #{option_v};"
+        else
+          output << "#{map_id}.map_options.#{option_k} = #{Gmaps4rails.filter option_v};"
+        end
+      end
+    end
+    output
+  end
+  
+  def Gmaps4rails.create_general_js(hash, map_id, category)
+    hash = hash.with_indifferent_access
+    output = Array.new
+    output << "#{map_id}.#{category} = #{hash[:data]};"
+    hash[:options] ||= Array.new
+    hash[:options].each do |option_k, option_v|
+      if option_k.to_sym == :raw
+        output << "#{map_id}.#{category}_conf.#{option_k} = #{option_v};"
+      else
+        output << "#{map_id}.#{category}_conf.#{option_k} = #{Gmaps4rails.filter option_v};"
+      end	
+    end
+    output << "#{map_id}.create_#{category}();"
+    output
+  end
+  
+  def Gmaps4rails.create_direction_js(hash, map_id)
+    hash = hash.with_indifferent_access
+    output = Array.new
+    output << "#{map_id}.direction_conf.origin = '#{hash["data"]["from"]}';"
+    output << "#{map_id}.direction_conf.destination = '#{hash["data"]["to"]}';"
+    hash[:options] ||= Array.new
+	  hash[:options].each do |option_k, option_v|
+      if option_k.to_sym == :waypoints
+        waypoints = Array.new
+        option_v.each do |waypoint|
+          waypoints << { "location" => waypoint, "stopover" => true }.to_json
+        end
+        output << "#{map_id}.direction_conf.waypoints = [#{waypoints * (",")}];"
+      else #option_k != "waypoint"
+        output << "#{map_id}.direction_conf.#{option_k} = #{Gmaps4rails.filter option_v};"
+      end
+    end #end .each
+    output << "#{map_id}.create_direction();"
+    output
+  end
+  
+  def Gmaps4rails.create_js_from_hash(hash)
     #the variable 'options' must have the following structure
     #{  
     #   :map_options => hash,
@@ -195,78 +247,31 @@ module Gmaps4rails
     #   :direction   => { :data => hash, :options => hash },
     #   :kml         => { :data => json, :options => hash }
     #}
-    # "map_options", "scripts" and "direction" must be treated separately because there content is slightly different from the others:
-    # - "map_options" and "scripts" don't contain interesting data for the view
-    # - "direction" has a hash as a data and waypoints options must be processed properly
-    #
-    #TODO: clean up this method
     result = Array.new
-    map_id = "Gmaps." + (edit_map_with_id || Gmaps4rails.get_map_id(hash[:map_options]) )
+    map_id = "Gmaps." + Gmaps4rails.get_map_id(hash[:map_options])
 
     #means we are creating a new map
-    if edit_map_with_id == false 
-      result << "#{map_id} = new #{Gmaps4rails.get_constructor hash[:map_options] }" + ";"
-      result << "function #{Gmaps4rails.js_function_name hash }() {"
-      
-      #extract map_options
-      unless hash[:map_options].nil?
-        hash[:map_options].each do |option_k, option_v|
-          case option_k.to_sym 
-          when :bounds #particular case, render the content unescaped
-            result << "#{map_id}.map_options.#{option_k} = #{option_v};"
-          when :raw #particular case, render the content unescaped
-            result << "#{map_id}.map_options.#{option_k} = #{option_v};"
-          when :class           #do nothing
-          when :container_class #do nothing
-          else
-            result << "#{map_id}.map_options.#{option_k} = #{Gmaps4rails.filter option_v};"
-          end
-        end
-      end
-      result << "#{map_id}.initialize();"
-    end
-
+    result << "#{map_id} = new #{Gmaps4rails.get_constructor hash[:map_options] }" + ";"
+    result << "function #{Gmaps4rails.js_function_name hash }() {"
+    result << Gmaps4rails.create_map_js(hash[:map_options], map_id) unless hash[:map_options].nil?
+    result << "#{map_id}.initialize();"
+    
     hash.each do |category, content| #loop through options hash
-      if [:map_options, :last_map, :scripts].include? category.to_sym
-        #nothing to do
-      elsif category.to_sym == :direction
-        result << "#{map_id}.direction_conf.origin = '#{content["data"]["from"]}';"
-        result << "#{map_id}.direction_conf.destination = '#{content["data"]["to"]}';"
-
-        content[:options] ||= Array.new 
-    	  content[:options].each do |option_k, option_v| 
-          if option_k.to_sym == :waypoints
-            waypoints = Array.new
-            option_v.each do |waypoint|
-              waypoints << { "location" => waypoint, "stopover" => true }.to_json
-            end
-            result << "#{map_id}.direction_conf.waypoints = [#{waypoints * (",")}];"
-          else #option_k != "waypoint"
-            result << "#{map_id}.direction_conf.#{option_k} = #{Gmaps4rails.filter option_v};"	
-          end
-        end #end .each
-        result << "#{map_id}.create_direction();"
-      else #default behaviour
-        result << "#{map_id}.#{category} = #{content[:data]};"
-        content[:options] ||= Array.new 
-        content[:options].each do |option_k, option_v|
-          if option_k.to_sym == :raw
-            result << "#{map_id}.#{category}_conf.#{option_k} = #{option_v};"
-          else
-            result << "#{map_id}.#{category}_conf.#{option_k} = #{Gmaps4rails.filter option_v};"
-          end	
+      skipped_categories = [:map_options, :last_map, :scripts]
+      unless skipped_categories.include? category.to_sym
+        if category.to_sym == :direction
+          result << Gmaps4rails.create_direction_js(content, map_id)
+        else  
+          result << Gmaps4rails.create_general_js(content, map_id, category)
         end
-        result << "#{map_id}.create_#{category}();"
-      end 
+      end
     end
     result << "#{map_id}.adjustMapToBounds();"
     result << "#{map_id}.callback();"
     
-    if edit_map_with_id == false 
-      result << "};"
-      if hash[:last_map].nil? || hash[:last_map] == true
-        result << "window.onload = function() { Gmaps.loadMaps(); };"
-      end
+    result << "};"
+    if hash[:last_map].nil? || hash[:last_map] == true
+      result << "window.onload = function() { Gmaps.loadMaps(); };"
     end
     
     result * ('

data/lib/gmaps4rails/extensions/hash.rb

@@ -2,8 +2,8 @@ class Hash
   
   # this method extracts all info from the hash to create javascript
   # this javascript is then rendered raw to the view so it can be interpreted and executed
-  def to_gmaps4rails(edit_map_with_id = false)
-    Gmaps4rails.create_js_from_hash(self.with_indifferent_access, edit_map_with_id)
+  def to_gmaps4rails
+    Gmaps4rails.create_js_from_hash(self.with_indifferent_access)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2152316380 !ruby/object:Gem::Requirement
+  requirement: &2152433280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152316380
+  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,