bhm-google-maps 0.2.1 → 0.3.0

data/bhm-google-maps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bhm-google-maps}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-08-21}
+  s.date = %q{2010-08-24}
   s.description = %q{A set of helpers and javascript files that makes it trivial to implement google maps unobtrusively in an application.}
   s.email = %q{darcy.laycock@youthtree.org.au}
   s.extra_rdoc_files = [

data/coffeescripts/gmap.coffee

@@ -39,13 +39,13 @@
   # automatically namespaces keys etc.
   mergeDataOptions = (element, options, keys, spacer) ->
     for key in keys
-      options[key] = getData(element, key, spacer) if hasData element, key, spacer
+      options[key] = getData(element, key, spacer) if hasData(element, key, spacer)
   
   # Return the map options for a given element.
   mapOptionsForElement = (element) ->
     options = $.extend {}, map.defaultOptions
     # Set the mapTypeId if it's a function
-    options.mapTypeId = options.mapTypeId() if $.isFunction options.mapTypeId
+    options.mapTypeId = options.mapTypeId() if $.isFunction(options.mapTypeId)
     mergeDataOptions  element, options, mapOptionKeys
     options
   
@@ -60,13 +60,11 @@
     id = $e.attr "id"
     $e.attr "id", "#{map.autoIDPrefix}#{map.count++}" unless id?
     # Get the position of the current marker.
-    if hasData $e, "latitude" and hasData $e, "longitude"
+    if hasData($e, "latitude") and hasData($e, "longitude")
       lat = Number getData($e, "latitude")
       lng = Number getData($e, "longitude")
-      map.drawLatLng $e, e, lat, lng
     else
-      address = getData $e, "address"
-      # TODO: Map the address.
+      return
     point = new google.maps.LatLng lat, lng
     # Start setting up the map / create a map element.
     mapOptions = mapOptionsForElement $e
@@ -78,9 +76,9 @@
     markerOptions =
       position: point
       map:      currentMap
-
     mergeDataOptions $e, markerOptions, markerOptionKeys, "marker-"
     marker = new google.maps.Marker markerOptions
+
     currentMap
   
   # On load, we'll install the maps.

data/javascripts/gmap.js

@@ -51,18 +51,17 @@ this['GMap'] = (function($) {
     });
   };
   map.setupElement = function(e) {
-    var $e, address, currentMap, id, lat, lng, mapOptions, marker, markerOptions, point;
+    var $e, currentMap, id, lat, lng, mapOptions, marker, markerOptions, point;
     $e = $(e);
     id = $e.attr("id");
     if (!((typeof id !== "undefined" && id !== null))) {
       $e.attr("id", ("" + (map.autoIDPrefix) + (map.count++)));
     }
-    if (hasData($e, "latitude" && hasData($e, "longitude"))) {
+    if (hasData($e, "latitude") && hasData($e, "longitude")) {
       lat = Number(getData($e, "latitude"));
       lng = Number(getData($e, "longitude"));
-      map.drawLatLng($e, e, lat, lng);
     } else {
-      address = getData($e, "address");
+      return null;
     }
     point = new google.maps.LatLng(lat, lng);
     mapOptions = mapOptionsForElement($e);

data/lib/bhm/google_maps/static_map.rb

@@ -23,7 +23,7 @@ module BHM
         params = @params.to_param
         params << "&"
         params << build_marker_params
-        URL_TEMPLATE % params
+        (URL_TEMPLATE % params).html_safe
       end
 
       def self.for_address(address, opts = {})

data/lib/bhm/google_maps/version.rb

@@ -1,5 +1,5 @@
 module BHM
   module GoogleMaps
-    VERSION = "0.2.1".freeze
+    VERSION = "0.3.0".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bhm-google-maps
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-21 00:00:00 +08:00
+date: 2010-08-24 00:00:00 +08:00
 default_executable: 
 dependencies: []