authlogic-connect 0.0.2 → 0.0.3.2

data/README.markdown

@@ -62,23 +62,11 @@ Otherwise, add this migration
 
     class AddAuthlogicConnectMigration < ActiveRecord::Migration
       def self.up
-        add_column :users, :oauth_token, :string
-        add_column :users, :oauth_secret, :string
-        add_index :users, :oauth_token
-
-        change_column :users, :login, :string, :default => nil, :null => true
-        change_column :users, :crypted_password, :string, :default => nil, :null => true
-        change_column :users, :password_salt, :string, :default => nil, :null => true
+        # TODO
       end
 
       def self.down
-        remove_column :users, :oauth_token
-        remove_column :users, :oauth_secret
-
-        [:login, :crypted_password, :password_salt].each do |field|
-          User.all(:conditions => "#{field} is NULL").each { |user| user.update_attribute(field, "") if user.send(field).nil? }
-          change_column :users, field, :string, :default => "", :null => false
-        end
+        # TODO
       end
     end
     
@@ -176,6 +164,14 @@ That's it! The rest is taken care of for you.
 
 This has no tests!  I had to build this in a weekend and am not fluent with Shoulda, which I'd like to use.  One of these days when I can breathe.
 
+## Goals
+
+1. It should require the end user ONE CLICK to create an account with your site.
+2. It should not depend on Javascript
+3. It should be enhanced by Javascript
+4. You should never have to touch the User/Session model/controller/migration if you are a just looking to get up and running quickly.
+5. You should be able to plugin ruby libraries that wrap an api, such as TwitterAuth via `@user.twitter`, and LinkedIn via `@user.linked_in`.  Just because it's that easy.
+
 ## TODO
 
 - Change `register_with_oauth` and related to `register_method` and `login_method`: oauth, openid, traditional

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.2"
+  s.version           = "0.0.3.2"
   s.summary           = "Authlogic Connect: Let your app use all of Oauth and OpenID"
   s.homepage          = "http://github.com/viatropos/authlogic-connect"
   s.email             = "lancejpollard@gmail.com"
@@ -38,7 +38,7 @@ end
 
 desc "Publish gem to rubygems"
 task :publish => [:package] do
-  `gem push pkg/#{spec.name}-#{spec.version}.gem`
+  %x[gem push pkg/#{spec.name}-#{spec.version}.gem]
 end
 
 desc "Print a list of the files to be put into the gem"

data/lib/authlogic-connect.rb

@@ -3,6 +3,7 @@ require 'authlogic'
 require 'oauth'
 require 'oauth2'
 
+
 # Throw callback rack app into the middleware stack
 # TODO: Somehow do this for Rails 3?
 # For now it is in the sample Rails 3 app
@@ -78,7 +79,7 @@ module AuthlogicConnect
     end
     
     def token(key)
-      throw Error unless AuthlogicConnect.include?(key) and !key.to_s.empty?
+      raise "can't find key '#{key.to_s}' in AuthlogicConnect.config" unless AuthlogicConnect.include?(key) and !key.to_s.empty?
       "#{key.to_s.camelcase}Token".constantize
     end
     

data/lib/authlogic_connect/common/user.rb

@@ -10,6 +10,14 @@ module AuthlogicConnect::Common
     
     module InstanceMethods
       
+      def authenticated_with
+        @authenticated_with ||= self.tokens.collect{|t| t.service_name.to_s}
+      end
+
+      def authenticated_with?(service)
+        self.tokens.detect{|t| t.service_name.to_s == service.to_s}
+      end
+      
       # core save method coordinating how to save the user
       def save(perform_validation = true, &block)
         status = true
@@ -19,11 +27,10 @@ module AuthlogicConnect::Common
           status = save_with_oauth(perform_validation, &block)
         end
         if status
-          result = super
+          result = super(:validate => true)
           yield(result) if block_given?
-          result
         end
-        status
+        result
       end
       
       def validate_password_with_oauth?

data/lib/authlogic_connect/oauth/process.rb

@@ -28,7 +28,7 @@ module AuthlogicConnect::Oauth
       else
         auth_controller.redirect_to oauth_consumer.web_server.authorize_url(
           :redirect_uri => oauth_callback_url,
-          :scope => oauth_token.settings[:scope]
+          :scope => oauth_token.config[:scope]
         )
       end
     end

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

@@ -2,18 +2,10 @@
 # http://developers.facebook.com/setup/
 class FacebookToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "https://graph.facebook.com",
-        :authorize_url => "https://graph.facebook.com/oauth/authorize",
-        :oauth_version => "2.0",
-        :scope => "email, offline_access"
-      }
-    end
-    
-    def oauth_version
-      2.0
-    end
-  end
-end
+  version 2.0
+  
+  settings "https://graph.facebook.com",
+    :authorize_url => "https://graph.facebook.com/oauth/authorize",
+    :scope         => "email, offline_access"
+  
+end

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

