authpwn_rails 0.10.1 → 0.10.2

data/Gemfile.lock

@@ -67,7 +67,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth2 (0.5.1)
       faraday (~> 0.7.4)
       multi_json (~> 1.0.3)

data/VERSION

@@ -1 +1 @@
-0.10.1
+0.10.2

data/{lib/authpwn_rails → app/models}/credentials/email.rb

@@ -18,19 +18,9 @@ class Email < ::Credential
   def set_verified_to_false
     self.verified ||= '0' if self.key.nil?
   end
+
+  # Forms can only change the e-mail in the credential.
+  attr_accessible :email
 end  # class Credentials::Email 
 
 end  # namespace Credentials
-
-# :nodoc: adds e-mail integration to the user model
-module Authpwn::UserModel::InstanceMethods
-  def email_credential
-    credentials.find { |c| c.instance_of?(Credentials::Email) }
-  end
-  
-  # The e-mail from the user's Email credential, or nil no credential exists.
-  def email
-    credential = self.email_credential
-    credential && credential.email
-  end
-end  # module Authpwn::UserModel::InstanceMethods

data/{lib/authpwn_rails → app/models}/credentials/facebook.rb

@@ -30,12 +30,16 @@ class Facebook < ::Credential
     uid = uid_from_token access_token
     credential = self.where(:name => uid.to_str).first
     if credential
-      credential.update_attributes! :key => access_token
+      credential.key = access_token
+      credential.save!
     else
       User.transaction do
         user = User.create!
-        credential = self.create! :name => uid, :key => access_token,
-                                  :user => user
+        credential = self.new
+        credential.facebook_uid = uid
+        credential.access_token = access_token
+        credential.user = user
+        credential.save!
       end
     end
     credential
@@ -49,29 +53,9 @@ class Facebook < ::Credential
   def self.uid_from_token(access_token)
     FBGraphRails.fbclient(access_token).selection.me.info!.id.to_s
   end
+  
+  # Forms should not be able to touch any attribute.
+  attr_accessible
 end  # class Credentials::Facebook 
 
 end  # namespace Credentials
-
-# :nodoc: adds Facebook integration methods to the User model.
-module Authpwn::UserModel::ClassMethods
-  # Fills out a new user's information based on a Facebook access token.
-  def create_with_facebook_token(token)
-    self.create! :email => "#{token.external_uid}@graph.facebook.com"
-  end
-  
-  # The user that owns a given Facebook OAuth2 token.
-  #
-  # A new user will be created if the token doesn't belong to any user. This
-  # is the case for a new visitor.
-  def for_facebook_token(access_token)
-    Credentials::Facebook.for(access_token).user
-  end
-end  # module Authpwn::UserModel::ClassMethods
-
-# :nodoc: adds Facebook integration methods to the User model.
-module Authpwn::UserModel::InstanceMethods
-  def facebook_credential
-    credentials.find { |c| c.instance_of?(Credentials::Facebook) }
-  end
-end  # module Authpwn::UserModel::InstanceMethods

data/{lib/authpwn_rails → app/models}/credentials/password.rb

@@ -5,7 +5,8 @@ module Credentials
 class Password < ::Credential
   # Virtual attribute: the user's password.
   attr_accessor :password
-  validates :password, :confirmation => true, :presence => true
+  validates :password, :presence => { :on => :create },
+                       :confirmation => { :allow_nil => true }
 
   # Virtual attribute: confirmation for the user's password.
   attr_accessor :password_confirmation
@@ -51,13 +52,10 @@ class Password < ::Credential
   # Generates a random salt value.
   def self.random_salt
     [(0...12).map { |i| 1 + rand(255) }.pack('C*')].pack('m').strip
-  end  
+  end
+  
+  # Forms can only change the plain-text password fields.
+  attr_accessible :password, :password_confirmation  
 end  # class Credentials::Password
 
 end  # namespace Credentials
-
-module Authpwn::UserModel::InstanceMethods
-  def password_credential
-    credentials.find { |c| c.instance_of?(Credentials::Password) }
-  end
-end

