authlogic-connect 0.0.1 → 0.0.2

data/README.markdown

@@ -81,8 +81,40 @@ Otherwise, add this migration
         end
       end
     end
-  
-### 4. Make sure you save your objects properly
+    
+### 4. Configure your keys
+
+In `config/initializers/authlogic_connect_config.rb`, write your keys and secrets for each service you would like to support.  You have to manually go to the websites and register with the service provider (list of those links coming soon, in token classes for now).
+
+    AuthlogicConnect.config = {
+      :services => {
+        :twitter => {
+          :key => "my_key",
+          :secret => "my_secret",
+          :label => "Twitter"
+        },
+        :facebook => {
+          :key => "my_key",
+          :secret => "my_secret",
+          :label => "Facebook"
+        },
+        :google => {
+          :key => "my_key",
+          :secret => "my_secret",
+          :label => "Google"
+        },
+        :yahoo => {
+          :key => "my_key",
+          :secret => "my_secret",
+          :label => "Yahoo"
+        },
+        :vimeo => {
+      
+        }
+      }
+    }
+
+### 5. Make sure you save your objects properly
 
 Because of the redirects involved in Oauth and OpenID, you MUST pass a block to the `save` method in your UsersController and UserSessionsController:
 
@@ -99,7 +131,7 @@ You should save your `@user` objects this way as well, because you also want the
 
 If we don't use the block, we will get a DoubleRender error. This lets us skip that entire block and send the user along their way without any problems.
 
-### 5. Create Custom Tokens (if they don't already exist)
+### 6. Create Custom Tokens (if they don't already exist)
 
 Here's an example of the FacebookToken for Oauth
 
@@ -142,4 +174,9 @@ That's it! The rest is taken care of for you.
 
 ## Tests
 
-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.
+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.
+
+## TODO
+
+- Change `register_with_oauth` and related to `register_method` and `login_method`: oauth, openid, traditional
+- Build view helpers

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.1"
+  s.version           = "0.0.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"

data/lib/{authlogic_connect.rb → authlogic-connect.rb}

@@ -3,6 +3,20 @@ 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
+=begin
+ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m|
+  ActionController::Dispatcher.middleware.each do |klass|
+    m.use klass
+  end
+  m.use AuthlogicConnect::CallbackFilter
+end
+=end
+this = File.dirname(__FILE__)
+library = "#{this}/authlogic_connect"
+
 class Hash
   def recursively_symbolize_keys!
     self.symbolize_keys!
@@ -50,7 +64,15 @@ module AuthlogicConnect
     def credentials(service)
       key("services.#{service.to_s}")
     end
-
+    
+    def services
+      key("services")
+    end
+    
+    def service_names
+      key("services").keys.collect(&:to_s)
+    end
+    
     def include?(service)
       !credentials(service).nil?
     end
@@ -66,6 +88,17 @@ module AuthlogicConnect
   end
 end
 
-require File.dirname(__FILE__) + "/authlogic_connect/openid"
-require File.dirname(__FILE__) + "/authlogic_connect/oauth"
-require File.dirname(__FILE__) + "/authlogic_connect/common"
+require "#{library}/callback_filter"
+require "#{library}/token"
+require "#{library}/openid"
+require "#{library}/oauth"
+require "#{library}/common"
+
+custom_models = ["#{library}/token"]
+custom_models += Dir["#{library}/oauth/tokens"]
+custom_models +=Dir["#{library}/openid/tokens"]
+
+custom_models.each do |path|
+  $LOAD_PATH << path
+  ActiveSupport::Dependencies.load_paths << path
+end

data/lib/{oauth_callback_filter.rb → authlogic_connect/callback_filter.rb}

@@ -1,9 +1,12 @@
-class OauthCallbackFilter
+class AuthlogicConnect::CallbackFilter
   def initialize(app)
     @app = app
   end
   
   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"][:oauth_callback_method].blank?
       env["REQUEST_METHOD"] = env["rack.session"].delete(:oauth_callback_method).to_s.upcase
     end

data/lib/authlogic_connect/oauth.rb

@@ -1,6 +1,7 @@
 module AuthlogicConnect::Oauth
 end
 
+require File.dirname(__FILE__) + "/oauth/variables"
 require File.dirname(__FILE__) + "/oauth/process"
 require File.dirname(__FILE__) + "/oauth/user"
 require File.dirname(__FILE__) + "/oauth/session"

data/lib/authlogic_connect/oauth/process.rb

@@ -2,7 +2,7 @@ module AuthlogicConnect::Oauth
   module Process
 
   private
-    include Variables
+    include AuthlogicConnect::Oauth::Variables
 
     def validate_by_oauth
       validate_email_field = false
@@ -26,7 +26,7 @@ module AuthlogicConnect::Oauth
         save_auth_session(request)
         auth_controller.redirect_to request.authorize_url
       else
-        auth_controller.redirect_to oauth_client.web_server.authorize_url(
+        auth_controller.redirect_to oauth_consumer.web_server.authorize_url(
           :redirect_uri => oauth_callback_url,
           :scope => oauth_token.settings[:scope]
         )
@@ -64,7 +64,7 @@ module AuthlogicConnect::Oauth
         result = request_token.get_access_token(:oauth_verifier => auth_params[:oauth_verifier])
         result = {:key => result.token, :secret => result.secret}
       else
-        result = oauth_client.web_server.get_access_token(oauth_key, :redirect_uri => oauth_callback_url)
+        result = oauth_consumer.web_server.get_access_token(oauth_key, :redirect_uri => oauth_callback_url)
         result = {:key => result.token, :secret => oauth_key}
       end
       result
@@ -74,7 +74,7 @@ module AuthlogicConnect::Oauth
       if oauth_version == 1.0
         request_token.get_access_token(:oauth_verifier => auth_params[:oauth_verifier])
       else
-        oauth_client.web_server.get_access_token(oauth_key, :redirect_uri => oauth_callback_url)
+        oauth_consumer.web_server.get_access_token(oauth_key, :redirect_uri => oauth_callback_url)
       end
     end
     

data/lib/authlogic_connect/oauth/session.rb

@@ -3,7 +3,6 @@ module AuthlogicConnect::Oauth
   # to the Authlogic::Session::Base class.
   module Session
     def self.included(base)
-      puts "included Oauth in Session"
       base.class_eval do
         include InstanceMethods
       end
@@ -34,8 +33,6 @@ module AuthlogicConnect::Oauth
       # Clears out the block if we are authenticating with oauth,
       # so that we can redirect without a DoubleRender error.
       def save_with_oauth(&block)
-        puts "SAVE SESSION WITH OAUTH"
-        puts "redirecting_to_oauth_server? #{redirecting_to_oauth_server?.to_s}"
         block = nil if redirecting_to_oauth_server?
         return block.nil?
       end

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

@@ -1,9 +1,20 @@
 class OauthToken < Token
-  
   # Main client for interfacing with remote service. Override this to use
   # preexisting library eg. Twitter gem.
   def client
-    @client ||= OAuth::AccessToken.new(self.class.consumer, token, secret)
+    unless @client
+      if oauth_version == 1.0
+        @client = OAuth::AccessToken.new(self.consumer, self.key, self.secret)
+      else
+        @client = OAuth2::AccessToken.new(self.consumer, self.key)
+      end
+    end
+    
+    @client
+  end
+  
+  def consumer
+    self.class.consumer
   end
   
   def simple_client
@@ -14,6 +25,10 @@ class OauthToken < Token
     self.class.oauth_version
   end
   
+  def get(path, options = {})
+    client.get(path)
+  end
+  
   class << self
     
     def oauth_version
@@ -25,11 +40,15 @@ class OauthToken < Token
     end
     
     def consumer
-      @consumer ||= OAuth::Consumer.new(credentials[:key], credentials[:secret], settings.merge(credentials[:options] || {}))
-    end
-    
-    def client
-      OAuth2::Client.new(credentials[:key], credentials[:secret], settings)
+      unless @consumer
+        if oauth_version == 1.0
+          @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], settings.merge(credentials[:options] || {}))
+        else
+          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], settings)
+        end
+      end
+      
+      @consumer
     end
     
     def request_token(token, secret)

data/lib/authlogic_connect/oauth/variables.rb

@@ -20,15 +20,11 @@ module AuthlogicConnect::Oauth
     end
     
     def oauth_consumer
-      AuthlogicConnect.consumer(oauth_provider)
-    end
-    
-    def oauth_client
-      oauth_token.client
+      oauth_token.consumer
     end
     
     def oauth_token
       AuthlogicConnect.token(oauth_provider)
     end
   end
-end
+end

data/lib/{token.rb → authlogic_connect/token.rb}

@@ -14,6 +14,10 @@ class Token < ActiveRecord::Base
     self.class.service_name
   end
   
+  def get(path)
+    
+  end
+  
   class << self
     def service_name
       @service_name ||= self.to_s.underscore.scan(/^(.*?)(_token)?$/)[0][0].to_sym

data/rails/init.rb

@@ -1,17 +1 @@
-require "authlogic_connect"
-require "oauth_callback_filter"
-
-# Throw callback rack app into the middleware stack
-ActionController::Dispatcher.middleware = ActionController::MiddlewareStack.new do |m|
-  ActionController::Dispatcher.middleware.each do |klass|
-    m.use klass
-  end
-  m.use OauthCallbackFilter
-end
-
-custom_models = Dir["#{File.dirname(__FILE__)}/../lib/authlogic_connect/oauth/tokens"]
-custom_models +=Dir["#{File.dirname(__FILE__)}/../lib/authlogic_connect/openid/tokens"]
-custom_models.each do |path|
-  $LOAD_PATH << path
-  ActiveSupport::Dependencies.load_paths << path
-end
+require "authlogic-connect"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Lance Pollard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,8 @@ files:
 - Rakefile
 - init.rb
 - MIT-LICENSE
+- lib/authlogic-connect.rb
+- lib/authlogic_connect/callback_filter.rb
 - lib/authlogic_connect/common/session.rb
 - lib/authlogic_connect/common/user.rb
 - lib/authlogic_connect/common/variables.rb
@@ -137,9 +139,7 @@ files:
 - lib/authlogic_connect/openid/user.rb
 - lib/authlogic_connect/openid/variables.rb
 - lib/authlogic_connect/openid.rb
-- lib/authlogic_connect.rb
-- lib/oauth_callback_filter.rb
-- lib/token.rb
+- lib/authlogic_connect/token.rb
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/viatropos/authlogic-connect