From 21391198458d9eb4b57670a24d58972fe2607946 Mon Sep 17 00:00:00 2001 From: Sam Lown Date: Tue, 15 Jun 2010 01:24:31 +0200 Subject: [PATCH] Supporting new active_support setup for Rails 3 --- lib/couchrest_extended_document.rb | 2 +- spec/couchrest/extended_doc_inherited_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/couchrest_extended_document.rb b/lib/couchrest_extended_document.rb index aa9e5e7..d256be4 100644 --- a/lib/couchrest_extended_document.rb +++ b/lib/couchrest_extended_document.rb @@ -5,7 +5,7 @@ gem 'couchrest' require 'couchrest' -require 'activesupport' +require 'active_support/core_ext' require 'mime/types' require "enumerator" diff --git a/spec/couchrest/extended_doc_inherited_spec.rb b/spec/couchrest/extended_doc_inherited_spec.rb index 5422091..32a0362 100644 --- a/spec/couchrest/extended_doc_inherited_spec.rb +++ b/spec/couchrest/extended_doc_inherited_spec.rb @@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__) begin require 'rubygems' unless ENV['SKIP_RUBYGEMS'] - require 'activesupport' + require 'active_support/json' ActiveSupport::JSON.backend = :JSONGem class PlainParent @@ -36,5 +36,5 @@ begin end rescue LoadError - puts "This spec requires 'active_support' to be loaded" + puts "This spec requires 'active_support/json' to be loaded" end