bhm-google-maps 0.1.3 → 0.2.1

data/Rakefile

@@ -25,12 +25,12 @@ end
 
 desc "Compiles the javascript from Coffeescript to Javascript"
 task :compile_scripts do
-  system "coffee --no-wrap -c coffeescripts/*.coffee -o javascripts/"
+  system "coffee --no-wrap -o javascripts/ -c coffeescripts/"
 end
 
 desc "Interactively compiles coffeescripts as they're changed"
 task :watch_scripts do
-  system "coffee --no-wrap -w -c coffeescripts/*.coffee -o javascripts/"
+  system "coffee --no-wrap -w -o javascripts/ -c coffeescripts/"
 end
 
 desc "Compile scripts, and produce a minified version."

data/bhm-google-maps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bhm-google-maps}
-  s.version = "0.1.3"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-05-03}
+  s.date = %q{2010-08-21}
   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 = [
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/YouthTree/bhm-google-maps}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Helpers for Google Maps v3 in Rails - Using html 5, the google maps api v3 and the static maps api}
   s.test_files = [
     "test/builder_test.rb",
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/coffeescripts/gmap.coffee

@@ -1,82 +1,86 @@
 # GMap is a simply, unobtrusive google map adder for jQuery + HTML5.
 # It uses data attributes to store map locations, works with a rails
 # plugin to generate static alternatives and most importantly is simple.
-@['GMap']: (($) ->
+@['GMap'] = (($) ->
   
   # The actual object we'll be exporting.
-  map:             {}
+  map = {}
   
   # Map and marker options to autoextract.
-  mapOptionKeys:    ["zoom", "title"]
-  markerOptionKeys: ["title"] 
+  mapOptionKeys    = ["zoom", "title"]
+  markerOptionKeys = ["title"] 
   
   # Exposed options / data.
-  map.count:          0
-  map.autoIDPrefix:   "gmap-"
-  map.maps:           []
+  map.count          = 0
+  map.autoIDPrefix   = "gmap-"
+  map.maps           = []
   
   # Use a function for the roadmap value to avoid load order issues.
   # e.g. if the google maps library is loaded after this one.
-  map.defaultOptions: {
+  map.defaultOptions =
     zoom:        15
     mapTypeId:   -> google.maps.MapTypeId.ROADMAP
     scrollwheel: false
-  }
   
   # Very, very simple wrapper for generating a data key - tbh possibly un-needed.
-  dataKey: (key, spacer) ->
+  dataKey = (key, spacer) ->
     spacer?= ""
-    "data-$spacer$key"
+    "data-#{spacer}#{key}"
     
   # Returns true iff the given element has the set data element, false otherwise.
-  hasData: (e, key, spacer) ->
-    e.is "[${dataKey key, spacer}]"
+  hasData = (e, key, spacer) ->
+    e.is "[#{dataKey key, spacer}]"
     
   # Return the value of a given data attribute.
-  getData: (e, key, spacer) ->
+  getData = (e, key, spacer) ->
     e.attr dataKey(key, spacer)
   
   # Merges a given object w/ values retrieved using data element.
   # automatically namespaces keys etc.
-  mergeDataOptions: (element, options, keys, spacer) ->
+  mergeDataOptions = (element, options, keys, spacer) ->
     for key in keys
       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
+  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
   
   # Install the google map onto each option with the .gmap key.
-  map.install: ->
+  map.install = ->
     $('.gmap').each -> map.setupElement this
-    
+
   # Called with a single html dom element as an argument, will
   # automatically set it up as a google map.
-  map.setupElement: (e) ->
-    $e: $ e
-    id: $e.attr "id"
-    $e.attr "id", "${map.autoIDPrefix}${map.count++}" unless id?
+  map.setupElement = (e) ->
+    $e = $ e
+    id = $e.attr "id"
+    $e.attr "id", "#{map.autoIDPrefix}#{map.count++}" unless id?
     # Get the position of the current marker.
-    lat: Number getData($e, "latitude")
-    lng: Number getData($e, "longitude")
-    point: new google.maps.LatLng lat, lng
+    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.
+    point = new google.maps.LatLng lat, lng
     # Start setting up the map / create a map element.
-    mapOptions: mapOptionsForElement $e
-    mapOptions.center: point
+    mapOptions = mapOptionsForElement $e
+    mapOptions.center = point
     $e.empty().addClass('dynamic-google-map').removeClass('static-google-map')
-    currentMap: new google.maps.Map e, mapOptions
+    currentMap = new google.maps.Map e, mapOptions
     map.maps.push currentMap
     # Now, we need to finally add the marker to the map.
-    markerOptions: {
+    markerOptions =
       position: point
       map:      currentMap
-    }
+
     mergeDataOptions $e, markerOptions, markerOptionKeys, "marker-"
-    marker: new google.maps.Marker markerOptions
+    marker = new google.maps.Marker markerOptions
     currentMap
   
   # On load, we'll install the maps.

data/javascripts/gmap.js

@@ -1,93 +1,75 @@
-var GMap;
-// GMap is a simply, unobtrusive google map adder for jQuery + HTML5.
-// It uses data attributes to store map locations, works with a rails
-// plugin to generate static alternatives and most importantly is simple.
-GMap = (function($) {
+this['GMap'] = (function($) {
   var dataKey, getData, hasData, map, mapOptionKeys, mapOptionsForElement, markerOptionKeys, mergeDataOptions;
-  // The actual object we'll be exporting.
   map = {};
-  // Map and marker options to autoextract.
   mapOptionKeys = ["zoom", "title"];
   markerOptionKeys = ["title"];
-  // Exposed options / data.
   map.count = 0;
   map.autoIDPrefix = "gmap-";
   map.maps = [];
-  // Use a function for the roadmap value to avoid load order issues.
-  // e.g. if the google maps library is loaded after this one.
   map.defaultOptions = {
     zoom: 15,
-    mapTypeId: function mapTypeId() {
+    mapTypeId: function() {
       return google.maps.MapTypeId.ROADMAP;
     },
     scrollwheel: false
   };
-  // Very, very simple wrapper for generating a data key - tbh possibly un-needed.
-  dataKey = function dataKey(key, spacer) {
+  dataKey = function(key, spacer) {
     spacer = (typeof spacer !== "undefined" && spacer !== null) ? spacer : "";
-    return "data-" + spacer + key;
+    return "data-" + (spacer) + (key);
   };
-  // Returns true iff the given element has the set data element, false otherwise.
-  hasData = function hasData(e, key, spacer) {
+  hasData = function(e, key, spacer) {
     return e.is(("[" + (dataKey(key, spacer)) + "]"));
   };
-  // Return the value of a given data attribute.
-  getData = function getData(e, key, spacer) {
+  getData = function(e, key, spacer) {
     return e.attr(dataKey(key, spacer));
   };
-  // Merges a given object w/ values retrieved using data element.
-  // automatically namespaces keys etc.
-  mergeDataOptions = function mergeDataOptions(element, options, keys, spacer) {
+  mergeDataOptions = function(element, options, keys, spacer) {
     var _a, _b, _c, _d, key;
     _a = []; _c = keys;
     for (_b = 0, _d = _c.length; _b < _d; _b++) {
       key = _c[_b];
       _a.push((function() {
         if (hasData(element, key, spacer)) {
-          options[key] = getData(element, key, spacer);
-          return options[key];
+          return (options[key] = getData(element, key, spacer));
         }
       })());
     }
     return _a;
   };
-  // Return the map options for a given element.
-  mapOptionsForElement = function mapOptionsForElement(element) {
+  mapOptionsForElement = function(element) {
     var options;
     options = $.extend({}, map.defaultOptions);
-    // Set the mapTypeId if it's a function
     if ($.isFunction(options.mapTypeId)) {
       options.mapTypeId = options.mapTypeId();
     }
     mergeDataOptions(element, options, mapOptionKeys);
     return options;
   };
-  // Install the google map onto each option with the .gmap key.
-  map.install = function install() {
+  map.install = function() {
     return $('.gmap').each(function() {
       return map.setupElement(this);
     });
   };
-  // Called with a single html dom element as an argument, will
-  // automatically set it up as a google map.
-  map.setupElement = function setupElement(e) {
-    var $e, currentMap, id, lat, lng, mapOptions, marker, markerOptions, point;
+  map.setupElement = function(e) {
+    var $e, address, 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++)));
     }
-    // Get the position of the current marker.
-    lat = Number(getData($e, "latitude"));
-    lng = Number(getData($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");
+    }
     point = new google.maps.LatLng(lat, lng);
-    // Start setting up the map / create a map element.
     mapOptions = mapOptionsForElement($e);
     mapOptions.center = point;
     $e.empty().addClass('dynamic-google-map').removeClass('static-google-map');
     currentMap = new google.maps.Map(e, mapOptions);
     map.maps.push(currentMap);
-    // Now, we need to finally add the marker to the map.
     markerOptions = {
       position: point,
       map: currentMap
@@ -96,10 +78,8 @@ GMap = (function($) {
     marker = new google.maps.Marker(markerOptions);
     return currentMap;
   };
-  // On load, we'll install the maps.
   $(document).ready(function() {
     return map.install();
   });
-  // Return map to set it up.
   return map;
 })(jQuery);

data/lib/bhm/google_maps/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bhm-google-maps
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 3
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +08:00
+date: 2010-08-21 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -57,23 +58,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Helpers for Google Maps v3 in Rails - Using html 5, the google maps api v3 and the static maps api