app/controllers/webhookr/events_controller.rb in webhookr-0.2.0 vs app/controllers/webhookr/events_controller.rb in webhookr-0.3.0

@@ -1,37 +1,44 @@
+# frozen_string_literal: true
+
 module Webhookr
   class EventsController < ActionController::Base
-    http_basic_authenticate_with(
-      :name => Webhookr.config.basic_auth.username,
-      :password => Webhookr.config.basic_auth.password
-    ) if Webhookr.config.basic_auth.username && Webhookr.config.basic_auth.password
+    if Webhookr.config.basic_auth.username && Webhookr.config.basic_auth.password
+      http_basic_authenticate_with(
+        name: Webhookr.config.basic_auth.username,
+        password: Webhookr.config.basic_auth.password
+      )
+    end
 
-    before_filter :create_service
+    if respond_to?(:before_action)
+      before_action :create_service
+    else
+      before_filter :create_service
+    end
 
     def show
-      render :nothing => true
+      render body: nil
     end
 
     def create
       @service.process!
-      render :nothing => true
+      render body: nil
     end
 
     private
 
-    def create_service
-      begin
+      def create_service
         # Rails 4.0.0 fix: https://github.com/rails/rails/pull/11353
         request.body.rewind
 
         @service = Webhookr::Service.new(
-          params[:service_id], :payload => request.body.read, :security_token => params[:security_token]
+          params[:service_id],
+          payload: request.body.read,
+          security_token: params[:security_token]
         )
-      rescue NameError => e
-        raise ActionController::RoutingError.new("No service '#{params[:service_id]}' is available.")
-      rescue Webhookr::InvalidSecurityTokenError => e
-        raise ActionController::InvalidAuthenticityToken.new("Invalid or missing security token for service '#{params[:service_id]}'.")
+      rescue Webhookr::InvalidServiceNameError
+        raise ActionController::RoutingError, "No service '#{params[:service_id]}' is available."
+      rescue Webhookr::InvalidSecurityTokenError
+        raise ActionController::InvalidAuthenticityToken, "Invalid or missing security token for service '#{params[:service_id]}'."
       end
-    end
-
   end
 end