lib/satisfaction/external_dependencies.rb in ruby-satisfaction-0.7.4 vs lib/satisfaction/external_dependencies.rb in ruby-satisfaction-0.7.5

@@ -1,9 +1,16 @@
 require 'rubygems'
-require 'active_support'
+
+require 'active_support/version'
+
+if ActiveSupport::VERSION::MAJOR == 3
+  require 'active_support/all'
+else
+  require 'active_support'
+end
+
 require 'nokogiri'
 require 'json'
-require 'json/add/rails'  #make json play nice with the json rails outputs
 gem('memcache-client')
 require 'memcache'
 
 require 'oauth'
 require 'oauth/signature/hmac/sha1'