gmaps4rails 0.6.4 → 0.6.5

data/lib/acts_as_gmappable/base.rb

@@ -129,14 +129,15 @@ module Gmaps4rails
             validate :process_geocoding
          end
           
+          #instance method
           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].nil?  ?   true : args[:check_process],
+              :checker        => args[:checker]             || "gmaps",
+              :msg            => args[:msg]                 || "Address invalid",
+              :validation     => args[:validation].nil?     ?   true : args[:validation]
               #TODO: address as a proc?
             }
           end
@@ -197,3 +198,6 @@ module Gmaps4rails
 end
 
 ::ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable::Base
+# Mongoid::Document::ClassMethods.class_eval do
+#   include Gmaps4rails::ActsAsGmappable::Base
+# end

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

@@ -1,6 +1,6 @@
 class User < ActiveRecord::Base
   acts_as_gmappable
-  
+
   def gmaps4rails_address
     address
   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();"
+    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();"
   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();"
+    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();"
   end
 end
 

data/test/dummy/spec/factories.rb

@@ -0,0 +1,20 @@
+Factory.define :user do |f|  
+  f.name    "me"
+  f.address "Toulon, France"
+end
+
+Factory.define :user_paris, :parent => :user do |f|
+  f.name    "me"
+  f.address "Paris, France"
+end
+
+Factory.define :user_with_pic, :parent => :user do |f|
+  f.name    "me"
+  f.address "Toulon, France"
+  f.picture "http://www.blankdots.com/img/github-32x32.png"
+end
+
+Factory.define :invalid_user, :parent => :user do |f|
+  f.name    "me"
+  f.address "home"
+end

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

@@ -4,7 +4,7 @@ describe "Acts as gmappable" do
   
   describe "standard configuration, valid user" do
     before(:each) do
-      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user = Factory(:user)
     end
     
     it "should have a geocoded position" do
@@ -17,7 +17,7 @@ describe "Acts as gmappable" do
     end
   
     it "should render a valid json from an array of ojects" do
-      @user2 = User.create!(:name => "me", :address => "Paris, France" )
+      @user2 = Factory(:user_paris)
       User.all.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ,{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"2.3509871\", \"latitude\": \"48.8566667\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
   
@@ -44,7 +44,7 @@ describe "Acts as gmappable" do
   
   describe "standard configuration, invalid address" do
     before(:each) do
-      @user = User.new(:name => "me", :address => "home" )
+      @user = Factory.build(:invalid_user)
     end
     
     it "should raise an error if validation option is turned on and address incorrect" do
@@ -75,7 +75,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.new(:name => "me", :address => "home" )
+      @user = Factory.build(:invalid_user)
       @user.should_not be_valid, "Custom Address invalid"
     end
   
@@ -92,7 +92,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.new(:name => "me", :address => "home" )
+      @user = Factory.build(:invalid_user)
       @user.should be_valid
     end
     
@@ -109,7 +109,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user = Factory(:user)
       @user.lat_test.should  == 43.1251606
       @user.long_test.should == 5.9311119
       @user.longitude.should == nil
@@ -130,10 +130,30 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @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
+          }
+        end
+      end
+      @user = Factory(:user)
+      @user.address = "paris, France"
+      @user.save
+      @user.latitude.should  == 48.8566667
+      @user.longitude.should == 2.3509871
+    end
+    
     it "should save to the proper boolean checker set in checker" do
       User.class_eval do
         def gmaps4rails_options
@@ -147,7 +167,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France" )
+      @user = Factory(:user)
       @user.gmaps.should == nil
       @user.bool_test.should == true
     end
@@ -158,7 +178,7 @@ describe "Acts as gmappable" do
           "My Beautiful Picture: #{picture}"
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France", :picture => "http://www.blankdots.com/img/github-32x32.png")
+      @user = Factory(:user_with_pic)
       @user.to_gmaps4rails.should == "[{\n\"description\": \"My Beautiful Picture: http://www.blankdots.com/img/github-32x32.png\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"\", \"width\": \"\", \"height\": \"\"\n} ]"
     end
     
@@ -175,7 +195,7 @@ describe "Acts as gmappable" do
           }
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France")
+      @user = Factory(:user)
       @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
     end
     
@@ -185,7 +205,7 @@ describe "Acts as gmappable" do
           "Sweet Title"
         end
       end
-      @user = User.create!(:name => "me", :address => "Toulon, France")
+      @user = Factory(:user)
       @user.to_gmaps4rails.should == "[{\n\"description\": \"\", \"title\": \"Sweet Title\",\n\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"\n} ]"
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - test/dummy/db/seeds.rb
 - test/dummy/spec/base/base_spec.rb
 - test/dummy/spec/controllers/users_controller_spec.rb
+- test/dummy/spec/factories.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/spec_helper.rb
 has_rdoc: true
@@ -146,5 +147,6 @@ test_files:
 - test/dummy/db/seeds.rb
 - test/dummy/spec/base/base_spec.rb
 - test/dummy/spec/controllers/users_controller_spec.rb
+- test/dummy/spec/factories.rb
 - test/dummy/spec/models/user_spec.rb
 - test/dummy/spec/spec_helper.rb