authpwn_rails 0.13.4 → 0.14.0

data/.travis.yml

@@ -4,8 +4,10 @@ env:
   - DB=mysql:utf8_bin
   - DB=pg DB_USER=postgres
   - DB=sqlite
+gemfile:
+  - Gemfile.rails3
+  - Gemfile.rails4
 rvm:
-  - 1.8.7
   - 1.9.3
-  - rbx-18mode
+  - 2.0.0
   - rbx-19mode

data/Gemfile

@@ -1,14 +1,14 @@
 source :rubygems
 
 gem 'fbgraph_rails', '>= 0.2.2'
-gem 'rails', '>= 3.2.11'
+
+gem 'rails', '>= 3.2.12'
 
 group :development do
-  gem 'bundler', '>= 1.2.3'
-  gem 'flexmock', '>= 1.3.0'
+  gem 'bundler', '>= 1.3.3'
+  gem 'mocha', '>= 0.13.3'
   gem 'jeweler', '>= 1.8.4'
-  gem 'rcov', '>= 0', :platform => :mri_18
-  gem 'simplecov', '>= 0', :platform => :mri_19
+  gem 'simplecov', '>= 0'
   gem 'mysql2', '>= 0.3.11'
   gem 'pg', '>= 0.14.1'
   gem 'sqlite3', '>= 1.3.7'

data/Gemfile.lock

@@ -1,37 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
+    actionmailer (3.2.12)
+      actionpack (= 3.2.12)
       mail (~> 2.4.4)
-    actionpack (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    actionpack (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-    activesupport (3.2.11)
+    activeresource (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     erubis (2.7.0)
-    faraday (0.8.5)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
     fbgraph (1.10.0)
       activesupport
@@ -47,62 +47,65 @@ GEM
       json (>= 1.6.1)
       oauth2 (>= 0.5.0)
       rails (>= 3.1.0)
-    flexmock (1.3.0)
     git (1.2.5)
-    hashie (1.2.0)
+    hashie (2.0.2)
     hike (1.2.1)
     httpauth (0.2.0)
-    i18n (0.6.1)
+    i18n (0.6.4)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.6)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
+    json (1.7.7)
+    jwt (0.1.7)
+      multi_json (>= 1.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.20.1)
-    multi_json (1.5.0)
-    multipart-post (1.1.5)
+    metaclass (0.0.1)
+    mime-types (1.21)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.6.1)
+    multi_xml (0.5.3)
+    multipart-post (1.2.0)
     mysql2 (0.3.11)
-    oauth2 (0.8.0)
+    oauth2 (0.9.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
     pg (0.14.1)
     polyglot (0.3.3)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.11)
-      actionmailer (= 3.2.11)
-      actionpack (= 3.2.11)
-      activerecord (= 3.2.11)
-      activeresource (= 3.2.11)
-      activesupport (= 3.2.11)
+    rails (3.2.12)
+      actionmailer (= 3.2.12)
+      actionpack (= 3.2.12)
+      activerecord (= 3.2.12)
+      activeresource (= 3.2.12)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.2.11)
-    railties (3.2.11)
-      actionpack (= 3.2.11)
-      activesupport (= 3.2.11)
+      railties (= 3.2.12)
+    railties (3.2.12)
+      actionpack (= 3.2.12)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rcov (1.0.0)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -117,23 +120,22 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.5)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.2.3)
+  bundler (>= 1.3.3)
   fbgraph_rails (>= 0.2.2)
-  flexmock (>= 1.3.0)
   jeweler (>= 1.8.4)
+  mocha (>= 0.13.3)
   mysql2 (>= 0.3.11)
   pg (>= 0.14.1)
-  rails (>= 3.2.11)
-  rcov
+  rails (>= 3.2.12)
   simplecov
   sqlite3 (>= 1.3.7)

data/Gemfile.rails3

