gmaps4rails 0.8.8 → 0.9.0

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

@@ -44,4 +44,8 @@ class UsersController < ApplicationController
   def test_list
     @json  = User.all.to_gmaps4rails
   end
+  
+  def ajax_map
+  end
+  
 end

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

@@ -10,7 +10,8 @@ class User < ActiveRecord::Base
   #   {
   #   "picture" => "http://www.blankdots.com/img/github-32x32.png",
   #   "width" => "32",
-  #   "height" => "32"
+  #   "height" => "32",
+  #   "marker_anchor" => [10,20]
   #   }
   # end
   # 

data/test/dummy/config/routes.rb

@@ -1,5 +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"
+  
   resources :users
   root :to => "users#index"
 end

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

@@ -45,7 +45,7 @@ describe "JS creation from hash" do
                             "options" => {"waypoints" => ["toulouse, france", "brest, france"], "travelMode" => "DRIVING", "display_panel" => true, "panel_id" => "instructions"}
                           }
     }
-    options_hash.to_gmaps4rails.should == "Gmaps4Rails.polylines = [[\n{\"longitude\": -122.214897, \"latitude\": 37.772323},\n{\"longitude\": -157.821856, \"latitude\": 21.291982},\n{\"longitude\": 178.431, \"latitude\": -18.142599},\n{\"longitude\": 153.027892, \"latitude\": -27.46758}\n],\n[\n{\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },\n{\"longitude\": -10.821856, \"latitude\": 50.291982}\n]];\nGmaps4Rails.create_polylines();\nGmaps4Rails.circles = [\n{\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},\n{\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}\n];\nGmaps4Rails.create_circles();\nGmaps4Rails.polygons = [[\n{\"longitude\": -80.190262, \"latitude\": 25.774252},\n{\"longitude\": -66.118292, \"latitude\": 18.466465},\n{\"longitude\": -64.75737, \"latitude\": 32.321384}\n]];\nGmaps4Rails.create_polygons();\nGmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];\nGmaps4Rails.create_markers();\nGmaps4Rails.direction_conf.origin = 'toulon, france';\nGmaps4Rails.direction_conf.destination = 'paris, france';\nGmaps4Rails.direction_conf.display_panel = true;\nGmaps4Rails.direction_conf.panel_id = 'instructions';\nGmaps4Rails.direction_conf.travelMode = 'DRIVING';\nGmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];\nGmaps4Rails.create_direction();\nif(typeof gmaps4rails_callback == 'function') { gmaps4rails_callback(); }"
+    options_hash.to_gmaps4rails.should == "Gmaps4Rails.polylines = [[\n{\"longitude\": -122.214897, \"latitude\": 37.772323},\n{\"longitude\": -157.821856, \"latitude\": 21.291982},\n{\"longitude\": 178.431, \"latitude\": -18.142599},\n{\"longitude\": 153.027892, \"latitude\": -27.46758}\n],\n[\n{\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },\n{\"longitude\": -10.821856, \"latitude\": 50.291982}\n]];\nGmaps4Rails.create_polylines();\nGmaps4Rails.circles = [\n{\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},\n{\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}\n];\nGmaps4Rails.create_circles();\nGmaps4Rails.polygons = [[\n{\"longitude\": -80.190262, \"latitude\": 25.774252},\n{\"longitude\": -66.118292, \"latitude\": 18.466465},\n{\"longitude\": -64.75737, \"latitude\": 32.321384}\n]];\nGmaps4Rails.create_polygons();\nGmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];\nGmaps4Rails.create_markers();\nGmaps4Rails.direction_conf.origin = 'toulon, france';\nGmaps4Rails.direction_conf.destination = 'paris, france';\nGmaps4Rails.direction_conf.display_panel = true;\nGmaps4Rails.direction_conf.panel_id = 'instructions';\nGmaps4Rails.direction_conf.travelMode = 'DRIVING';\nGmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];\nGmaps4Rails.create_direction();\nGmaps4Rails.callback();"
   end
   
   it "should add map settings when 'true' passed" do
@@ -77,7 +77,7 @@ describe "JS creation from hash" do
                             "options" => {"waypoints" => ["toulouse, france", "brest, france"], "travelMode" => "DRIVING", "display_panel" => true, "panel_id" => "instructions"}
                           }
     }
