gcoder 1.0.0 → 1.1.0

data/README.md

@@ -158,7 +158,7 @@ G = GCoder.connect \
 
 ## Contributors
 
- * Carsten Nielsen
- * Christos Pappas (Added support for Google Maps API Premier and Rails.cache
-   adapter.)
- * [GUI](http://github.com/GUI) (Ruby 1.8.7 compatibility, URI encoding fixes.)
+ * [Carsten Nielsen](http://github.com/heycarsten)
+ * [Christos Pappas](http://github.com/christospappas) - Added support for
+   Google Maps API Premier and Rails.cache adapter.
+ * [GUI](http://github.com/GUI) - Ruby 1.8.7 compatibility, URI encoding fixes.

data/gcoder.gemspec

@@ -6,18 +6,19 @@ Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.date              = Date.today.strftime('%F')
   s.homepage          = 'http://github.com/heycarsten/gcoder'
-  s.authors           = ['Carsten Nielsen', 'Christos Pappas']
+  s.authors           = ['Carsten Nielsen', 'Christos Pappas', 'GUI']
   s.email             = 'heycarsten@gmail.com'
   s.summary           = 'A nice library for geocoding stuff with Google Maps API V3'
   s.rubyforge_project = 'gcoder'
-  s.files             = `git ls-files`.split(?\n)
-  s.test_files        = `git ls-files -- {test,spec}/*`.split(?\n)
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {test,spec}/*`.split("\n")
   s.require_paths     = ['lib']
 
   s.add_dependency             'hashie'
-  s.add_dependency             'yajl-ruby'
+  s.add_dependency             'multi_json'
   s.add_dependency             'ruby-hmac'
-  s.add_development_dependency 'bundler', '>= 1.0.14'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'minitest'
   s.add_development_dependency 'redis'
 
   s.description = <<-END

data/lib/gcoder/geocoder.rb

@@ -6,7 +6,7 @@ module GCoder
 
     class Request
       def self.to_query(params)
-        params.map { |key, val|
+        params.sort_by { |key, val| key.to_s }.map { |key, val|
           "#{CGI.escape(key.to_s)}=#{CGI.escape(val.to_s)}"
         }.join('&')
       end
@@ -26,12 +26,12 @@ 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
 
@@ -78,7 +78,7 @@ module GCoder
       end
 
       def http_get
-        Yajl::Parser.parse(
+        MultiJson.load(
           (self.class.stubs[uri] || Net::HTTP.get(HOST, path)),
           :symbolize_keys => true
         )

data/lib/gcoder/resolver.rb

@@ -23,7 +23,7 @@ module GCoder
     def fetch(key)
       raise ArgumentError, 'block required' unless block_given?
       Hashie::Mash.new(
-        (val = get(key)) ? Yajl::Parser.parse(val) : set(key, yield)
+        (val = get(key)) ? MultiJson.load(val) : set(key, yield)
       )
     end
 
@@ -36,7 +36,7 @@ module GCoder
 
     def set(key, value)
       return value unless @conn
-      @conn.set(key, Yajl::Encoder.encode(value))
+      @conn.set(key, MultiJson.dump(value))
       value
     end
 

data/lib/gcoder/version.rb

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

data/lib/gcoder.rb

@@ -1,4 +1,4 @@
-require 'yajl'
+require 'multi_json'
 require 'hashie'
 require 'net/http'
 require 'cgi'
@@ -16,12 +16,13 @@ require 'gcoder/storage'
 require 'gcoder/resolver'
 
 module GCoder
-  class NoResultsError < StandardError; end
-  class OverLimitError < StandardError; end
-  class GeocoderError < StandardError; end
-  class BadQueryError < StandardError; end
-  class NotImplementedError < StandardError; end
-  class TimeoutError < StandardError; end
+  class Error < StandardError; end
+  class NoResultsError < Error; end
+  class OverLimitError < Error; end
+  class GeocoderError < Error; end
+  class BadQueryError < Error; end
+  class NotImplementedError < Error; end
+  class TimeoutError < Error; end
 
   DEFAULT_CONFIG = {
     :timeout        => 5,

data/spec/gcoder/geocoder_spec.rb

@@ -3,44 +3,44 @@ require 'spec_helper'
 
 describe GCoder::Geocoder::Request do
   it 'should raise an error when passed nil' do
-    -> {
+    lambda {
       GCoder::Geocoder::Request.new(nil)
     }.must_raise GCoder::BadQueryError
   end
 
   it 'should raise an error when passed a blank string' do
-    -> {
+    lambda {
       GCoder::Geocoder::Request.new(' ')
     }.must_raise GCoder::BadQueryError
   end
 
   it 'should raise an error when passed incorrect lat/lng pair' do
     GCoder::Geocoder::Request.tap do |req|
-      -> { req.new([])           }.must_raise GCoder::BadQueryError
-      -> { req.new([43.64])      }.must_raise GCoder::BadQueryError
-      -> { req.new([43.64, nil]) }.must_raise GCoder::BadQueryError
-      -> { req.new(['', 43.64])  }.must_raise GCoder::BadQueryError
+      lambda { req.new([])           }.must_raise GCoder::BadQueryError
+      lambda { req.new([43.64])      }.must_raise GCoder::BadQueryError
+      lambda { req.new([43.64, nil]) }.must_raise GCoder::BadQueryError
+      lambda { req.new(['', 43.64])  }.must_raise GCoder::BadQueryError
     end
   end
 
   it 'should URI encode a string' do
     q = GCoder::Geocoder::Request.to_query(:q => 'hello world', :a => 'test')
-    q.must_equal 'q=hello+world&a=test'
+    q.must_equal 'a=test&q=hello+world'
   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'
+    q.must_equal 'a=test&q=hello+%26+world'
   end
 
   it 'should URI encode a UTF-8 string' do
     q = GCoder::Geocoder::Request.to_query(:q => 'मुंबई', :a => 'test')
-    q.must_equal 'q=%E0%A4%AE%E0%A5%81%E0%A4%82%E0%A4%AC%E0%A4%88&a=test'
+    q.must_equal 'a=test&q=%E0%A4%AE%E0%A5%81%E0%A4%82%E0%A4%AC%E0%A4%88'
   end
 
   it 'should create a query string' do
     q = GCoder::Geocoder::Request.to_query(:q => 'hello world', :a => 'test')
-    q.must_equal 'q=hello+world&a=test'
+    q.must_equal 'a=test&q=hello+world'
   end
 
   it '(when passed a bounds option) should generate correct query params' do
@@ -65,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+angeles&client=gme-test&signature=owxOUlItGsYUp-iEPw6n1S06TSc='
+    q.must_equal '/maps/api/geocode/json?address=los+angeles&client=gme-test&sensor=false&signature=vzm0saCgyMirMQJqFGHgGaoADhU='
   end
   
 end

data/spec/gcoder/resolver_spec.rb

@@ -22,26 +22,26 @@ describe 'GCoder::Resolver (with caching)' do
   end
 
   it 'should raise an error for queries with no results' do
-    -> { @g['noresults', :region => nil] }.must_raise GCoder::NoResultsError
+    lambda { @g.geocode('noresults', :region => nil) }.must_raise GCoder::NoResultsError
   end
 
   it 'should raise an error for denied queries' do
-    -> { @g['denied', :region => nil] }.must_raise GCoder::GeocoderError
+    lambda { @g.geocode('denied', :region => nil) }.must_raise GCoder::GeocoderError
   end
 
   it 'should raise an error when the query limit is exceeded' do
-    -> { @g['overlimit', :region => nil] }.must_raise GCoder::OverLimitError
+    lambda { @g.geocode('overlimit', :region => nil) }.must_raise GCoder::OverLimitError
   end
 
   it 'should raise an error when the request is invalid' do
-    -> { @g['denied', :region => nil] }.must_raise GCoder::GeocoderError
+    lambda { @g.geocode('denied', :region => nil) }.must_raise GCoder::GeocoderError
   end
 end
 
 describe 'GCoder::Resolver (without caching)' do
   it 'should resolve queries' do
     g = GCoder.connect(:storage => nil)
-    r = g['queen and spadina', :region => :ca]
+    r = g.geocode('queen and spadina', :region => :ca)
     r.must_be_instance_of Array
   end
 end

data/spec/gcoder/storage_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe GCoder::Storage::Adapter do
   it 'shoyld raise an error if instantiated directly' do
-    -> { GCoder::Storage::Adapter.new }.must_raise GCoder::NotImplementedError
+    lambda { GCoder::Storage::Adapter.new }.must_raise GCoder::NotImplementedError
   end
 end
 

data/spec/support/requests.yml

@@ -1,18 +1,18 @@
 ---
 - :file: 1.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=queen+and+spadina&region=ca
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?address=queen+and+spadina&region=ca&sensor=false
 
 - :file: 2.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&latlng=43.6487606%2C-79.3962415
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?latlng=43.6487606%2C-79.3962415&sensor=false
 
 - :file: 3.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=noresults
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?address=noresults&sensor=false
 
 - :file: 4.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=denied
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?address=denied&sensor=false
 
 - :file: 5.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=overlimit
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?address=overlimit&sensor=false
 
 - :file: 6.json
-  :uri: http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=invalid
+  :uri: http://maps.googleapis.com/maps/api/geocode/json?address=invalid&sensor=false

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: gcoder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
 - Carsten Nielsen
 - Christos Pappas
+- GUI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70138928847000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138928847000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70138928846580 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138928846580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70138928846160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +55,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70138928846160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70138928845660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138928845660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70138928845240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +103,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70138928845240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Uses Google Maps Geocoding API (V3) to geocode stuff and optionally
   caches the
 
@@ -115,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1108805213569123765
+      hash: 629522719236126165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,10 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1108805213569123765
+      hash: 629522719236126165
 requirements: []
 rubyforge_project: gcoder
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A nice library for geocoding stuff with Google Maps API V3