Merge branch 'deprecating-ausence-of-required-fields'

app/controllers/devise_controller.rb

@@ -161,4 +161,4 @@ MESSAGE
       super
     end
   end
-end
+end

app/views/devise/_links.erb

@@ -1,4 +1,3 @@
 <% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
-  "please use devise/shared/_links.erb instead." %>
-  <%= render "shared/links" %>
-<% end %>
+  "please use devise/shared/_links.erb instead."%>
+<%= render "shared/links" %>

lib/devise/models.rb

@@ -55,8 +55,12 @@ module Devise
       klass.devise_modules.each do |mod|
         instance = klass.new
 
-        const_get(mod.to_s.classify).required_fields(klass).each do |field|
-          failed_attributes << field unless instance.respond_to?(field)
+        if const_get(mod.to_s.classify).respond_to?(:required_fields)
+          const_get(mod.to_s.classify).required_fields(klass).each do |field|
+            failed_attributes << field unless instance.respond_to?(field)
+          end
+        else
+          ActiveSupport::Deprecation.warn "The module #{mod} doesn't implement self.required_fields(klass). Devise uses required_fields to warn developers of any missing fields in their models. Please implement #{mod}.required_fields(klass) that returns an array of symbols with the required fields."
         end
       end
 
@@ -114,4 +118,4 @@ module Devise
   end
 end
 
-require 'devise/models/authenticatable'
+require 'devise/models/authenticatable'

test/models_test.rb

@@ -157,4 +157,23 @@ class CheckFieldsTest < ActiveSupport::TestCase
       Devise::Models.check_fields!(Magician)
     end
   end
+
+  test "doesn't raise a NoMethodError exception when the module doesn't have a required_field(klass) class method" do
+     driver = Class.new do
+      extend Devise::Models
+
+      def self.before_validation(instance)
+      end
+
+      attr_accessor :encrypted_password, :email
+
+      devise :database_authenticatable
+    end
+
+    swap_module_method_existence Devise::Models::DatabaseAuthenticatable, :required_fields do
+      assert_deprecated do
+        Devise::Models.check_fields!(driver)
+      end
+    end
+  end
 end

test/support/helpers.rb

@@ -67,4 +67,25 @@ class ActiveSupport::TestCase
       end
     end
   end
+
+  def swap_module_method_existence(klass, method)
+    klass.module_eval %Q[
+      class << self
+        alias #{method}_referenced #{method}
+        undef #{method}
+      end
+    ]
+
+    begin
+      yield if block_given?
+    ensure
+
+      klass.module_eval %Q[
+        class << self
+          alias #{method} #{method}_referenced
+          undef #{method}_referenced
+        end
+      ]
+    end
+  end
 end