@@ -1,14 +1,9 @@
 # http://getsatisfaction.com/developers/oauth
 class GetSatisfactionToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://getsatisfaction.com",
-        :request_token_path => "/api/request_token",
-        :authorize_url => "/api/authorize",
-        :access_token_path => "/api/access_token"
-      }
-    end
-  end
+  settings "http://getsatisfaction.com",
+    :request_token_path => "/api/request_token",
+    :authorize_url      => "/api/authorize",
+    :access_token_path  => "/api/access_token"
+  
 end

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

@@ -24,15 +24,10 @@
 # YouTube           http://gdata.youtube.com
 class GoogleToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "https://www.google.com", 
-        :request_token_path => "/accounts/OAuthGetRequestToken",
-        :authorize_path => "/accounts/OAuthAuthorizeToken",
-        :access_token_path => "/accounts/OAuthGetAccessToken",
-        :scope => "https://www.google.com/m8/feeds/"
-      }
-    end
-  end
+  settings "https://www.google.com", 
+    :request_token_path => "/accounts/OAuthGetRequestToken",
+    :authorize_path     => "/accounts/OAuthAuthorizeToken",
+    :access_token_path  => "/accounts/OAuthGetAccessToken",
+    :scope              => "https://www.google.com/m8/feeds/"
+  
 end

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

@@ -0,0 +1,10 @@
+# http://developer.linkedin.com/docs/DOC-1008
+# http://github.com/pengwynn/linkedin/tree/master/lib/linked_in/
+class LinkedInToken < OauthToken
+  
+  settings "https://api.linkedin.com",
+    :request_token_path => "/uas/oauth/requestToken",
+    :access_token_path  => "/uas/oauth/accessToken",
+    :authorize_path     => "/uas/oauth/authorize"
+  
+end

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

@@ -1,14 +1,11 @@
 # http://wiki.developer.myspace.com/index.php?title=Category:MySpaceID
+# http://developerwiki.myspace.com/index.php?title=OAuth_REST_API_Usage_-_Authentication_Process
+# http://developerwiki.myspace.com/index.php?title=How_to_Set_Up_a_New_Application_for_OpenID
 class MyspaceToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "https://www.google.com", 
-        :request_token_path => "/accounts/OAuthGetRequestToken",
-        :authorize_path => "/accounts/OAuthAuthorizeToken",
-        :access_token_path => "/accounts/OAuthGetAccessToken"
-      }
-    end
-  end
+  settings "http://api.myspace.com", 
+    :request_token_path => "/request_token",
+    :authorize_path     => "/authorize",
+    :access_token_path  => "/access_token"
+  
 end

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

@@ -1,6 +1,5 @@
 class OauthToken < Token
-  # Main client for interfacing with remote service. Override this to use
-  # preexisting library eg. Twitter gem.
+  
   def client
     unless @client
       if oauth_version == 1.0
@@ -13,14 +12,6 @@ class OauthToken < Token
     @client
   end
   
-  def consumer
-    self.class.consumer
-  end
-  
-  def simple_client
-    @simple_client ||= SimpleClient.new(OAuth::AccessToken.new(self.class.consumer, token, secret))
-  end
-  
   def oauth_version
     self.class.oauth_version
   end
@@ -31,20 +22,20 @@ class OauthToken < Token
   
   class << self
     
-    def oauth_version
-      1.0
+    def version(value)
+      @oauth_version = value
     end
     
-    def settings
-      @settings ||= {}
+    def oauth_version
+      @oauth_version ||= 1.0
     end
     
     def consumer
       unless @consumer
         if oauth_version == 1.0
-          @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], settings.merge(credentials[:options] || {}))
+          @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
         else
