chore: Namespace MailingList for Zeitwerk

Author: olleolleolle

app/controllers/concerns/mailing_list_concerns.rb

@@ -10,14 +10,14 @@ module MailingListConcerns
   module InstanceMethods
     def subscribe_to_newsletter(member)
       member.update(opt_in_newsletter_at: Time.zone.now)
-      MailingList.new(ENV['NEWSLETTER_ID']).subscribe(member.email,
-                                                      member.name,
-                                                      member.surname)
+      Services::MailingList.new(ENV['NEWSLETTER_ID']).subscribe(member.email,
+                                                                member.name,
+                                                                member.surname)
     end
 
     def unsubscribe_from_newsletter(member)
       member.update(opt_in_newsletter_at: nil)
-      MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
+      Services::MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
     end
   end
 end

app/models/contact.rb

@@ -18,7 +18,7 @@ def unsubscribe_from_mailing_list
   end
 
   def mailing_list
-    @mailing_list ||= MailingList.new(ENV['SPONSOR_NEWSLETTER_ID'])
+    @mailing_list ||= Services::MailingList.new(ENV['SPONSOR_NEWSLETTER_ID'])
   end
 
   private

app/models/subscription.rb

@@ -22,10 +22,10 @@ def coach?
   private
 
   def subscribe_to_mailing_list
-    MailingList.new(group.mailing_list_id).subscribe(member.email, member.name, member.surname)
+    Services::MailingList.new(group.mailing_list_id).subscribe(member.email, member.name, member.surname)
   end
 
   def unsubscribe_from_mailing_list
-    MailingList.new(group.mailing_list_id).unsubscribe(member.email)
+    Services::MailingList.new(group.mailing_list_id).unsubscribe(member.email)
   end
 end

lib/services/mailing_list.rb

@@ -1,4 +1,4 @@
-class MailingList
+class Services::MailingList
   attr_reader :list_id
 
   def initialize(list_id)

lib/tasks/delete_member.rake

@@ -17,7 +17,7 @@ namespace :member do
     $stdin.getch
 
     ActiveRecord::Base.transaction do
-      MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
+      Services::MailingList.new(ENV['NEWSLETTER_ID']).unsubscribe(member.email)
 
       member.auth_services.delete_all
       member.subscriptions.delete_all

lib/tasks/mailing_list.rake

@@ -6,7 +6,7 @@ namespace :mailing_list do
     newsletter_id = ENV['NEWSLETTER_ID'] || Rails.logger.info('NEWSLETTER_ID not set. Aborting task') && abort
 
     members = Member.includes(:subscriptions).where.not('subscriptions.member_id' => nil).uniq
-    newsletter = MailingList.new(newsletter_id)
+    newsletter = Services::MailingList.new(newsletter_id)
 
     members.each do |member|
       member.update(opt_in_newsletter_at: Time.zone.now)

spec/lib/services/mailing_list_spec.rb

@@ -1,8 +1,8 @@
 require 'json'
 require 'services/mailing_list'
 
-RSpec.describe MailingList do
-  let(:mailing_list) { MailingList.new(:list_id) }
+RSpec.describe Services::MailingList do
+  let(:mailing_list) { Services::MailingList.new(:list_id) }
   let(:client) { double(:flodesk) }
 
   before do

spec/lib/tasks/mailing_list_rake_spec.rb

@@ -17,8 +17,8 @@
     subscribed.each { |member| Fabricate(:subscription, member: member) }
     subscribed[0...3].each { |member| Fabricate(:subscription, member: member) }
 
-    newslettter = MailingList.new(:id)
-    expect(MailingList).to receive(:new).and_return(newslettter)
+    newslettter = Services::MailingList.new(:id)
+    expect(Services::MailingList).to receive(:new).and_return(newslettter)
 
     subscribed.each do |subscriber|
       expect(newslettter).to receive(:subscribe).with(subscriber.email,