Properly privatize event class methods by using self << class block

Author: tjgrathwell

Diff for: app/models/event.rb

@@ -1,39 +1,41 @@
 class Event
   RAILSBRIDGE_ORGANIZATION_ID = 1
 
-  def self.sorted_events(state = nil, options = {})
-    events = (state == :upcoming) ? upcoming_events(options) : past_events(options)
-    sort_by_starts_at(events)
-  end
+  class << self
+    def sorted_events(state = nil, options = {})
+      events = (state == :upcoming) ? upcoming_events(options) : past_events(options)
+      sort_by_starts_at(events)
+    end
 
-  private
+    private
 
-  def self.of_type(type, options = {})
-    events = begin
-      fetch_json({type: type}.merge(options))
-    rescue StandardError => e
-      puts "Error fetching events from BridgeTroll: #{e.message}"
+    def of_type(type, options = {})
+      events = begin
+        fetch_json({type: type}.merge(options))
+      rescue StandardError => e
+        puts "Error fetching events from BridgeTroll: #{e.message}"
+      end
+      events || []
     end
-    events || []
-  end
 
-  def self.upcoming_events(options = {})
-    of_type('upcoming', options)
-  end
+    def upcoming_events(options = {})
+      of_type('upcoming', options)
+    end
 
-  def self.past_events(options = {})
-    of_type('past', options).select { |event| event['workshop'] }
-  end
+    def past_events(options = {})
+      of_type('past', options).select { |event| event['workshop'] }
+    end
 
-  def self.sort_by_starts_at(events)
-    events.sort_by { |event| event['sessions'].first['starts_at'].to_time }
-  end
+    def sort_by_starts_at(events)
+      events.sort_by { |event| event['sessions'].first['starts_at'].to_time }
+    end
 
-  def self.fetch_json(options)
-    uri = URI::parse(BRIDGETROLL_URL)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = true
-    response = http.send(:get, "/events.json?#{options.to_query}")
-    JSON.parse(response.body)
+    def fetch_json(options)
+      uri = URI::parse(BRIDGETROLL_URL)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      response = http.send(:get, "/events.json?#{options.to_query}")
+      JSON.parse(response.body)
+    end
   end
 end

Diff for: app/presenters/event_presenter.rb

@@ -30,12 +30,11 @@ def event_url
   end
 
   def signup_link
-    case
-    when !external_event? then "RSVP on Bridge Troll"
-    when url =~ /meetup.com/ then "RSVP on Meetup"
-    when url =~ /eventbrite.com/ then "RSVP on Eventbrite"
-    else "Event Signup"
-    end
+    return "RSVP on Bridge Troll" unless external_event?
+    return "RSVP on Meetup" if url =~ /meetup.com/
+    return "RSVP on Eventbrite" if url =~ /eventbrite.com/
+
+    "Event Signup"
   end
 
   def valid_location?