authpwn_rails 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d9f6491cc0db1aefaffb07a6636cdc7c328d29
-  data.tar.gz: e941fc3b74301db97605f6910a405b0a955d1a28
+  metadata.gz: 5c56c44cfe9c778f80d1a6aa1ff6d4c4cbdb4be4
+  data.tar.gz: 46ac32e85072239a83ce8cb997d988deb776af66
 SHA512:
-  metadata.gz: e4cd7cc70aadf0bee5535415f2702e9d049e12977ce5ed7c2e955f0b7a4f2d801e127c695698195fd9076eb12dd9b5ac2942c07cda3669870c6bb5ce49b3b478
-  data.tar.gz: a1e540e43c6726d38f4980b740f974909b01c0429ef4891177400d2dc2c01c980a6eace4182ecb24802b0d87d065cfbe5611136c5e1b1ac177cb3ab8123e3e7b
+  metadata.gz: a0d4e3563d5e3e3019fc8587af6fe2dd55c19edd3e75662e6124c67e555b4300a936a9c37be33c434263fb1b7cf19bf387ad687c37a6f1cf888fcc4df8b16ec2
+  data.tar.gz: 455ccfab2e29a549d552592b6edd15b588c32b15c413e6908ece34c76350b3ccb4dbbcb4efcf72bdce34e440ed2be84e0d0737d51a871aad278849397d7a6cda

data/VERSION

@@ -1 +1 @@
-0.14.1
+0.14.2

data/app/models/credentials/email.rb

@@ -3,10 +3,23 @@ module Credentials
 
 # Associates an e-mail address with the user account.
 class Email < ::Credential
+  # E-mail is a user-visible attribute, so we want good error messages for some
+  # of its validations. This means we must re-define them.
+  if respond_to?(:clear_validators!)
+    clear_validators!
+  else
+    # Backport clear_validators! from Rails 4.
+    reset_callbacks :validate
+    _validators.clear
+  end
+
+  # The user whose email this is.
+  validates :user, presence: true
+
   # The e-mail address.
   alias_attribute :email, :name
   validates :name, format: /\A[A-Za-z0-9.+_]+@[^@]*\.(\w+)\Z/,
-       presence: true, uniqueness: { scope: [:type],
+       presence: true, length: 1..128, uniqueness: { scope: [:type],
        message: 'This e-mail address is already claimed by an account' }
 
   # '1' if the user proved ownership of the e-mail address.

data/authpwn_rails.gemspec

@@ -2,15 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: authpwn_rails 0.14.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.14.1"
+  s.version = "0.14.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2013-12-07"
+  s.date = "2013-12-11"
   s.description = "Works with Facebook."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -118,7 +117,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/pwnall/authpwn_rails"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.0.14"
   s.summary = "User authentication for Rails 3 applications."
 
   if s.respond_to? :specification_version then

data/lib/authpwn_rails/user_extensions/email_field.rb

@@ -13,8 +13,13 @@ module EmailField
   extend ActiveSupport::Concern
 
   included do
-    validates :email, format: /\A[A-Za-z0-9.+_]+@[^@]*\.(\w+)\Z/,
-         presence: true
+    validates_each :email do |record, attr, value|
+      unless record.email_credential.valid?
+        record.email_credential.errors.each do |_, message|
+          record.errors.add attr, message
+        end
+      end
+    end
     if ActiveRecord::Base.respond_to? :mass_assignment_sanitizer=
       attr_accessible :email
     end

data/test/credentials/email_credential_test.rb

@@ -46,18 +46,27 @@ class EmailCredentialTest < ActiveSupport::TestCase
   test 'email length' do
     @credential.email = 'abcde' * 25 + '@mit.edu'
     assert !@credential.valid?, 'Overly long email'
+    assert @credential.errors[:name].any? { |m| /too long/i =~ m },
+           'Validation errors include length error'
   end
 
   test 'email format' do
     ['cos tan@gmail.com', 'costan@x@mit.edu'].each do |email|
       @credential.email = email
       assert !@credential.valid?, "Bad email format - #{email}"
+      assert @credential.errors[:name].any? { |m| /invalid/i =~ m },
+             'Validation errors include format error'
     end
   end
 
   test 'email uniqueness' do
     @credential.email = credentials(:john_email).email
     assert !@credential.valid?
+    assert @credential.errors[:name].any? { |m| /already claimed/i =~ m },
+           'Validation errors include custom uniqueness error'
+    assert !@credential.errors[:name].
+                        any? { |m| m == 'has already been taken' },
+           'Validation errors do not include default uniqueness error'
   end
 
   test 'authenticate' do

data/test/user_extensions/email_field_test.rb

@@ -7,12 +7,12 @@ 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
     assert @user.valid?
   end
@@ -21,7 +21,7 @@ class EmailFieldTest < ActiveSupport::TestCase
     @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
@@ -31,13 +31,27 @@ class EmailFieldTest < ActiveSupport::TestCase
   test 'email length' do
     @user.email = 'abcde' * 25 + '@mit.edu'
     assert !@user.valid?, 'Overly long email'
+    assert_not_nil @user.errors[:email], 'No validation errors on e-mail'
+    assert @user.errors[:email].any? { |m| /too long/i =~ m },
+           'E-mail validation errors include length error'
   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    
+      assert_not_nil @user.errors[:email], 'No validation errors on e-mail'
+      assert @user.errors[:email].any? { |m| /invalid/i =~ m },
+             'E-mail validation errors include format error'
+    end
+  end
+
+  test 'email uniqueness' do
+    @user.email = @john.email
+    assert !@user.valid?, 'Using existent e-mail'
+    assert_not_nil @user.errors[:email], 'No validation errors on e-mail'
+    assert @user.errors[:email].any? { |m| /already claimed/i =~ m },
+           'E-mail validation errors include uniqueness error'
   end
 
   test 'email' do
@@ -50,7 +64,7 @@ class EmailFieldTest < ActiveSupport::TestCase
     assert_equal users(:john),
                  UserWithEmail.with_email(credentials(:john_email).email)
     assert_equal users(:jane),
-                 UserWithEmail.with_email(credentials(:jane_email).email) 
+                 UserWithEmail.with_email(credentials(:jane_email).email)
     assert_nil UserWithEmail.with_email('nosuch@email.com')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Victor Costan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: User authentication for Rails 3 applications.