authlogic-connect 0.0.3.2 → 0.0.3.3

data/README.markdown

@@ -160,11 +160,7 @@ That's it! The rest is taken care of for you.
   - Save user
 - Finish block, render page
 
-## 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.
-
-## Goals
+## Project Goals
 
 1. It should require the end user ONE CLICK to create an account with your site.
 2. It should not depend on Javascript
@@ -172,6 +168,21 @@ This has no tests!  I had to build this in a weekend and am not fluent with Shou
 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.
 
+### Tests
+
+This has no tests!  I had to build this in a day and am not fluent with Shoulda, which I'd like to use.  It should have lots of tests to make sure all permutations of login and account association work perfectly.
+
+Goal:
+
+- Test Framework: [Shoulda](http://github.com/thoughtbot/shoulda)
+- Autotest with Shoulda
+- Testing style like [Paperclip Tests](http://github.com/thoughtbot/paperclip/tree/master/test/)
+- Rails 2.3+ and Rails 3 Compatability
+
+I have no idea how to get up and running with Autotest and Shoulda right now.  If you know, I'd love to get the answer on Stack Overflow:
+
+[http://stackoverflow.com/questions/2823224/what-test-environment-setup-do-committers-use-in-the-ruby-community](http://stackoverflow.com/questions/2823224/what-test-environment-setup-do-committers-use-in-the-ruby-community)
+
 ## 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.3.2"
+  s.version           = "0.0.3.3"
   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

@@ -3,49 +3,11 @@ 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!
-    self.values.each do |v|
-      if v.is_a? Hash
-        v.recursively_symbolize_keys!
-      elsif v.is_a? Array
-        v.recursively_symbolize_keys!
-      end
-    end
-    self
-  end
-end
-
-class Array
-  def recursively_symbolize_keys!
-    self.each do |item|
-      if item.is_a? Hash
-        item.recursively_symbolize_keys!
-      elsif item.is_a? Array
-        item.recursively_symbolize_keys!
-      end
-    end
-  end
-end
-
 module AuthlogicConnect
-  VERSION = "0.0.1"
+  KEY = "connect"
   
   class << self
     
@@ -63,15 +25,15 @@ module AuthlogicConnect
     end
     
     def credentials(service)
-      key("services.#{service.to_s}")
+      key("#{KEY}.#{service.to_s}")
     end
     
     def services
-      key("services")
+      key(KEY)
     end
     
     def service_names
-      key("services").keys.collect(&:to_s)
+      services.keys.collect(&:to_s)
     end
     
     def include?(service)

data/lib/authlogic_connect/callback_filter.rb

@@ -3,12 +3,16 @@ class AuthlogicConnect::CallbackFilter
     @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"][:oauth_callback_method].blank?
-      env["REQUEST_METHOD"] = env["rack.session"].delete(:oauth_callback_method).to_s.upcase
+    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

data/lib/authlogic_connect/common.rb

@@ -1,6 +1,7 @@
 module AuthlogicConnect::Common
 end
 
+require File.dirname(__FILE__) + "/common/ext"
 require File.dirname(__FILE__) + "/common/variables"
 require File.dirname(__FILE__) + "/common/user"
 require File.dirname(__FILE__) + "/common/session"

data/lib/authlogic_connect/common/ext.rb

@@ -0,0 +1,55 @@
+class String
+  # normalizes an OpenID according to http://openid.net/specs/openid-authentication-2_0.html#normalization
+  def normalize_identifier
+    # clean up whitespace
+    identifier = self.dup.strip
+
+    # if an XRI has a prefix, strip it.
+    identifier.gsub!(/xri:\/\//i, '')
+
+    # dodge XRIs -- TODO: validate, don't just skip.
+    unless ['=', '@', '+', '$', '!', '('].include?(identifier.at(0))
+      # does it begin with http?  if not, add it.
+      identifier = "http://#{identifier}" unless identifier =~ /^http/i
+
+      # strip any fragments
+      identifier.gsub!(/\#(.*)$/, '')
+
+      begin
+        uri = URI.parse(identifier)
+        uri.scheme = uri.scheme.downcase  # URI should do this
+        identifier = uri.normalize.to_s
+      rescue URI::InvalidURIError
+        raise InvalidOpenId.new("#{identifier} is not an OpenID identifier")
+      end
+    end
+
+    return identifier
+  end
+end
+
+class Hash
+  def recursively_symbolize_keys!
+    self.symbolize_keys!
+    self.values.each do |v|
+      if v.is_a? Hash
+        v.recursively_symbolize_keys!
+      elsif v.is_a? Array
+        v.recursively_symbolize_keys!
+      end
+    end
+    self
+  end
+end
+
+class Array
+  def recursively_symbolize_keys!
+    self.each do |item|
+      if item.is_a? Hash
+        item.recursively_symbolize_keys!
+      elsif item.is_a? Array
+        item.recursively_symbolize_keys!
+      end
+    end
+  end
+end

data/lib/authlogic_connect/oauth/process.rb

@@ -34,13 +34,14 @@ module AuthlogicConnect::Oauth
     end
     
     def save_oauth_callback
+      puts "save_oauth_callback"
       # Store the class which is redirecting, so we can ensure other classes
       # don't get confused and attempt to use the response
       auth_session[:oauth_request_class]        = self.class.name
       auth_session[:oauth_provider]             = auth_params[:oauth_provider]
 
       # Tell our rack callback filter what method the current request is using
-      auth_session[:oauth_callback_method]      = auth_controller.request.method
+      auth_session[:auth_callback_method]      = auth_controller.request.method
     end
     
     def save_auth_session(request)

data/lib/authlogic_connect/oauth/user.rb

@@ -59,9 +59,11 @@ module AuthlogicConnect::Oauth
       def authenticating_with_oauth?
         return false unless oauth_provider
         # Initial request when user presses one of the button helpers
-        (auth_params && !auth_params[:register_with_oauth].blank?) ||
+        initial_request = (auth_params && !auth_params[:register_with_oauth].blank?)
         # When the oauth provider responds and we made the initial request
-        (oauth_response && auth_session && auth_session[:oauth_request_class] == self.class.name)
+        initial_response = (oauth_response && auth_session && auth_session[:oauth_request_class] == self.class.name)
+        
+        return initial_request || initial_response
       end
 
       def authenticate_with_oauth

data/lib/authlogic_connect/openid/user.rb

@@ -23,15 +23,14 @@ module AuthlogicConnect::Openid
       end
       
       def openid_identifier=(value)
-        write_attribute(:openid_identifier, value.blank? ? nil : OpenIdAuthentication.normalize_identifier(value))
+        write_attribute(:openid_identifier, value.blank? ? nil : value.to_s.normalize_identifier)
         reset_persistence_token if openid_identifier_changed?
-      rescue OpenIdAuthentication::InvalidOpenId => e
+      rescue Exception => e
         @openid_error = e.message
       end
       
       def save_with_openid(perform_validation = true, &block)
         return false if perform_validation && block_given? && authenticating_with_openid? && !authenticating_with_openid
-        return false if new_record? && !openid_complete?
         return true
       end
       
@@ -42,15 +41,15 @@ module AuthlogicConnect::Openid
         end
         
         def using_openid?
-          respond_to?(:openid_identifier) && !openid_identifier.blank?
+          respond_to?(:openid_identifier) && !auth_params[:openid_identifier].blank?
         end
         
         def openid_complete?
-          auth_params[:open_id_complete] && auth_params[:for_model]
+          auth_session[:openid_attributes]
         end
         
         def authenticating_with_openid?
-          session_class.activated? && ((using_openid? && openid_identifier_changed?) || openid_complete?)
+          session_class.activated? && ((using_openid?) || openid_complete?)
         end
         
         def validate_password_with_openid?
@@ -60,15 +59,15 @@ module AuthlogicConnect::Openid
         def authenticating_with_openid
           @openid_error = nil
           if !openid_complete?
-            auth_session[:openid_attributes] = attributes_to_save
+            # Tell our rack callback filter what method the current request is using
+            auth_session[:auth_callback_method]   = auth_controller.request.method
+            auth_session[:openid_attributes]      = attributes_to_save
           else
-            self.attributes = auth_session[:openid_attributes]
-            auth_session[:openid_attributes] = nil
+            self.attributes                       = auth_session.delete(:openid_attributes)
           end
           
           options = {}
-          options[:return_to] = auth_controller.url_for(:for_model => "1",:controller => "users", :action => "create")
-          
+          options[:return_to] = auth_controller.url_for(:for_model => "1", :controller => "users", :action => "create")
           auth_controller.send(:authenticate_with_open_id, openid_identifier, options) do |result, openid_identifier, registration|
             if result.unsuccessful?
               @openid_error = result.message

data/test/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter: sqlite3
+  database: ":memory:"

data/test/test_authlogic_connect.rb

@@ -0,0 +1,13 @@
+require 'test/helper'
+
+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

data/test/test_helper.rb

@@ -0,0 +1,53 @@
+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'])

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 3
-  - 2
-  version: 0.0.3.2
+  - 3
+  version: 0.0.3.3
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - MIT-LICENSE
 - lib/authlogic-connect.rb
 - lib/authlogic_connect/callback_filter.rb
+- lib/authlogic_connect/common/ext.rb
 - lib/authlogic_connect/common/session.rb
 - lib/authlogic_connect/common/user.rb
 - lib/authlogic_connect/common/variables.rb
@@ -140,6 +141,9 @@ files:
 - lib/authlogic_connect/openid.rb
 - lib/authlogic_connect/token.rb
 - rails/init.rb
+- test/database.yml
+- test/test_authlogic_connect.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/viatropos/authlogic-connect
 licenses: []