-    options_hash.to_gmaps4rails(true).should == "Gmaps4Rails.map_options.center_longitude = 180;\nGmaps4Rails.map_options.type = 'SATELLITE';\nGmaps4Rails.map_options.zoom = 3;\nGmaps4Rails.initialize();\nGmaps4Rails.polylines = [[\n{\"longitude\": -122.214897, \"latitude\": 37.772323},\n{\"longitude\": -157.821856, \"latitude\": 21.291982},\n{\"longitude\": 178.431, \"latitude\": -18.142599},\n{\"longitude\": 153.027892, \"latitude\": -27.46758}\n],\n[\n{\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },\n{\"longitude\": -10.821856, \"latitude\": 50.291982}\n]];\nGmaps4Rails.create_polylines();\nGmaps4Rails.circles = [\n{\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},\n{\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}\n];\nGmaps4Rails.create_circles();\nGmaps4Rails.polygons = [[\n{\"longitude\": -80.190262, \"latitude\": 25.774252},\n{\"longitude\": -66.118292, \"latitude\": 18.466465},\n{\"longitude\": -64.75737, \"latitude\": 32.321384}\n]];\nGmaps4Rails.create_polygons();\nGmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];\nGmaps4Rails.create_markers();\nGmaps4Rails.direction_conf.origin = 'toulon, france';\nGmaps4Rails.direction_conf.destination = 'paris, france';\nGmaps4Rails.direction_conf.display_panel = true;\nGmaps4Rails.direction_conf.panel_id = 'instructions';\nGmaps4Rails.direction_conf.travelMode = 'DRIVING';\nGmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];\nGmaps4Rails.create_direction();\nif(typeof gmaps4rails_callback == 'function') { gmaps4rails_callback(); }"
+    options_hash.to_gmaps4rails(true).should == "Gmaps4Rails.map_options.center_longitude = 180;\nGmaps4Rails.map_options.type = 'SATELLITE';\nGmaps4Rails.map_options.zoom = 3;\nGmaps4Rails.initialize();\nGmaps4Rails.polylines = [[\n{\"longitude\": -122.214897, \"latitude\": 37.772323},\n{\"longitude\": -157.821856, \"latitude\": 21.291982},\n{\"longitude\": 178.431, \"latitude\": -18.142599},\n{\"longitude\": 153.027892, \"latitude\": -27.46758}\n],\n[\n{\"longitude\": -120.214897, \"latitude\": 30.772323, \"strokeColor\": \"#000\", \"strokeWeight\" : 2 },\n{\"longitude\": -10.821856, \"latitude\": 50.291982}\n]];\nGmaps4Rails.create_polylines();\nGmaps4Rails.circles = [\n{\"longitude\": -122.214897, \"latitude\": 37.772323, \"radius\": 1000000},\n{\"longitude\": 122.214897, \"latitude\": 37.772323, \"radius\": 1000000, \"strokeColor\": \"#FF0000\"}\n];\nGmaps4Rails.create_circles();\nGmaps4Rails.polygons = [[\n{\"longitude\": -80.190262, \"latitude\": 25.774252},\n{\"longitude\": -66.118292, \"latitude\": 18.466465},\n{\"longitude\": -64.75737, \"latitude\": 32.321384}\n]];\nGmaps4Rails.create_polygons();\nGmaps4Rails.markers = [{ \"description\": \"\", \"title\": \"\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ,{ \"description\": \"\", \"title\": \"\", \"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\" } ];\nGmaps4Rails.create_markers();\nGmaps4Rails.direction_conf.origin = 'toulon, france';\nGmaps4Rails.direction_conf.destination = 'paris, france';\nGmaps4Rails.direction_conf.display_panel = true;\nGmaps4Rails.direction_conf.panel_id = 'instructions';\nGmaps4Rails.direction_conf.travelMode = 'DRIVING';\nGmaps4Rails.direction_conf.waypoints = [{\"stopover\":true,\"location\":\"toulouse, france\"},{\"stopover\":true,\"location\":\"brest, france\"}];\nGmaps4Rails.create_direction();\nGmaps4Rails.callback();"
   end
 end
 

data/test/dummy/spec/javascripts/support/jasmine_config.rb

@@ -0,0 +1,23 @@
+module Jasmine
+  class Config
+
+    # Add your overrides or custom config code here
+
+  end
+end
+
+
+# Note - this is necessary for rspec2, which has removed the backtrace
+module Jasmine
+  class SpecBuilder
+    def declare_spec(parent, spec)
+      me = self
+      example_name = spec["name"]
+      @spec_ids << spec["id"]
+      backtrace = @example_locations[parent.description + " " + example_name]
+      parent.it example_name, {} do
+        me.report_spec(spec["id"])
+      end
+    end
+  end
+end

data/test/dummy/spec/javascripts/support/jasmine_runner.rb

@@ -0,0 +1,20 @@
+$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
+
+require 'rubygems'
+require 'jasmine'
+require 'rspec'
+jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))
+require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
+
+jasmine_config = Jasmine::Config.new
+spec_builder = Jasmine::SpecBuilder.new(jasmine_config)
+
+should_stop = false
+
+RSpec.configuration.after(:suite) do
+  spec_builder.stop if should_stop
+end
+
+spec_builder.start
+should_stop = true
+spec_builder.declare_suites

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

@@ -1,384 +1,269 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "Acts as gmappable" do
-  
-  before(:each) do 
-    #reset all configuration to default or nil
-    User.class_eval do
-      def gmaps4rails_options
-        {
-          :lat_column     => "latitude",
-          :lng_column     => "longitude",
-          :check_process  => true,
-          :checker        => "gmaps",
-          :msg            => "Address invalid",
-          :validation     => true,
-          :address    => "gmaps4rails_address",
-          :language   => "en"
-        }
-      end
+DEFAULT_CONFIG_HASH = {
+  :lat_column     => "latitude",
+  :lng_column     => "longitude",
+  :check_process  => true,
+  :checker        => "gmaps",
+  :msg            => "Address invalid",
+  :validation     => true,
+  :address    => "gmaps4rails_address",
+  :language   => "en"
+}
+
+PARIS  = { :latitude => 48.856614, :longitude => 2.3522219 }
+TOULON = { :latitude => 43.124228, :longitude => 5.928 }
+
+#set model configuration
+def set_gmaps4rails_options!(change_conf = {})
+  User.class_eval do
+    define_method "gmaps4rails_options" do
+      DEFAULT_CONFIG_HASH.merge(change_conf)
     end
-    @toulon = { :latitude => 43.124228, :longitude => 5.928}
-    @paris = { :latitude => 48.856614, :longitude => 2.3522219}
   end
+end
+
+set_gmaps4rails_options!
+
+describe Gmaps4rails::ActsAsGmappable do
+
+  let(:user)         { Factory(:user) }
+  let(:invalid_user) { Factory.build(:invalid_user) }
   
-  describe "standard configuration, valid user" do
-    before(:each) do
-      @user = Factory(:user)
-    end
+  context "standard configuration, valid user" do  
     
     it "should have a geocoded position" do
-      @user.latitude.should  == @toulon[:latitude]
-      @user.longitude.should == @toulon[:longitude]
+      user.should have_same_position_as TOULON
     end
   
     it "should set boolean to true once user is created" do
-      @user.gmaps.should == true
+      user.gmaps.should be_true
     end
   
     it "should render a valid json from an array of ojects" do
-      @user2 = Factory(:user_paris)
-      User.all.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"},\n{\"longitude\": \"" + @paris[:longitude].to_s + "\", \"latitude\": \"" + @paris[:latitude].to_s + "\"}]"
+      user #needed trigger the object from the let statement
+      Factory(:user_paris)
+      User.all.to_gmaps4rails.should == "[{\"longitude\": \"" + TOULON[:longitude].to_s + "\", \"latitude\": \"" + TOULON[:latitude].to_s + "\"},\n{\"longitude\": \"" + PARIS[:longitude].to_s + "\", \"latitude\": \"" + PARIS[:latitude].to_s + "\"}]"
     end
   
     it "should render a valid json from a single object" do
-      @user.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
+      user.to_gmaps4rails.should == "[{\"longitude\": \"" + TOULON[:longitude].to_s + "\", \"latitude\": \"" + TOULON[:latitude].to_s + "\"}]"
     end
     
     it "should not geocode again after address changes if checker is true" do
