Merge remote branch 'rails/master'

1 files changed, 15 insertions, 0 deletions

diff --git a/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb b/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb
new file mode 100644
index 0000000000..c1c0e3f25b
--- /dev/null
+++ b/activerecord/lib/rails/generators/active_record/observer/observer_generator.rb
@@ -0,0 +1,15 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class ObserverGenerator < Base
+      check_class_collision :suffix => "Observer"
+
+      def create_observer_file
+        template 'observer.rb', File.join('app/models', class_path, "#{file_name}_observer.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end