deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Supporting new active_support setup for Rails 3

Browse source
This commit is contained in:
Sam Lown 2010-06-15 01:24:31 +02:00
parent 5dfd18cd71
commit 2139119845
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/couchrest_extended_document.rb
View file

@ -5,7 +5,7 @@ gem 'couchrest'
require 'couchrest' require 'couchrest'
require 'activesupport' require 'active_support/core_ext'
require 'mime/types' require 'mime/types'
require "enumerator" require "enumerator"

4
spec/couchrest/extended_doc_inherited_spec.rb
View file

@ -2,7 +2,7 @@ require File.expand_path('../../spec_helper', __FILE__)
begin begin
require 'rubygems' unless ENV['SKIP_RUBYGEMS'] require 'rubygems' unless ENV['SKIP_RUBYGEMS']
require 'activesupport' require 'active_support/json'
ActiveSupport::JSON.backend = :JSONGem ActiveSupport::JSON.backend = :JSONGem
class PlainParent class PlainParent
@ -36,5 +36,5 @@ begin
end end
rescue LoadError rescue LoadError
puts "This spec requires 'active_support' to be loaded" puts "This spec requires 'active_support/json' to be loaded"
end end