googlestaticmap 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 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
+
 === 1.1.2 / 2012-04-27
 * Fixed bug from 1.1.1 when specifying https when calling get_map (thanks aduncan for catching it!)
 

data/lib/googlestaticmap.rb

@@ -57,6 +57,7 @@
 
 require 'cgi'
 require 'net/http'
+require 'net/https' if RUBY_VERSION < "1.9"
 require File.dirname(__FILE__) +  '/googlestaticmap_helper'
 
 # Main class for creating a static map.  Create an instance, Set attributes
@@ -172,12 +173,12 @@ class GoogleStaticMap
     http = Net::HTTP.Proxy(@proxy_address,@proxy_port).new("maps.google.com", port)
     http.use_ssl = protocol == 'https'
 
-    resp, data = http.get2(relative_url(protocol))
+    resp = http.get2(relative_url(protocol))
     if resp && resp.is_a?(Net::HTTPSuccess)
       if output_file
-        File.open(output_file, "wb") {|f| f << data }
+        File.open(output_file, "wb") {|f| f << resp.body }
       end
-      data
+      resp.body
     else
       if resp
         raise Exception.new("Error encountered while retrieving google map, code #{resp.code}, text #{resp.body}")

data/test/tc_google_static_map.rb

@@ -6,8 +6,13 @@ require 'mocha'
 require File.dirname(__FILE__) +  '/../lib/googlestaticmap'
 
 class MockSuccess < Net::HTTPSuccess #:nodoc: all
-  def initialize
+  def initialize(data)
+    @data = data
   end
+
+  def body
+    @data
+  end	
 end
 
 class MockFailure < Net::HTTPServiceUnavailable #:nodoc: all
@@ -95,7 +100,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
 
   def test_get_map_success_no_file_http
     test_data = "asdf"
-    MockHttp.any_instance.expects(:get2).returns([MockSuccess.new,test_data])
+    MockHttp.any_instance.expects(:get2).returns(MockSuccess.new(test_data))
     MockHttp.any_instance.expects(:"use_ssl=").with(false).returns(false)
     Net::HTTP.expects(:new).returns(MockHttp.new)
 
@@ -107,7 +112,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
 
   def test_get_map_success_no_file_https
     test_data = "asdf"
-    MockHttp.any_instance.expects(:get2).returns([MockSuccess.new,test_data])
+    MockHttp.any_instance.expects(:get2).returns(MockSuccess.new(test_data))
     MockHttp.any_instance.expects(:"use_ssl=").with(true).returns(true)
     Net::HTTP.expects(:new).returns(MockHttp.new)
 
@@ -119,7 +124,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
 
   def test_get_map_success_write_file
     test_data = "asdf"
-    MockHttp.any_instance.expects(:get2).returns([MockSuccess.new,test_data])
+    MockHttp.any_instance.expects(:get2).returns(MockSuccess.new(test_data))
     Net::HTTP.expects(:new).returns(MockHttp.new)
     file_data = ""
     file_name = "testdata.png"
@@ -137,7 +142,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
 
   def test_get_map_success_check_url
     test_data = "asdf"
-    MockHttp.any_instance.expects(:get2).returns([MockSuccess.new,test_data])
+    MockHttp.any_instance.expects(:get2).returns(MockSuccess.new(test_data))
     Net::HTTP.expects(:new).returns(MockHttp.new)
     file_data = ""
     file_name = "testdata.png"
@@ -155,7 +160,7 @@ class GoogleStaticMapTest < Test::Unit::TestCase #:nodoc: all
 
 
   def test_get_map_failure
-    MockHttp.any_instance.expects(:get2).returns([MockFailure.new,""])
+    MockHttp.any_instance.expects(:get2).returns(MockFailure.new)
     Net::HTTP.expects(:new).returns(MockHttp.new)
     g = default_map
     assert_raise Exception do

metadata

@@ -1,67 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: googlestaticmap
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.1.3
   prerelease: 
-  version: 1.1.2
 platform: ruby
-authors: 
+authors:
 - Brent Sowers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-27 00:00:00 Z
+date: 2012-07-08 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.
+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: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - History.txt
-files: 
+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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Class for retrieving maps from the Google Maps Static API service
-test_files: 
+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