Simplify finders method naming

Author: carlosantoniodasilva

app/controllers/devise/registrations_controller.rb

@@ -44,7 +44,7 @@ def edit
   # We need to use a copy of the resource because we don't want to change
   # the current user in place.
   def update
-    self.resource = resource_class.devise_find_by_id!(send(:"current_#{resource_name}").to_key)
+    self.resource = resource_class.devise_find!(send(:"current_#{resource_name}").to_key)
     prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)
 
     resource_updated = update_resource(resource, account_update_params)

lib/devise/models/authenticatable.rb

@@ -227,7 +227,7 @@ def serialize_into_session(record)
         end
 
         def serialize_from_session(key, salt)
-          record = devise_find_by_id(key)
+          record = devise_find(key)
           record if record && record.authenticatable_salt == salt
         end
 
@@ -265,7 +265,7 @@ def find_for_authentication(tainted_conditions)
         end
 
         def find_first_by_auth_conditions(tainted_conditions, opts = {})
-          devise_find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
+          devise_find_by(devise_parameter_filter.filter(tainted_conditions).merge(opts))
         end
 
         # Find or initialize a record setting an error if it can't be found.

lib/devise/models/recoverable.rb

@@ -113,7 +113,7 @@ module ClassMethods
         # If a user is not found, return nil
         def with_reset_password_token(token)
           reset_password_token = Devise.token_generator.digest(self, :reset_password_token, token)
-          devise_find_first(reset_password_token: reset_password_token)
+          devise_find_by(reset_password_token: reset_password_token)
         end
 
         # Attempt to find a user by its email. If a record is found, send new

lib/devise/models/rememberable.rb

@@ -139,15 +139,15 @@ def serialize_into_cookie(record)
         def serialize_from_cookie(*args)
           id, token, generated_at = *args
 
-          record = devise_find_by_id(id)
+          record = devise_find(id)
           record if record && record.remember_me?(token, generated_at)
         end
 
         # Generate a token checking if one does not already exist in the database.
         def remember_token #:nodoc:
           loop do
             token = Devise.friendly_token
-            break token unless devise_find_first(remember_token: token)
+            break token unless devise_find_by(remember_token: token)
           end
         end
 

lib/devise/orm.rb

@@ -17,33 +17,33 @@ def self.included(model)
     end
 
     module ActiveRecordFinders
-      def devise_find_by_id(id)
+      def devise_find(id)
         id = id.first if id.is_a?(Array)
         find_by(id: id)
       end
 
-      def devise_find_by_id!(id)
+      def devise_find!(id)
         id = id.first if id.is_a?(Array)
         find(id)
       end
 
-      def devise_find_first(conditions)
+      def devise_find_by(conditions)
         find_by(conditions)
       end
     end
 
     module MongoidFinders
-      def devise_find_by_id(id)
+      def devise_find(id)
         id = id.first if id.is_a?(Array)
         where(id: id).first
       end
 
-      def devise_find_by_id!(id)
+      def devise_find!(id)
         id = id.first if id.is_a?(Array)
         find(id)
       end
 
-      def devise_find_first(conditions)
+      def devise_find_by(conditions)
         where(conditions).first
       end
     end

lib/devise/token_generator.rb

@@ -19,7 +19,7 @@ def generate(klass, column)
       loop do
         raw = Devise.friendly_token
         enc = OpenSSL::HMAC.hexdigest(@digest, key, raw)
-        break [raw, enc] unless klass.devise_find_first(column => enc)
+        break [raw, enc] unless klass.devise_find_by(column => enc)
       end
     end
 

test/models/rememberable_test.rb

@@ -21,7 +21,7 @@ def create_resource
   test 'remember_me should not generate a new token if valid token exists' do
     user = create_user
     user.singleton_class.send(:attr_accessor, :remember_token)
-    User.expects(:devise_find_first).returns(nil)
+    User.expects(:devise_find_by).returns(nil)
 
     user.remember_me!
     existing_token = user.remember_token
@@ -40,7 +40,7 @@ def create_resource
   test 'can generate remember token' do
     user = create_user
     user.singleton_class.send(:attr_accessor, :remember_token)
-    User.expects(:devise_find_first).returns(nil)
+    User.expects(:devise_find_by).returns(nil)
     user.remember_me!
     assert user.remember_token
   end

test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb

@@ -8,7 +8,7 @@ def facebook
   end
 
   def sign_in_facebook
-    user = User.devise_find_first(email: 'user@test.com')
+    user = User.devise_find_by(email: 'user@test.com')
     user.remember_me = true
     sign_in user
     render body: ""