gmaps4rails 0.7.8 → 0.7.9

data/lib/acts_as_gmappable/base.rb

@@ -32,11 +32,11 @@ module Gmaps4rails
   end
   
   def Gmaps4rails.title(object)
-    return "\"description\": \"#{object.gmaps4rails_title}\", " if object.respond_to?("gmaps4rails_title")
+    return "\"title\": \"#{object.gmaps4rails_title}\", " if object.respond_to?("gmaps4rails_title")
   end
   
   def Gmaps4rails.sidebar(object)
-    return "\"description\": \"#{object.gmaps4rails_sidebar}\"," if object.respond_to?("gmaps4rails_sidebar")
+    return "\"sidebar\": \"#{object.gmaps4rails_sidebar}\"," if object.respond_to?("gmaps4rails_sidebar")
   end
   
   def Gmaps4rails.picture(object)

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

@@ -5,6 +5,25 @@ class User < ActiveRecord::Base
     address
   end
   
+  def gmaps4rails_infowindow
+    "My Beautiful Name: #{name}"
+  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"
+  end
   # def gmaps4rails_sidebar
   #   "<b>#{name}</b>"
   # end

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

@@ -223,7 +223,7 @@ describe "Acts as gmappable" do
           "Sweet Title"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"Sweet Title\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
     end
     
     it "should take into account the sidebar content provided in the model" do
@@ -233,7 +233,7 @@ describe "Acts as gmappable" do
           "sidebar content"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
+      @user.to_gmaps4rails.should == "[{\"sidebar\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\"}]"
     end
     
     it "should take into account all additional data provided in the model" do
@@ -260,7 +260,7 @@ describe "Acts as gmappable" do
           "sidebar content"
         end
       end
-      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: \", \"description\": \"Sweet Title\", \"description\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
+      @user.to_gmaps4rails.should == "[{\"description\": \"My Beautiful Picture: \", \"title\": \"Sweet Title\", \"sidebar\": \"sidebar content\",\"longitude\": \"5.9311119\", \"latitude\": \"43.1251606\", \"picture\": \"http://www.blankdots.com/img/github-32x32.png\", \"width\": \"32\", \"height\": \"32\"}]"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 7
-  - 8
-  version: 0.7.8
+  - 9
+  version: 0.7.9
 platform: ruby
 authors: 
 - Benjamin Roth