gcoder 0.12.1 → 1.0.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Carsten Nielsen
+Copyright (c) 2012 Carsten Nielsen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -161,9 +161,4 @@ G = GCoder.connect \
  * Carsten Nielsen
  * Christos Pappas (Added support for Google Maps API Premier and Rails.cache
    adapter.)
-
-## Notes
-
-Tested with Ruby 1.9.2 (MRI) and nothing else, fork it. See
-[LICENSE](http://github.com/heycarsten/gcoder/blob/master/LICENSE) for details
-about that jazz.
+ * [GUI](http://github.com/GUI) (Ruby 1.8.7 compatibility, URI encoding fixes.)

data/lib/gcoder/geocoder.rb

@@ -5,9 +5,10 @@ module GCoder
     PATH = '/maps/api/geocode/json'
 
     class Request
-
       def self.to_query(params)
-        URI.escape(params.map { |key, val| "#{key}=#{val}" }.join('&'))
+        params.map { |key, val|
+          "#{CGI.escape(key.to_s)}=#{CGI.escape(val.to_s)}"
+        }.join('&')
       end
 
       def self.stubs
@@ -25,17 +26,19 @@ module GCoder
 
       def params
         p = { :sensor => 'false' }
-        p[:address]   = address             if @address
-        p[:latlng]    = latlng              if @latlng
-        p[:language]  = @config[:language]  if @config[:language]
-        p[:region]    = @config[:region]    if @config[:region]
-        p[:bounds]    = bounds              if @config[:bounds]
-        p[:client]    = @config[:client]    if @config[:client]
+        p[:address]   = address            if @address
+        p[:latlng]    = latlng             if @latlng
+        p[:language]  = @config[:language] if @config[:language]
+        p[:region]    = @config[:region]   if @config[:region]
+        p[:bounds]    = bounds             if @config[:bounds]
+        p[:client]    = @config[:client]   if @config[:client]
         p
       end
 
       def path
-        "#{PATH}?#{self.class.to_query(params)}#{"&signature=#{sign_key(@config[:key])}" if @config[:key]}"
+        str = "#{PATH}?#{self.class.to_query(params)}"
+        str << "&signature=#{sign_key(@config[:key])}" if @config[:key]
+        str
       end
 
       def uri
@@ -92,7 +95,7 @@ module GCoder
       def address
         @config[:append] ? "#{@address} #{@config[:append]}" : @address
       end
-      
+
       def url_safe_base64_decode(string)
         return Base64.decode64(string.tr('-_','+/')).gsub(/\n/,'')
       end
@@ -100,13 +103,12 @@ module GCoder
       def url_safe_base64_encode(raw)
         return Base64.encode64(raw).tr('+/','-_').gsub(/\n/,'')
       end
-      
+
       def sign_key(key)
         sha1 = HMAC::SHA1.new(url_safe_base64_decode(key))
         sha1 << "#{PATH}?#{self.class.to_query(params)}"
         raw_signature = sha1.digest()
-        
-        url_safe_base64_encode(raw_signature)  
+        url_safe_base64_encode(raw_signature)
       end
     end
 

data/lib/gcoder/version.rb

@@ -1,3 +1,3 @@
 module GCoder
-  VERSION = '0.12.1'
+  VERSION = '1.0.0'
 end

data/lib/gcoder.rb

@@ -1,7 +1,7 @@
 require 'yajl'
 require 'hashie'
 require 'net/http'
-require 'uri'
+require 'cgi'
 require 'base64'
 require 'timeout'
 require 'digest/sha1'

data/spec/gcoder/geocoder_spec.rb

@@ -25,7 +25,12 @@ describe GCoder::Geocoder::Request do
 
   it 'should URI encode a string' do
     q = GCoder::Geocoder::Request.to_query(:q => 'hello world', :a => 'test')
-    q.must_equal 'q=hello%20world&a=test'
+    q.must_equal 'q=hello+world&a=test'
+  end
+
+  it 'should URI encode a string with ampersands' do
+    q = GCoder::Geocoder::Request.to_query(:q => 'hello & world', :a => 'test')
+    q.must_equal 'q=hello+%26+world&a=test'
   end
 
   it 'should URI encode a UTF-8 string' do
@@ -35,7 +40,7 @@ describe GCoder::Geocoder::Request do
 
   it 'should create a query string' do
     q = GCoder::Geocoder::Request.to_query(:q => 'hello world', :a => 'test')
-    q.must_equal 'q=hello%20world&a=test'
+    q.must_equal 'q=hello+world&a=test'
   end
 
   it '(when passed a bounds option) should generate correct query params' do
@@ -60,7 +65,7 @@ describe GCoder::Geocoder::Request do
   
   it "(when passed a premier client and key) should generate correct query params" do
     q = GCoder::Geocoder::Request.new('los angeles', :client => "gme-test", :key => "zNf23lb-YIoD4kEFN34C6324cww=").path
-    q.must_equal '/maps/api/geocode/json?sensor=false&address=los%20angeles&client=gme-test&signature=p0EiRD298eLhlGTqlBA5RKxv448='
+    q.must_equal '/maps/api/geocode/json?sensor=false&address=los+angeles&client=gme-test&signature=owxOUlItGsYUp-iEPw6n1S06TSc='
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcoder
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70147457520440 !ruby/object:Gem::Requirement
+  requirement: &70138928847000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147457520440
+  version_requirements: *70138928847000
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70147457519540 !ruby/object:Gem::Requirement
+  requirement: &70138928846580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147457519540
+  version_requirements: *70138928846580
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70147457518700 !ruby/object:Gem::Requirement
+  requirement: &70138928846160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147457518700
+  version_requirements: *70138928846160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70147457455060 !ruby/object:Gem::Requirement
+  requirement: &70138928845660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *70147457455060
+  version_requirements: *70138928845660
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70147457454080 !ruby/object:Gem::Requirement
+  requirement: &70138928845240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147457454080
+  version_requirements: *70138928845240
 description: ! 'Uses Google Maps Geocoding API (V3) to geocode stuff and optionally
   caches the
 
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3722071626544291887
+      hash: -1108805213569123765
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +124,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3722071626544291887
+      hash: -1108805213569123765
 requirements: []
 rubyforge_project: gcoder
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A nice library for geocoding stuff with Google Maps API V3