authlogic-connect 0.0.5.1 → 0.0.6

data/README.markdown

@@ -1,32 +1,14 @@
 # AuthlogicConnect
 
-AuthlogicConnect is an extension of the Authlogic library that aims to add complete and seamless Oauth and OpenID support to your application.
+> Instant Oauth and OpenID support for your Rails and Sinatra Apps
 
-It allows you to login through any of the 30+ Oauth and OpenID providers on the Internet without having to write any of the logic yourself.
+AuthlogicConnect is an extension of the Authlogic library that adds complete Oauth and OpenID support to your application.  It provides a single interface to Oauth 1.0 and Oauth 2.0.
 
-That makes life easy and gives you a lot of power.
+It currently allows you to login with Github, Facebook, Twitter, Google, LinkedIn, MySpace, Vimeo, and Yahoo Oauth providers, and all the OpenID providers.  Feel free to add support for more as you need them.
 
-Here's a **[live example](http://authlogic-connect.heroku.com)** on Heroku ([with source](http://github.com/viatropos/authlogic-connect-example)).
+Here's a **[live example](http://authlogic-connect.heroku.com)** on Heroku ([with source](http://github.com/viatropos/authlogic-connect-example)).  [Here's the Docs](http://rdoc.info/projects/viatropos/authlogic-connect)
 
-## Supported Providers
-
-AuthlogicConnect currently allows you to login with 7 Oauth providers and all the OpenID providers.  Feel free to add support for more as you need them.
-
-### Oauth
-
-- Twitter
-- Facebook
-- Google
-- LinkedIn
-- MySpace
-- Vimeo
-- Yahoo
-
-### OpenID
-
-- MyOpenID
-
-### Lists of all known providers here:
+### Lists of known providers:
 
 - [Oauth Providers](http://wiki.oauth.net/ServiceProviders)
 - [OpenID Providers](http://en.wikipedia.org/wiki/List_of_OpenID_providers)
@@ -233,7 +215,7 @@ If they've associated their Facebook account with your site, you can access Face
 
 ## Rest...
 
-Thanks for the people that are already extending the project, all the input making things move much faster.
+Thanks for the people that are already extending the project, all the input making things move much faster.  [Andrew Cove](http://github.com/andrewacove) and [Daf](http://github.com/daf) have helped me quite a bit, thanks guys.
 
 Feel free to add to the wiki if you figure things out or make new distinctions.
 
@@ -245,4 +227,8 @@ Feel free to add to the wiki if you figure things out or make new distinctions.
 
 #### Notes
 
-- Build mechanize tool to automatically create applications with service providers.
+- Build mechanize tool to automatically create applications with service providers.
+
+### Todo
+
+- Add [Andrew Cove's](http://github.com/andrewacove) idea of a "Merge Code".  So if user creates Facebook account logs out, and create Twitter account, a code they can use to pass to facebook account so it knows it's associated with Twitter.

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "authlogic-connect"
   s.author            = "Lance Pollard"
-  s.version           = "0.0.5.1"
+  s.version           = "0.0.6"
   s.summary           = "Authlogic Connect: Oauth and OpenID made dead simple"
   s.homepage          = "http://github.com/viatropos/authlogic-connect"
   s.email             = "lancejpollard@gmail.com"
@@ -72,4 +72,14 @@ end
 
 task :yank do
   `gem yank #{spec.name} -v #{spec.version}`
+end
+
+desc 'run unit tests'
+task :test do
+  Dir["test/**/*"].each do |file|
+    next unless File.extname(file) == ".rb"
+    next unless File.basename(file) =~ /test_/
+    next if File.basename(file) =~ /test_helper/
+    system "ruby #{file}"
+  end
 end

data/lib/authlogic-connect.rb

@@ -21,9 +21,12 @@ custom_models =   ["#{library}/access_token"]
 custom_models +=  Dir["#{library}/oauth/tokens"]
 custom_models +=  Dir["#{library}/openid/tokens"]
 
+# Rails 3/2 config
+load_path_method = ActiveSupport::Dependencies.respond_to?(:autoload_paths) ? :autoload_paths : :load_paths
+
 custom_models.each do |path|
   $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
+  ActiveSupport::Dependencies.send(load_path_method) << path
 end
 
 # Rails 3beta4 backport

data/lib/authlogic_connect/access_token.rb

@@ -17,6 +17,10 @@ class AccessToken < ActiveRecord::Base
     self.class.settings
   end
   
+  def config
+    self.class.config
+  end
+  
   def get(path)
     
   end
@@ -43,6 +47,10 @@ class AccessToken < ActiveRecord::Base
       @settings.dup
     end
     
+    def api_version(value = nil)
+      config[:api]
+    end
+    
     protected
     
     def credentials

data/lib/authlogic_connect/common/state.rb

@@ -29,4 +29,17 @@ module AuthlogicConnect::Common::State
     !using_oauth? && super
   end
   
+  # because user and session are so closely tied together, I am still
+  # uncertain as to how they are saved.  So this makes sure if we are
+  # logging in, it must be saving the session, otherwise the user.
+  def correct_request_class?
+    return false unless auth_params?
+    
+    if is_auth_session?
+      auth_type.to_s == "session"
+    else
+      auth_type.to_s == "user"
+    end
+  end
+  
 end

data/lib/authlogic_connect/common/user.rb

@@ -60,8 +60,8 @@ module AuthlogicConnect::Common::User
       save_options = ActiveRecord::VERSION::MAJOR < 3 ? options[:validate] : options
       
       # kill the block if we're starting authentication
-      authenticate_via_protocol(block_given?, options) do |redirecting|
-        block = nil if redirecting
+      authenticate_via_protocol(block_given?, options) do |start_authentication|
+        block = nil if start_authentication # redirecting
         # forces you to validate, only if a block is given
         result = super(save_options) # validate!
         unless block.nil?

data/lib/authlogic_connect/common/variables.rb

@@ -47,19 +47,6 @@ module AuthlogicConnect::Common::Variables
     result
   end
   
-  # because user and session are so closely tied together, I am still
-  # uncertain as to how they are saved.  So this makes sure if we are
-  # logging in, it must be saving the session, otherwise the user.
-  def correct_request_class?
-    return false unless auth_params?
-    
-    if is_auth_session?
-      auth_type.to_s == "session"
-    else
-      auth_type.to_s == "user"
-    end
-  end
-  
   def add_session_key(key, value)
     
   end

data/lib/authlogic_connect/oauth/process.rb

@@ -71,5 +71,5 @@ module AuthlogicConnect::Oauth::Process
       :_secret,
     ].each {|key| remove_session_key(key)}
   end
-    
+  
 end

data/lib/authlogic_connect/oauth/state.rb

@@ -11,7 +11,7 @@ module AuthlogicConnect::Oauth::State
   # 2. from call
   # checks that the correct session variables are there
   def oauth_response?
-    !oauth_response.nil? && !auth_session.nil? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth"
+    !oauth_response.nil? && auth_session? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth"
   end
   
   def oauth_complete?
@@ -54,7 +54,7 @@ module AuthlogicConnect::Oauth::State
   end
   
   def stored_oauth_token_and_secret?
-    !is_auth_session? && auth_params && auth_params.has_key?(:_key) && auth_params.has_key?(:_token) && auth_params.has_key?(:_secret)
+    !is_auth_session? && auth_params? && auth_params.has_key?(:_key) && auth_params.has_key?(:_token) && auth_params.has_key?(:_secret)
   end
   
 end

data/lib/authlogic_connect/oauth/tokens/foursquare_token.rb

@@ -0,0 +1,15 @@
+class FoursquareToken < OauthToken
+  
+  key do |access_token|
+    body = JSON.parse(access_token.get("/user.json").body)
+    user_id = body['user']['id'].to_s
+  end
+  
+  settings "http://api.foursquare.com/:api_version",
+    :request_token_url  => "http://foursquare.com/oauth/request_token",
+    :access_token_url   => "http://foursquare.com/oauth/access_token",
+    :authorize_url      => "http://foursquare.com/oauth/authorize",
+    :api_versions       => {1 => "v1", 2 => "v2"},
+    :api_version        => 1
+  
+end

data/lib/authlogic_connect/oauth/tokens/get_satisfaction_token.rb

@@ -6,4 +6,4 @@ class GetSatisfactionToken < OauthToken
     :authorize_url      => "/api/authorize",
     :access_token_path  => "/api/access_token"
   
-end
+end

data/lib/authlogic_connect/oauth/tokens/oauth_token.rb

@@ -20,14 +20,26 @@ class OauthToken < AccessToken
     self.class.oauth_version
   end
   
-  def get(path, options = {})
-    client.get(path, options)
+  def get(path, headers = {})
+    client.get(path, headers)
   end
-
+  
   def post(path, body = "", headers = {})
     client.post(path, body, headers)
   end
-
+  
+  def head(path, headers = {})
+    client.head(path, headers)
+  end
+  
+  def put(path, body = "", headers = {})
+    client.put(path, body, headers)
+  end
+  
+  def delete(path, headers = {})
+    client.delete(path, headers)
+  end
+  
   class << self
     
     # oauth version, 1.0 or 2.0
@@ -55,11 +67,15 @@ class OauthToken < AccessToken
       @oauth_key
     end
     
+    def config
+      super.merge(credentials[:options] || {})
+    end
+
     def consumer
       if oauth_version == 1.0
-        OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        OAuth::Consumer.new(credentials[:key], credentials[:secret], config)
       else
-        OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
+        OAuth2::Client.new(credentials[:key], credentials[:secret], config)
       end
     end
     

data/lib/authlogic_connect/oauth/user.rb

@@ -32,7 +32,7 @@ module AuthlogicConnect::Oauth::User
     # modules work like inheritance
     def save_oauth_session
       super
-      auth_session[:auth_attributes]            = attributes.reject!{|k, v| v.blank? || !self.respond_to?(k)} unless is_auth_session?
+      auth_session[:auth_attributes] = attributes.reject!{|k, v| v.blank? || !self.respond_to?(k)} unless is_auth_session?
     end
     
     def redirect_to_oauth
@@ -57,7 +57,6 @@ module AuthlogicConnect::Oauth::User
         self.errors.add(:tokens, "you have already created an account using your #{token_class.service_name} account, so it")
       else
         self.access_tokens << token
-        self.active_token = token
       end
     end
     

data/lib/authlogic_connect/openid/tokens/openid_token.rb

@@ -6,4 +6,4 @@ class OpenidToken < AccessToken
     self.key = self.key.to_s.normalize_identifier unless self.key.blank?
   end
   
-end
+end

data/lib/authlogic_connect/rack_state.rb

@@ -0,0 +1,19 @@
+class AuthlogicConnect::RackState
+  def initialize(app)
+    @app = app
+  end
+  
+  # this intercepts how the browser interprets the url.
+  # so we override it and say,
+  # "if we've stored a variable in the session called :auth_callback_method,
+  # then convert that into a POST call so we re-call the original method"
+  def call(env)
+    if env["rack.session"].nil?
+      raise "Make sure you are setting the session in Rack too!  Place this in config/application.rb"
+    end
+    unless env["rack.session"][:auth_callback_method].blank?
+      env["REQUEST_METHOD"] = env["rack.session"].delete(:auth_callback_method).to_s.upcase
+    end
+    @app.call(env)
+  end
+end

data/test/libs/database.rb

@@ -17,21 +17,22 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime :created_at
     t.datetime :updated_at
   end
-
-  create_table :access_tokens, :force => true do |t|
-    t.integer  :user_id
-    t.string   :type,       :limit => 30
-    t.string   :key,        :limit => 1024
-    t.string   :secret
-    t.boolean  :active
-    t.datetime :created_at
-    t.datetime :updated_at
+  
+  create_table :access_tokens do |t|
+    t.integer :user_id
+    t.string :type, :limit => 30
+    t.string :key # how we identify the user, in case they logout and log back in
+    t.string :token, :limit => 1024 # This has to be huge because of Yahoo's excessively large tokens
+    t.string :secret
+    t.boolean :active # whether or not it's associated with the account
+    t.timestamps
   end
-
+  
   create_table :users, :force => true do |t|
     t.datetime :created_at
     t.datetime :updated_at
     t.string   :login
+    t.string   :email
     t.string   :crypted_password
     t.string   :password_salt
     t.string   :persistence_token,                :null => false
@@ -41,8 +42,6 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime :current_login_at
     t.string   :last_login_ip
     t.string   :current_login_ip
-    t.string   :openid_identifier
-    t.integer  :active_token_id
   end
 
 end

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require "active_record"
 require "active_record/fixtures"
 require 'action_controller'
 require 'shoulda'
+require 'mocha'
 
 require File.dirname(__FILE__) + '/libs/database'
 require File.dirname(__FILE__) + '/../lib/authlogic-connect' unless defined?(AuthlogicConnect)
@@ -26,30 +27,33 @@ unless defined?(::ActiveModel)
   end
 end
 
-
 AuthlogicConnect.config = {
   :default => "twitter",
   :connect => {
     :twitter => {
       :key => "my_key",
       :secret => "my_secret",
-      :label => "Twitter",
-      :user_agent => "Netscape"
+      :headers => {
+        "User-Agent" => "Safari",
+        "MyApp-Version" => "1.2"
+      },
+      :api_version => 1
     },
     :facebook => {
       :key => "my_key",
-      :secret => "my_secret",
-      :label => "Facebook"
+      :secret => "my_secret"
+    },
+    :foursquare => {
+      :key => "my_key",
+      :secret => "my_secret"
     },
     :google => {
       :key => "my_key",
-      :secret => "my_secret",
-      :label => "Google"
+      :secret => "my_secret"
     },
     :yahoo => {
       :key => "my_key",
-      :secret => "my_secret",
-      :label => "Yahoo"
+      :secret => "my_secret"
     },
     :vimeo => {
   
@@ -99,6 +103,27 @@ class ActiveSupport::TestCase
   fixtures :all
   setup :activate_authlogic
   
+  def create_token
+    token = OAuth::RequestToken.new("twitter", "key", "secret")
+    token.params = {
+      :oauth_callback_confirmed => "true", 
+      :oauth_token_secret => "secret",
+      :oauth_token => "key"
+    }
+    token.consumer = OAuth::Consumer.new("key", "secret",
+      :site => "http://twitter.com",
+      :proxy => nil,
+      :oauth_version => "1.0",
+      :request_token_path => "/oauth/request_token",
+      :authorize_path => "/oauth/authorize",
+      :scheme => :header,
+      :signature_method => "HMAC-SHA1",
+      :authorize_url => "http://twitter.com/oauth/authenticate",
+      :access_token_path => "/oauth/access_token"
+    )
+    token
+  end
+  
   private
     def password_for(user)
       case user

data/test/test_oauth.rb

@@ -0,0 +1,178 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+module AuthlogicConnect
+  class OauthTest < ActiveSupport::TestCase
+    context "Oauth (with TwitterToken)" do
+      setup do
+        @user = User.new(:login => "viatropos")
+        controller.params.merge!(:authentication_type => "user")
+        Authlogic::Session::Base.controller = controller
+        
+        # this is the only thing the controller passes through for oauth
+        @user.auth_controller.params.merge!(:oauth_provider => "twitter")
+        
+        # mock token
+        @token = create_token
+        
+        @session_vars = [
+          :authentication_type,
+          :auth_request_class,
+          :oauth_provider,
+          :auth_callback_method
+        ]
+      end
+      
+      context "REQUEST (with TwitterToken)" do
+        
+        should "have an 'oauth_provider'" do
+          assert_equal "twitter", @user.auth_params[:oauth_provider]
+          assert_equal true, @user.oauth_provider?
+          # session hasn't started yet
+          assert_equal false, @user.auth_session?
+        end
+
+        should "be an 'oauth_request'" do
+          assert_equal true, @user.oauth_request?
+          # oauth_request? == (auth_params? && oauth_provider?)
+          assert_equal true, @user.auth_params?
+          assert_equal true, @user.oauth_provider?
+        end
+
+        should "not be an 'oauth_response'" do
+          assert_equal false, @user.oauth_response?
+          # oauth_response? == (!oauth_response.nil? && auth_session? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth")
+          assert_equal false, !@user.oauth_response.nil?
+          assert_equal false, @user.auth_session?
+          assert_equal false, @user.stored_oauth_token_and_secret?
+        end
+
+        should "be using oauth" do
+          # all of the above too!
+          assert @user.using_oauth?
+        end
+        
+        should "start authentication" do
+          assert_equal true, @user.start_authentication?
+          # start_authentication? == (start_oauth? || start_openid?)
+          assert_equal true, @user.start_oauth?
+          # start_oauth == (authenticating_with_oauth? && !oauth_complete?)
+          assert_equal true, @user.authenticating_with_oauth?
+          # authenticating_with_oauth? == (correct_request_class? && using_oauth?)
+          assert_equal true, @user.correct_request_class?
+          assert_equal true, @user.using_oauth?
+          assert_equal true, !@user.oauth_complete?          
+        end
+        
+        should "not be using openid" do
+          assert_equal false, @user.start_openid?
+          assert_equal false, @user.using_openid?
+          assert_equal false, @user.openid_request?
+          # openid_request? == (!openid_identifier.blank? && auth_session[:auth_attributes].nil?)
+          assert_equal false, @user.openid_response?
+          # openid_response? == (auth_controller? && !auth_session[:auth_attributes].nil? && auth_session[:auth_method] == "openid")
+        end
+
+        should "have the correct class (authentication_type == user)" do
+          assert_equal "user", @user.auth_params[:authentication_type]
+          assert @user.correct_request_class?
+        end
+
+        should "realize we are authenticating_with_oauth?" do
+          assert_equal true, @user.authenticating_with_oauth?
+        end
+      end
+      
+      context "SAVE" do
+        setup do
+          @user.save
+          request_token = {:token => "a_token", :secret => "a_secret"}
+          # mock out like we've saved the data just before the first redirect
+          @user.save_oauth_session
+          @user.auth_session[:oauth_request_token]        = request_token[:token]
+          @user.auth_session[:oauth_request_token_secret] = request_token[:secret]
+        end
+        
+        should "save without a block" do
+          assert_equal true, @user.authenticating_with_oauth?
+          assert_equal true, @user.valid?
+        end
+        
+        should "still be an oauth request" do
+          assert_equal true, @user.oauth_request?
+        end
+        
+        context "RESPONSE (with TwitterToken)" do
+          setup do
+            @key_and_secret = {:key => "a_key", :secret => "a_secret", :token => "a_token"}
+            @user.auth_controller.params.merge!(:oauth_token => @key_and_secret[:token])
+            TwitterToken.stubs(:get_token_and_secret).returns(@key_and_secret)
+          end
+
+          should "have TwitterToken" do
+            assert_equal TwitterToken, @user.token_class
+            assert 1.0, @user.token_class.oauth_version
+          end
+          
+          should "have oauth token" do
+            assert @user.auth_params
+            assert_equal true, @user.auth_params?
+            assert_equal "a_token", @user.oauth_token
+          end
+          
+          should "not be an 'oauth_request'" do
+            assert_equal true, @user.auth_params?
+            assert_equal true, @user.oauth_provider?
+            assert_equal false, @user.oauth_response.blank?
+            #assert_equal false, @user.oauth_request?
+            # need a better way of checking this!
+          end
+
+          should "be an 'oauth_response'" do
+            assert_equal true, !@user.oauth_response.nil?
+            assert_equal true, @user.auth_session?
+            assert_equal true, (@user.auth_session[:auth_request_class] == @user.class.name)
+            assert_equal true, (@user.auth_session[:auth_method] == "oauth")
+            assert_equal true, @user.oauth_response?
+          end
+
+          should "be using oauth" do
+            assert_equal true, @user.using_oauth?
+          end
+          
+          should "not be using openid" do
+            assert_equal false, @user.using_openid?
+          end
+
+          should "not be an 'openid_request'" do
+            assert_equal false, @user.using_openid?
+          end
+
+          should "not be an 'openid_response" do
+            assert_equal false, @user.using_openid?
+          end
+
+          teardown do
+            #TwitterToken.unstub(:get_token_and_secret)
+          end
+        end
+      end
+
+    end
+    
+    context "tokens" do
+      setup do
+        @token = TwitterToken.new
+      end
+      
+      should "be version 1 since it's twitter" do
+        assert_equal 1.0, @token.oauth_version
+      end
+      
+      should "return a new consumer with each call" do
+        first_consumer = @token.consumer
+        second_consumer = @token.consumer
+        assert_not_equal first_consumer, second_consumer
+      end
+    end
+  end
+end

data/test/test_openid.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+module AuthlogicConnect
+  class OpenIdTest < Test::Unit::TestCase
+    context "OpenId" do
+      setup do
+        @user = User.new(:login => "viatropos")
+        controller.params.merge!(:authentication_type => "user")
+        Authlogic::Session::Base.controller = controller
+        @user.auth_controller.params.merge!(:openid_identifier => "viatropos.myopenid.com")
+        @session_vars = [
+          :authentication_type,
+          :auth_request_class,
+          :openid_identifier,
+          :auth_callback_method
+        ]
+      end
+      
+      should "have an 'openid_identifier'" do
+        assert_equal true, @user.openid_identifier?
+      end
+      
+      should "be an 'openid_request'" do
+        assert @user.openid_request?
+      end
+      
+      should "not be an 'openid_response'" do
+        assert_equal false, @user.openid_response?
+      end
+      
+      should "be using openid" do
+        assert @user.using_openid?
+      end
+      
+      should "not be using oauth" do
+        assert_equal false, @user.using_oauth?
+      end
+      
+      should "have the correct class (authentication_type == user)" do
+        assert @user.correct_request_class?
+      end
+      
+      should "realize we are authenticating_with_openid?" do
+        assert @user.authenticating_with_openid?
+      end
+      
+      context "and 'save_with_openid', manually checking each step" do
+        
+        setup do
+          # mock save
+          # this, and the whole redirect process happens
+          # but we'll just assume we saved the session data and got the redirect back
+          @user.save_openid_session
+          @user.save(:skip_redirect => true, :keep_session => true) do
+            "I'm the block you want"
+          end
+          # copy to test controller
+          @user.auth_session.each do |key, value|
+            @user.auth_controller.session[key] = value
+          end
+        end
+        
+        teardown do
+          @user.destroy
+        end
+        
+      end
+      
+    end
+  end
+end

data/test/test_user.rb

@@ -6,7 +6,7 @@ module AuthlogicConnect
       setup do
         @user = User.new(:login => "viatropos")
       end
-
+      
       should "make sure we are loading the models" do
         assert_equal "viatropos", @user.login
       end
@@ -44,159 +44,41 @@ module AuthlogicConnect
           assert @user.auth_session.empty?
           assert_equal false, @user.auth_session?
         end
+
+      end
+      
+      context "save the user without any parameters" do
         
-        context "save the user without any parameters" do
-          
-          setup do
-            @save_success = @user.save
-          end
-          
-          should "be a valid save" do
-            assert @save_success
-          end
-          
-          should "not be using oauth" do
-            assert_equal false, @user.using_oauth?
-          end
-          
-          should "not be using openid" do
-            assert_equal false, @user.using_openid?
-          end
-          
+        setup do
+          @save_success = @user.save
         end
         
-        context "with oauth parameters" do
-          
-          setup do
-            @user.auth_controller.params.merge!(:oauth_provider => "twitter")
-            # mock token
-            @token = OAuth::RequestToken.new("twitter", "key", "secret")
-            @token.params = {
-              :oauth_callback_confirmed => "true", 
-              :oauth_token_secret=>"secret",
-              :oauth_token=>"key"
-            }
-            @token.consumer = OAuth::Consumer.new("key", "secret",
-              :site=>"http://twitter.com",
-              :proxy=>nil,
-              :oauth_version=>"1.0",
-              :request_token_path=>"/oauth/request_token",
-              :authorize_path=>"/oauth/authorize",
-              :scheme=>:header,
-              :signature_method=>"HMAC-SHA1",
-              :authorize_url=>"http://twitter.com/oauth/authenticate",
-              :access_token_path=>"/oauth/access_token"
-            )
-            @session_vars = [
-              :authentication_type,
-              :auth_request_class,
-              :oauth_provider,
-              :auth_callback_method
-            ]
-          end
-          
-          should "have an 'oauth_provider'" do
-            assert @user.oauth_provider?
-          end
-          
-          should "be an 'oauth_request'" do
-            assert @user.oauth_request?
-          end
-          
-          should "not be an 'oauth_response'" do
-            assert_equal false, @user.oauth_response?
-          end
-          
-          should "be using oauth" do
-            assert @user.using_oauth?
-          end
-          
-          should "not be using openid" do
-            assert_equal false, @user.using_openid?
-          end
-          
-          should "have the correct class (authentication_type == user)" do
-            assert @user.correct_request_class?
-          end
-          
-          should "realize we are authenticating_with_oauth?" do
-            assert @user.authenticating_with_oauth?
-          end
-          
+        should "be a valid save" do
+          assert @save_success
         end
         
-        context "with openid parameters" do
-          setup do
-            @user.auth_controller.params.merge!(:openid_identifier => "viatropos.myopenid.com")
-            @session_vars = [
-              :authentication_type,
-              :auth_request_class,
-              :openid_identifier,
-              :auth_callback_method
-            ]
-          end
-          
-          should "have an 'openid_identifier'" do
-            assert_equal true, @user.openid_identifier?
-          end
-          
-          should "be an 'openid_request'" do
-            assert @user.openid_request?
-          end
-          
-          should "not be an 'openid_response'" do
-            assert_equal false, @user.openid_response?
-          end
-          
-          should "be using openid" do
-            assert @user.using_openid?
-          end
-          
-          should "not be using oauth" do
-            assert_equal false, @user.using_oauth?
-          end
-          
-          should "have the correct class (authentication_type == user)" do
-            assert @user.correct_request_class?
-          end
-          
-          should "realize we are authenticating_with_openid?" do
-            assert @user.authenticating_with_openid?
-          end
-          
-          context "and 'save_with_openid', manually checking each step" do
-            
-            setup do
-              # mock save
-              # this, and the whole redirect process happens
-              # but we'll just assume we saved the session data and got the redirect back
-              @user.save_openid_session
-              @user.save(:skip_redirect => true, :keep_session => true) do
-                "I'm the block you want"
-              end
-              # copy to test controller
-              @user.auth_session.each do |key, value|
-                @user.auth_controller.session[key] = value
-              end
-            end
-            
-            teardown do
-              @user.destroy
-            end
-            
-          end
+        should "not be using oauth" do
+          assert_equal false, @user.using_oauth?
+          # using_oauth? == (oauth_request? || oauth_response? || stored_oauth_token_and_secret?)
+          assert_equal false, @user.oauth_request?
+          # oauth_request? == (auth_params? && oauth_provider?)
+          assert_equal false, @user.auth_params?
+          assert_equal false, @user.oauth_provider?
+          assert_equal false, @user.oauth_response?
+          # oauth_response? == (!oauth_response.nil? && auth_session? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth")
+          assert_equal false, !@user.oauth_response.nil?
+          assert_equal false, @user.auth_session?
+          assert_equal false, @user.stored_oauth_token_and_secret?
         end
-
-      end
-    end
-    
-    context "tokens" do
-      setup do
-        @token = TwitterToken.new
+        
+        should "not be using openid" do
+          assert_equal false, @user.using_openid?
+        end
+        
       end
       
-      should "be version 1 since it's twitter" do
-        assert_equal 1.0, @token.oauth_version
+      context "user with required password field" do
+        
       end
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic-connect
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  - 1
-  version: 0.0.5.1
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -07:00
+date: 2010-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,6 +166,7 @@ files:
 - lib/authlogic_connect/oauth/state.rb
 - lib/authlogic_connect/oauth/tokens/aol_token.rb
 - lib/authlogic_connect/oauth/tokens/facebook_token.rb
+- lib/authlogic_connect/oauth/tokens/foursquare_token.rb
 - lib/authlogic_connect/oauth/tokens/get_satisfaction_token.rb
 - lib/authlogic_connect/oauth/tokens/github_token.rb
 - lib/authlogic_connect/oauth/tokens/google_token.rb
@@ -194,6 +194,7 @@ files:
 - lib/authlogic_connect/openid/user.rb
 - lib/authlogic_connect/openid/variables.rb
 - lib/authlogic_connect/openid.rb
+- lib/authlogic_connect/rack_state.rb
 - lib/open_id_authentication.rb
 - rails/init.rb
 - test/controllers/test_users_controller.rb
@@ -201,9 +202,9 @@ files:
 - test/libs/database.rb
 - test/libs/user.rb
 - test/libs/user_session.rb
-- test/old.rb
-- test/test_authlogic_connect.rb
 - test/test_helper.rb
+- test/test_oauth.rb
+- test/test_openid.rb
 - test/test_user.rb
 has_rdoc: true
 homepage: http://github.com/viatropos/authlogic-connect

data/test/old.rb

@@ -1,53 +0,0 @@
-require 'rubygems'
-require 'tempfile'
-require 'test/unit'
-
-require 'shoulda'
-gem 'activerecord',  '~>3.0.0'
-gem 'activesupport', '~>3.0.0'
-gem 'actionpack',    '~>3.0.0'
-require 'active_record'
-require 'active_record/version'
-require 'active_support'
-require 'action_pack'
-gem "ruby-openid"
-gem 'rack-openid', '>=0.2.1'
-gem "authlogic", :git => "git://github.com/odorcicd/authlogic.git", :branch => "rails3"
-require 'authlogic'
-gem "oauth"
-gem "oauth2"
-
-puts "Testing against version #{ActiveRecord::VERSION::STRING}"
-
-begin
-  require 'ruby-debug'
-rescue LoadError => e
-  puts "debugger disabled"
-end
-
-ROOT = File.join(File.dirname(__FILE__), '..')
-
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  yield
-ensure
-  $VERBOSE = old_verbose
-end
-
-class Test::Unit::TestCase
-  def setup
-    silence_warnings do
-      Object.const_set(:Rails, stub('Rails', :root => ROOT, :env => 'test'))
-    end
-  end
-end
-
-$LOAD_PATH << File.join(ROOT, 'lib')
-$LOAD_PATH << File.join(ROOT, 'lib', 'authlogic-connect')
-
-require File.join(ROOT, 'lib', 'authlogic-connect.rb')
-
-FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures") 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config['test'])

data/test/test_authlogic_connect.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class AuthlogicConnectTest < Test::Unit::TestCase
-  context "AuthlogicConnect.config" do
-    setup do
-      AuthlogicConnect.config = {}
-    end
-
-    should "have an empty configuration hash" do
-      assert_equal true, AuthlogicConnect.config.empty?
-    end
-  end
-end