googlestaticmap 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddc7e2e770498a9ac12d73e0d79cf954b4333c9
-  data.tar.gz: 6e9dfcd215d46cb14de2708959e0caa5fba8e194
+  metadata.gz: 71d11263c1112a4dcbf313e0fb3e133bb4602090
+  data.tar.gz: 5e5e853c9c7d71c6bb2f59ae09f180f9b3aa9b03
 SHA512:
-  metadata.gz: 2aa7f214d79aa9c8d0b0042b5169ee964b1a34b5310e09c018c6d887af82885252a11634ec89cc71be1c1490c92228b6bf7df431887e6de85552e654bcbfc328
-  data.tar.gz: b4ec9c02c81f05483bab97f3e066e877dfcb2d73f9b83dfd3dd139a39b5a1d23377cdad69c939139da20cff40fd0576698ea666ebc7671caf94483b8cf2c8519
+  metadata.gz: b84b6bc8dd68641b0b6c96eed2e377559e1a61c2401465653325a77a22fb1bba8c9268741481ec66b7b05f8095913797d8679995c5bb6f04688980083fb3dbc1
+  data.tar.gz: f6dd673216d577fbc3b2f174355666259fd8e79c53634b98c0ef8a1ddc049a13f47d01baca66fc0fb28addc183cb9383d37877dc5a5f515e648d51a29be4510b

data/History.txt

@@ -1,3 +1,6 @@
+== 1.2.1 / 2014-03-03
+* Fixed bug in the signature generation for business customers from 1.2.0
+
 == 1.2.0 / 2014-03-03
 * Added support for setting an API key for monitoring, and a client ID/private key for business customers (thanks forrest!)
 * Changed to use maps.googleapis.com instead of maps.google.com (thanks nathany!)

data/lib/googlestaticmap.rb

@@ -2,8 +2,6 @@
 # info, etc.
 
 require 'cgi'
-require 'base64'
-require 'openssl'
 require 'net/http'
 require 'net/https' if RUBY_VERSION < "1.9"
 require File.dirname(__FILE__) +  '/googlestaticmap_helper'
@@ -114,9 +112,10 @@ class GoogleStaticMap
     attrs << ["center", @center.to_s] if !@center.nil?
     attrs << ["key", @api_key] if !@api_key.nil?
     attrs << ["client", @client_id] if @api_key.nil? && !@client_id.nil? && !@private_key.nil?
-    path << attrs.collect {|attr| "#{attr[0]}=#{attr[1]}"}.join("&")
+    path << attrs.sort_by {|k,v| k}.collect {|attr| "#{attr[0]}=#{attr[1]}"}.join("&")
     if @api_key.nil? && !@client_id.nil? && !@private_key.nil?
-      path << "&signature=" << sign(path)
+      signature = GoogleStaticMapHelpers.sign(path, @private_key)
+      path << "&signature=" << signature
     end
     base + path
   end
@@ -157,24 +156,6 @@ class GoogleStaticMap
     end
   end
 
-  private
-
-  # signing code is grabbed from https://github.com/alexreisner/geocoder
-  def sign(path)
-    raw_private_key = url_safe_base64_decode(@private_key)
-    digest = OpenSSL::Digest.new('sha1')
-    raw_signature = OpenSSL::HMAC.digest(digest, raw_private_key, path)
-    url_safe_base64_encode(raw_signature)
-  end
-
-  def url_safe_base64_decode(base64_string)
-    Base64.decode64(base64_string.tr('-_', '+/'))
-  end
-
-  def url_safe_base64_encode(raw)
-    Base64.encode64(raw).tr('+/', '-_').strip
-  end
-
 end
 
 # Container class for a location on the map.  Set either a latitude and
@@ -239,7 +220,7 @@ class MapMarker
   def to_s
     raise Exception.new("Need a location for the marker") unless @location && @location.is_a?(MapLocation)
     attrs = GoogleStaticMapHelpers.safe_instance_variables(self, ["location"])
-    s = attrs.to_a.collect do |k|
+    s = attrs.to_a.sort_by {|x| x[0]}.collect do |k|
       # If the icon URL is URL encoded, it won't work
       val = (k[0] == "icon" ? k[1] : CGI.escape(k[1].to_s))
       "#{k[0]}:#{val}"
