venues_controller.rb in calagator-2.0.0.pre.0

- old
+ new

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'calagator/duplicate_checking/controller_actions'
 
 module Calagator
   class VenuesController < Calagator::ApplicationController
     # Provides #duplicates and #squash_many_duplicates
@@ -36,11 +38,11 @@
     def autocomplete
       @venues = Venue
                 .non_duplicates
                 .in_business
                 .where(['LOWER(title) LIKE ?', "%#{params[:term]}%".downcase])
-                .order('LOWER(title)')
+                .order(Arel.sql('LOWER(title)'))
 
       render json: @venues
     end
 
     # GET /venues/map
@@ -53,23 +55,23 @@
       Show.new(self).call
     end
 
     class Show < SimpleDelegator
       def call
-        show_all_if_not_found || redirect_to_progenitor || render_venue
+        show_all_if_not_found || redirect_to_originator || render_venue
       end
 
       private
 
       def show_all_if_not_found
         return if venue
-      rescue ActiveRecord::RecordNotFound => exception
-        redirect_to venues_path, flash: { failure: exception.to_s }
+      rescue ActiveRecord::RecordNotFound => e
+        redirect_to venues_path, flash: { failure: e.to_s }
       end
 
-      def redirect_to_progenitor
-        redirect_to venue.progenitor if venue.duplicate?
+      def redirect_to_originator
+        redirect_to venue.originator if venue.duplicate?
       end
 
       def render_venue
         respond_to do |format|
           format.html
@@ -100,16 +102,16 @@
       CreateOrUpdate.new(self).call(recaptcha_verified?(venue))
     end
     alias update create
 
     class CreateOrUpdate < SimpleDelegator
-      def call(verified)
-        if verified
+      def call(recaptcha_result)
+        if recaptcha_result
           block_spammers || (save && render_success) || render_failure
         else
           render_failure
         end
-        end
+      end
 
       private
 
       def block_spammers
         return if params[:trap_field].blank?