gmaps4rails 0.2.2 → 0.2.3

data/README.rdoc

@@ -1,21 +1,25 @@
 == Gmaps4rails
 
-Gmaps4rails is developped to simply create a Google Map (Gmaps) with model instances (say Users).
-It's based on Ruby on Rails 3 Engines.
-It works properly but I still have something to correct: making it work without resorting to the serve_static_assets to true in production.
+Gmaps4rails is developped to simply create a Google Map (Gmaps) from:
+
+- model instances (say Users),
+
+- your own json
+
+It's based on Ruby on Rails 3 Engines and uses Google Maps API V3 with Marker Clusterer in option.
+
 
 == Installation
 
 	gem install gmaps4rails
 
 == Requirements
-- jQuery (used for ajax json)
 - <%= yield :head %> (in your header)
 - <%= yield :scripts %> (in your footer)
 - config.serve_static_assets = true  (in your production.rb)
+- jQuery (used for ajax json, not mandatory if you only use the 'json' option)
 
-== Quickstart
-Say you have a User model.
+== Basic configuration
 In your model, add:
 
 	acts_as_gmappable
@@ -24,16 +28,33 @@ In your model, add:
 	  self.address #describe how to retrieve the address from your model
 	end
 
-Create a migration and add the following fields to your table:
+Create a migration and add the following fields to your table (here users):
 
 	add_column :users, :latitude, :float
 	add_column :users, :longitude, :float
 	add_column :users, :gmaps, :boolean
 
+== How to?
+=== QuickStart!
+Say you have a User model and you want to display all the users on a map.
 In your view:
 
 	<%= gmaps4rails_map("User") %>
 
+Done!
+
+=== Same Result, alternative solution
+With this version, you won't need jQuery.
+In your controller:
+ 
+  @json = User.all.to_gmaps4rails
+
+In your view:
+
+  <%= gmaps4rails_map(@json, { "processing" => 'json' }) %>
+
+Done again!
+
 == Options
 
 === Add an info window
@@ -93,12 +114,9 @@ Then in your view:
 Or with options as well:
   
 	<%= gmaps4rails_map(@json, {"processing" => 'json', "map_center_longitude" => "90"}) %>
-	
 
 == Todo?
 
-Maybe use Geokit to handle the geocoding stuff.
-
 Feel free ton contact me, you have your say. I hope I'll have time enough to improve it.
 
 == Copyright

data/app/controllers/gmaps4rails/gmaps_controller.rb

@@ -9,11 +9,14 @@ module Gmaps4rails
       
       # The split returns the array [scope_name, arg1, arg2, ...]
       if @scope && !@scope.empty? && @model.gmaps4rails_trusted_scopes.include?(@scope.split(/\(| *, *|\)/)[0])
-        @objects = eval("#{@model}.#{@scope}") # Cannot use send with lambda scope 
+        object = eval("#{@model}.#{@scope}") # Cannot use send with lambda scope 
                                                 # because the arguments have to be separated
+        @objects = object.to_gmaps4rails
       else
-        @objects = @model.all
+        @objects = @model.all.to_gmaps4rails
       end 
+      
+      render :json => @objects
     end        
   end
 end

data/lib/acts_as_gmappable/base.rb

@@ -3,6 +3,17 @@ require 'uri'
 require 'crack'
 
 module Gmaps4rails
+  
+  def Gmaps4rails.create_json(object)
+   	"{\"description\": \"#{object.gmaps4rails_infowindow}\",
+     \"longitude\": \"#{object.gmaps4rails_longitude}\",
+     \"latitude\": \"#{object.gmaps4rails_latitude}\",
+     \"picture\": \"#{object.gmaps4rails_marker_picture['picture']}\",
+     \"width\": \"#{object.gmaps4rails_marker_picture['width']}\",
+     \"height\": \"#{object.gmaps4rails_marker_picture['height']}\"
+    }"
+  end
+  
   module ActsAsGmappable
 
     module Base
@@ -40,6 +51,16 @@ module Gmaps4rails
         def self.gmaps4rails_trusted_scopes
           []
         end
+        
+        def to_gmaps4rails
+          json = "["
+          if (!(self.gmaps4rails_latitude == "" || self.gmaps4rails_longitude == ""))
+           	json += Gmaps4rails.create_json(self)
+            json += "," 
+          end
+          json.chop!
+          json += "]"
+        end
  
         def get_coordinates
          if self.gmaps4rails_address.nil? || self.gmaps4rails_address.empty?

data/lib/array.rb

@@ -0,0 +1,13 @@
+class Array
+  def to_gmaps4rails
+    json = "["
+    each do |object|
+      if (!(object.gmaps4rails_latitude == "" || object.gmaps4rails_longitude == ""))
+        json += Gmaps4rails.create_json(object)
+        json += "," 
+      end
+    end
+    json.chop!
+    json += "]"
+  end
+end

data/lib/gmaps4rails.rb

@@ -2,6 +2,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
   module Gmaps4rails
     require "rails"
     require "action_controller"
+    require 'array'
     require 'application_helper'
     require 'acts_as_gmappable/base'
   
@@ -9,7 +10,8 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
        initializer "static assets" do |app|
          app.middleware.use ::ActionDispatch::Static, "#{root}/public"
        end
-     end
+    end
+
   end
 end
 

data/public/javascripts/gmaps4rails.js

@@ -57,7 +57,6 @@ var Gmaps4Rails = {
 
 		  if(this.model_scope != null)
 		  	{ request += '&scope=' + this.model_scope; }
-
   			jQuery.getJSON(request,function(data){
 													Gmaps4Rails.locations = data;
 												  Gmaps4Rails.setup_Markers();			

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,10 +45,10 @@ files:
 - app/controllers/gmaps4rails/gmaps_controller.rb
 - app/helpers/gmaps4rails/gmaps_helper.rb
 - app/views/gmaps4rails/_gmaps4rails.html.erb
-- app/views/gmaps4rails/gmaps/index.js.erb
 - config/routes.rb
 - lib/acts_as_gmappable/base.rb
 - lib/application_helper.rb
+- lib/array.rb
 - lib/gmaps4rails.rb
 - lib/rails/generators/gmaps4rails/gmaps4rails_generator.rb
 - lib/rails/generators/gmaps4rails/templates/initializer.rb

data/app/views/gmaps4rails/gmaps/index.js.erb

@@ -1,19 +0,0 @@
-[ 
-<% 
-	@objects.each do |object|
-		# lat = object.gmaps4rails_latitude.nil? ? "" : object.gmaps4rails_latitude
-		# long = object.gmaps4rails_longitude.nil? ? "" : object.gmaps4rails_longitude
-		if (!(object.gmaps4rails_latitude == "" || object.gmaps4rails_longitude == ""))
-%>
-		 {"description": "<%=raw object.gmaps4rails_infowindow %>",
-		  "longitude": "<%= object.gmaps4rails_longitude %>",
-		  "latitude": "<%= object.gmaps4rails_latitude %>",
-		  "picture": "<%= object.gmaps4rails_marker_picture["picture"] %>",
-		  "width": "<%= object.gmaps4rails_marker_picture["width"] %>",
-		  "height": "<%= object.gmaps4rails_marker_picture["height"] %>"
-		  } <%= ',' unless object == @objects.last %>
-<% 
-		end 
-	end
-%>
-]