Merge pull request #2 from tiramizoo/master

Cleanup, tests and features from @gregormelhorn

Author: wyattdanger

.gitignore

@@ -1,2 +1,3 @@
 .*.sw*
+node_modules
 scrap.js

README.markdown

@@ -27,11 +27,19 @@ geocoder.reverseGeocode( 33.7489, -84.3789, function ( err, data ) {
 geocoder.reverseGeocode( 33.7489, -84.3789, function ( err, data ) {
   // do something with data
 }, { sensor: true });
+
+// Setting language to German
+geocoder.reverseGeocode( 33.7489, -84.3789, function ( err, data ) {
+  // do something with data
+}, { language: 'de' });
+
+
+
 ```
 
 Results will look like standard [Google JSON Output](http://code.google.com/apis/maps/documentation/geocoding/#JSON)
 
-You can pass in an optional options hash as a last argument, useful for setting sensor to true (it defaults to false).
+You can pass in an optional options hash as a last argument, useful for setting sensor to true (it defaults to false) and the language (default is empty which means that google geocoder will guess it by geo ip data). For details see the [Google Geocoding API Docs](http://code.google.com/intl/en-US/apis/maps/documentation/geocoding/#GeocodingRequests)
 
 ###Testing:
 Tests are written with [Vows](http://vowsjs.org/) and can be run from project root with `node test/*`.

index.js

@@ -7,46 +7,15 @@
  */
 
 var http = require( 'http' );
+var Hash = require('hashish');
+var querystring = require('querystring');
 
 /**
  * Version
  */
 
 var version = '0.0.5';
 
-/**
- * Formats a given `loc` to submit to Google
- *
- * @param {String} loc, required
- * @api private
- */
-
-function formatLoc ( loc ) {
-    return loc.replace( /\s/g, '+' );
-}
-
-/**
- * Combines given `objects` and returns the result
- *
- * @param objects, required
- * @api private
- */
-
-function merge ( objects ) {
-    var result = {},
-        args = Array.prototype.slice.call( arguments );
-
-    args.forEach(function ( item ) {
-        for ( var prop in item ) {
-            if ( item.hasOwnProperty( prop ) ) {
-                result[prop] = item[prop];
-            }
-        }
-    });
-
-    return result;
-}
-
 /**
  * Makes request to Google API and passes result to a callback
  *
@@ -105,42 +74,34 @@ Geocoder.prototype = {
     if ( ! loc ) {
         return cbk( new Error( "Geocoder.geocode requires a location.") );
     }
-    var sensor, defaults, options;
 
-    sensor = opts && opts.sensor ? opts.sensor : false;
+    var options = Hash.merge({sensor: false, address: loc}, opts || {});
 
-    defaults = {
+    var params = {
       host: 'maps.googleapis.com',
       port: 80,
-      path: '/maps/api/geocode/json?address=' + formatLoc( loc ) + '&sensor=' + sensor,
+      path: '/maps/api/geocode/json?' + querystring.stringify(options),
       headers: {}
     };
 
-    options = merge( defaults, opts || {} );
-
-    return request( options, cbk ); 
-
+    return request( params, cbk );
   },
 
   reverseGeocode: function ( lat, lng, cbk, opts ) {
     if ( !lat || !lng ) {
       return cbk( new Error( "Geocoder.reverseGeocode requires a latitude and longitude." ) );
     }
 
-    var sensor, defaults, options;
+    var options = Hash.merge({sensor: false, latlng: lat + ',' + lng}, opts || {});
 
-    sensor = opts && opts.sensor ? opts.sensor : false;
-
-    defaults = {
+    var params = {
       host: 'maps.googleapis.com',
       port: 80,
-      path: '/maps/api/geocode/json?latlng=' + lat + ',' + lng + '&sensor=' + sensor,
+      path: '/maps/api/geocode/json?' + querystring.stringify(options),
       headers: {}
     };
 
-    options = merge( defaults, opts || {} );
-
-    return request( options, cbk ); 
+    return request( params, cbk );
 
   },
 
@@ -154,14 +115,8 @@ Geocoder.prototype = {
 
 };
 
-/**
- * Expose the geocoder
- */
-
-exports = new Geocoder();
-
 /**
  * Export
  */
 
-module.exports = exports;
+module.exports = new Geocoder();

package.json

@@ -11,5 +11,8 @@
   "license": {
     "type": "Apachev2",
     "url": "http://www.apache.org/licenses/LICENSE-2.0"
+  },
+  "dependencies" : {
+    "hashish" : ">= 0.0.4"
   }
 }

test/geocoder-test.js

@@ -1,16 +1,33 @@
-var vows = require('vows'),
-    assert = require('assert'),
-    geocoder = require('../index.js');
+geocoder = require('../index.js');
 
+module.exports = {
+  testExposeGeocodeFunction: function(test){
+    test.equal(typeof geocoder.geocode, 'function');
+    test.done()
+  },
 
-vows.describe('Geocoder Public Interface').addBatch({
-    'after requiring geocoder': {
-        topic: geocoder,
-        'geocoder exposes a geocode method': function (topic) {
-            assert.equal(typeof geocoder.geocode, 'function');
-        },
-        'geocoder exposes a reverseGeocode method': function (topic) {
-            assert.equal(typeof geocoder.reverseGeocode, 'function');
-        }
-    }
-}).run();
+  testExposeGeocodeFunction: function(test){
+    test.equal(typeof geocoder.geocode, 'function');
+    test.done()
+  },
+
+  testGeocode: function(test){
+    test.expect(3);
+    geocoder.geocode("Plattlinger Str. 10, 81479 Munich, Germany", function(err, result){
+      test.ok(!err);
+      test.equals('OK', result.status);
+      test.ok(result.results[0].formatted_address.match(/Munich/));
+      test.done();
+    });
+  },
+
+  testLanguage: function(test){
+    test.expect(3);
+    geocoder.geocode("Plattlinger Str. 10, 81479 München, Deutschland", function(err, result){
+      test.ok(!err);
+      test.equals('OK', result.status);
+      test.ok(result.results[0].formatted_address.match(/München/));
+      test.done();
+    }, {language: 'de'});
+  }
+}