gmaps4rails 0.9.1 → 0.10.0.pre1

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

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

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

@@ -1,19 +1,24 @@
 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",
-  #   "marker_anchor" => [10,20]
+  #   "shadow_picture" => "https://secure.gravatar.com/avatar/808bec1c640143bd7091888d9edfb2f2.png",
+  #   "shadow_height" => 40, 
+  #   "shadow_width" => 50,
+  #   "shadow_anchor" => [10, -30]
   #   }
   # end
+  
   # 
   # def gmaps4rails_title
   #   "Sweet Title"
@@ -23,8 +28,8 @@ class User < ActiveRecord::Base
   #   "<b>#{name}</b>"
   # end
   #  
-#  def gmaps4rails_infowindow
-#    "je suis l'infowindow de #{name}"
-#  end
+ # def gmaps4rails_infowindow
+ #   "<div style='width:500px; background-color:#b0c4de;'><b>je suis l'infowindow de <h1>#{name}</h1></b> Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>"
+ # end
 
 end

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

@@ -87,8 +87,8 @@ describe "Hash extension" do
      @options = {
             "map_options" => { "type" => "SATELLITE", "center_longitude" => 180, "zoom" => 3, "auto_adjust" => true},
             "markers"     => { "data" => '[{ "description": "", "title": "", "longitude": "5.9311119", "latitude": "43.1251606", "picture": "", "width": "", "height": "" } ,{ "description": "", "title": "", "longitude": "2.3509871", "latitude": "48.8566667", "picture": "", "width": "", "height": "" } ]',
-      											   "options" => { "do_clustering" => false, "list_container" => "makers_list" } 
-      											 },
+            "options" => { "do_clustering" => false, "list_container" => "makers_list" } 
+                        },
             "polylines"   => { "data" => '[[
     {"longitude": -122.214897, "latitude": 37.772323},
     {"longitude": -157.821856, "latitude": 21.291982},
@@ -108,7 +108,7 @@ describe "Hash extension" do
     {"longitude": -122.214897, "latitude": 37.772323, "radius": 1000000},
     {"longitude": 122.214897, "latitude": 37.772323, "radius": 1000000, "strokeColor": "#FF0000"}
     ]',
-             									},
+    },
    "direction"   => { 
                       "data"    => { "from" => "toulon, france", "to" => "paris, france"} , 
                       "options" => {"waypoints" => ["toulouse, france", "brest, france"], "travelMode" => "DRIVING", "display_panel" => true, "panel_id" => "instructions"}

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

@@ -40,14 +40,28 @@ describe Gmaps4rails::ActsAsGmappable do
       user.gmaps.should be_true
     end
   
-    it "should render a valid json from an array of ojects" do
+    it "should render a valid json from an array of objects" do
       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 + "\"}]"
+      User.all.to_gmaps4rails.should == "[{\"lng\": \"" + TOULON[:longitude].to_s + "\", \"lat\": \"" + TOULON[:latitude].to_s + "\"},\n{\"lng\": \"" + PARIS[:longitude].to_s + "\", \"lat\": \"" + PARIS[:latitude].to_s + "\"}]"
+    end
+    
+    it "should accept additional block for an array of objects" do
+      user #needed trigger the object from the let statement
+      Factory(:user_paris)
+      User.all.to_gmaps4rails do |u|
+        "\"model\": \"" + u.class.to_s + "\""
+      end.should == "[{\"lng\": \"" + TOULON[:longitude].to_s + "\", \"lat\": \"" + TOULON[:latitude].to_s + "\", \"model\": \"User\"},\n{\"lng\": \"" + PARIS[:longitude].to_s + "\", \"lat\": \"" + PARIS[:latitude].to_s + "\", \"model\": \"User\"}]"
     end
   
+    it "should accept additional block for a single object" do
+      user.to_gmaps4rails do |u|
+        "\"model\": \"" + u.class.to_s + "\""
+      end.should == "[{\"lng\": \"" + TOULON[:longitude].to_s + "\", \"lat\": \"" + TOULON[:latitude].to_s + "\", \"model\": \"User\"}]"
+    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 == "[{\"lng\": \"" + TOULON[:longitude].to_s + "\", \"lat\": \"" + TOULON[:latitude].to_s + "\"}]"
     end
     
     it "should not geocode again after address changes if checker is true" do
@@ -223,7 +237,7 @@ describe Gmaps4rails::ActsAsGmappable do
             "Sweet Title"
           end
         end
-        user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"longitude\": \"" + TOULON[:longitude].to_s + "\", \"latitude\": \"" + TOULON[:latitude].to_s + "\"}]"
+        user.to_gmaps4rails.should == "[{\"title\": \"Sweet Title\", \"lng\": \"" + TOULON[:longitude].to_s + "\", \"lat\": \"" + TOULON[:latitude].to_s + "\"}]"
       end
     
       it "should take into account the sidebar content provided in the model" do
@@ -234,7 +248,7 @@ describe Gmaps4rails::ActsAsGmappable do
         end
         user.to_gmaps4rails.should include "\"sidebar\": \"sidebar content\""
       end
-    
+
       it "should take into account all additional data provided in the model" do
         user.instance_eval do
           def gmaps4rails_infowindow

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: gmaps4rails
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
+  hash: -1876988240
+  prerelease: true
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  - pre1
+  version: 0.10.0.pre1
 platform: ruby
 authors: 
 - Benjamin Roth
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 +02:00
+date: 2011-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +34,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: "Enables easy display of items (taken from a Rails 3 model) on a Google Maps (JS API V3). Geocoding + Directions included. Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines, polygons, circles etc... See wiki on github for full description and examples."
+description: "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. Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines, polygons, circles etc... See wiki on github for full description and examples."
 email: 
 - apnea.diving.deep@gmail.com
 - david.ruyer@gmail.com
@@ -46,16 +47,20 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - app/views/gmaps4rails/_gmaps4rails.html.erb
+- lib/generators/gmaps4rails/install_generator.rb
+- lib/generators/templates/README
 - lib/gmaps4rails.rb
 - lib/gmaps4rails/acts_as_gmappable.rb
 - lib/gmaps4rails/base.rb
 - lib/gmaps4rails/extensions/array.rb
 - lib/gmaps4rails/extensions/hash.rb
-- lib/gmaps4rails/generators/gmaps4rails/install_generator.rb
-- lib/gmaps4rails/generators/templates/README
 - lib/gmaps4rails/helper/gmaps4rails_helper.rb
 - public/images/marker.png
+- public/javascripts/gmaps4rails.bing.js
+- public/javascripts/gmaps4rails.googlemaps.js
 - public/javascripts/gmaps4rails.js
+- public/javascripts/gmaps4rails.mapquest.js
+- public/javascripts/gmaps4rails.openlayers.js
 - public/stylesheets/gmaps4rails.css
 - LICENSE.txt
 - README.rdoc
@@ -110,19 +115,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 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 Maps (JS API V3). Geocoding + Directions included.
+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.
 test_files: 
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/users_controller.rb