updated callbacks for rails 5

lib/mandrill-rails/web_hook_processor.rb

@@ -34,8 +34,8 @@ module Mandrill::Rails::WebHookProcessor
  extend ActiveSupport::Concern
 
  included do
- skip_before_filter :verify_authenticity_token
- before_filter :authenticate_mandrill_request!, :only => [:create]
+ skip_before_action :verify_authenticity_token, raise: false
+ before_action :authenticate_mandrill_request!, :only => [:create]
  end
 
  module ClassMethods

spec/mandrill-rails/web_hook_processor_spec.rb

@@ -3,10 +3,10 @@
 class WebHookProcessorTestHarness
  # Mock some controller behaviour
  # TODO: we should probably start using a real controller harness for testing
- def self.skip_before_filter(*args) ; @skip_before_filter_settings = args; end
- def self.skip_before_filter_settings ; @skip_before_filter_settings; end
- def self.before_filter(*args) ; @before_filter_settings = args ; end
- def self.before_filter_settings ; @before_filter_settings; end
+ def self.skip_before_action(*args) ; @skip_before_filter_settings = args; end
+ def self.skip_before_action_settings ; @skip_before_filter_settings; end
+ def self.before_action(*args) ; @before_filter_settings = args ; end
+ def self.before_action_settings ; @before_filter_settings; end
  def head(*args) ; end
  attr_accessor :params, :request
 
@@ -22,15 +22,15 @@ def head(*args) ; end
  processor_class.on_unhandled_mandrill_events! nil
  end
 
- describe "##skip_before_filter settings" do
- subject { processor_class.skip_before_filter_settings }
+ describe "##skip_before_action settings" do
+ subject { processor_class.skip_before_action_settings }
  it "includes verify_authenticity_token" do
  expect(subject).to eql([:verify_authenticity_token])
  end
  end
 
- describe "##before_filter settings" do
- subject { processor_class.before_filter_settings }
+ describe "##before_action settings" do
+ subject { processor_class.before_action_settings }
  it "includes authenticate_mandrill_request" do
  expect(subject).to eql([:authenticate_mandrill_request!, {:only=>[:create]}])
  end
@@ -169,4 +169,4 @@ def head(*args) ; end
  end
  end
 
-end
+end