gcoder 0.8.0 → 0.9.0

data/Gemfile

@@ -1,3 +1,4 @@
 source :rubygems
 
 gem 'hashie'
+gem 'yajl-ruby'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Carsten Nielsen
+Copyright (c) 2011 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/gcoder.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'gcoder'
 
   s.add_dependency 'hashie'
+  s.add_dependency 'yajl-ruby'
 
   s.files         = `git ls-files`.split(?\n)
   s.test_files    = `git ls-files -- {test,spec}/*`.split(?\n)

data/lib/gcoder/geocoder.rb

@@ -79,7 +79,10 @@ module GCoder
       end
 
       def http_get
-        self.class.stubs[uri] || Net::HTTP.get(HOST, path)
+        Yajl::Parser.parse(
+          (self.class.stubs[uri] || Net::HTTP.get(HOST, path)),
+          :symbolize_keys => true
+        )
       end
 
       def latlng
@@ -97,36 +100,35 @@ module GCoder
 
 
     class Response
-      attr_reader :body, :uri
+      attr_reader :uri, :data
 
-      def initialize(uri, body)
-        @uri      = uri
-        @body     = body
-        @response = Hashie::Mash.new(JSON.parse(@body))
+      def initialize(uri, data)
+        @uri  = uri
+        @data = Hashie::Mash.new(data)
         validate_status!
       end
 
       def as_mash
-        @response
+        data
       end
 
       private
 
       def validate_status!
-        case @response.status
+        case data.status
         when 'OK'
           # All is well!
         when 'ZERO_RESULTS'
-          raise NoResultsError, "Geocoding API returned no results: (#{@uri})"
+          raise NoResultsError, "Geocoding API returned no results: (#{uri})"
         when 'OVER_QUERY_LIMIT'
           raise OverLimitError, 'Rate limit for Geocoding API exceeded!'
         when 'REQUEST_DENIED'
-          raise GeocoderError, "Request denied by the Geocoding API: (#{@uri})"
+          raise GeocoderError, "Request denied by the Geocoding API: (#{uri})"
         when 'INVALID_REQUEST'
-          raise GeocoderError, "An invalid request was made: (#{@uri})"
+          raise GeocoderError, "An invalid request was made: (#{uri})"
         else
           raise GeocoderError, 'No status in Geocoding API response: ' \
-          "(#{@uri})\n\n#{@body}"
+          "(#{uri})\n\n#{data.inspect}"
         end
       end
     end

data/lib/gcoder/resolver.rb

@@ -15,14 +15,16 @@ module GCoder
     end
 
     def geocode(query, opts = {})
-      fetch([query, opts].join) do
+      fetch([query, opts].join) {
         Geocoder::Request.new(query, opts).get.as_mash
-      end.results
+      }.results
     end
 
     def fetch(key)
       raise ArgumentError, 'block required' unless block_given?
-      Hashie::Mash.new((val = get(key)) ? JSON.parse(val) : set(key, yield))
+      Hashie::Mash.new(
+        (val = get(key)) ? Yajl::Parser.parse(val) : set(key, yield)
+      )
     end
 
     private
@@ -34,7 +36,7 @@ module GCoder
 
     def set(key, value)
       return value unless @conn
-      @conn.set(key, value.to_json)
+      @conn.set(key, Yajl::Encoder.encode(value))
       value
     end
 

data/lib/gcoder/version.rb

@@ -1,3 +1,3 @@
 module GCoder
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/gcoder.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'yajl'
 require 'hashie'
 require 'net/http'
 require 'timeout'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Carsten Nielsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
+date: 2011-01-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Uses Google Geocoder API to geocode stuff and optionally caches the results somewhere
 email: 
 - heycarsten@gmail.com