Switch to DSL methods for credentials and extra, update README

Author: Michael Bleigh

README.md

@@ -1,5 +1,9 @@
 # OmniAuth OAuth
 
+**Note:** This gem is designed to work with the unreleased OmniAuth 1.0
+library. It will not be officially released on RubyGems.org until
+OmniAuth 1.0 is released.
+
 This gem contains a generic OAuth strategy for OmniAuth. It is meant to
 serve as a building block strategy for other strategies and not to be
 used independently (since it has no inherent way to gather uid and user
@@ -22,29 +26,24 @@ subclass it and add a few extra methods like so:
           # initializing your consumer from the OAuth gem.
           option :client_options, {:site => "https://api.somesite.com"}
 
-          # This is called after authentication has succeeded. If
+          # These are called after authentication has succeeded. If
           # possible, you should try to set the UID without making
           # additional calls (if the user id is returned with the token
           # or as a URI parameter). This may not be possible with all
           # providers.
-          def uid
-            request.params['user_id']
-          end
+          uid{ request.params['user_id'] }
 
-          # This is called after authentication has succeeded. You can
-          # make signed API requests by using the #access_token method
-          # which is simply an OAuth gem AccessToken object.
-          def info
+          info do
             {
               :name => raw_info['name'],
               :location => raw_info['city']
             }
           end
 
-          def extra
-            super.merge({
+          extra do
+            {
               'raw_info' => raw_info
-            })
+            }
           end
 
           def raw_info
@@ -54,4 +53,26 @@ subclass it and add a few extra methods like so:
       end
     end
 
-That's pretty much it! Once you are successfully 
+That's pretty much it!
+
+## License
+
+Copyright (C) 2011 by Michael Bleigh and Intridea, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

lib/omniauth/strategies/oauth.rb

@@ -67,11 +67,11 @@ def callback_phase
         fail!(:session_expired, e)
       end
 
-      def credentials
+      credentials do
         {'token' => access_token.token, 'secret' => access_token.secret}
       end
 
-      def extra
+      extra do
         {'access_token' => access_token}
       end
     end

spec/omniauth/strategies/oauth_spec.rb

@@ -2,13 +2,8 @@
 
 describe "OmniAuth::Strategies::OAuth" do
   class MyOAuthProvider < OmniAuth::Strategies::OAuth
-    def uid
-      access_token.token
-    end
-
-    def info
-      {'name' => access_token.token}
-    end
+    uid{ access_token.token }
+    info{ {'name' => access_token.token} }
   end
 
   def app
@@ -40,6 +35,7 @@ def session
       before do
         get '/auth/example.org'
       end
+
       it 'should redirect to authorize_url' do
         last_response.should be_redirect
         last_response.headers['Location'].should == 'https://api.example.org/oauth/authorize?oauth_token=yourtoken'