Fix namespaces

Author: bradgessler

lib/generators/supermail/email/email_generator.rb

@@ -3,7 +3,7 @@
 require 'rails/generators/named_base'
 
 module Supermail
-  class EmailGenerator < Rails::Generators::NamedBase
+  class EmailGenerator < ::Rails::Generators::NamedBase
     source_root File.expand_path('templates', __dir__)
 
     desc "Generate a new email class"
@@ -22,4 +22,4 @@ def class_name
       name.camelize
     end
   end
-end
+end

lib/generators/supermail/install/install_generator.rb

@@ -3,7 +3,7 @@
 require 'rails/generators/base'
 
 module Supermail
-  class InstallGenerator < Rails::Generators::Base
+  class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
 
       desc "Install Supermail in a Rails application"
@@ -16,4 +16,4 @@ def create_emails_directory
         empty_directory 'app/emails'
       end
   end
-end
+end

lib/generators/supermail/install/templates/application_email.rb.tt

@@ -1,4 +1,4 @@
-class ApplicationEmail < Supermail::Base
+class ApplicationEmail < Supermail::Rails::Base
   def from = "website@example.com"
 
   def body

lib/supermail.rb

@@ -1,30 +1,27 @@
 # frozen_string_literal: true
 
 require_relative "supermail/version"
-require 'action_mailer'
+require "action_mailer"
 
 module Supermail
   class Error < StandardError; end
 
-  class Base
-    delegate :deliver, :deliver_now, :deliver_later, to: :message_delivery
+  module Rails
+    class Base
+      delegate :deliver, :deliver_now, :deliver_later, to: :message_delivery
 
-    def to = nil
-    def from = nil
-    def subject = nil
-    def body = ""
+      def to = nil
+      def from = nil
+      def subject = nil
+      def body = ""
 
-    def message
-      message_delivery.message
-    end
+      def message
+        message_delivery.message
+      end
 
-    def message_delivery
-      ActionMailer::Base.mail(to:, from:, subject:, body:)
+      def message_delivery
+        ActionMailer::Base.mail(to:, from:, subject:, body:)
+      end
     end
   end
 end
-
-# Load generators only when Rails is available
-if defined?(::Rails)
-  require 'rails'
-end

spec/generators/install_generator_spec.rb

@@ -5,10 +5,10 @@
 
 RSpec.describe Supermail::InstallGenerator, type: :generator do
   tests Supermail::InstallGenerator
-  
+
   INSTALL_DESTINATION_PATH = Pathname.new(__dir__).join("../tmp/generators")
   destination INSTALL_DESTINATION_PATH.to_s
-  
+
   before { prepare_destination }
   after { FileUtils.rm_rf(INSTALL_DESTINATION_PATH) }
 
@@ -17,7 +17,7 @@
 
     describe "app/emails/application_email.rb" do
       subject { File.read(INSTALL_DESTINATION_PATH.join("app/emails/application_email.rb")) }
-      it { is_expected.to match(/class ApplicationEmail < Supermail::Base/) }
+      it { is_expected.to match(/class ApplicationEmail < Supermail::Rails::Base/) }
       it { is_expected.to match(/def from = "website@example.com"/) }
       it { is_expected.to match(/The Example.com Team/) }
     end
@@ -27,4 +27,4 @@
       it { is_expected.to be true }
     end
   end
-end
+end

spec/supermail_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-class ExampleMailer < Supermail::Base
+class ExampleMailer < Supermail::Rails::Base
   def initialize(to:, from:, subject:, body:)
     @to = to
     @from = from