gmapper 0.2.0 → 0.2.1

data/README.rdoc

@@ -18,7 +18,7 @@ To create a map of a location, say the Googleplex:
 
 Then, lets say we want to add a marker to point out where it is:
 
-  map << Google::Maps::Static::Marker.new([37.422, 122.084], :color => :blue, :label => 'G')
+  map << Google::Maps::Static::Markers.new([37.422, 122.084], :color => :blue, :label => 'G')
 
 To save the map to your local disk:
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require 'echoe'
 require 'spec/rake/spectask'
 
-Echoe.new( 'gmapper', '0.2.0' ) do |p|
+Echoe.new( 'gmapper', '0.2.1' ) do |p|
   p.author          = "TJ Peden"
   p.email           = "tj.peden@tj-coding.com"
   p.summary         = "A version agnostic, dependency free Ruby library for the Google Maps API."

data/gmapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gmapper}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Peden"]
-  s.date = %q{2010-09-02}
+  s.date = %q{2010-09-22}
   s.description = %q{A (mostly) version agnostic, dependency free Ruby library for the Google Maps API.
 
 Currently only supports Google Static Maps.

data/lib/google/maps/static/items/base.rb

@@ -1,3 +1,5 @@
+# All map items have the same format 
+
 module Google
   
   module Maps

data/lib/google/maps/static/map.rb

@@ -5,6 +5,8 @@ module Google
     module Static
       
       class Map
+        attr_accessor :timeout
+        
         def initialize *args
           @base = "http://maps.google.com/maps/api/staticmap"
           
@@ -31,8 +33,12 @@ module Google
         alias_method :add_item, :<<
         
         def save file
-          response = ::Net::HTTP.get( ::URI.parse( url._encode ) )
-          File.open( file, 'wb' ) { |f| f.write response }
+          uri = ::URI.parse( url._encode )
+          http = ::Net::HTTP.new( uri.host, uri.port )
+          http.read_timeout = @timeout if @timeout
+          
+          response = http.get( "#{uri.path}?#{uri.query}" )
+          File.open( file, 'wb' ) { |f| f.write response.body }
         end
         
         def url
@@ -48,7 +54,7 @@ module Google
             url = "#{@base}?#{parameters}"
             
             def url._encode
-              gsub(/\|/, '%7C')
+              gsub(/\|/) { |match| '%' + match.unpack('H2').join.upcase }
             end
             
             @url = url
@@ -74,9 +80,9 @@ module Google
             
             result += '&' + @items.join('&') unless @items.empty?
             
-            result.gsub!(/\s/, '+')
+            result.gsub!(' ', '+')
             
-            result
+            result.split(/&(?=[a-z]+=)/).map { |param| param.gsub('&', '%26') }.join('&')
           end
       end # => Google::Maps::Static::Map
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - TJ Peden
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -04:00
+date: 2010-09-22 00:00:00 -05:00
 default_executable: 
 dependencies: []