data/authpwn_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.10.1"
+  s.version = "0.10.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2011-11-21"
+  s.date = "2011-11-25"
   s.description = "Works with Facebook."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -27,14 +27,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/helpers/session_helper.rb",
+    "app/models/credentials/email.rb",
+    "app/models/credentials/facebook.rb",
+    "app/models/credentials/password.rb",
     "authpwn_rails.gemspec",
     "legacy/migrate_09_to_010.rb",
     "lib/authpwn_rails.rb",
     "lib/authpwn_rails/credential_model.rb",
-    "lib/authpwn_rails/credentials.rb",
-    "lib/authpwn_rails/credentials/email.rb",
-    "lib/authpwn_rails/credentials/facebook.rb",
-    "lib/authpwn_rails/credentials/password.rb",
     "lib/authpwn_rails/engine.rb",
     "lib/authpwn_rails/facebook_session.rb",
     "lib/authpwn_rails/generators/all_generator.rb",
@@ -53,17 +52,22 @@ Gem::Specification.new do |s|
     "lib/authpwn_rails/session.rb",
     "lib/authpwn_rails/session_controller.rb",
     "lib/authpwn_rails/test_extensions.rb",
+    "lib/authpwn_rails/user_extensions/email_field.rb",
+    "lib/authpwn_rails/user_extensions/password_field.rb",
     "lib/authpwn_rails/user_model.rb",
     "test/cookie_controller_test.rb",
     "test/email_credential_test.rb",
+    "test/email_field_test.rb",
     "test/facebook_controller_test.rb",
     "test/facebook_credential_test.rb",
     "test/helpers/application_controller.rb",
+    "test/helpers/autoload_path.rb",
     "test/helpers/db_setup.rb",
     "test/helpers/fbgraph.rb",
     "test/helpers/routes.rb",
     "test/helpers/view_helpers.rb",
     "test/password_credential_test.rb",
+    "test/password_field_test.rb",
     "test/session_controller_api_test.rb",
     "test/test_helper.rb",
     "test/user_test.rb"

data/lib/authpwn_rails/generators/templates/003_create_credentials.rb

@@ -3,7 +3,7 @@ class CreateCredentials < ActiveRecord::Migration
     create_table :credentials do |t|
       t.references :user, :null => false
       t.string :type, :limit => 32, :null => false
-      t.string :name, :limit => 256, :null => true
+      t.string :name, :limit => 128, :null => true
       
       t.boolean :verified, :null => false, :default => false
       

data/lib/authpwn_rails/generators/templates/user.rb

@@ -2,5 +2,10 @@
 class User < ActiveRecord::Base
   include Authpwn::UserModel
 
+  # Virtual email attribute, with validation.
+  # include Authpwn::UserExtensions::EmailField
+  # Virtual password attribute, with confirmation validation.
+  # include Authpwn::UserExtensions::PasswordField
+
   # Add your extensions to the User class here.
 end

data/lib/authpwn_rails/user_extensions/email_field.rb

@@ -0,0 +1,58 @@
+require 'active_model'
+require 'active_support'
+
+# :nodoc: namespace
+module Authpwn
+
+# :nodoc: namespace
+module UserExtensions
+  
+# Augments the User model with an email virtual attribute.
+module EmailField
+  extend ActiveSupport::Concern
+  
+  included do
+    validates :email, :format => /^[A-Za-z0-9.+_]+@[^@]*\.(\w+)$/,
+         :presence => true
+    attr_accessible :email
+  end
+  
+  module ClassMethods
+    # The user who has a certain e-mail, or nil if the e-mail is unclaimed.
+    def with_email(email)
+      credential = Credentials::Email.where(:name => email).includes(:user).first
+      credential && credential.user
+    end
+  end
+  
+  module InstanceMethods
+    # Credentials::Email instance associated with this user.
+    def email_credential
+      credentials.find { |c| c.instance_of?(Credentials::Email) }
+    end
+    
+    # The e-mail from the user's Email credential.
+    #
+    # Returns nil if this user has no Email credential.
+    def email
+      credential = self.email_credential
+      credential && credential.email
+    end
+    
+    # Sets the e-mail on the user's Email credential.
+    #
+    # Creates a new Credentials::Email instance if necessary.
+    def email=(new_email)
+      if credential = self.email_credential
+        credential.email = new_email
+      else
+        credentials << Credentials::Email.new(:email => new_email)
+      end
+      new_email
+    end
+  end
+end  # module Authpwn::UserExtensions::EmailField
+  
+end  # module Authpwn::UserExtensions
+  
+end  # module Authpwn

