gmaps4rails 0.11.0 → 0.11.1

data/README.rdoc

@@ -41,7 +41,7 @@ To make Rails serve the assets (javascripts, stylesheets and marker images) you
   
   * //= require gmaps4rails/openlayers.js
   
-  You even don't need the `yield :head` if you include `require gmaps4rails` in you CSS manifest.
+  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.
@@ -83,7 +83,7 @@ Done!
 
 == Options
 
-* Markers with Info window, Custom Picture
+* Markers with Info window, Custom Picture, RichMarkers (make your own markers with custom html)
 
 * Automatic sidebar with list of markers
 

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

@@ -17,6 +17,7 @@ if enable_css == true %>
     <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/trunk/richmarker/src/richmarker-compiled.js"></script>  
   <% end %>
   
   <% if Rails::VERSION::MINOR < 1 %>

data/lib/gmaps4rails.rb

@@ -6,7 +6,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
     require 'gmaps4rails/extensions/array'
     require 'gmaps4rails/extensions/hash'
     require 'gmaps4rails/helper/gmaps4rails_helper'
-  
+    
     class Engine < Rails::Engine
        initializer "gmaps4rails view helpers" do |app|
          ActionView::Base.send :include, Gmaps4railsHelper

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

@@ -337,6 +337,7 @@ var Gmaps4Rails = {
           "shadow_width":     this.exists(this.markers[i].shadow_width)   ? this.markers[i].shadow_width   : null,
           "shadow_height":    this.exists(this.markers[i].shadow_height)  ? this.markers[i].shadow_height  : null,
           "marker_draggable": this.exists(this.markers[i].draggable)      ? this.markers[i].draggable      : this.markers_conf.draggable,
+          "rich_marker":      this.exists(this.markers[i].rich_marker)    ? this.markers[i].rich_marker    : null,
           "Lat":              Lat,
           "Lng":              Lng,
           "index":            i

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

@@ -98,9 +98,19 @@ Gmaps4Rails.createMarker = function(args){
   var markerLatLng = Gmaps4Rails.createLatLng(args.Lat, args.Lng); 
 
   // Marker sizes are expressed as a Size of X,Y
-  if (args.marker_picture === "" ) { 
+  if (args.marker_picture === "" && args.rich_marker === null) { 
     return new google.maps.Marker({position: markerLatLng, map: Gmaps4Rails.map, title: args.marker_title, draggable: args.marker_draggable});
-  } else {
+  } 
+  else if (args.rich_marker !== null){
+    return new RichMarker({position: markerLatLng,
+      map: Gmaps4Rails.map,
+      draggable: args.marker_draggable,
+      content: args.rich_marker,
+      flat: args.marker_anchor === null ? false : args.marker_anchor[1],
+      anchor: args.marker_anchor === null ? 0 : args.marker_anchor[0]
+    });
+  }
+  else {
     // calculate MarkerImage anchor location
     var imageAnchorPosition  = this.createImageAnchorPosition(args.marker_anchor);
     var shadowAnchorPosition = this.createImageAnchorPosition(args.shadow_anchor);
@@ -108,7 +118,6 @@ Gmaps4Rails.createMarker = function(args){
     //create or retrieve existing MarkerImages
     var markerImage = this.createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition);
     var shadowImage = this.createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition);
-
     return new google.maps.Marker({position: markerLatLng, map: this.map, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage});
   }
 };

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

@@ -1,4 +1,7 @@
 class UsersController < ApplicationController    
+  
+  respond_to :html, :json, :gmaps4rails
+  
   def index
     @users = User.all
     @json  = User.all.to_gmaps4rails do |user|
@@ -13,6 +16,11 @@ class UsersController < ApplicationController
   def new
     @user = User.new
   end
+  
+  def renderer
+    @users = User.all
+    respond_with @users
+  end
 
   def create
     @user = User.new(params[:user])

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

@@ -1,23 +1,26 @@
 class User < ActiveRecord::Base
    
   acts_as_gmappable
-    
+  
   def gmaps4rails_address
     sec_address
   end
+  
+  
 
   
-  # def gmaps4rails_marker_picture
-  #   {
-  #   "picture" => "http://www.blankdots.com/img/github-32x32.png",
-  #   "width" => "32",
-  #   "height" => "32",
-  #   "shadow_picture" => "https://secure.gravatar.com/avatar/808bec1c640143bd7091888d9edfb2f2.png",
-  #   "shadow_height" => 40, 
-  #   "shadow_width" => 50,
-  #   "shadow_anchor" => [10, -30]
-  #   }
-  # end
+    # def gmaps4rails_marker_picture
+    #   {
+    #   "width" => "32",
+    #   "height" => "32",
+    #   "marker_anchor" => [2, -30],
+    #   "rich_marker" => "<div class='my-marker'>It works!<img height='30' width='30' src='http://farm4.static.flickr.com/3212/3012579547_097e27ced9_m.jpg'/></div>",
+    #   "shadow_picture" => "https://secure.gravatar.com/avatar/808bec1c640143bd7091888d9edfb2f2.png",
+    #   "shadow_height" => 40, 
+    #   "shadow_width" => 50,
+    #   "shadow_anchor" => [10, -30]
+    #   }
+    # end
   
   # 
   # def gmaps4rails_title

data/test/dummy/config/application.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
-
 # If you have a Gemfile, require the gems listed there, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
@@ -35,8 +34,8 @@ module Dummy
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
-
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    
   end
 end

data/test/dummy/config/routes.rb

@@ -1,7 +1,7 @@
 Dummy::Application.routes.draw do
   match "users/test_list" => "users#test_list", :as => "test_list"
   match "users/ajax_map" => "users#ajax_map", :as => "ajax_map"
-  
+  match "users/renderer" => "users#renderer", :as => "renderer"
   resources :users
   root :to => "users#index"
 end

data/test/dummy/spec/requests/users_spec.rb

@@ -19,5 +19,4 @@ describe "list creation", :js => true do
     page.should have_content("User2")
   end
   
-end
-
+end

data/test/dummy31/config/application.rb

@@ -40,4 +40,4 @@ module Dummy31
     # Enable the asset pipeline
     config.assets.enabled = true
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 49
+  prerelease: 
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 +02:00
-default_executable: 
+date: 2011-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack
@@ -119,7 +118,6 @@ files:
 - test/dummy31/db/migrate/20110809134019_create_users.rb
 - test/dummy31/db/schema.rb
 - test/dummy31/db/seeds.rb
-has_rdoc: true
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
 
@@ -149,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.9
 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.