static_map 0.1.0 → 0.1.1

data/lib/static_map.rb

@@ -19,10 +19,10 @@ module StaticMap
     # center String   - center the map around this location
     # zoom Integer    - zoom level of the map
     # size String     - in pixels of the image. 500x500
-    # sensor Boolean  - autodetect user user location
-    # markers Hash    - location of pin on map, requires location address or lat/long
-    # maptype String  - satelite, road... etc
-    # path String     - where to save the file
+    # sensor Boolean  - autodetect user location
+    # markers Array of Hashes - location of pins on map. Requires a location address or lat/long coordinates
+    # maptype String  - type of map (satellite, road, hybrid, terrain)
+    # path String     - path to write file to when #save is called
     # alt String      - alt text if using image tag
     # title String    - title text if using image tag
     attr_accessor :center, :zoom, :size, :sensor, :markers, :maptype, :path, :alt, :title
@@ -42,11 +42,11 @@ module StaticMap
     def save
       raise "Please set the path argument to save the image" unless @path
 
-      File.open(@path, "w") { |f| f.write(open(url).read) }
+      File.open(@path, "w") { |f| f.write( open(url).read ) }
     end
 
     def url
-      "#{URL}?#{params}"
+      "#{URL}?#{params}".strip
     end
 
     def params
@@ -61,12 +61,12 @@ module StaticMap
     def marker_params
       @markers.map do |marker|
         str = ["markers="]
-        str << ["color:#{marker[:color]}"] if marker[:color]
-        str << ["label:#{marker[:label]}"] if marker[:label]
-        str << ["#{marker[:location]}"] if marker[:location]
+        str << [CGI.escape("color:#{marker[:color]}")] if marker[:color]
+        str << [CGI.escape("label:#{marker[:label]}")] if marker[:label]
+        str << [CGI.escape("#{marker[:location]}")] if marker[:location]
         str << ["#{marker[:latitude]},#{marker[:longitude]}"] if marker[:latitude] && marker[:longitude]
-        str.join("|")
-      end.join("&").gsub(/\=\|/i, '=')
+        str.map{|v| v }.join("%7C") # %7C
+      end.join("&").gsub(/\=\%7C/i, '=')
     end
 
     def to_html

data/lib/static_map/version.rb

@@ -1,3 +1,3 @@
 module StaticMap
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/static_map_test.rb

@@ -7,22 +7,22 @@ class StaticMapTest < Test::Unit::TestCase
 
   def test_defaults
     img = StaticMap::Image.new
-    assert_equal "http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true", img.url
-    assert_equal %{<img src='http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true' title='' alt=''/>}, img.to_html
+    assert_equal "http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true&maptype=road", img.url
+    assert_equal %{<img src='http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true&maptype=road' title='' alt=''/>}, img.to_html
   end
 
   def test_params
     img = StaticMap::Image.new
-    assert_equal "size=500x500&zoom=1&sensor=true", img.params
+    assert_equal "size=500x500&zoom=1&sensor=true&maptype=road", img.params
     img.size = '900x900'
-    assert_equal "size=900x900&zoom=1&sensor=true", img.params
+    assert_equal "size=900x900&zoom=1&sensor=true&maptype=road", img.params
   end
 
   def test_marker_params
     img = StaticMap::Image.new
     img.markers << { latitude: 44.477462, longitude: -73.212032, color: "red", label: "A" }
     img.markers << { location: "Winooski, Vermont", color: "red", label: "B" }
-    assert_equal "markers=color:red|label:A|44.477462,-73.212032&markers=color:red|label:B|Winooski, Vermont", img.marker_params
+    assert_equal "markers=color%3Ared%7Clabel%3AA%7C44.477462,-73.212032&markers=color%3Ared%7Clabel%3AB%7CWinooski%2C+Vermont", img.marker_params
   end
 
   def test_url
@@ -32,18 +32,21 @@ class StaticMapTest < Test::Unit::TestCase
     img.zoom = 11
     img.sensor = false
     img.markers << { latitude: 44.477462, longitude: -73.212032, color: "green", label: "A" }
-    assert_equal "http://maps.google.com/maps/api/staticmap?size=300x300&zoom=11&sensor=false&markers=color:green|label:A|44.477462,-73.212032", img.url
+    assert_equal "http://maps.google.com/maps/api/staticmap?size=300x300&zoom=11&sensor=false&maptype=road&markers=color%3Agreen%7Clabel%3AA%7C44.477462,-73.212032", img.url
   end
 
   def test_to_html
     img = StaticMap::Image.new(:size => "500x500", :alt => "Alt Test", :title => "Title Test")
-    assert_equal "<img src='http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true' title='Title Test' alt='Alt Test'/>", img.to_html
+    assert_equal "<img src='http://maps.google.com/maps/api/staticmap?size=500x500&zoom=1&sensor=true&maptype=road' title='Title Test' alt='Alt Test'/>", img.to_html
   end
 
   def test_save
     # TODO fake the remote resource
-    img = StaticMap::Image.new(path: "./test/tmp.png").save
+    img = StaticMap::Image.new(path: "./test/tmp.png")
+    img.markers << { latitude: 44.477462, longitude: -73.212032, color: "red", label: "B" }
+    img.markers << { location: "Santa Barbara,California", color: "blue", label: "A" }
+    img.save
     assert File.exists?("./test/tmp.png")
-    File.delete("./test/tmp.png")
+    # File.delete("./test/tmp.png")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: