Use ActiveSupport::JSON instead of JSON if available

README.rdoc

@@ -93,6 +93,11 @@ Additionally, geoplanet has the following gem dependencies:
 * rest-client >= 0.9
 * json >= 1.1.3
 
+Please note that if you have ActiveSupport::JSON defined (either by
+manually having loaded it or when you use geoplanet within a Rails
+application) the json dependency will be ignored and geoplanet uses
+ActiveSupport::JSON instead.
+
 == INSTALL:
 
 * gem install carlosparamio-geoplanet --source http://gems.github.com
@@ -120,4 +125,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

geoplanet.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "geoplanet"
-  s.version  = "0.2.0"
-  s.date     = "2009-03-23"
+  s.version  = "0.2.2"
+  s.date     = "2009-04-01"
   s.summary  = "A Ruby wrapper for the Yahoo! GeoPlanet API."
   s.email    = "carlosparamio@gmail.com"
   s.homepage = "http://github.com/carlosparamio/geoplanet/"
@@ -24,4 +24,4 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = false
   s.rdoc_options = ["--main", "README.rdoc"]
-end
+end

lib/geoplanet.rb

@@ -1,4 +1,15 @@
-%w{rubygems rest_client json}.each { |x| require x }
+%w{rubygems rest_client}.each { |x| require x }
+
+if defined?(ActiveSupport::JSON)
+  JSON = ActiveSupport::JSON
+  module JSON
+    def self.parse(json)
+      decode(json)
+    end
+  end
+else
+  require 'json'
+end
 
 require 'geoplanet/version'
 require 'geoplanet/base'
@@ -15,4 +26,4 @@ class << self
   class BadRequest           < StandardError; end
   class NotFound             < StandardError; end
   class NotAcceptable        < StandardError; end
-end
+end