Skip to content

Commit

Permalink
Update with adding orm_adaptor support
Browse files Browse the repository at this point in the history
  • Loading branch information
shenoudab committed Nov 26, 2010
1 parent b45f416 commit af2432f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
11 changes: 7 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ source 'http://rubygems.org'

gem 'rails'

gem 'orm_adapter', :git => 'git://github.com/shenoudab/orm_adapter.git'
gem 'devise', :git => 'git://github.com/plataformatec/devise.git'

gem 'couchrest', :git => 'git://github.com/couchrest/couchrest.git'
gem 'couchrest_model', :git => 'git://github.com/couchrest/couchrest_model.git'

gem 'oauth2'
gem 'oa-oauth', :require => "omniauth/oauth"
gem 'oa-openid', :require => "omniauth/openid"

gem 'rails3-generators', :git => 'git://github.com/shenoudab/rails3-generators.git'

gem 'webrat'
gem 'mocha', :require => false
gem 'bcrypt-ruby', :require => 'bcrypt'
group :test do
gem 'webrat', :require => false
gem 'mocha', :require => false
end
1 change: 1 addition & 0 deletions lib/devise/orm/couchrest_model.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'devise_couch'
require 'devise/orm/couchrest_model/schema'
require 'orm_adapter/adapters/couchrest_model'

module Devise
module Orm
Expand Down
2 changes: 1 addition & 1 deletion lib/devise_couch/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module DeviseCouch
VERSION = "1.0.0.beta1"
VERSION = "1.0.0.beta2"
end
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
config.open_error_files = false
end

Devise::Oauth.test_mode!
Devise::OmniAuth.test_mode!

# Add support to load paths so we can overwrite broken webrat setup
$:.unshift "#{DEVISE_PATH}/test/support"
Expand Down

0 comments on commit af2432f

Please sign in to comment.