ActiveAdmin: Allow for both singular and plural model names

Author: vfonic

lib/annotate/annotate_models.rb

@@ -173,7 +173,10 @@ def files_by_pattern(root_directory, pattern_type, options)
       when 'controller'
         [File.join(root_directory, CONTROLLER_DIR, "%PLURALIZED_MODEL_NAME%_controller.rb")]
       when 'admin'
-        [File.join(root_directory, ACTIVEADMIN_DIR, "%MODEL_NAME%.rb")]
+        [
+          File.join(root_directory, ACTIVEADMIN_DIR, "%MODEL_NAME%.rb"),
+          File.join(root_directory, ACTIVEADMIN_DIR, "%PLURALIZED_MODEL_NAME%.rb")
+        ]
       when 'helper'
         [File.join(root_directory, HELPER_DIR, "%PLURALIZED_MODEL_NAME%_helper.rb")]
       else

spec/lib/annotate/annotate_models_spec.rb

@@ -1659,6 +1659,16 @@ def mock_column(name, type, options = {})
         end
       end
     end
+
+    context 'when pattern_type is "admin"' do
+      let(:root_directory) { '/root' }
+      let(:pattern_type) { 'admin' }
+      let(:options) { {} }
+
+      it 'returns both singular and pluralized model names' do
+        is_expected.to eq(['/root/app/admin/%MODEL_NAME%.rb', '/root/app/admin/%PLURALIZED_MODEL_NAME%.rb'])
+      end
+    end
   end
 
   describe '.get_patterns' do