From 179cb2c88a2be958f942ddbe8100b5bd6bedc2c3 Mon Sep 17 00:00:00 2001
From: Sean Hill <seandhi@gmail.com>
Date: Sun, 28 Aug 2011 16:02:58 -0500
Subject: [PATCH] Changed the order of the devise_generator methods to create
 the model after the migration to properly use model_exists?, and I added
 tests to prove the generator works.

---
 lib/generators/active_record/devise_generator.rb | 8 ++++----
 test/generators/active_record_generator_test.rb  | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/generators/active_record/devise_generator.rb b/lib/generators/active_record/devise_generator.rb
index 448d723c..424f7f5e 100644
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -9,10 +9,6 @@ module ActiveRecord
       include Devise::Generators::OrmHelpers
       source_root File.expand_path("../templates", __FILE__)
 
-      def generate_model
-        invoke "active_record:model", [name], :migration => false unless model_exists? && behavior == :invoke
-      end
-
       def copy_devise_migration
         unless model_exists?
           migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
@@ -21,6 +17,10 @@ module ActiveRecord
         end
       end
 
+      def generate_model
+        invoke "active_record:model", [name], :migration => false unless model_exists? && behavior == :invoke
+      end
+      
       def inject_devise_content
         inject_into_class(model_path, class_name, model_contents + <<CONTENT) if model_exists?
   # Setup accessible (or protected) attributes for your model
diff --git a/test/generators/active_record_generator_test.rb b/test/generators/active_record_generator_test.rb
index 8c33994c..9963e3b8 100644
--- a/test/generators/active_record_generator_test.rb
+++ b/test/generators/active_record_generator_test.rb
@@ -13,6 +13,13 @@ if DEVISE_ORM == :active_record
       assert_file "app/models/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
       assert_migration "db/migrate/devise_create_monsters.rb"
     end
+    
+    test "update model migration when model exists" do
+      run_generator %w(monster)
+      assert_file "app/models/monster.rb"
+      run_generator %w(monster)
+      assert_migration "db/migrate/add_devise_to_monsters.rb"
+    end
   
     test "all files are properly deleted" do
       run_generator %w(monster)