google_maps_api-directions 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ab55ac8c65193c48ef84b188aad24fb9cc4339
-  data.tar.gz: 64ea3b0da7201bd113dbf9ded5c00150ae22c632
+  metadata.gz: 2976224fb7deea7c716d1fc5375a0060c412bb74
+  data.tar.gz: 283d8b097f315c74ac6d6ea9a71832dd6bef1234
 SHA512:
-  metadata.gz: b946bac2ceb2942a92fcb229dcac1e0ba070434ed4d04f37adab6427d5e204626b8d3050ed0aee38d6175f01b32a844684f05f21eee0f5eaa8bb4564da188585
-  data.tar.gz: d1955b2f858213d5665d90dccc8a903a49415934ce19544fbcd3c536b87ff0ec4050fb01dae526c0849db39ad8d3f8e546a57e4ebc6675ef5ad9c48862298dad
+  metadata.gz: 775b60444e7b7456a6cca02d5cbf7102ef0caf7f9d0b036a34e326df40cc0819afe54bb1afb8b2d0b5fdadd81bb2367a00e79a54bf232ce00b0bf530cdb11672
+  data.tar.gz: 3123f9f401259bb8985daaaaab7596d30d6bef7ada95c1ed6fe008072f436beb732ed8872c2c97660df12ffea4f18fa8de21f40e5e6b6e866565e9723d3a044a

data/README.md

@@ -25,6 +25,8 @@ GoogleMapsAPI::Directions.route(origin, destination, options = {})
 Origin and destination can be an a string or anything that supports ```to_ary```.
 Options is a *Symbols* Hash with optional parameters. (See https://developers.google.com/maps/documentation/directions/#RequestParameters for more information).
 
+For Google Business/Enterprise requests, include the ```:key```, ```:client``` and optionally, ```:channel``` in the options hash.
+
 ### Examples:
 
 ```ruby

data/google_maps_api-directions.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", ">= 3.0.0.beta2", "< 4"
 
-  spec.add_dependency "google_maps_api-core", "~> 0"
+  spec.add_dependency "google_maps_api-core", "~> 0.2"
 end

data/lib/google_maps_api/directions/request.rb

@@ -1,7 +1,7 @@
 require "net/http"
 
 class GoogleMapsAPI::Directions::Request
-  BASE_PATH = "maps.googleapis.com/maps/api/directions/json"
+  BASE_PATH = "/maps/api/directions/json"
 
   attr_accessor :origin, :destination, :options, :http_adapter
 
@@ -10,7 +10,7 @@ class GoogleMapsAPI::Directions::Request
     destination = destination.to_ary.join(",") if destination.respond_to?(:to_ary)
     @origin = origin
     @destination = destination
-    @options = default_options.merge(options)
+    @options = options
     @http_adapter = nil
   end
 
@@ -31,9 +31,20 @@ class GoogleMapsAPI::Directions::Request
   end
 
   def uri
-    uri = URI("#{scheme}://#{BASE_PATH}")
-    query = prepared_options.merge({origin: origin, destination: destination})
-    uri.query = URI.encode_www_form(query)
+    base_host = GoogleMapsAPI::Core::BASE_HOST
+    uri = "#{scheme}://#{base_host}#{BASE_PATH}"
+    query_params = prepared_options.merge(
+      {origin: origin, destination: destination}
+    ).reject { |key, value| [:client, :channel].include?(key) }
+
+    if business_account?
+      query_params = query_params.reject { |key, value| [:key].include?(key) }
+      uri = "#{uri}?#{to_query(query_params)}"
+      uri = sign_uri(uri)
+    else
+      uri = URI("#{uri}?#{URI.encode_www_form(query_params)}")
+    end
+
     uri
   end
 
@@ -45,6 +56,10 @@ class GoogleMapsAPI::Directions::Request
     @http_adapter || Net::HTTP
   end
 
+  def business_account?
+    options.key?(:key) && options.key?(:client)
+  end
+
   private
 
   def default_options
@@ -58,7 +73,13 @@ class GoogleMapsAPI::Directions::Request
   end
 
   def prepared_options
-    options = self.options.dup
+    options = default_options.merge(self.options)
+
+    # Symbolizes the options keys
+    options.keys.each do |key|
+      options[(key.to_sym rescue key) || key] = options.delete(key)
+    end
+
     options[:departure_time] = time_or_date_to_unix(options[:departure_time])
     options[:arrival_time] = time_or_date_to_unix(options[:arrival_time])
 
@@ -79,4 +100,18 @@ class GoogleMapsAPI::Directions::Request
     return time_or_date.to_time.to_i if time_or_date.is_a?(Date)
     time_or_date
   end
+
+  def sign_uri(uri)
+    options = prepared_options
+    GoogleMapsAPI::Core::URISigner.sign(
+      uri.to_s, 
+      options[:client], 
+      options[:key], 
+      options[:channel]
+    )
+  end
+
+  def to_query(hash)
+    hash.to_a.map { |x| "#{x[0]}=#{x[1]}" }.join("&")
+  end
 end

data/lib/google_maps_api/directions/version.rb

@@ -1,5 +1,5 @@
 module GoogleMapsAPI
   module Directions
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_maps_api-directions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Felipe Zavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: 
 email:
 - zavan@outlook.com