-      @user.sec_address = "paris, France"
-      @user.save
-      @user.latitude.should  == @toulon[:latitude]
-      @user.longitude.should == @toulon[:longitude]
+      user.update_attributes({ :sec_address => "PARIS, France" })
+      user.should have_same_position_as TOULON
     end
     
     it "should geocode after address changes if checker is false" do
-      @user.sec_address = "paris, France"
-      @user.gmaps = false
-      @user.save
-      @user.latitude.should  == @paris[:latitude]
-      @user.longitude.should == @paris[:longitude]
+      user.update_attributes({ :sec_address => "PARIS, France", 
+                               :gmaps        => false})
+      user.should have_same_position_as PARIS
     end
   end
   
   
-  describe "standard configuration, invalid address" do
-    before(:each) do
-      @user = Factory.build(:invalid_user)
-    end
+  context "standard configuration, invalid address" do
     
     it "should raise an error if validation option is turned on and address incorrect" do
-      @user.should_not be_valid, "Address invalid"
+      invalid_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
+      invalid_user.gmaps.should_not be_true
     end
   end
   
   
-  describe "model customization" do
-    
+  context "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 use indifferently a db column for address if passed in config" do
-      User.class_eval do
-        def gmaps4rails_options
-          {
-            :lat_column     => "latitude",
-            :lng_column     => "longitude",
-            :check_process  => true,
-            :checker        => "gmaps",
-            :msg            => "Address invalid",
-            :validation     => true,
-            :address    => "sec_address",
-            :language   => "en"
-          }
-        end
+    context "acts_as_gmappable options" do
+     
+      after(:all) do 
+        #reset all configuration to default
+        set_gmaps4rails_options!
       end
-      @user = Factory(:user)
-      @user.latitude.should  == @toulon[:latitude]
-      @user.longitude.should == @toulon[:longitude]
-    end
-    
-    it "should save the normalized address if requested" do
-      User.class_eval do
-        def gmaps4rails_options
-          {
-            :lat_column     => "latitude",
-            :lng_column     => "longitude",
-            :check_process  => true,
-            :checker        => "gmaps",
-            :msg            => "Address invalid",
-            :validation     => true,
-            :normalized_address => "norm_address",
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+      
+      it "should use indifferently a db column for address if passed in config" do
+        set_gmaps4rails_options!({:address => "sec_address"})
+        user.should have_same_position_as TOULON
       end
-      @user = Factory(:user)
-      @user.norm_address.should == "Toulon, France"
-    end
-    
-    it "should override user's address with normalized address if requested" 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,
-            :normalized_address => "sec_address",
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should save the normalized address if requested" do
+        set_gmaps4rails_options!({ :normalized_address => "norm_address" })
+        user.norm_address.should == "Toulon, France"
       end
-      @user = Factory.build(:user)
-      @user.sec_address.should == "Toulon, France"
-    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,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should override user's address with normalized address if requested" do
+        set_gmaps4rails_options!({ :normalized_address => "sec_address" })
+        user = Factory(:user, :sec_address => "ToUlOn, FrAnCe")
+        user.sec_address.should == "Toulon, France"
       end
-      @user = Factory.build(:invalid_user)
-      @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,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should display the proper error message when address is invalid" do
+        set_gmaps4rails_options!({ :msg => "Custom Address invalid"})
+        invalid_user.should_not be_valid
+        invalid_user.errors[:gmaps4rails_address].should include("Custom Address invalid")
       end
-      @user = Factory.build(:invalid_user)
-      @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,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should not raise an error if validation option is turned off" do
+        set_gmaps4rails_options!({ :validation => false })
+        invalid_user.should be_valid
       end
-      @user = Factory(:user)
-      @user.lat_test.should  == @toulon[:latitude]
-      @user.long_test.should == @toulon[:longitude]
-      @user.longitude.should == nil
-      @user.latitude.should  == nil
-    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,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should save longitude and latitude to the customized columns" do
+        set_gmaps4rails_options!({
+                                :lat_column     => "lat_test",
+                                :lng_column     => "long_test"
+                                })
+        user.latitude.should be_nil
+        user.should have_same_position_as TOULON
       end
-      @user = Factory(:user)
-      @user.gmaps.should == nil
-    end
-    
-    it "should geocode after each save if 'check_process' is false" do
-      User.class_eval do
-        def gmaps4rails_options
-          {
-            :lat_column     => "latitude",
-            :lng_column     => "longitude",
-            :check_process  => false,
-            :checker        => "gmaps",
-            :msg            => "Address invalid",
-            :validation     => true,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
-        end
+
+      it "should not save the boolean if check_process is false" do
+        set_gmaps4rails_options!({ :check_process  => false })
+        user.gmaps.should be_nil
       end
-      @user = Factory(:user)
-      @user.sec_address = "paris, France"
-      @user.save
-      @user.latitude.should  == @paris[:latitude]
-      @user.longitude.should == @paris[:longitude]
-    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,
-            :address    => "gmaps4rails_address",
-            :language   => "en"
-          }
+
+      it "should geocode after each save if 'check_process' is false" do
+        set_gmaps4rails_options!({ :check_process  => false })
+        user = Factory(:user, :sec_address => "PARIS, France")
+        user.should have_same_position_as PARIS
+      end
+
+      it "should save to the proper boolean checker set in checker" do
+        set_gmaps4rails_options!({ :checker => "bool_test" })
+        user.gmaps.should be_nil
+        user.bool_test.should be_true
+      end     
+      
+      it "should call a callback in the model if asked to" do
+        User.class_eval do
+          def gmaps4rails_options
+            DEFAULT_CONFIG_HASH.merge({ :callback   => "save_callback" })
+          end
+
+          def save_callback(data)
+            self.called_back = true
+          end
+
+          attr_accessor :called_back
         end
+        user.called_back.should be_true
       end
-      @user = Factory(:user)
-      @user.gmaps.should == nil
-      @user.bool_test.should == true
+
+      it "should return results in the specified language" do
+        set_gmaps4rails_options!({ 
+                                :language   => "de",
+                                :normalized_address => "norm_address"
+                                })
+        user.norm_address.should == "Toulon, Frankreich"
+      end
+      
     end
-    
-    it "should take into account the description provided in the model" do
-      @user = Factory(:user_with_pic)
-      @user.class_eval do
-        def gmaps4rails_infowindow
-          "My Beautiful Picture: #{picture}"
+
+    context "instance methods" do
+      let(:user_with_pic) { Factory(:user_with_pic) }
+      
+      it "should take into account the description provided in the model" do
+        user_with_pic.instance_eval do
+          def gmaps4rails_infowindow
+            "My Beautiful Picture: #{picture}"
+          end
         end
+        user_with_pic.to_gmaps4rails.should include "\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\""
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
-    end
     
-    it "should take into account the picture provided in the model" do
-      @user = Factory(:user)
-      @user.class_eval do
-        def gmaps4rails_marker_picture
-          {
-          "picture" => "http://www.blankdots.com/img/github-32x32.png",
-          "width" => "32",
-          "height" => "32"
-          }
+      it "should take into account the picture provided in the model" do
+        user.instance_eval do
+          def gmaps4rails_marker_picture
+            {
+            "picture" => "http://www.blankdots.com/img/github-32x32.png",
+            "width" => "32",
+            "height" => "32"
+            }
+          end
         end
+        result = user.to_gmaps4rails
+        result.should include "\"picture\": \"http://www.blankdots.com/img/github-32x32.png\""
+        result.should include "\"width\": \"32\"" 
+        result.should include "\"height\": \"32\""
       end
-      @user.to_gmaps4rails.should == "[{\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
-    end
-    
-    it "should take into account the title provided in the model" do
-      @user = Factory(:user)
-      @user.class_eval do
-        def gmaps4rails_title
-          "Sweet Title"
+      
+      it "should take into account the picture and shadow provided in the model" do
+        user.instance_eval do
+          def gmaps4rails_marker_picture
+            {
+            "picture" => "http://www.blankdots.com/img/github-32x32.png",
+            "width" => "32",
+            "height" => "32",
+            "marker_anchor" => [10, 20],
+            "shadow_picture" => "http://code.google.com/apis/maps/documentation/javascript/examples/images/beachflag_shadow.png" ,
+            "shadow_width" => "40",
+            "shadow_height" => "40",
+            "shadow_anchor" => [5, 10]
+            }
+          end
         end
+        result = user.to_gmaps4rails
+        result.should include "\"shadow_width\": \"40\""
+        result.should include "\"shadow_height\": \"40\""
+        result.should include "\"shadow_picture\": \"http://code.google.com/apis/maps/documentation/javascript/examples/images/beachflag_shadow.png\""
+        result.should include "\"shadow_anchor\": [5, 10]"
+        result.should include "\"marker_anchor\": [10, 20]"
       end
-      @user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
-    end
     
-    it "should take into account the sidebar content provided in the model" do
-      @user = Factory(:user)
-      @user.class_eval do
-        def gmaps4rails_sidebar
-          "sidebar content"
+      it "should take into account the title provided in the model" do
+        user.instance_eval do
+          def gmaps4rails_title
+            "Sweet Title"
+          end
         end
+        user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"" + TOULON[:longitude].to_s + "\", \"latitude\": \"" + TOULON[:latitude].to_s + "\"}]"
       end
-      @user.to_gmaps4rails.should == "[{\"sidebar\": \"sidebar content\",\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\"}]"
-    end
     
-    it "should take into account all additional data provided in the model" do
-      @user = Factory(:user)
-      
-      @user.instance_eval do
-        def gmaps4rails_infowindow
-          "My Beautiful Picture: #{picture}"
-        end
-        
-        def gmaps4rails_marker_picture
-          {
-          "picture" => "http://www.blankdots.com/img/github-32x32.png",
-          "width" => "32",
-          "height" => "32"
-          }
-        end
-        
-        def gmaps4rails_title
-          "Sweet Title"
-        end
-        
-        def gmaps4rails_sidebar
-          "sidebar content"
+      it "should take into account the sidebar content provided in the model" do
+        user.instance_eval do
+          def gmaps4rails_sidebar
+            "sidebar content"
+          end
         end
+        user.to_gmaps4rails.should include "\"sidebar\": \"sidebar content\""
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: \", \"title\": \"Sweet Title\", \"sidebar\": \"sidebar content\",\"longitude\": \"" + @toulon[:longitude].to_s + "\", \"latitude\": \"" + @toulon[:latitude].to_s + "\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
-    end
     
-    it "should call a callback in the model if asked to" do
-      User.class_eval do
-        def gmaps4rails_options
-          {
-            :lat_column     => "latitude",
-            :lng_column     => "longitude",
-            :check_process  => true,
-            :checker        => "gmaps",
-            :msg            => "Address invalid",
-            :validation     => true,
-            :address    => "gmaps4rails_address",
-            :language   => "en",
-            :callback   => "save_callback"
-          }
-        end
+      it "should take into account all additional data provided in the model" do
+        user.instance_eval do
+          def gmaps4rails_infowindow
+            "My Beautiful Picture: #{picture}"
+          end
         
-        def save_callback(data)
-          self.called_back = true
-        end
+          def gmaps4rails_marker_picture
+            {
+            "picture" => "http://www.blankdots.com/img/github-32x32.png",
+            "width" => "32",
+            "height" => "32"
+            }
+          end
         
-        attr_accessor :called_back
-      end
-      @user = Factory(:user)
-      @user.called_back.should == true
-    end
-    
-    it "should return results in the specified language" do
-      User.class_eval do
-        def gmaps4rails_options
-          {
-            :lat_column     => "latitude",
-            :lng_column     => "longitude",
-            :check_process  => true,
-            :checker        => "gmaps",
-            :msg            => "Address invalid",
-            :validation     => true,
-            :address    => "gmaps4rails_address",
-            :language   => "de",
-            :normalized_address => "norm_address"
-          }
+          def gmaps4rails_title
+            "Sweet Title"
+          end
+        
+          def gmaps4rails_sidebar
+            "sidebar content"
+          end
         end
+        result = user.to_gmaps4rails
+        result.should include "\"description\": \"My Beautiful Picture: \""
+        result.should include "\"title\": \"Sweet Title\""
+        result.should include "\"sidebar\": \"sidebar content\""
+        result.should include "\"picture\": \"http://www.blankdots.com/img/github-32x32.png\""
       end
-      @user = Factory(:user)
-      @user.norm_address.should == "Toulon, Frankreich"
+      
     end
   end