lib/authgasm/session/config.rb in authgasm-0.10.1 vs lib/authgasm/session/config.rb in authgasm-0.10.2
- old
+ new
@@ -89,20 +89,20 @@
# more details.
#
# * <tt>Default:</tt> Guesses based on the model columns, tries login, username, and email. If none are present it defaults to login
# * <tt>Accepts:</tt> Symbol or String
def login_field
- @login_field ||= (klass.columns.include?("login") && :login) || (klass.columns.include?("username") && :username) || (klass.columns.include?("email") && :email) || :login
+ @login_field ||= (klass.column_names.include?("login") && :login) || (klass.column_names.include?("username") && :username) || (klass.column_names.include?("email") && :email) || :login
end
attr_writer :login_field
# Works exactly like login_field, but for the password instead.
#
# * <tt>Default:</tt> Guesses based on the model columns, tries password and pass. If none are present it defaults to password
# * <tt>Accepts:</tt> Symbol or String
def password_field
- @password_field ||= (klass.columns.include?("password") && :password) || (klass.columns.include?("pass") && :pass) || :password
+ @password_field ||= (klass.column_names.include?("password") && :password) || (klass.column_names.include?("pass") && :pass) || :password
end
attr_writer :password_field
# The length of time until the cookie expires.
#
@@ -124,13 +124,13 @@
#
# * <tt>Default:</tt> Guesses based on the model columns, tries remember_token, remember_key, cookie_token, and cookie_key. If none are present it defaults to remember_token
# * <tt>Accepts:</tt> Symbol or String
def remember_token_field
@remember_token_field ||=
- (klass.columns.include?("remember_token") && :remember_token) ||
- (klass.columns.include?("remember_key") && :remember_key) ||
- (klass.columns.include?("cookie_token") && :cookie_token) ||
- (klass.columns.include?("cookie_key") && :cookie_key) ||
+ (klass.column_names.include?("remember_token") && :remember_token) ||
+ (klass.column_names.include?("remember_key") && :remember_key) ||
+ (klass.column_names.include?("cookie_token") && :cookie_token) ||
+ (klass.column_names.include?("cookie_key") && :cookie_key) ||
:remember_token
end
attr_writer :remember_token_field
# Works exactly like cookie_key, but for sessions. See cookie_key for more info.
\ No newline at end of file