[#105] Complete documentation of notification_target & notification_o…

…bject (#106)

notification-handler/README.md

@@ -124,8 +124,6 @@ You can create a notification from a `target`:
 User.first.notify(object: Recipe.first)
 ```
 
-...
-
 ### `notification_object`
 
 When using records of an ActiveRecord class as notification objects, add this to your class:
@@ -142,8 +140,6 @@ Now associated notifications are easy to access:
 notifications = Recipe.first.belonging_notifications
 ```
 
-...
-
 ### Groups
 
 Groups are a powerful way to bulk-create notifications for multiple objects that don't necessarily have a common class.

notification-handler/lib/notification_handler/object.rb

@@ -1,25 +1,22 @@
 # frozen_string_literal: true
 
+require 'active_support'
+
 module NotificationHandler
   module Object
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
-    module ClassMethods
-      def notification_object
+    included do
+      def self.notification_object
         has_many :belonging_notifications,
                  as: :object, class_name: 'Notification', dependent: :destroy
-        include NotificationHandler::Object::InstanceMethods
-
-        return unless defined?(NotificationSettings)
 
-        include NotificationSettings::Subscribable
+        # rubocop:disable Style/GuardClause
+        if defined?(NotificationSettings)
+          include NotificationSettings::Subscribable
+        end
+        # rubocop:enable Style/GuardClause
       end
     end
-
-    module InstanceMethods
-      # ...
-    end
   end
 end

notification-handler/lib/notification_handler/target.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
+require 'active_support'
+
 module NotificationHandler
   module Target
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
-    module ClassMethods
-      def notification_target
+    included do
+      def self.notification_target
         has_many :notifications, as: :target, dependent: :destroy
         include NotificationHandler::Target::InstanceMethods
 
         include NotificationSettings::Target if defined?(NotificationSettings)
-        return unless defined?(NotificationSettings)
-
-        include NotificationSettings::Subscriber
+        # rubocop:disable Style/GuardClause
+        if defined?(NotificationSettings)
+          include NotificationSettings::Subscriber
+        end
+        # rubocop:enable Style/GuardClause
       end
     end