data/lib/authpwn_rails/user_extensions/password_field.rb

@@ -0,0 +1,79 @@
+require 'active_model'
+require 'active_support'
+
+# :nodoc: namespace
+module Authpwn
+
+# :nodoc: namespace
+module UserExtensions
+  
+# Augments the User model with a password virtual attribute.
+module PasswordField
+  extend ActiveSupport::Concern
+  
+  included do
+    validates :password, :presence => { :on => :create },
+                         :confirmation => { :allow_nil => true }
+    attr_accessible :password, :password_confirmation
+  end
+  
+  module ClassMethods
+    # The user who has a certain e-mail, or nil if the e-mail is unclaimed.
+    def with_email(email)
+      credential = Credentials::Email.where(:name => email).includes(:user).first
+      credential && credential.user
+    end
+  end
+  
+  module InstanceMethods
+    # Credentials::Password instance associated with this user.
+    def password_credential
+      credentials.find { |c| c.instance_of?(Credentials::Password) }
+    end
+    
+    # The password from the user's Password credential, or nil.
+    #
+    # Returns nil if this user has no Password credential.
+    def password
+      credential = self.password_credential
+      credential && credential.password
+    end
+    
+    # The password_confirmation from the user's Password credential, or nil.
+    #
+    # Returns nil if this user has no Password credential.
+    def password_confirmation
+      credential = self.password_credential
+      credential && credential.password_confirmation
+    end
+
+    # Sets the password on the user's Password credential.
+    #
+    # Creates a new Credentials::Password instance if necessary.
+    def password=(new_password)
+      if credential = self.password_credential
+        credential.password = new_password
+      else
+        credentials << Credentials::Password.new(:password => new_password)
+      end
+      new_password
+    end
+
+    # Sets the password on the user's Password credential.
+    #
+    # Creates a new Credentials::Password instance if necessary.
+    def password_confirmation=(new_password_confirmation)
+      if credential = self.password_credential
+        credential.password_confirmation = new_password_confirmation
+      else
+        credentials << Credentials::Password.new(:password_confirmation =>
+                                                 new_password_confirmation)
+      end
+      new_password_confirmation
+    end
+  end
+end  # module Authpwn::UserExtensions::PasswordField
+  
+end  # module Authpwn::UserExtensions
+  
+end  # module Authpwn

data/lib/authpwn_rails/user_model.rb

@@ -19,8 +19,15 @@ module UserModel
     
     # Credentials used to authenticate the user.
     has_many :credentials, :dependent => :destroy, :inverse_of => :user
+    validates_associated :credentials
+    # This is safe, because credentials use attr_accessible.
+    accepts_nested_attributes_for :credentials, :allow_destroy => true
     
+    # Automatically assign exuid.
     before_validation :set_default_exuid, :on => :create
+    
+    # Forms should not be able to touch any attribute.
+    attr_accessible :credentials_attributes
   end
 
   # Class methods on models that include Authpwn::UserModel.
@@ -49,3 +56,22 @@ module UserModel
 end  # namespace Authpwn::UserModel
 
 end  # namespace Authpwn
+
+
+# :nodoc: adds Facebook integration methods to the User model.
+module Authpwn::UserModel::ClassMethods
+  # The user that owns a given Facebook OAuth2 token.
+  #
+  # A new user will be created if the token doesn't belong to any user. This
+  # is the case for a new visitor.
+  def for_facebook_token(access_token)
+    Credentials::Facebook.for(access_token).user
+  end
+end  # module Authpwn::UserModel::ClassMethods
+
+# :nodoc: adds Facebook integration methods to the User model.
+module Authpwn::UserModel::InstanceMethods
+  def facebook_credential
+    credentials.find { |c| c.instance_of?(Credentials::Facebook) }
+  end
+end  # module Authpwn::UserModel::InstanceMethods

data/lib/authpwn_rails.rb

@@ -1,14 +1,23 @@
+require 'active_support'
+
 # :nodoc: namespace
 module Authpwn
+  extend ActiveSupport::Autoload
+  
+  autoload :CredentialModel, 'authpwn_rails/credential_model.rb'
+  autoload :SessionController, 'authpwn_rails/session_controller.rb'
+  autoload :UserModel, 'authpwn_rails/user_model.rb'
+
+  # Contains extensions to the User model.
+  module UserExtensions
+    autoload :EmailField, 'authpwn_rails/user_extensions/email_field.rb'
+    autoload :PasswordField, 'authpwn_rails/user_extensions/password_field.rb'
+  end
 end
 
-require 'authpwn_rails/credential_model.rb'
-require 'authpwn_rails/credentials.rb'
 require 'authpwn_rails/facebook_session.rb'
 require 'authpwn_rails/session.rb'
-require 'authpwn_rails/session_controller.rb'
 require 'authpwn_rails/test_extensions.rb'
-require 'authpwn_rails/user_model.rb'
 
 if defined?(Rails)
   require 'authpwn_rails/engine.rb'

data/test/email_credential_test.rb

@@ -2,8 +2,8 @@ require File.expand_path('../test_helper', __FILE__)
 
 class EmailCredentialTest < ActiveSupport::TestCase  
   def setup
-    @credential = Credentials::Email.new :email => 'dvdjohn@mit.edu',
-        :user => users(:bill)
+    @credential = Credentials::Email.new :email => 'dvdjohn@mit.edu'
+    @credential.user = users(:bill)
   end
   
   test 'setup' do
@@ -41,16 +41,4 @@ class EmailCredentialTest < ActiveSupport::TestCase
     @credential.email = credentials(:john_email).email
     assert !@credential.valid?
   end
-  
-  test 'User#email_credential' do
-    assert_equal credentials(:john_email), users(:john).email_credential
-    assert_equal credentials(:jane_email), users(:jane).email_credential
-    assert_nil users(:bill).email_credential
-  end
-
-  test 'User#email' do
-    assert_equal credentials(:john_email).email, users(:john).email
-    assert_equal credentials(:jane_email).email, users(:jane).email
-    assert_nil users(:bill).email
-  end
 end

data/test/email_field_test.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class UserWithEmail < User
+  include Authpwn::UserExtensions::EmailField
+end
+
+class EmailFieldTest < ActiveSupport::TestCase
+  def setup
+    @user = UserWithEmail.new :email => 'blah@gmail.com'
+    
+    @john = UserWithEmail.find_by_id(users(:john).id)
+    @jane = UserWithEmail.find_by_id(users(:jane).id)
+    @bill = UserWithEmail.find_by_id(users(:bill).id)
+  end
+  
+  test 'setup' do
+    @user.save!
+    assert @user.valid?
+  end
+
+  test 'email presence' do
+    @user.email = nil
+    assert !@user.valid?
+  end
+  
+  test 'email_credential' do
+    assert_equal credentials(:john_email), @john.email_credential
+    assert_equal credentials(:jane_email), @jane.email_credential
+    assert_nil @bill.email_credential
+  end
+
+  test 'email length' do
+    @user.email = 'abcde' * 25 + '@mit.edu'
+    assert !@user.valid?, 'Overly long email'
+  end
+  
+  test 'email format' do
+    ['cos tan@gmail.com', 'costan@x@mit.edu'].each do |email|
+      @user.email = email
+      assert !@user.valid?, "Bad email format - #{email}"
+    end    
+  end
+
+  test 'email' do
+    assert_equal credentials(:john_email).email, @john.email
+    assert_equal credentials(:jane_email).email, @jane.email
+    assert_nil @bill.email
+  end
+
+  test 'with_email' do
+    assert_equal users(:john),
+                 UserWithEmail.with_email(credentials(:john_email).email)
+    assert_equal users(:jane),
+                 UserWithEmail.with_email(credentials(:jane_email).email) 
+    assert_nil UserWithEmail.with_email('nosuch@email.com')
+  end
+end

