google_maps 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/google_maps.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "google_maps"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tushar Ranka"]

data/lib/google_maps/geocoder.rb

@@ -20,6 +20,11 @@ module GoogleMaps
 
     def self.url(options)
       ssl = options.delete(:ssl)
+
+      if !options[:clientId] && ::GoogleMaps.enterprise_account
+        options.merge!(::GoogleMaps.geocoder_key_name => ::GoogleMaps.key)
+      end
+
       parameters = []
       options.each do |key, value|
         parameters << "#{key}=#{CGI.escape(value.to_s)}"

data/lib/google_maps.rb

@@ -2,3 +2,15 @@ require 'rubygems'
 require 'rest_client'
 require 'active_support/all'
 require 'google_maps/geocoder'
+
+module GoogleMaps
+  mattr_accessor :key, :enterprise_account
+
+  def self.key_name
+    enterprise_account ? "client" : "key"
+  end
+
+  def self.geocoder_key_name
+    "clientId" if enterprise_account
+  end
+end

data/test/google_maps/geocoder_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
 require 'mocha'
 
-class GoogleMaps::GeocoderTest < Test::Unit::TestCase
+class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
 
   def test_locate__castilian
-    RestClient.expects(:get).with(expected_url("address=50+Castilian+Drive%2C+Goleta%2C+CA&sensor=false")).returns(castilian_json)
+    GoogleMaps::Geocoder.expects(:url).with(:address => "50 Castilian Drive, Goleta, CA", :ssl => false, :sensor => false).returns(:url)
+    RestClient.expects(:get).with(:url).returns(castilian_json)
     result = GoogleMaps::Geocoder.locate!("50 Castilian Drive, Goleta, CA")
 
     assert result.status.ok?
@@ -20,7 +21,8 @@ class GoogleMaps::GeocoderTest < Test::Unit::TestCase
   end
 
   def test_locate__new_york
-    RestClient.expects(:get).with(expected_url("address=New+York&sensor=false")).returns(new_york_json)
+    GoogleMaps::Geocoder.expects(:url).with(:address => "New York", :ssl => false, :sensor => false).returns(:url)
+    RestClient.expects(:get).with(:url).returns(new_york_json)
     result = GoogleMaps::Geocoder.locate!("New York")
     assert result.status.ok?
 
@@ -52,18 +54,48 @@ class GoogleMaps::GeocoderTest < Test::Unit::TestCase
   end
 
   def test_url
-    assert_equal expected_url("address=50+Castilian+Drive%2C+Goleta%2C+CA&sensor=true"), GoogleMaps::Geocoder.url(ordered_hash(:sensor => true, :ssl => false, :address => "50 Castilian Drive, Goleta, CA"))
-    assert_equal expected_url("address=50+Castilian+Drive%2C+Goleta%2C+CA&sensor=false", true), GoogleMaps::Geocoder.url(ordered_hash(:sensor => false, :ssl => true, :address => "50 Castilian Drive, Goleta, CA"))
+    assert_url_parts expected_url("address=50+Castilian+Drive%2C+Goleta%2C+CA&sensor=true"), GoogleMaps::Geocoder.url(ordered_hash(:sensor => true, :ssl => false, :address => "50 Castilian Drive, Goleta, CA"))
+    assert_url_parts expected_url("address=50+Castilian+Drive%2C+Goleta%2C+CA&sensor=false", true), GoogleMaps::Geocoder.url(ordered_hash(:sensor => false, :ssl => true, :address => "50 Castilian Drive, Goleta, CA"))
+  end
+
+  def test_url__with_client_id
+    GoogleMaps.key = "bar"
+    GoogleMaps.enterprise_account = true
+    assert_url_parts expected_url("address=A&sensor=false&clientId=foo"), GoogleMaps::Geocoder.url(ordered_hash(:sensor => false, :address => "A", :clientId => 'foo'))
+    assert_url_parts expected_url("address=A&sensor=false&clientId=bar"), GoogleMaps::Geocoder.url(ordered_hash(:sensor => false, :address => "A"))
+    #assert_equal expected_url("address=A&sensor=false&clientId=foo"), GoogleMaps::Geocoder.url(ordered_hash(:sensor => false, :address => "A", :clientId => 'foo'))
+    #
   end
 
   private
 
+  def assert_url_parts(expected, actual)
+    expected_base_url, expected_url_params = expected.split('?')
+    actual_base_url, actual_url_params = actual.split('?')
+    assert_equal expected_base_url, actual_base_url
+
+    expected_params = url_params(expected_url_params)
+    actual_params   = url_params(actual_url_params)
+    assert_equal expected_params, actual_params
+  end
+
+  def url_params(params)
+    {}.tap do |hash|
+      params.split('&').each do |param|
+        hash[param.split('=').first]  = param.split('=').last
+      end
+    end
+  end
+
   def expected_url(parameters, ssl = false)
     "http#{'s' if ssl}://#{GoogleMaps::Geocoder::URI_BASE}?#{parameters}"
   end
 
   def ordered_hash(hash)
     oh = ActiveSupport::OrderedHash.new
+    oh[:address] = hash[:address] if hash[:address]
+    oh[:sensor] = hash[:sensor] if hash[:sensor]
+    oh[:clientId] = hash[:clientId] if hash[:clientId]
     oh.merge!(hash)
     oh
   end

data/test/test_helper.rb

@@ -16,7 +16,15 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'google_maps'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
+
+  setup :clear_configuration
+
+  def clear_configuration
+    GoogleMaps.enterprise_account = nil
+    GoogleMaps.key = nil
+  end
+
   def castilian_json
     "{\n   \"results\" : [\n      {\n         \"address_components\" : [\n            {\n               \"long_name\" : \"50\",\n               \"short_name\" : \"50\",\n               \"types\" : [ \"street_number\" ]\n            },\n            {\n               \"long_name\" : \"Castilian Dr\",\n               \"short_name\" : \"Castilian Dr\",\n               \"types\" : [ \"route\" ]\n            },\n            {\n               \"long_name\" : \"Goleta\",\n               \"short_name\" : \"Goleta\",\n               \"types\" : [ \"locality\", \"political\" ]\n            },\n            {\n               \"long_name\" : \"Santa Barbara\",\n               \"short_name\" : \"Santa Barbara\",\n               \"types\" : [ \"administrative_area_level_2\", \"political\" ]\n            },\n            {\n               \"long_name\" : \"California\",\n               \"short_name\" : \"CA\",\n               \"types\" : [ \"administrative_area_level_1\", \"political\" ]\n            },\n            {\n               \"long_name\" : \"United States\",\n               \"short_name\" : \"US\",\n               \"types\" : [ \"country\", \"political\" ]\n            },\n            {\n               \"long_name\" : \"93117\",\n               \"short_name\" : \"93117\",\n               \"types\" : [ \"postal_code\" ]\n            }\n         ],\n         \"formatted_address\" : \"50 Castilian Dr, Goleta, CA 93117, USA\",\n         \"geometry\" : {\n            \"location\" : {\n               \"lat\" : 34.43447590,\n               \"lng\" : -119.8639080\n            },\n            \"location_type\" : \"ROOFTOP\",\n            \"viewport\" : {\n               \"northeast\" : {\n                  \"lat\" : 34.43582488029149,\n                  \"lng\" : -119.8625590197085\n               },\n               \"southwest\" : {\n                  \"lat\" : 34.43312691970849,\n                  \"lng\" : -119.8652569802915\n               }\n            }\n         },\n         \"types\" : [ \"street_address\" ]\n      }\n   ],\n   \"status\" : \"OK\"\n}\n"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_maps
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tushar Ranka