-          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], settings)
+          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], config)
         end
       end
       
@@ -56,7 +47,7 @@ class OauthToken < Token
     end
     
     def get_request_token(callback_url)
-      consumer.get_request_token({:oauth_callback => callback_url}, settings)
+      consumer.get_request_token({:oauth_callback => callback_url}, config)
     end
     
     def get_access_token(oauth_verifier)

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

@@ -1,11 +1,6 @@
 class TwitterToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://twitter.com",
-        :authorize_url => "http://twitter.com/oauth/authenticate"
-      }
-    end
-  end
+  settings "http://twitter.com",
+    :authorize_url => "http://twitter.com/oauth/authenticate"
+  
 end

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

@@ -2,12 +2,7 @@
 # http://www.vimeo.com/api/applications/new
 class VimeoToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://vimeo.com",
-        :authorize_url => "http://vimeo.com/oauth/authorize"
-      }
-    end
-  end
+  settings "http://vimeo.com",
+    :authorize_url => "http://vimeo.com/oauth/authorize"
+  
 end

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

@@ -2,19 +2,11 @@
 # http://developer.yahoo.com/oauth/guide/oauth-accesstoken.html
 class YahooToken < OauthToken
   
-  class << self
-    def settings
-      @settings ||= {
-        :site => "https://api.login.yahoo.com",
-        :request_token_path => '/oauth/v2/get_request_token',
-        :access_token_path  => '/oauth/v2/get_token',
-        :authorize_path     => '/oauth/v2/request_auth'
-      }
-    end
-    
-    def oauth_version
-      2.0
-    end
-  end
+  version 2
+  
+  settings "https://api.login.yahoo.com",
+    :request_token_path => '/oauth/v2/get_request_token',
+    :access_token_path  => '/oauth/v2/get_token',
+    :authorize_path     => '/oauth/v2/request_auth'
   
 end

data/lib/authlogic_connect/token.rb

@@ -14,6 +14,10 @@ class Token < ActiveRecord::Base
     self.class.service_name
   end
   
+  def settings
+    self.class.settings
+  end
+  
   def get(path)
     
   end
@@ -31,6 +35,14 @@ class Token < ActiveRecord::Base
       raise "implement consumer in subclass"
     end
     
+    def settings(site, hash = {})
+      @settings = hash.merge(:site => site)
+    end
+    
+    def config
+      @settings ||= {}
+    end
+    
     protected
     
     def credentials

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
+  - 3
   - 2
-  version: 0.0.2
+  version: 0.0.3.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -115,15 +116,13 @@ files:
 - lib/authlogic_connect/oauth/helper.rb
 - lib/authlogic_connect/oauth/process.rb
 - lib/authlogic_connect/oauth/session.rb
-- lib/authlogic_connect/oauth/tokens/delicious_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/myspace_token.rb
 - lib/authlogic_connect/oauth/tokens/oauth_token.rb
 - lib/authlogic_connect/oauth/tokens/opensocial_token.rb
-- lib/authlogic_connect/oauth/tokens/photobucket_token.rb
-- lib/authlogic_connect/oauth/tokens/smug_mug_token.rb
 - lib/authlogic_connect/oauth/tokens/twitter_token.rb
 - lib/authlogic_connect/oauth/tokens/vimeo_token.rb
 - lib/authlogic_connect/oauth/tokens/yahoo_token.rb

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

@@ -1,12 +0,0 @@
-class DeliciousToken < OauthToken
-  
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://api.del.icio.us",
-        :realm => "yahooapis.com"
-      }
-    end
-  end
-  
-end

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

@@ -1,13 +0,0 @@
-# http://photobucket.com/developer/
-# https://login.photobucket.com/developer/register
-class PhotobucketToken < OauthToken
-  
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://twitter.com",
-        :authorize_url => "http://twitter.com/oauth/authenticate"
-      }
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-# http://wiki.smugmug.net/display/API/OAuth
-class SmugMugToken < OauthToken
-  
-  class << self
-    def settings
-      @settings ||= {
-        :site => "http://api.smugmug.com",
-        :request_token_path => "/services/oauth/getRequestToken.mg",
-        :authorize_url => "/services/oauth/authorize.mg",
-        :access_token_path => "/services/oauth/getAccessToken.mg"
-      }
-    end
-  end
-end