fix remaining specs

Author: chamnap

lib/mongoid-observers.rb

@@ -1,7 +1,8 @@
 require "rails/observers/active_model"
+
 require "mongoid"
 require "mongoid/observers/config"
-require "mongoid/observers/composable"
+require "mongoid/observers/interceptable"
 require "mongoid/observers/railtie" if defined? Rails
 require "mongoid/observer"
 

lib/mongoid/observer.rb

@@ -118,8 +118,6 @@ class Observer < ActiveModel::Observer
     #   observer.add_observer!(Document)
     #
     # @param [ Class ] klass The child observer to add.
-    #
-    # @since 2.0.0.rc.8
     def add_observer!(klass)
       super and define_callbacks(klass)
     end
@@ -130,12 +128,10 @@ def add_observer!(klass)
     #   observer.define_callbacks(Document)
     #
     # @param [ Class ] klass The model to define them on.
-    #
-    # @since 2.0.0.rc.8
     def define_callbacks(klass)
       observer = self
       observer_name = observer.class.name.underscore.gsub('/', '__')
-      Mongoid::Interceptable::CALLBACKS.each do |callback|
+      Mongoid::Interceptable.observables.each do |callback|
         next unless respond_to?(callback)
         callback_meth = :"_notify_#{observer_name}_for_#{callback}"
         unless klass.respond_to?(callback_meth)
@@ -178,8 +174,6 @@ class << self
       #   end
       #
       # @param [ Array<Symbol> ] models The names of the models.
-      #
-      # @since 3.0.15
       def observe(*models)
         models.flatten!
         models.collect! do |model|

lib/mongoid/observers/composable.rb

@@ -0,0 +1,52 @@
+module Mongoid
+  module Interceptable
+    include ActiveModel::Observing
+
+    class << self
+
+      # Get all callbacks that can be observed.
+      #
+      # @example Get the observables.
+      #   Interceptable.observables
+      #
+      # @return [ Array<Symbol> ] The names of the observables.
+      def observables
+        CALLBACKS + registered_observables
+      end
+
+      # Get all registered callbacks that can be observed, not included in
+      # Mongoid's defaults.
+      #
+      # @example Get the observables.
+      #   Interceptable.registered_observables
+      #
+      # @return [ Array<Symbol> ] The names of the registered observables.
+      def registered_observables
+        @registered_observables ||= []
+      end
+    end
+
+    module ClassMethods
+
+      # Set a custom callback as able to be observed.
+      #
+      # @example Set a custom callback as observable.
+      #   class Band
+      #     include Mongoid::Document
+      #
+      #     define_model_callbacks :notification
+      #     observable :notification
+      #   end
+      #
+      # @param [ Array<Symbol> ] args The names of the observable callbacks.
+      #
+      # @since 3.0.1
+      def observable(*args)
+        observables = args.flat_map do |name|
+          [ :"before_#{name}", :"after_#{name}", :"around_#{name}" ]
+        end
+        Interceptable.registered_observables.concat(observables).uniq
+      end
+    end
+  end
+end

lib/mongoid/observers/interceptable.rb

@@ -1,6 +1,10 @@
 class Actor
   include Mongoid::Document
   field :name
+  field :after_custom_count, type: Integer, default: 0
+
+  define_model_callbacks :custom
+  observable :custom
 
   def do_something
     run_callbacks(:custom) do

spec/app/models/actor.rb

@@ -14,7 +14,7 @@ def reset
     @last_record = {}
   end
 
-  Mongoid::Interceptable::CALLBACKS.each do |callback|
+  Mongoid::Interceptable.observables.each do |callback|
     define_method(callback) do |record, &block|
       @last_callback = callback
       @call_count[callback] += 1

spec/app/models/callback_recorder.rb

@@ -201,7 +201,7 @@ class BandObserver < Mongoid::Observer
     end
   end
 
-  context "when custom callbacks are being fired", :pending do
+  context "when custom callbacks are being fired" do
 
     let!(:actor) do
       Actor.create!
@@ -273,7 +273,7 @@ class BandObserver < Mongoid::Observer
     end
   end
 
-  context "when using a custom callback", :pending do
+  context "when using a custom callback" do
 
     let(:actor) do
       Actor.new