@@ -273,7 +254,7 @@ class MapPath
   def to_s
     raise Exception.new("Need more than one point for the path") unless @points && @points.length > 1
     attrs = GoogleStaticMapHelpers.safe_instance_variables(self, ["points"])
-    s = attrs.to_a.collect {|k| "#{k[0]}:#{CGI.escape(k[1].to_s)}"}.join(MAP_SEPARATOR)
+    s = attrs.to_a.sort_by {|x| x[0]}.collect {|k| "#{k[0]}:#{CGI.escape(k[1].to_s)}"}.join(MAP_SEPARATOR)
     s << MAP_SEPARATOR << @points.join(MAP_SEPARATOR)
   end
 end

data/lib/googlestaticmap_helper.rb

@@ -1,3 +1,6 @@
+require 'base64'
+require 'openssl'
+
 # Helper methods used in this code
 module GoogleStaticMapHelpers #:nodoc: all
   # Returns a hash of instance variables for the passed in Object, where the
@@ -24,4 +27,21 @@ module GoogleStaticMapHelpers #:nodoc: all
     end
     ivs
   end
+
+  # signing code is grabbed from https://github.com/alexreisner/geocoder
+  def self.sign(path, key)
+    raw_private_key = self.url_safe_base64_decode(key)
+    digest = OpenSSL::Digest.new('sha1')
+    raw_signature = OpenSSL::HMAC.digest(digest, raw_private_key, path)
+    self.url_safe_base64_encode(raw_signature)
+  end
+
+  def self.url_safe_base64_decode(base64_string)
+    Base64.decode64(base64_string.tr('-_', '+/'))
+  end
+
+  def self.url_safe_base64_encode(raw)
+    Base64.encode64(raw).tr('+/', '-_').strip
+  end
+
 end

data/test/tc_google_static_map.rb

@@ -116,11 +116,11 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
   def test_url_for_business
     g = default_map
     g.client_id = "asdfclientid"
-    g.private_key = "asdfprivatekey"
+    g.private_key = "vNIXE0xscrmjlyV-12Nj_BvUPaw="
     u = nil
     assert_nothing_raised { u = g.url }
     assert_equal 9, u.split("&").length, u
-    assert u.include?("signature="), u
+    assert u.include?("signature=qB3i5UMtI7tHPz-cy_BGrl-5i80="), u
     assert u.include?("client=asdfclientid"), u
     assert !u.include?("key="), u
   end

data/test/tc_helper.rb

@@ -50,6 +50,15 @@ class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
     end
   end
 
+  def test_signature
+    # This comes from the google example at
+    # https://developers.google.com/maps/documentation/business/webservices/auth
+    private_key = "vNIXE0xscrmjlyV-12Nj_BvUPaw="
+    url = "/maps/api/geocode/json?address=New+York&sensor=false&client=clientID"
+    sig = GoogleStaticMapHelpers.sign(url, private_key)
+    assert_equal sig, "KrU1TzVQM7Ur0i8i7K3huiw3MsA="
+  end
+
   private
   def ivs_no_at
     ivs = {}
@@ -58,4 +67,4 @@ class GoogleStaticMapHelperTest < Test::Unit::TestCase #:nodoc: all
     end
     ivs
   end
-end
+end

metadata

@@ -1,19 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: googlestaticmap
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brent Sowers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
-dependencies: []
-description: Easily retrieve single PNG, GIF, or JPG map images from Google with your
-  own custom markers and paths using the Static Maps API service with this gem.  Simply
-  set the attributes you want for your map and GoogleStaticMap will take care of getting
-  the map for you, or giving your the URL to retrieve the map.
+date: 2014-03-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  prerelease: false
+  type: :development
+description: Easily retrieve single PNG, GIF, or JPG map images from Google with your own custom markers and paths using the Static Maps API service with this gem.  Simply set the attributes you want for your map and GoogleStaticMap will take care of getting the map for you, or giving your the URL to retrieve the map.
 email: brent@coordinatecommons.com
 executables: []
 extensions: []
@@ -34,24 +59,24 @@ homepage: http://www.coordinatecommons.com/googlestaticmap/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Class for retrieving maps from the Google Maps Static API service
 test_files: