googlestaticmap 1.1.3 → 1.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ff2ebb1801c05d4809f1747c82f079cbed2b7ccc
+  data.tar.gz: 042aaceadc71f079c683b3d4cbb7fd3dc8c9db01
+SHA512:
+  metadata.gz: 2d4be157dc6dd3058897e5c1b5c51fb2ec8991dd8fadfcdcc30c38141a402286f76cb540643ca085eeda6bfb309c793b1f2edc570105a96842269029f439cd12
+  data.tar.gz: 56d3a7f1461f6186321ba86e29497f883eb398017076e8202c6584d53d05b5ce2a10a7797b72ccfda692d14b7c439353da6d5ad3d07df3a6b45a172dffd31179

data/History.txt

@@ -1,3 +1,6 @@
+== 1.1.4 / 2013-07-04
+* Properly URL encoding the URLs, caused an issue when using URI.parse on generated URLs (thanks nathany!)
+
 === 1.1.3 / 2012-07-08
 * Fixed a Ruby 1.9.3 compatibility issue (thanks dusanb!)
 * Fixed a Ruby 1.8.7 compatibility issue introduced in 1.1.1

data/lib/googlestaticmap.rb

@@ -60,6 +60,8 @@ require 'net/http'
 require 'net/https' if RUBY_VERSION < "1.9"
 require File.dirname(__FILE__) +  '/googlestaticmap_helper'
 
+MAP_SEPARATOR = CGI.escape("|")
+
 # Main class for creating a static map.  Create an instance, Set attributes
 # that describe properties of the map.  Then call url to get a URL that you
 # can use as the src of an img tag.  You can also call get_map to actually
@@ -108,7 +110,7 @@ class GoogleStaticMap
   # * terrain
   # * hybrid - satellite imagery with roads
   attr_accessor :maptype
-  
+
   # If you need to use a proxy server to reach Google, set the name/address
   # of the proxy server here
   attr_accessor :proxy_address
@@ -121,7 +123,7 @@ class GoogleStaticMap
     defaults = {:width => 500, :height => 350, :markers => [],
                 :sensor => false, :maptype => "roadmap", :paths => [],
                 :proxy_port => nil, :proxy_address => nil,}
-                
+
     attributes = defaults.merge(attrs)
     attributes.each {|k,v| self.send("#{k}=".to_sym,v)}
   end
@@ -255,8 +257,8 @@ class MapMarker
       # 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}"
-    end.join("|")
-    s << "|#{@location.to_s}"
+    end.join(MAP_SEPARATOR)
+    s << MAP_SEPARATOR << @location.to_s
   end
 end
 
@@ -285,8 +287,8 @@ 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("|")
-    s << "|" << @points.join("|")
+    s = attrs.to_a.collect {|k| "#{k[0]}:#{CGI.escape(k[1].to_s)}"}.join(MAP_SEPARATOR)
+    s << MAP_SEPARATOR << @points.join(MAP_SEPARATOR)
   end
 end
 

data/test/tc_google_static_map.rb

@@ -12,7 +12,7 @@ class MockSuccess < Net::HTTPSuccess #:nodoc: all
 
   def body
     @data
-  end	
+  end
 end
 
 class MockFailure < Net::HTTPServiceUnavailable #:nodoc: all
@@ -68,7 +68,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
     assert u.include?("scale=2")
     assert u.include?("asdf")
     assert u.include?("http://maps.google.com")
-    assert u.include?("color:0x00FF00FF|fillcolor:0x00FF0060|38.8,-77.5|38.8,-76.9|39.2,-76.9|39.2,-77.5|38.8,-77.5"), "Polygon not in URL"
+    assert u.include?("color:0x00FF00FF#{MAP_SEPARATOR}fillcolor:0x00FF0060#{MAP_SEPARATOR}38.8,-77.5#{MAP_SEPARATOR}38.8,-76.9#{MAP_SEPARATOR}39.2,-76.9#{MAP_SEPARATOR}39.2,-77.5#{MAP_SEPARATOR}38.8,-77.5"), "Polygon not in URL"
     assert u.include?("Washington%2C+DC")
 
     f = nil

data/test/tc_map_marker.rb

@@ -33,12 +33,17 @@ class MapMarkerTest < Test::Unit::TestCase #:nodoc: all
     m = default_marker
     s = nil
     assert_nothing_raised {s = m.to_s}
-    assert_equal 6, s.split("|").length
+    assert_equal 6, s.split(MAP_SEPARATOR).length
     assert s.include?(CGI.escape("Washington, DC"))
     assert s.include?("color:green")
     assert s.include?("icon:http://www.google.com")
   end
 
+  def test_string_is_a_valid_ruby_uri
+    m = default_marker
+    URI.parse(m.to_s)
+  end
+
   private
   def default_marker
     MapMarker.new(:color => "green",

data/test/tc_map_path_and_polygon.rb

@@ -30,12 +30,17 @@ class MapPathAndPolygonTest < Test::Unit::TestCase #:nodoc: all
     p = default_path
     s = nil
     assert_nothing_raised { s = p.to_s }
-    assert_equal 4, s.split("|").length
+    assert_equal 4, s.split(MAP_SEPARATOR).length
     assert s.include?("color:0xFF0000FF")
     assert s.include?("loc1")
     assert s.include?("loc2")
   end
 
+  def test_string_is_a_valid_ruby_uri
+    m = default_path
+    URI.parse(m.to_s)
+  end
+
   def test_polygon
     # Polygon inherits from MapPath and uses MapPath's to_s method, so only
     # limited testing needs to happen here

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: googlestaticmap
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4
 platform: ruby
 authors:
 - Brent Sowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2013-07-04 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
@@ -25,39 +24,38 @@ files:
 - lib/googlestaticmap.rb
 - lib/googlestaticmap_helper.rb
 - test/tc_map_path_and_polygon.rb
+- test/tc_map_location.rb
 - test/tc_google_static_map.rb
 - test/tc_helper.rb
 - test/tc_map_marker.rb
-- test/tc_map_location.rb
 - README
 - History.txt
 homepage: http://www.coordinatecommons.com/googlestaticmap/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Class for retrieving maps from the Google Maps Static API service
 test_files:
 - test/tc_map_path_and_polygon.rb
+- test/tc_map_location.rb
 - test/tc_google_static_map.rb
 - test/tc_helper.rb
 - test/tc_map_marker.rb
-- test/tc_map_location.rb