Merge branch 'master' into openid

[rails.git] / vendor / plugins / open_id_authentication / init.rb

diff --git a/vendor/plugins/open_id_authentication/init.rb b/vendor/plugins/open_id_authentication/init.rb
index 808c7bdbd723b453ffd69e358350d61c1265f970..84ec11fc4919a4ca9412e25e26e67f157022aa97 100644 (file)
--- a/vendor/plugins/open_id_authentication/init.rb
+++ b/vendor/plugins/open_id_authentication/init.rb
@@ -1,18 +1,12 @@
-if config.respond_to?(:gems)
-  config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
-else
-  begin
-    require 'openid'
-  rescue LoadError
-    begin
-      gem 'ruby-openid', '>=2.0.4'
-    rescue Gem::LoadError
-      puts "Install the ruby-openid gem to enable OpenID support"
-    end
-  end
+if Rails.version < '3'
+  config.gem 'rack-openid', :lib => 'rack/openid', :version => '>=0.2.1'
 end
 
-config.to_prepare do
+require 'open_id_authentication'
+
+config.middleware.use OpenIdAuthentication
+
+config.after_initialize do
   OpenID::Util.logger = Rails.logger
   ActionController::Base.send :include, OpenIdAuthentication
 end