data/test/facebook_credential_test.rb

@@ -3,9 +3,10 @@ require File.expand_path('../test_helper', __FILE__)
 class FacebookCredentialTest < ActiveSupport::TestCase  
   def setup
     @code = 'AAAEj8jKX2a8BAA4kNheRhOs6SlECVcZCE9o5pPKMytOjjoiNAoZBGZAwuL4KrrxXWesfJRhzDZCJiqrcQG3UdjRRNtyMJQMZD'
-    @credential = Credentials::Facebook.new :facebook_uid => '1181310542',
-        :key => 'AAAEj8jKX2a8BAOBMZCjxBe4dw7cRoD1JVxUgZAtB6ozJlR4Viazh6OAYcHB5kZAtUwgjpDy7a54ZA1DObLmBT9X99CLWYOj5Stqx8bHwnE7EzyBS1WxY',
-        :user => users(:bill)
+    @credential = Credentials::Facebook.new
+    @credential.facebook_uid = '1181310542'
+    @credential.key = 'AAAEj8jKX2a8BAOBMZCjxBe4dw7cRoD1JVxUgZAtB6ozJlR4Viazh6OAYcHB5kZAtUwgjpDy7a54ZA1DObLmBT9X99CLWYOj5Stqx8bHwnE7EzyBS1WxY'
+    @credential.user = users(:bill)
   end
   
   test 'setup' do

data/test/helpers/autoload_path.rb

@@ -0,0 +1,4 @@
+require 'active_support/dependencies'
+
+ActiveSupport::Dependencies.autoload_paths << File.expand_path(
+    '../../../app/models', __FILE__)

data/test/password_credential_test.rb

@@ -3,7 +3,8 @@ require File.expand_path('../test_helper', __FILE__)
 class PasswordCredentialTest < ActiveSupport::TestCase  
   def setup
     @credential = Credentials::Password.new :password => 'awesome',
-        :password_confirmation => 'awesome', :user => users(:bill)
+                                            :password_confirmation => 'awesome'
+    @credential.user = users(:bill)
   end
   
   test 'setup' do
@@ -58,10 +59,4 @@ class PasswordCredentialTest < ActiveSupport::TestCase
         Credentials::Password.authenticate_email('john@gmail.com', 'awesome'),
         'Bogus password'
   end
-  
-  test 'User#password_credential' do
-    assert_equal credentials(:john_password), users(:john).password_credential
-    assert_equal credentials(:jane_password), users(:jane).password_credential
-    assert_nil users(:bill).password_credential
-  end
 end

data/test/password_field_test.rb

@@ -0,0 +1,41 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class UserWithPassword < User
+  include Authpwn::UserExtensions::PasswordField
+end
+
+class PasswordFieldTest < ActiveSupport::TestCase
+  def setup
+    @user = UserWithPassword.new :password => 'awesome',
+                                 :password_confirmation => 'awesome'
+    
+    @john = UserWithPassword.find_by_id(users(:john).id)
+    @jane = UserWithPassword.find_by_id(users(:jane).id)
+    @bill = UserWithPassword.find_by_id(users(:bill).id)
+  end
+  
+  test 'setup' do
+    assert @user.valid?
+  end
+  
+  test 'password required' do
+    @user.password = @user.password_confirmation = nil
+    assert !@user.valid?
+  end
+  
+  test 'password assumed ok for existing records' do
+    @john.save!
+    assert @john.valid?
+  end
+  
+  test 'password confirmation' do
+    @user.password_confirmation = 'not awesome'
+    assert !@user.valid?
+  end
+  
+  test 'password_credential' do
+    assert_equal credentials(:john_password), @john.password_credential
+    assert_equal credentials(:jane_password), @jane.password_credential
+    assert_nil @bill.password_credential
+  end
+end

data/test/test_helper.rb

@@ -15,6 +15,7 @@ require 'authpwn_rails'
 require 'helpers/view_helpers.rb'
 # NOTE: application_controller has to follow view_helpers
 require 'helpers/application_controller.rb'
+require 'helpers/autoload_path.rb'
 require 'helpers/db_setup.rb'
 require 'helpers/fbgraph.rb'
 require 'helpers/routes.rb'

data/test/user_test.rb

@@ -34,4 +34,11 @@ class UserTest < ActiveSupport::TestCase
     assert_equal nil, User.find_by_param('bogus id')
     assert_equal nil, User.find_by_param(nil)
   end
+  
+  test 'nested attributes' do
+    @user = User.new :credentials_attributes => { 0 =>
+        {:name => 'test@email.com', :type => 'Credentials::Password'}}
+    assert_equal 1, @user.credentials.length
+    assert_equal 'test@email.com', @user.credentials.first.name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
-  requirement: &10153440 !ruby/object:Gem::Requirement
+  requirement: &17655420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *10153440
+  version_requirements: *17655420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10152600 !ruby/object:Gem::Requirement
+  requirement: &17653940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *10152600
+  version_requirements: *17653940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10151940 !ruby/object:Gem::Requirement
+  requirement: &17652840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10151940
+  version_requirements: *17652840
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &10151200 !ruby/object:Gem::Requirement
+  requirement: &17599820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *10151200
+  version_requirements: *17599820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &10150220 !ruby/object:Gem::Requirement
+  requirement: &17598940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *10150220
+  version_requirements: *17598940
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &10149480 !ruby/object:Gem::Requirement
+  requirement: &17598120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10149480
+  version_requirements: *17598120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10148440 !ruby/object:Gem::Requirement
+  requirement: &17597180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *10148440
+  version_requirements: *17597180
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -106,14 +106,13 @@ files:
 - Rakefile
 - VERSION
 - app/helpers/session_helper.rb
+- app/models/credentials/email.rb
+- app/models/credentials/facebook.rb
+- app/models/credentials/password.rb
 - authpwn_rails.gemspec
 - legacy/migrate_09_to_010.rb
 - lib/authpwn_rails.rb
 - lib/authpwn_rails/credential_model.rb
-- lib/authpwn_rails/credentials.rb
-- lib/authpwn_rails/credentials/email.rb
-- lib/authpwn_rails/credentials/facebook.rb
-- lib/authpwn_rails/credentials/password.rb
 - lib/authpwn_rails/engine.rb
 - lib/authpwn_rails/facebook_session.rb
 - lib/authpwn_rails/generators/all_generator.rb
@@ -132,17 +131,22 @@ files:
 - lib/authpwn_rails/session.rb
 - lib/authpwn_rails/session_controller.rb
 - lib/authpwn_rails/test_extensions.rb
+- lib/authpwn_rails/user_extensions/email_field.rb
+- lib/authpwn_rails/user_extensions/password_field.rb
 - lib/authpwn_rails/user_model.rb
 - test/cookie_controller_test.rb
 - test/email_credential_test.rb
+- test/email_field_test.rb
 - test/facebook_controller_test.rb
 - test/facebook_credential_test.rb
 - test/helpers/application_controller.rb
+- test/helpers/autoload_path.rb
 - test/helpers/db_setup.rb
 - test/helpers/fbgraph.rb
 - test/helpers/routes.rb
 - test/helpers/view_helpers.rb
 - test/password_credential_test.rb
+- test/password_field_test.rb
 - test/session_controller_api_test.rb
 - test/test_helper.rb
 - test/user_test.rb
@@ -161,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2383073164549657310
+      hash: -3179900965882251985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/authpwn_rails/credentials.rb

@@ -1,16 +0,0 @@
-# Loads sub-classes of the Credential model.
-#
-# We allow the Credential model to be defined in the Rails application, so the
-# application can choose the storage model (ActiveRecord vs Mongoid etc.). This
-# means that we have to load the classes that inherit from Credential after it's
-# defined, which is long after the authpwn_rails engine is loaded.
-
-require 'active_support'
-
-module Credentials
-  extend ActiveSupport::Autoload
-  
-  autoload :Email, 'authpwn_rails/credentials/email.rb'
-  autoload :Facebook, 'authpwn_rails/credentials/facebook.rb'
-  autoload :Password, 'authpwn_rails/credentials/password.rb'
-end