google_maps 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/google_maps.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "google_maps"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tushar Ranka"]
-  s.date = "2012-05-15"
+  s.date = "2012-05-30"
   s.description = "General Purpose Library to interact with Google Maps v3 api. Geocoder. "
   s.email = "tusharranka@gmail.com"
   s.extra_rdoc_files = [

data/lib/google_maps.rb

@@ -11,6 +11,14 @@ module GoogleMaps
     block.call(self)
   end
   
+  def self.client(*args)
+    if args.present?
+      @@client = args.first
+    else
+      @@client
+    end
+  end
+  
   def self.key(*args)
     if args.present?
       @@key = args.first
@@ -18,7 +26,7 @@ module GoogleMaps
       @@key
     end
   end
-  
+    
   def self.use_enterprise_account(*args)
     if args.first.present? && args.first == false
       @@enterprise_account = false
@@ -31,11 +39,4 @@ module GoogleMaps
     @@enterprise_account || false
   end
 
-  def self.key_name
-    enterprise_account? ? :client : :key
-  end
-
-  def self.geocoder_key_name
-    :clientId if enterprise_account?
-  end
 end

data/lib/google_maps/geocoder.rb

@@ -1,3 +1,5 @@
+require 'base64'
+require 'openssl'
 require 'google_maps/geocoder/result'
 require 'google_maps/geocoder/location'
 
@@ -10,7 +12,8 @@ module GoogleMaps
   
   module Geocoder
 
-    URI_BASE = "maps.googleapis.com/maps/api/geocode/json"
+    URI_DOMAIN = "maps.googleapis.com"
+    URI_BASE   = "/maps/api/geocode/json"
 
     def self.locate!(address, options = { })
       options = {
@@ -26,22 +29,32 @@ module GoogleMaps
     end
 
     def self.url(options)
-      ssl = options.delete(:ssl)
-
-      if !options[:clientId] && ::GoogleMaps.enterprise_account?
-        options.merge!(::GoogleMaps.geocoder_key_name => ::GoogleMaps.key)
-      end
+      ssl      = options.delete(:ssl)
+      # for enterprise account
+      client   = options.delete(:client) || ::GoogleMaps.client
+      key = options.delete(:key) || ::GoogleMaps.key  
 
       parameters = []
-      options.each do |key, value|
-        parameters << "#{key}=#{CGI.escape(value.to_s)}"
+      options.each do |k, v|
+        parameters << "#{k}=#{CGI.escape(v.to_s)}"
+      end
+      
+      if ::GoogleMaps.enterprise_account? && client && key
+        parameters << "client=#{CGI.escape(client)}"
+        sign_str = "#{URI_BASE}?#{parameters.join('&')}"
+        sha1 = OpenSSL::Digest::Digest.new('sha1')
+        binary_key = Base64.decode64(key.tr('-_','+/'))
+        binary_signature = OpenSSL::HMAC.digest(sha1, binary_key, sign_str)
+        signature = Base64.encode64(binary_signature).tr('+/','-_').strip
+        parameters << "signature=#{signature}"
       end
+      
       "#{uri_base_path(:ssl => ssl)}?#{parameters.join('&')}"
     end
 
     def self.uri_base_path(options = { })
       protocol = options[:ssl] ? "https" : "http"
-      "#{protocol}://#{URI_BASE}"
+      "#{protocol}://#{URI_DOMAIN}#{URI_BASE}"
     end
   end
-end
+end

data/test/google_maps/geocoder_test.rb

@@ -64,9 +64,9 @@ class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
   
 
   def test_url_base_path
-    assert_equal "http://#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path
-    assert_equal "http://#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path(:ssl => false)
-    assert_equal "https://#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path(:ssl => true)
+    assert_equal "http://#{GoogleMaps::Geocoder::URI_DOMAIN}#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path
+    assert_equal "http://#{GoogleMaps::Geocoder::URI_DOMAIN}#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path(:ssl => false)
+    assert_equal "https://#{GoogleMaps::Geocoder::URI_DOMAIN}#{GoogleMaps::Geocoder::URI_BASE}", GoogleMaps::Geocoder.uri_base_path(:ssl => true)
   end
 
   def test_url
@@ -74,11 +74,11 @@ class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
     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"
+  def test_url__with_enterprise_account
+    GoogleMaps.client "clientID"
+    GoogleMaps.key "vNIXE0xscrmjlyV-12Nj_BvUPaw="
     GoogleMaps.use_enterprise_account
-    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=New+York&sensor=false&client=clientID&signature=KrU1TzVQM7Ur0i8i7K3huiw3MsA="), GoogleMaps::Geocoder.url(ordered_hash(:address => "New York", :sensor => false))
   end
 
   private
@@ -102,7 +102,7 @@ class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
   end
 
   def expected_url(parameters, ssl = false)
-    "http#{'s' if ssl}://#{GoogleMaps::Geocoder::URI_BASE}?#{parameters}"
+    "http#{'s' if ssl}://#{GoogleMaps::Geocoder::URI_DOMAIN}#{GoogleMaps::Geocoder::URI_BASE}?#{parameters}"
   end
 
   def ordered_hash(hash)
@@ -113,4 +113,4 @@ class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
     oh.merge!(hash)
     oh
   end
-end
+end

data/test/google_maps_test.rb

@@ -1,28 +1,22 @@
 require 'test_helper'
 
 class GoogleMaps::GeocoderTest < ActiveSupport::TestCase
-  def test_configure__free_key
+  def test_configure__free_account
     GoogleMaps.configure do |maps|
-      maps.key "foobar"
     end
     
-    assert_equal "foobar", GoogleMaps.key
     assert_equal false, GoogleMaps.enterprise_account?
-    assert_equal :key, GoogleMaps.key_name
-    assert_equal nil, GoogleMaps.geocoder_key_name
   end
   
-  def test_configure__enterprise_key
+  def test_configure__enterprise_account
     GoogleMaps.configure do |maps|
-      maps.key "foobarenterprise"
+      maps.client "foobar"
+      maps.key "foobarkey"
       maps.use_enterprise_account
     end
     
-    assert_equal "foobarenterprise", GoogleMaps.key
+    assert_equal "foobar", GoogleMaps.client
+    assert_equal "foobarkey", GoogleMaps.key
     assert GoogleMaps.enterprise_account?
-    assert_equal :client, GoogleMaps.key_name
-    assert_equal :clientId, GoogleMaps.geocoder_key_name
   end
-  
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_maps
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tushar Ranka
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime