geokit-premier 0.0.5 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geokit-premier (0.0.5)
+    geokit-premier (0.0.7)
       hoe
       json_pure
 
@@ -23,10 +23,10 @@ GEM
     autotest (4.4.2)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    hoe (2.8.0)
-      rake (>= 0.8.7)
+    hoe (2.12.4)
+      rake (~> 0.8)
     i18n (0.5.0)
-    json_pure (1.4.6)
+    json_pure (1.6.3)
     mysql (2.8.1)
     rake (0.8.7)
     rspec (2.0.1)
@@ -51,8 +51,6 @@ DEPENDENCIES
   ZenTest
   autotest
   geokit-premier!
-  hoe
-  json_pure
   mysql
   rspec
   standalone_migrations

data/lib/geokit/geocoders.rb

@@ -45,9 +45,7 @@ module Geokit
     end
     
     def url_escape(s)
-    s.gsub(/([^ a-zA-Z0-9_.-]+)/nu) do
-      '%' + $1.unpack('H2' * $1.size).join('%').upcase
-      end.tr(' ', '+')
+      URI.escape(s)
     end
     
     def camelize(str)
@@ -599,7 +597,7 @@ module Geokit
         res = res = self.call_geocoder_service(self.geocode_url(address,options))
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
         json = res.body
-        logger.debug "Google geocoding. Address: #{address}. Result: #{json}"
+#         logger.debug "Google geocoding. Address: #{address}. Result: #{json}"
         return self.json2GeoLoc(json, address)        
       end
  
@@ -707,15 +705,17 @@ module Geokit
           res.lat=addr['geometry']['location']['lat'].to_f
           res.lng=addr['geometry']['location']['lng'].to_f
 
-          ne=Geokit::LatLng.new(
-            addr['geometry']['viewport']['northeast']['lat'].to_f, 
-            addr['geometry']['viewport']['northeast']['lng'].to_f
+          if addr['geometry'].include?('viewport')
+            ne=Geokit::LatLng.new(
+              addr['geometry']['viewport']['northeast']['lat'].to_f, 
+              addr['geometry']['viewport']['northeast']['lng'].to_f
+              )
+            sw=Geokit::LatLng.new(
+              addr['geometry']['viewport']['southwest']['lat'].to_f,
+              addr['geometry']['viewport']['southwest']['lng'].to_f
             )
-          sw=Geokit::LatLng.new(
-            addr['geometry']['viewport']['southwest']['lat'].to_f,
-            addr['geometry']['viewport']['southwest']['lng'].to_f
-          )
-          res.suggested_bounds = Geokit::Bounds.new(sw,ne)
+            res.suggested_bounds = Geokit::Bounds.new(sw,ne)
+          end
 
           if ret
             ret.all.push(res)

data/lib/geokit/geocoders_mine.rb

@@ -38,9 +38,7 @@ module Geokit
     end
     
     def url_escape(s)
-    s.gsub(/([^ a-zA-Z0-9_.-]+)/nu) do
-      '%' + $1.unpack('H2' * $1.size).join('%').upcase
-      end.tr(' ', '+')
+      URI.escape(s)
     end
     
     def camelize(str)

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/geokit.rb

@@ -24,6 +24,7 @@ path = File.expand_path(File.dirname(__FILE__))
 $:.unshift path unless $:.include?(path)
 require 'geokit/geocoders'
 require 'geokit/mappable'
+require 'openssl'
 
 # make old-style module name "GeoKit" equivalent to new-style "Geokit"
 GeoKit=Geokit

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geokit-premier
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andrew Forward (forked project from Andre Lewis and Bill Eisenhauer)
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -05:00
-default_executable: 
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -157,7 +156,6 @@ files:
 - test/test_multi_ip_geocoder.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
-has_rdoc: true
 homepage: https://github.com/aforward/geokit-premier-gem
 licenses: []
 
@@ -187,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Enables google geocoding using a premier account