Fixed JSON support when used as Rails plugin

pierrevalade · Jan 1, 2009 · d4facf4 · d4facf4
1 parent 23c1ae5
commit d4facf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/google_ajax.rb b/lib/google_ajax.rb
@@ -2,7 +2,7 @@
 require 'open-uri'
 require 'ostruct'
 require 'rubygems'
-require 'json'
+require 'json' unless defined? Rails
 
 require 'google_ajax/feed'
 require 'google_ajax/language'

diff --git a/lib/google_ajax/parser.rb b/lib/google_ajax/parser.rb
@@ -1,7 +1,11 @@
 class GoogleAjax
   class Parser
     def self.parse(api, method, data)
-      data = JSON.parse(data)
+      if defined? Rails
+        data = ActiveSupport::JSON::decode(data) 
+      else
+        data = JSON.parse(data) 
+      end
       Errors.process(data)
       parser = Parser::PARSERS[api][method]
       parser.process(data['responseData'])