lib/rails/generators/mailer/mailer_generator.rb in actionmailer-5.0.7.2 vs lib/rails/generators/mailer/mailer_generator.rb in actionmailer-5.1.0.beta1

@@ -6,32 +6,31 @@
       argument :actions, type: :array, default: [], banner: "method method"
 
       check_class_collision suffix: "Mailer"
 
       def create_mailer_file
-        template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb")
+        template "mailer.rb", File.join("app/mailers", class_path, "#{file_name}_mailer.rb")
 
         in_root do
-          if self.behavior == :invoke && !File.exist?(application_mailer_file_name)
-            template 'application_mailer.rb', application_mailer_file_name
+          if behavior == :invoke && !File.exist?(application_mailer_file_name)
+            template "application_mailer.rb", application_mailer_file_name
           end
         end
       end
 
       hook_for :template_engine, :test_framework
 
-      protected
-        def file_name
-          @_file_name ||= super.gsub(/_mailer/i, '')
+      private
+        def file_name # :doc:
+          @_file_name ||= super.gsub(/_mailer/i, "")
         end
 
-      private
         def application_mailer_file_name
           @_application_mailer_file_name ||= if mountable_engine?
-                                             "app/mailers/#{namespaced_path}/application_mailer.rb"
-                                           else
-                                             "app/mailers/application_mailer.rb"
-                                           end
+            "app/mailers/#{namespaced_path}/application_mailer.rb"
+          else
+            "app/mailers/application_mailer.rb"
+          end
         end
     end
   end
 end