chore: namespace "Ticket" for Zeitwerk

Author: olleolleolle

app/controllers/events_controller.rb

@@ -13,16 +13,17 @@ def index
     events << Event.past.includes(:venue, :sponsors).limit(RECENT_EVENTS_DISPLAY_LIMIT)
     events = events.compact.flatten.sort_by(&:date_and_time).reverse.first(RECENT_EVENTS_DISPLAY_LIMIT)
     events_hash_grouped_by_date = events.group_by(&:date)
-    @past_events = events_hash_grouped_by_date.map.inject({}) do |hash, (key, value)|
+    @past_events = events_hash_grouped_by_date.map.each_with_object({}) do |(key, value), hash|
       hash[key] = EventPresenter.decorate_collection(value)
-      hash
     end
 
     events = [Workshop.includes(:chapter).upcoming.joins(:chapter).merge(Chapter.active)]
     events << Meeting.upcoming.all
     events << Event.upcoming.includes(:venue, :sponsors).all
     events = events.compact.flatten.sort_by(&:date_and_time).group_by(&:date)
-    @events = events.map.inject({}) { |hash, (key, value)| hash[key] = EventPresenter.decorate_collection(value); hash }
+    @events = events.map.each_with_object({}) do |(key, value), hash|
+ hash[key] = EventPresenter.decorate_collection(value)
+    end
   end
 
   def show
@@ -34,7 +35,7 @@ def show
     return unless logged_in?
 
     invitation = Invitation.find_by(member: current_user, event: event, attending: true)
-    return redirect_to event_invitation_path(@event, invitation) if invitation
+    redirect_to event_invitation_path(@event, invitation) if invitation
   end
 
   def student
@@ -47,7 +48,7 @@ def coach
 
   def rsvp
     set_event
-    ticket = Ticket.new(request, params)
+    ticket = Services::Ticket.new(request, params)
     member = Member.find_by(email: ticket.email)
     invitation = member.invitations.where(event: @event, role: 'Student').try(:first)
     invitation ||= Invitation.create(event: @event, member: member, role: 'Student')

app/mailers/event_invitation_mailer.rb

@@ -34,7 +34,7 @@ def attending(event, member, invitation)
 
     require 'services/event_calendar'
     attachments['codebar.ics'] = { mime_type: 'text/calendar',
-                                   content: ServicesEventCalendar.new(@event).calendar.to_ical }
+                                   content: Services::EventCalendar.new(@event).calendar.to_ical }
 
     subject = "Your spot to #{@event.name} has been confirmed."
 

lib/services/ticket.rb

@@ -1,19 +1,21 @@
-class Ticket
-  def initialize(request, params)
-    authorise(request)
-    @params = params
-  end
+module Services
+  class Ticket
+    def initialize(request, params)
+      authorise(request)
+      @params = params
+    end
 
-  def email
-    @email ||= params[:email]
-  end
+    def email
+      @email ||= params[:email]
+    end
 
-  private
+    private
 
-  attr_reader :params
+    attr_reader :params
 
-  def authorise(request)
-    # TODO
-    # verify referer
+    def authorise(request)
+      # TODO
+      # verify referer
+    end
   end
 end

spec/features/subscribing_to_newsletter_spec.rb

@@ -14,7 +14,7 @@
   context 'A new member' do
     scenario 'is subscribed to the newsletter by default' do
       mailing_list = double(:mailing_list)
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:subscribe).with('[email protected]', 'Jane', 'Doe')
 
       visit new_member_path
@@ -33,7 +33,7 @@
 
     scenario 'can opt out of the newsletter' do
       mailing_list = double(:mailing_list)
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:unsubscribe).with('[email protected]')
 
       visit new_member_path
@@ -60,7 +60,7 @@
       login member
 
       mailing_list = double(:mailing_list)
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:subscribe)
 
       visit subscriptions_path
@@ -75,7 +75,7 @@
       login member
 
       mailing_list = double(:mailing_list)
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:unsubscribe)
 
       visit subscriptions_path
@@ -90,15 +90,15 @@
       login member
 
       mailing_list = double(:mailing_list)
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:subscribe)
 
       visit subscriptions_path
       click_on 'Subscribe to newsletter'
 
       expect(page).to have_content('You have subscribed to codebar\'s newsletter')
 
-      expect(MailingList).to receive(:new).and_return(mailing_list)
+      expect(Services::MailingList).to receive(:new).and_return(mailing_list)
       expect(mailing_list).to receive(:unsubscribe)
 
       click_on 'Unsubscribe from newsletter'