Merge branch 'master' of github.com:intridea/omniauth-openid

Author: Michael Bleigh

README.md

@@ -4,13 +4,7 @@ Provides strategies for authenticating to providers using the OpenID standard.
 
 ## Installation
 
-To get just OpenID functionality:
-
-    gem install oa-openid
-
-For the full auth suite:
-
-    gem install omniauth
+    gem install omniauth-openid
 
 ## Stand-Alone Example
 
@@ -20,9 +14,9 @@ Use the strategy as a middleware in your application:
     require 'openid/store/filesystem'
 
     use Rack::Session::Cookie
-    use OmniAuth::Strategies::OpenID, OpenID::Store::Filesystem.new('/tmp')
+    use OmniAuth::Strategies::OpenID, :store => OpenID::Store::Filesystem.new('/tmp')
 
-Then simply direct users to '/auth/open_id' to prompt them for their OpenID identifier. You may also pre-set the identifier by passing an `identifier` parameter to the URL (Example: `/auth/open_id?openid_url=yahoo.com`).
+Then simply direct users to `/auth/open_id` to prompt them for their OpenID identifier. You may also pre-set the identifier by passing an `identifier` parameter to the URL (Example: `/auth/open_id?openid_url=yahoo.com`).
 
 A list of all OpenID stores is available at http://github.com/openid/ruby-openid/tree/master/lib/openid/store/
 
@@ -31,20 +25,18 @@ A list of all OpenID stores is available at http://github.com/openid/ruby-openid
 If OpenID is one of several authentication strategies, use the OmniAuth Builder:
 
     require 'omniauth/openid'
-    require 'omniauth/basic'  # for Campfire
     require 'openid/store/filesystem'
 
     use OmniAuth::Builder do
-      provider :open_id, OpenID::Store::Filesystem.new('/tmp')
-      provider :campfire
+      provider :open_id, :store => OpenID::Store::Filesystem.new('/tmp')
     end
 
 ## Configured Identifiers
 
 You may pre-configure an OpenID identifier.  For example, to use Google's main OpenID endpoint:
 
     use OmniAuth::Builder do
-      provider :open_id, nil, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
+      provider :open_id, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
     end
 
 Note the use of nil, which will trigger ruby-openid's default Memory Store.