@@ -0,0 +1,15 @@
+source :rubygems
+
+gem 'fbgraph_rails', '>= 0.2.2'
+
+gem 'rails', '>= 3.2.12'
+
+group :development do
+  gem 'bundler', '>= 1.3.2'
+  gem 'mocha', '>= 0.13.3'
+  gem 'jeweler', '>= 1.8.4'
+  gem 'simplecov', '>= 0'
+  gem 'mysql2', '>= 0.3.11'
+  gem 'pg', '>= 0.14.1'
+  gem 'sqlite3', '>= 1.3.7'
+end

data/Gemfile.rails4

@@ -0,0 +1,15 @@
+source :rubygems
+
+gem 'fbgraph_rails', '>= 0.2.2'
+
+gem 'rails', '>= 4.0.0.beta1'
+
+group :development do
+  gem 'bundler', '>= 1.3.2'
+  gem 'mocha', '>= 0.13.3'
+  gem 'jeweler', '>= 1.8.4'
+  gem 'simplecov', '>= 0'
+  gem 'mysql2', '>= 0.3.11'
+  gem 'pg', '>= 0.14.1'
+  gem 'sqlite3', '>= 1.3.7'
+end

data/VERSION

@@ -1 +1 @@
-0.13.4
+0.14.0

data/app/models/credentials/email.rb

@@ -1,23 +1,23 @@
 # :namespace
 module Credentials
-  
+
 # Associates an e-mail address with the user account.
 class Email < ::Credential
   # The e-mail address.
   alias_attribute :email, :name
-  validates :name, :format => /^[A-Za-z0-9.+_]+@[^@]*\.(\w+)$/,
-       :presence => true, :uniqueness => { :scope => [:type],
-       :message => 'This e-mail address is already claimed by an account' }
+  validates :name, format: /\A[A-Za-z0-9.+_]+@[^@]*\.(\w+)\Z/,
+       presence: true, 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.
-  validates :key, :presence => true, :inclusion => { :in => ['0', '1'] }
+  validates :key, presence: true, inclusion: { in: ['0', '1'] }
 
-  before_validation :set_verified_to_false, :on => :create
+  before_validation :set_verified_to_false, on: :create
   # :nodoc: by default, e-mail addresses are not verified
   def set_verified_to_false
     self.key ||= '0' if self.key.nil?
   end
-  
+
   # True if the e-mail has been verified via a token URL.
   def verified?
     key == '1'
@@ -44,20 +44,36 @@ class Email < ::Credential
     user = credential.user
     user.auth_bounce_reason(credential) || user
   end
-  
-  # Locates the credential holding an e-mail address.
-  #
-  # Returns the User matching the given e-mail, or nil if the e-mail is not
-  # associated with any user.
-  def self.with(email)
-    # This method is likely to be used to kick off a complex authentication
-    # process, so it makes sense to pre-fetch the user's other credentials.
-    credential = Credentials::Email.where(:name => email).
-                                    includes(:user => :credentials).first
+
+  begin
+    ActiveRecord::QueryMethods.instance_method :references
+    # Rails 4.
+
+    # Locates the credential holding an e-mail address.
+    #
+    # Returns the User matching the given e-mail, or nil if the e-mail is not
+    # associated with any user.
+    def self.with(email)
+      # This method is likely to be used to kick off a complex authentication
+      # process, so it makes sense to pre-fetch the user's other credentials.
+      Credentials::Email.includes(user: :credentials).where(name: email).
+                         references(:credential).first
+    end
+  rescue NameError
+    # Rails 3.
+
+    def self.with(email)
+      # This method is likely to be used to kick off a complex authentication
+      # process, so it makes sense to pre-fetch the user's other credentials.
+      Credentials::Email.includes(user: :credentials).where(name: email).
+                         first
+    end
   end
 
-  # Forms can only change the e-mail in the credential.
-  attr_accessible :email
+  if ActiveRecord::Base.respond_to? :mass_assignment_sanitizer=
+    # Forms can only change the e-mail in the credential.
+    attr_accessible :email
+  end
 end  # class Credentials::Email
 
 end  # namespace Credentials

data/app/models/credentials/facebook.rb

@@ -5,17 +5,17 @@ module Credentials
 class Facebook < ::Credential
   # The Graph API object ID of the Facebook account.
   alias_attribute :facebook_uid, :name
-  validates :name, :format => /^\d+$/, :presence => true,
-       :uniqueness => { :scope => [:type],
-       :message => 'Your Facebook user is already associated to an account' }
+  validates :name, format: /\A\d+\Z/, presence: true,
+       uniqueness: { scope: [:type],
+       message: 'Your Facebook user is already associated to an account' }
 
   # A user can be associated to a single Facebook account.
-  validates :user_id, :uniqueness => {
-      :message => 'Your account is already associated to a Facebook user' }
+  validates :user_id, uniqueness: {
+      message: 'Your account is already associated to a Facebook user' }
 
   # OAuth2 token issued by Facebook.
   alias_attribute :access_token, :key
-  validates :key, :presence => true
+  validates :key, presence: true
 
   # FBGraph client loaded with this access token.
   def facebook_client
@@ -28,7 +28,7 @@ class Facebook < ::Credential
   # token. Otherwise, a new model will be created, together with a user.
   def self.for(access_token)
     uid = uid_from_token access_token
-    credential = self.where(:name => uid.to_str).first
+    credential = self.where(name: uid.to_str).first
     if credential
       credential.key = access_token
       credential.save!
@@ -54,8 +54,10 @@ class Facebook < ::Credential
     FBGraphRails.fbclient(access_token).selection.me.info![:id].to_s
   end
 
-  # Forms should not be able to touch any attribute.
-  attr_accessible
+  if ActiveRecord::Base.respond_to? :mass_assignment_sanitizer=
+    # Forms should not be able to touch any attribute.
+    attr_accessible
+  end
 end  # class Credentials::Facebook
 
 end  # namespace Credentials

data/app/models/credentials/password.rb

@@ -5,14 +5,14 @@ module Credentials
 class Password < ::Credential
   # Virtual attribute: the user's password.
   attr_accessor :password
-  validates :password, :presence => { :on => :create },
-                       :confirmation => { :allow_nil => true }
+  validates :password, presence: { on: :create },
+                       confirmation: { allow_nil: true }
 
   # Virtual attribute: confirmation for the user's password.
   attr_accessor :password_confirmation
 
   # A user can have a single password.
-  validates :user_id, :uniqueness => true
+  validates :user_id, uniqueness: true
 
   # Passwords can expire, if users don't change them often enough.
   include Authpwn::Expires
@@ -73,8 +73,10 @@ class Password < ::Credential
     [(0...12).map { |i| 1 + rand(255) }.pack('C*')].pack('m').strip
   end
 
-  # Forms can only change the plain-text password fields.
-  attr_accessible :password, :password_confirmation
+  if ActiveRecord::Base.respond_to? :mass_assignment_sanitizer=
+    # Forms can only change the plain-text password fields.
+    attr_accessible :password, :password_confirmation
+  end
 end  # class Credentials::Password
 
 end  # namespace Credentials

data/app/models/tokens/base.rb

@@ -26,8 +26,8 @@ class Base < ::Credential
   # Token names are random, so we can expect they'll be unique across the
   # entire namespace. We need this check to enforce name uniqueness across
   # different token types.
-  validates :name, :format => /^[A-Za-z0-9\_\-]+$/, :presence => true,
-                   :uniqueness => true
+  validates :name, format: /\A[A-Za-z0-9\_\-]+\Z/, presence: true,
+                   uniqueness: true
 
   # Tokens can expire. This is a good idea most of the time, because token
   # codes are supposed to be used quickly.
@@ -45,17 +45,30 @@ class Base < ::Credential
     credential ? credential.authenticate : :invalid
   end
 
-  # Scope that uses a secret code.
-  def self.with_code(code)
-    # NOTE 1: The where query must be performed off the root type, otherwise
-    #         Rails will try to guess the right values for the 'type' column,
-    #         and will sometimes get them wrong.
-    # NOTE 2: After using this method, it's likely that the user's other tokens
-    #         (e.g., email or Facebook OAuth token) will be required, so we
-    #         pre-fetch them.
-    credential = Credential.where(:name => code).
-        where(Credential.arel_table[:type].matches('Tokens::%')).
-        includes(:user => :credentials)
+  
+  begin
+    ActiveRecord::QueryMethods.instance_method :references
+    # Rails 4.
+
+    # Scope that uses a secret code.
+    def self.with_code(code)
+      # NOTE 1: The where query must be performed off the root type, otherwise
+      #         Rails will try to guess the right values for the 'type' column,
+      #         and will sometimes get them wrong.
+      # NOTE 2: After using this method, it's likely that the user's other
+      #         tokens (e.g., email or Facebook OAuth token) will be required,
+      #         so we pre-fetch them.
+      Credential.where(name: code).includes(user: :credentials).
+          where(Credential.arel_table[:type].matches('Tokens::%')).
+          references(:credential)
+    end
+  rescue NameError
+    # Rails 3.
+
+    def self.with_code(code)
+      Credential.where(name: code).includes(user: :credentials).
+          where(Credential.arel_table[:type].matches('Tokens::%'))
+    end
   end
 
   # Authenticates a user using this token.
@@ -119,7 +132,7 @@ class Base < ::Credential
   # @param [String] param value returned by Token#to_param
   # @return [ActiveRecord::Relation]
   def self.with_param(param)
-    where(:name => param)
+    where(name: param)
   end
 end  # class Tokens::Base
 

data/app/models/tokens/email_verification.rb

@@ -10,7 +10,7 @@ class EmailVerification < Tokens::OneTime
   # user. Otherwise, a user might be able to change their e-mail address and
   # then use the token to verify the ownership of the wrong address.
   alias_attribute :email, :key
-  validates :email, :presence => true
+  validates :email, presence: true
 
   # Verification tokens only work this much time after they have been issued.
   self.expires_after =

data/app/models/tokens/session_uid.rb

@@ -6,13 +6,13 @@ class SessionUid < Tokens::Base
   alias_attribute :suid, :name
 
   # The IP address and User-Agent string of the browser using this session.
-  store :key, :accessors => [:browser_ip, :browser_ua]
+  store :key, accessors: [:browser_ip, :browser_ua]
 
   # The User-Agent header of the browser that received this suid.
-  validates :browser_ua, :presence => true
+  validates :browser_ua, presence: true
 
   # The IP of the computer that received this suid.
-  validates :browser_ip, :presence => true
+  validates :browser_ip, presence: true
 
   # Browser users are logged out if they don't hit the app in this much time.
   self.expires_after = Authpwn::Engine.config.authpwn.session_expiration
@@ -25,7 +25,7 @@ class SessionUid < Tokens::Base
   #                            session
   def self.random_for(user, browser_ip, browser_ua)
     browser_ua = browser_ua[0, 1536] if browser_ua.length > 1536
-    key = { :browser_ip => browser_ip, :browser_ua => browser_ua }
+    key = { browser_ip: browser_ip, browser_ua: browser_ua }
     super user, key, self
   end
 
@@ -33,7 +33,7 @@ class SessionUid < Tokens::Base
   #
   # When a session UID is used to authenticate a user, its updated_at time is
   # refreshed if it differs from the current time by this much.
-  class_attribute :updates_after, :instance_writer => false
+  class_attribute :updates_after, instance_writer: false
   self.updates_after = Authpwn::Engine.config.authpwn.session_precision
 
   # Updates the time associated with the session.

data/authpwn_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "authpwn_rails"
-  s.version = "0.13.4"
+  s.version = "0.14.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = "2013-02-05"
+  s.date = "2013-03-14"
   s.description = "Works with Facebook."
   s.email = "victor@costan.us"
   s.extra_rdoc_files = [
@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
+    "Gemfile.rails3",
+    "Gemfile.rails4",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -90,6 +92,7 @@ Gem::Specification.new do |s|
     "test/fixtures/bare_session/new.html.erb",
     "test/fixtures/bare_session/password_change.html.erb",
     "test/fixtures/bare_session/welcome.html.erb",
+    "test/helpers/action_controller.rb",
     "test/helpers/action_mailer.rb",
     "test/helpers/application_controller.rb",
     "test/helpers/autoload_path.rb",
@@ -114,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 = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "User authentication for Rails 3 applications."
 
   if s.respond_to? :specification_version then
@@ -122,22 +125,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fbgraph_rails>, [">= 0.2.2"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.2.11"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.3"])
-      s.add_development_dependency(%q<flexmock>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.3.3"])
+      s.add_development_dependency(%q<mocha>, [">= 0.13.3"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, [">= 0.3.11"])
       s.add_development_dependency(%q<pg>, [">= 0.14.1"])
       s.add_development_dependency(%q<sqlite3>, [">= 1.3.7"])
     else
       s.add_dependency(%q<fbgraph_rails>, [">= 0.2.2"])
-      s.add_dependency(%q<rails>, [">= 3.2.11"])
-      s.add_dependency(%q<bundler>, [">= 1.2.3"])
-      s.add_dependency(%q<flexmock>, [">= 1.3.0"])
+      s.add_dependency(%q<rails>, [">= 3.2.12"])
+      s.add_dependency(%q<bundler>, [">= 1.3.3"])
+      s.add_dependency(%q<mocha>, [">= 0.13.3"])
       s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<mysql2>, [">= 0.3.11"])
       s.add_dependency(%q<pg>, [">= 0.14.1"])
@@ -145,11 +146,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<fbgraph_rails>, [">= 0.2.2"])
-    s.add_dependency(%q<rails>, [">= 3.2.11"])
-    s.add_dependency(%q<bundler>, [">= 1.2.3"])
-    s.add_dependency(%q<flexmock>, [">= 1.3.0"])
+    s.add_dependency(%q<rails>, [">= 3.2.12"])
+    s.add_dependency(%q<bundler>, [">= 1.3.3"])
+    s.add_dependency(%q<mocha>, [">= 0.13.3"])
     s.add_dependency(%q<jeweler>, [">= 1.8.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<mysql2>, [">= 0.3.11"])
     s.add_dependency(%q<pg>, [">= 0.14.1"])

data/lib/authpwn_rails/credential_model.rb

@@ -11,17 +11,19 @@ module CredentialModel
 
   included do
     # The user whose token this is.
-    belongs_to :user, :inverse_of => :credentials
-    validates :user, :presence => true
+    belongs_to :user, inverse_of: :credentials
+    validates :user, presence: true
 
     # Name that can be used to find the token.
-    validates :name, :length => { :in => 1..128, :allow_nil => true },
-                     :uniqueness => { :scope => [:type], :allow_nil => true }
+    validates :name, length: { in: 1..128, allow_nil: true },
+                     uniqueness: { scope: [:type], allow_nil: true }
 
     # Secret information associated with the token.
-    validates :key, :length => { :in => 1..2.kilobytes, :allow_nil => true }
+    validates :key, length: { in: 1..2.kilobytes, allow_nil: true }
 
-    attr_accessible
+    if ActiveRecord::Base.respond_to? :mass_assignment_sanitizer=
+      attr_accessible
+    end
   end
 
   # Included in the metaclass of models that call pwnauth_facebook_token_model.

data/lib/authpwn_rails/expires.rb

@@ -10,7 +10,7 @@ module Expires
     #
     # Users can reset this timer by updating their credentials, e.g. changing
     # their password.
-    class_attribute :expires_after, :instance_writer => false
+    class_attribute :expires_after, instance_writer: false
   end
 
   # True if this password is too old and should not be used for authentication.

data/lib/authpwn_rails/generators/templates/001_create_users.rb

@@ -1,11 +1,11 @@
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
-      t.string :exuid, :limit => 32, :null => false
-      
+      t.string :exuid, limit: 32, null: false
+
       t.timestamps
     end
-    
-    add_index :users, :exuid, :unique => true, :null => false
+
+    add_index :users, :exuid, unique: true
   end
 end