authlogic-connect 0.0.3.9 → 0.0.4.03

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

@@ -1,4 +1,4 @@
-class OpenidToken < Token
+class OpenidToken < AccessToken
   
   before_save :format_identifier
   

data/lib/authlogic_connect/openid/user.rb

@@ -21,33 +21,6 @@ module AuthlogicConnect::Openid
         end
       end
       
-      def authenticate_with_openid
-        @openid_error = nil
-        if !openid_response?
-          save_openid_session
-        else
-          restore_attributes
-        end
-        options = {}
-        options[:return_to] = auth_callback_url(:for_model => "1", :action => "create")
-        auth_controller.send(:authenticate_with_open_id, openid_identifier, options) do |result, openid_identifier|
-          create_openid_token(result, openid_identifier)
-          return true
-        end
-        return false
-      end
-      
-      def create_openid_token(result, openid_identifier)
-        if result.unsuccessful?
-          @openid_error = result.message
-        elsif Token.find_by_key(openid_identifier.normalize_identifier)
-        else
-          token = OpenidToken.new(:key => openid_identifier)
-          self.tokens << token
-          self.active_token = token
-        end
-      end
-      
       def attributes_to_save
         attr_list = [:id, :password, crypted_password_field, password_salt_field, :persistence_token, :perishable_token, :single_access_token, :login_count, 
           :failed_login_count, :last_request_at, :current_login_at, :last_login_at, :current_login_ip, :last_login_ip, :created_at,
@@ -55,8 +28,11 @@ module AuthlogicConnect::Openid
         attrs_to_save = attributes.clone.delete_if do |k, v|
           attr_list.include?(k.to_sym)
         end
-        attrs_to_save.merge!(:password => password, :password_confirmation => password_confirmation)
+        if self.respond_to?(:password) && self.respond_to?(:password_confirmation)
+          attrs_to_save.merge!(:password => password, :password_confirmation => password_confirmation)
+        end
+        attrs_to_save
       end
     end
   end
-end
+end

data/lib/authlogic_connect/openid/variables.rb

@@ -9,11 +9,11 @@ module AuthlogicConnect::Openid::Variables
 #  end
   
   def openid_identifier
-    auth_params[:openid_identifier]
+    auth_params[:openid_identifier] if auth_params?
   end
   
   def openid_provider
-    from_session_or_params(:openid_provider)
+    from_session_or_params(:openid_provider) if auth_controller?
   end
   
 end

data/lib/open_id_authentication.rb

@@ -108,7 +108,6 @@ module OpenIdAuthentication
     def complete_open_id_authentication
       response   = request.env[Rack::OpenID::RESPONSE]
       identifier = response.display_identifier
-
       case response.status
       when OpenID::Consumer::SUCCESS
         yield Result[:successful], identifier,

data/test/libs/user.rb

@@ -1,3 +1,7 @@
 class User < ActiveRecord::Base
-  acts_as_authentic
-end
+  acts_as_authentic do |config|
+    config.validate_email_field    = false
+    config.validate_login_field    = false
+    config.validate_password_field = false
+  end
+end

data/test/test_helper.rb

@@ -75,7 +75,7 @@ module ControllerHelpers
   
   def url_for(options = {})
     p = []
-    option.each do |k,v|
+    options.each do |k,v|
       p << "#{k}=#{v}"
     end
     p = "?#{p.join("&")}"

data/test/test_user.rb

@@ -13,9 +13,9 @@ module AuthlogicConnect
       
       context "responds to added oauth methods (our oauth api on the user)" do
         
-        should "have 'tokens' method" do
-          assert @user.respond_to?(:tokens)
-          assert_equal [], @user.tokens
+        should "have 'access_tokens' method" do
+          assert @user.respond_to?(:access_tokens)
+          assert_equal [], @user.access_tokens
         end
         
         should "have 'active_token' method" do
@@ -51,8 +51,8 @@ module AuthlogicConnect
             @save_success = @user.save
           end
           
-          should "not be a valid save" do
-            assert_equal false, @save_success
+          should "be a valid save" do
+            assert @save_success
           end
           
           should "not be using oauth" do
@@ -123,67 +123,6 @@ module AuthlogicConnect
             assert @user.authenticating_with_oauth?
           end
           
-          context "and 'save_with_oauth', 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_oauth_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
-            
-            should "should have a full session" do
-              @session_vars.each {|key| assert @user.auth_session.has_key?(key)}
-            end
-            
-            should "'cleanup_auth_session'" do
-              @user.cleanup_auth_session
-              @session_vars.each {|key| assert_equal false, @user.auth_session.has_key?(key)}
-            end
-            
-            teardown do
-              @user.destroy
-            end
-            
-          end
-          
-          context "and 'save_with_oauth' completely" 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_oauth_session
-              @user.save(:skip_redirect => true, :keep_session => false) do
-                "I'm the block you want"
-              end
-              # copy to test controller
-              @user.auth_controller.session = @user.auth_session
-            end
-            
-            should "have a clear session" do
-              @session_vars.each do |key|
-                assert_equal false, @user.auth_session.has_key?(key)
-              end
-            end
-            
-            should "be a valid save" do
-              assert @user.valid?
-            end
-            
-            # so login isn't saved
-            teardown do
-              User.all.collect(&:destroy)
-            end
-          end
-          
-        
         end
         
         context "with openid parameters" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
+  - 4
   - 3
-  - 9
-  version: 0.0.3.9
+  version: 0.0.4.03
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 -07:00
+date: 2010-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id008
-description: Let your app use all of Oauth and OpenID
+description: Oauth and OpenID made dead simple
 email: lancejpollard@gmail.com
 executables: []
 
@@ -134,6 +134,7 @@ files:
 - init.rb
 - MIT-LICENSE
 - lib/authlogic-connect.rb
+- lib/authlogic_connect/access_token.rb
 - lib/authlogic_connect/authlogic_connect.rb
 - lib/authlogic_connect/callback_filter.rb
 - lib/authlogic_connect/common/session.rb
@@ -147,12 +148,16 @@ files:
 - lib/authlogic_connect/oauth/process.rb
 - lib/authlogic_connect/oauth/session.rb
 - 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/get_satisfaction_token.rb
 - lib/authlogic_connect/oauth/tokens/google_token.rb
 - lib/authlogic_connect/oauth/tokens/linked_in_token.rb
+- lib/authlogic_connect/oauth/tokens/meetup_token.rb
 - lib/authlogic_connect/oauth/tokens/myspace_token.rb
+- lib/authlogic_connect/oauth/tokens/netflix_token.rb
 - lib/authlogic_connect/oauth/tokens/oauth_token.rb
+- lib/authlogic_connect/oauth/tokens/ohloh_token.rb
 - lib/authlogic_connect/oauth/tokens/opensocial_token.rb
 - lib/authlogic_connect/oauth/tokens/twitter_token.rb
 - lib/authlogic_connect/oauth/tokens/vimeo_token.rb
@@ -171,7 +176,6 @@ files:
 - lib/authlogic_connect/openid/user.rb
 - lib/authlogic_connect/openid/variables.rb
 - lib/authlogic_connect/openid.rb
-- lib/authlogic_connect/token.rb
 - lib/open_id_authentication.rb
 - rails/init.rb
 - test/controllers/test_users_controller.rb
@@ -212,6 +216,6 @@ rubyforge_project: authlogic-connect
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: "Authlogic Connect: Let your app use all of Oauth and OpenID"
+summary: "Authlogic Connect: Oauth and OpenID made dead simple"
 test_files: []