gmaps4rails 0.8.5 → 0.8.6

data/README.rdoc

@@ -65,8 +65,6 @@ Done!
 
 == Todo?
 
-* Marker clusterer customization
-
 * Integrate Markers with Label: http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1.2/
 
 * Other options from here: http://code.google.com/p/google-maps-utility-library-v3/wiki/Libraries

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

@@ -27,7 +27,6 @@ window.onload = gmaps4rails_loadScript;
 
 </script>
 <% end %>
-
-<div id="<%= options["map_options"].nil? || options['map_options']['container_id'].nil? ? "map_container" : options['map_options']['container_id'] %>"> 
-  <div id="<%= options["map_options"].nil? || options['map_options']['id'].nil? ? "gmaps4rails_map" : options['map_options']['id'] %>"></div>
+<div id="<%= options['map_options'].try(:[],'container_id').nil? ? "map_container" : options['map_options']['container_id'] %>"> 
+  <div id="<%= options['map_options'].try(:[],'id').nil? ? "gmaps4rails_map" : options['map_options']['id'] %>"></div>
 </div>

data/lib/acts_as_gmappable/base.rb

@@ -13,8 +13,8 @@ module Gmaps4rails
   class DirectionInvalidQuery < StandardError; end
 
   def Gmaps4rails.create_json(object)
-    unless object[object.gmaps4rails_options[:lat_column]].blank? && object[object.gmaps4rails_options[:lng_column]].blank?
-"{#{Gmaps4rails.description(object)}#{Gmaps4rails.title(object)}#{Gmaps4rails.sidebar(object)}\"longitude\": \"#{object[object.gmaps4rails_options[:lng_column]]}\", \"latitude\": \"#{object[object.gmaps4rails_options[:lat_column]]}\"#{Gmaps4rails.picture(object)}},\n"
+    unless object.send(object.gmaps4rails_options[:lat_column]).blank? && object.send(object.gmaps4rails_options[:lng_column]).blank?
+"{#{Gmaps4rails.description(object)}#{Gmaps4rails.title(object)}#{Gmaps4rails.sidebar(object)}\"longitude\": \"#{object.send(object.gmaps4rails_options[:lng_column])}\", \"latitude\": \"#{object.send(object.gmaps4rails_options[:lat_column])}\"#{Gmaps4rails.picture(object)}},\n"
     end
   end  
   
@@ -146,8 +146,8 @@ module Gmaps4rails
           logger.warn(e)
           #TODO add customization here?
         else #if no exception
-          self[gmaps4rails_options[:lng_column]] = coordinates.first[:lng]
-          self[gmaps4rails_options[:lat_column]] = coordinates.first[:lat]
+          self.send(gmaps4rails_options[:lng_column]+"=", coordinates.first[:lng]) if self.respond_to?(gmaps4rails_options[:lng_column]+"=")
+          self.send(gmaps4rails_options[:lat_column]+"=", coordinates.first[:lat]) if self.respond_to?(gmaps4rails_options[:lat_column]+"=")
           unless gmaps4rails_options[:normalized_address].nil?
             self.send(gmaps4rails_options[:normalized_address].to_s+"=", coordinates.first[:matched_address])
           end

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

@@ -1,4 +1,5 @@
 class UsersController < ApplicationController
+    
   def index
     @users = User.all
     @json  = User.all.to_gmaps4rails

data/test/dummy/app/models/user.rb

@@ -1,10 +1,12 @@
 class User < ActiveRecord::Base
+   
   acts_as_gmappable
   
   def gmaps4rails_address
     sec_address
   end
-  # 
+  
+    # 
   # def gmaps4rails_infowindow
   #   "My Beautiful Name: #{name}"
   # end
@@ -22,14 +24,11 @@ class User < ActiveRecord::Base
   # end
   # 
   # def gmaps4rails_sidebar
-  #   "sidebar content"
-  # end
-  # def gmaps4rails_sidebar
   #   "<b>#{name}</b>"
   # end
   #  
-  # def gmaps4rails_infowindow
-  #   "je suis l'infowindow de #{name}"
-  # end
+#  def gmaps4rails_infowindow
+#    "je suis l'infowindow de #{name}"
+#  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +02:00
+date: 2011-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency