gmaps4rails 0.3.0 → 0.4.0

data/app/controllers/gmaps4rails/gmaps_controller.rb

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

data/lib/acts_as_gmappable/base.rb

@@ -44,7 +44,7 @@ module Gmaps4rails
          end
          return array
        else #status != OK
-         raise Gmaps4rails::GeocodeStatus, "The adress you passed seems invalid, status was: #{parse["status"]}.
+         raise Gmaps4rails::GeocodeStatus, "The address you passed seems invalid, status was: #{parse["status"]}.
          Request was: #{request}"
        end #end parse status
        
@@ -73,12 +73,12 @@ module Gmaps4rails
           
           define_method "gmaps4rails_options" do
             {
-              :lat_column => args[:lat] || "latitude",
-              :lng_column => args[:lng] || "longitude",
-              :check_process => args[:check_process] || true,
-              :checker => args[:checker] || "gmaps",
-              :msg => args[:msg] || "Address invalid",
-              :validation => args[:validation] || true
+              :lat_column     => args[:lat]           || "latitude",
+              :lng_column     => args[:lng]           || "longitude",
+              :check_process  => args[:check_process] || true,
+              :checker        => args[:checker]       || "gmaps",
+              :msg            => args[:msg]           || "Address invalid",
+              :validation     => args[:validation]    || true
               #TODO: address as a proc?
             }
           end
@@ -103,7 +103,7 @@ module Gmaps4rails
           else #if no exception
             self[gmaps4rails_options[:lng_column]] = coordinates.first[:lng]
             self[gmaps4rails_options[:lat_column]] = coordinates.first[:lat]
-            if gmaps4rails_options[:check_process] = true
+            if gmaps4rails_options[:check_process] == true
               self[gmaps4rails_options[:checker]] = true
             end
           end
@@ -123,8 +123,7 @@ module Gmaps4rails
         
         def to_gmaps4rails
           json = "["
-          json += Gmaps4rails.create_json(self).to_s
-          json.chop! #removes the extra comma
+          json += Gmaps4rails.create_json(self).to_s.chop #removes the extra comma
           json += "]"
         end
         

data/lib/application_helper.rb

@@ -4,4 +4,9 @@ module ApplicationHelper
     render :partial => 'gmaps4rails/gmaps4rails', :locals => { :builder => builder, :options => options }
   end
   
+  def gmaps4rails(builder, options = {})
+    options.merge!({ "processing" => 'json' })
+    render :partial => 'gmaps4rails/gmaps4rails', :locals => { :builder => builder, :options => options }
+  end
+  
 end

data/lib/array.rb

@@ -4,7 +4,7 @@ class Array
     each do |object|
       json += Gmaps4rails.create_json(object).to_s
     end
-    json.chop!
+    json.chop! unless json == "["
     json += "]"
   end
 end

data/public/javascripts/gmaps4rails.js

@@ -9,6 +9,7 @@ var Gmaps4Rails = {
 	map_center_latitude : 0,
 	map_center_longitude : 0, 
 	map_zoom : 1,
+	auto_adjust : false,
 	base_url : '/gmaps',
 	rails_model : null,
 	model_scope : null,
@@ -20,6 +21,7 @@ var Gmaps4Rails = {
   do_clustering: true,
   clusterer_gridSize: 50,
 	clusterer_maxZoom: 10,
+	bounds: null,
 	//Triggers the creation of the map.
 	//Two options:
 	// 1- processing == "rails_model"  && builder = model_name
@@ -40,6 +42,9 @@ var Gmaps4Rails = {
 			this.locations = builder;
 			this.setup_Markers();
 		}
+		if (this.auto_adjust) {
+			this.map.fitBounds(this.bounds);
+		}
 	},
 	
 	//resets the map, removes all markers
@@ -68,7 +73,9 @@ var Gmaps4Rails = {
   setup_Markers: function () {		
 		//variable used for Marker Clusterer
 		var markers = [];
-	
+		//variable used for Auto-adjust
+		this.bounds = new google.maps.LatLngBounds(); 
+		
 		//resests Clusterer if needed
 		if (this.markerClusterer) {
 			this.markerClusterer.clearMarkers();
@@ -94,7 +101,13 @@ var Gmaps4Rails = {
 					//save the marker again in a list for the clusterer
 					markers.push(ThisMarker);		
 					//add click listener
-		  	  google.maps.event.addListener(Gmaps4Rails.locations[i].marker_object, 'click', function() { if (Gmaps4Rails.info_window!=null) {Gmaps4Rails.info_window.close();}; Gmaps4Rails.getInfoWindow(this);});		
+		  	  google.maps.event.addListener(Gmaps4Rails.locations[i].marker_object, 'click', function() { if (Gmaps4Rails.info_window!=null) {Gmaps4Rails.info_window.close();}; Gmaps4Rails.getInfoWindow(this);});
+		
+					//extending bounds, ref: http://unicornless.com/code/google-maps-v3-auto-zoom-and-auto-center
+					if (this.auto_adjust) {
+					    var ll = new google.maps.LatLng(this.locations[i].latitude, this.locations[i].longitude);
+					    this.bounds.extend(ll);
+					}		
 		 }
 		this.setup_Clusterer(markers);
 	},

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

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

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

@@ -0,0 +1,42 @@
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+    @json  = User.all.to_gmaps4rails
+  end
+
+  def show
+    @user = User.find(params[:id])
+  end
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new(params[:user])
+    if @user.save
+      redirect_to @user, :notice => "Successfully created user."
+    else
+      render :action => 'new'
+    end
+  end
+
+  def edit
+    @user = User.find(params[:id])
+  end
+
+  def update
+    @user = User.find(params[:id])
+    if @user.update_attributes(params[:user])
+      redirect_to @user, :notice  => "Successfully updated user."
+    else
+      render :action => 'edit'
+    end
+  end
+
+  def destroy
+    @user = User.find(params[:id])
+    @user.destroy
+    redirect_to users_url, :notice => "Successfully destroyed user."
+  end
+end

data/test/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/dummy/app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

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

@@ -0,0 +1,8 @@
+class User < ActiveRecord::Base
+  acts_as_gmappable
+  
+  def gmaps4rails_address
+    address
+  end
+
+end

data/test/dummy/config/application.rb

@@ -0,0 +1,42 @@
+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)
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # 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/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Dummy::Application.initialize!

data/test/dummy/config/environments/development.rb

@@ -0,0 +1,26 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/test/dummy/config/environments/production.rb

@@ -0,0 +1,49 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/dummy/config/environments/test.rb

@@ -0,0 +1,35 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/dummy/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = '2a919a7d43f61da3daa4f6ea302b6c57ecc7ba76129e9ab4d8021e5588c927e6f52027e10bbc5a82cc0715002c5455e36461e8c785b47a5c2e1db59dcf53c6e1'

data/test/dummy/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# Dummy::Application.config.session_store :active_record_store

data/test/dummy/config/routes.rb

@@ -0,0 +1,4 @@
+Dummy::Application.routes.draw do
+  resources :users
+  root :to => "users#index"
+end

data/test/dummy/db/migrate/20110306182914_create_users.rb

@@ -0,0 +1,21 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string    :name
+      t.string    :address
+      t.text      :description
+      t.string    :picture
+      t.float     :lat_test
+      t.float     :long_test
+      t.float     :latitude
+      t.float     :longitude
+      t.boolean   :gmaps
+      t.boolean   :bool_test
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/test/dummy/db/schema.rb

@@ -0,0 +1,30 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110306182914) do
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "address"
+    t.text     "description"
+    t.string   "picture"
+    t.float    "lat_test"
+    t.float    "long_test"
+    t.float    "latitude"
+    t.float    "longitude"
+    t.boolean  "gmaps"
+    t.boolean  "bool_test"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/dummy/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Mayor.create(:name => 'Daley', :city => cities.first)

data/test/dummy/spec/base/base_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Basic Functions" do
+  #Gmaps4rails.geocode(address)
+  it "should geocode properly an address" do
+    Gmaps4rails.geocode("alaska").should == [{:lat=>63.588753, :lng=>-154.4930619, :matched_address=>"Alaska, USA"}]
+  end
+  
+  it "should raise an error when error invalid" do
+    lambda { Gmaps4rails.geocode("home")}.should raise_error Gmaps4rails::GeocodeStatus
+  end
+  
+  it "should raise an error when net connection failed" #TODO: Damn, I don't know how to test that!
+  
+end

data/test/dummy/spec/controllers/users_controller_spec.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe UsersController do
+  fixtures :all
+  render_views
+
+  it "index action should render index template" do
+    get :index
+    response.should render_template(:index)
+  end
+
+  it "show action should render show template" do
+    get :show, :id => User.first
+    response.should render_template(:show)
+  end
+
+  it "new action should render new template" do
+    get :new
+    response.should render_template(:new)
+  end
+
+  it "create action should render new template when model is invalid" do
+    User.any_instance.stubs(:valid?).returns(false)
+    post :create
+    response.should render_template(:new)
+  end
+
+  it "create action should redirect when model is valid" do
+    User.any_instance.stubs(:valid?).returns(true)
+    post :create
+    response.should redirect_to(user_url(assigns[:user]))
+  end
+
+  it "edit action should render edit template" do
+    get :edit, :id => User.first
+    response.should render_template(:edit)
+  end
+
+  it "update action should render edit template when model is invalid" do
+    User.any_instance.stubs(:valid?).returns(false)
+    put :update, :id => User.first
+    response.should render_template(:edit)
+  end
+
+  it "update action should redirect when model is valid" do
+    User.any_instance.stubs(:valid?).returns(true)
+    put :update, :id => User.first
+    response.should redirect_to(user_url(assigns[:user]))
+  end
+
+  it "destroy action should destroy model and redirect to index action" do
+    user = User.first
+    delete :destroy, :id => user
+    response.should redirect_to(users_url)
+    User.exists?(user.id).should be_false
+  end
+end

data/test/dummy/spec/models/user_spec.rb

@@ -0,0 +1,168 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Acts as gmappable" do
+  
+  describe "standard configuration, valid user" do
+    before(:each) do
+      @user = User.create!(:name => "me", :address => "Toulon, France" )
+    end
+    
+    it "should have a geocoded position" do
+      @user.latitude.should  == 43.1251606
+      @user.longitude.should == 5.9311119
+    end
+
+    it "should set boolean to true once user is created" do
+      @user.gmaps.should == true
+    end
+
+    it "should render a valid json from an array of ojects" do
+      @user2 = User.create!(:name => "me", :address => "Paris, France" )
+      User.all.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ,{\"description\": \"\",\n\"longitude\": \"2.3509871\",\n\"latitude\": \"48.8566667\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+    end
+
+    it "should render a valid json from a single object" do
+      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+    end
+    
+  end
+  
+
+  describe "standard configuration, invalid address" do
+    before(:each) do
+      @user = User.new(:name => "me", :address => "home" )
+    end
+    
+    it "should raise an error if validation option is turned on and address incorrect" do
+      @user.should_not be_valid, "Address invalid"
+    end
+    
+    it "should not set boolean to true when address update fails" do
+      @user["gmaps"].should_not == true
+    end
+  end
+
+
+  describe "model customization" do  
+    it "should render a valid json even if there is no instance in the db" do
+      User.all.to_gmaps4rails.should == "[]"
+    end
+    
+    it "should display the proper error message when address is invalid" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "latitude",
+            :lng_column     => "longitude",
+            :check_process  => true,
+            :checker        => "gmaps",
+            :msg            => "Custom Address invalid",
+            :validation     => true
+          }
+        end
+      end
+      @user = User.new(:name => "me", :address => "home" )
+      @user.should_not be_valid, "Custom Address invalid"
+    end
+  
+    it "should not raise an error if validation option is turned off" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "latitude",
+            :lng_column     => "longitude",
+            :check_process  => true,
+            :checker        => "gmaps",
+            :msg            => "Address invalid",
+            :validation     => false
+          }
+        end
+      end
+      @user = User.new(:name => "me", :address => "home" )
+      @user.should be_valid
+    end
+    
+    it "should save longitude and latitude to the customized columns" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "lat_test",
+            :lng_column     => "long_test",
+            :check_process  => true,
+            :checker        => "gmaps",
+            :msg            => "Address invalid",
+            :validation     => true
+          }
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user.lat_test.should  == 43.1251606
+      @user.long_test.should == 5.9311119
+      @user.longitude.should == nil
+      @user.latitude.should  == nil
+      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+    end
+    
+    it "should not save the boolean if check_process is false" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "lat_test",
+            :lng_column     => "long_test",
+            :check_process  => false,
+            :checker        => "gmaps",
+            :msg            => "Address invalid",
+            :validation     => true
+          }
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user.gmaps.should == nil
+    end
+    
+    it "should save to the proper boolean checker set in checker" do
+      User.class_eval do
+        def gmaps4rails_options
+          {
+            :lat_column     => "lat_test",
+            :lng_column     => "long_test",
+            :check_process  => true,
+            :checker        => "bool_test",
+            :msg            => "Address invalid",
+            :validation     => true
+          }
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user.gmaps.should == nil
+      @user.bool_test.should == true
+    end
+    
+    it "should take into account the description provided in the model" do 
+      User.class_eval do
+        def gmaps4rails_infowindow
+          "My Beautiful Picture: #{picture}"
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France", :picture => "http://www.blankdots.com/img/github-32x32.png")
+      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"\",\n\"width\": \"\",\n\"height\": \"\"\n} ]"
+    end
+    
+    it "should take into account the picture provided in the model" do 
+      User.class_eval do
+        def gmaps4rails_infowindow
+          #to reset the former declaration
+        end
+        def gmaps4rails_marker_picture
+          {
+          "picture" => "http://www.blankdots.com/img/github-32x32.png",
+          "width" => "32",
+          "height" => "32"
+          }
+        end
+      end
+      @user = User.create!(:name => "me", :address => "Toulon, France")
+      @user.to_gmaps4rails.should == "[{\"description\": \"\",\n\"longitude\": \"5.9311119\",\n\"latitude\": \"43.1251606\",\n\"picture\": \"http://www.blankdots.com/img/github-32x32.png\",\n\"width\": \"32\",\n\"height\": \"32\"\n} ]"
+    end
+  end
+end

data/test/dummy/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+end

data/test/dummy/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/test/dummy/test/test_helper.rb

@@ -0,0 +1,13 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 15
+  prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,8 +61,32 @@ files:
 - public/javascripts/old.js
 - public/stylesheets/gmaps4rails.css
 - README.rdoc
-- test/test_helper.rb
-- test/unit/gmaps4rails_widget_test.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/users_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/users_helper.rb
+- test/dummy/app/models/user.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/routes.rb
+- test/dummy/db/migrate/20110306182914_create_users.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/seeds.rb
+- test/dummy/spec/base/base_spec.rb
+- test/dummy/spec/controllers/users_controller_spec.rb
+- test/dummy/spec/models/user_spec.rb
+- test/dummy/spec/spec_helper.rb
+- test/dummy/test/performance/browsing_test.rb
+- test/dummy/test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/apneadiving/Google-Maps-for-Rails
 licenses: []
@@ -93,10 +117,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Enables easy display of items (taken from a Rails 3 model) on a Google Map. Uses Javascript API V3.
 test_files: 
-- test/test_helper.rb
-- test/unit/gmaps4rails_widget_test.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/users_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/users_helper.rb
+- test/dummy/app/models/user.rb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/routes.rb
+- test/dummy/db/migrate/20110306182914_create_users.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/seeds.rb
+- test/dummy/spec/base/base_spec.rb
+- test/dummy/spec/controllers/users_controller_spec.rb
+- test/dummy/spec/models/user_spec.rb
+- test/dummy/spec/spec_helper.rb
+- test/dummy/test/performance/browsing_test.rb
+- test/dummy/test/test_helper.rb

data/test/test_helper.rb

@@ -1,56 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-
-require 'test/unit'
-require 'rubygems'
-require 'yaml'
-require 'active_record'
-require 'mysql'
-
-require 'app/models/gmaps4rails/widget.rb'
-
-def gmaps4rails_widget( fixture_name )
-  id = @@fixtures['gmaps4rails_widget'][ fixture_name.to_s ][ 'id' ]
-  gmaps4rails::Widget.find( id )
-end
-
-def load_schema
-  config = YAML::load( IO.read( File.dirname(__FILE__) + '/database.yml') )
-
-  # Manually initialize the database
-  conn = Mysql.real_connect( config['mysql']['host'], config['mysql']['username'], config['mysql']['password'] )
-  conn.query( "CREATE DATABASE IF NOT EXISTS #{config['mysql']['database']}" )
-  
-  ActiveRecord::Base.establish_connection( config['mysql'] )
-  ActiveRecord::Base.connection()
-  
-  load(File.dirname(__FILE__) + "/../" +
-    "lib/rails/generators/gmaps4rails/templates/schema.rb")
-
-  @@fixtures = {}
-  
-  load_fixture( 'gmaps4rails_widget' )
-end
-
-def load_fixture( table )
-  @@fixtures[ table ] = {}
-  fixture = YAML::load( IO.read( File.dirname(__FILE__) + "/fixtures/#{table}.yml") )
-  @@fixtures[ table ] = fixture
-
-  klass = class_eval table.titleize.gsub(/ /, '::')
-
-  fixture.each do |record_name, record|
-    record.each do |column, value|
-      if ( match = column.match(/(.*)_id/) )
-        fixture_reference = "gmaps4rails_" + match[1].pluralize
-        if value.is_a? Symbol
-          r = class_eval "#{fixture_reference}( '#{value}' )"
-          record[ column ] = r.id
-        end
-      end
-    end
-      
-    r = klass.create( record )
-    @@fixtures[ table ][ record_name ][ 'id' ] = r.id
-  end
-
-end

data/test/unit/gmaps4rails_widget_test.rb

@@ -1,11 +0,0 @@
-require 'test_helper'
-
-class WidgetTest < Test::Unit::TestCase
-  load_schema
-
-  def test_fixtures_are_working
-    assert_equal gmaps4rails_widget(:first).title, "This is the title"
-  end
-  
-    
-end