noticed 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2466298cbeef0bde1ae34d07ed5317032659ba413cc15797e211012c9d7847c
-  data.tar.gz: b4edc8f7a819331a2d66a39c04d491f8c534f44fae8c14edbc0ce2b366556c8f
+  metadata.gz: 2526071997479bc9e570c51d5b148ce569f9afb45912b6c2b1bea71be65fc30e
+  data.tar.gz: ffa64bdc283245497a456f125680a41da2cf0ba7ad52c2c6320af24b5ec3d956
 SHA512:
-  metadata.gz: bf817631a96cf372b864e6df07c38f3c0a4e97f288ae63b934af36fa9102e22408802176e9642f6a1c3a22b46854c764dfd6a25d19da00c3da5c0eeeec778694
-  data.tar.gz: 4d7a596f35331bc8f38e1337398f72fdf38af34b631bae27db48c32b4f58f702023c3a5d44e00ebb9f7e8e990b1053d8bc76c5941db8c9b7a296e03e9f4c2a96
+  metadata.gz: 1cf980bb8d8ae9057ff80bd6313158997b1cee1fd664e3e4fef819d1cf3ba5cac469e55e02e8c4d1a2e70bf53658a58cd6c524e93da00fb2dc7a228bdda1a195
+  data.tar.gz: 109fe7195032238f53ed001910db4bdce5e58a89543b45c2aefc88046f7e649b68cd77421dc005fa932fe1984e610349597b1f5ffb60fde9550356b91585f5b9

data/README.md

@@ -1,19 +1,26 @@
-# Noticed 
+# Noticed
+
 ### 🎉  Notifications for your Ruby on Rails app.
 
 [![Build Status](https://github.com/excid3/noticed/workflows/Tests/badge.svg)](https://github.com/excid3/noticed/actions) [![Gem Version](https://badge.fury.io/rb/noticed.svg)](https://badge.fury.io/rb/noticed)
 
-Noticed helps you send notifications in your Rails apps. Notifications can be sent to any number of recipients. You might want a Slack notification with 0 recipients to let your team know when something happens. A notification can also be sent to 1+ recipients with individual deliveries (like an email to each recipient).
+**⚠️⚠️ Upgrading from V1? Read the [Upgrade Guide](https://github.com/excid3/noticed/blob/main/UPGRADE.md)!**
+
+Noticed is a gem that allows your application to send notifications of varying types, over various mediums, to various recipients. Be it a Slack notification to your own team when some internal event occurs or a notification to your user, sent as a text message, email, and real-time UI element in the browser, Noticed supports all of the above (at the same time)!
+
+Noticed implements two top-level types of delivery methods:
+
+1. Individual Deliveries: Where each recipient gets their own notification
 
-The core concepts of Noticed are:
+Let’s use a car dealership as an example here. When someone purchases a car, a notification will be sent to the buyer with some contract details (“Congrats on your new 2024 XYZ Model...”), another to the car sales-person with different details (“You closed X deal; your commission is Y”), and another to the bank handling the loan with financial details (“New loan issued; amount $20,000...”). The event (the car being sold) necessitates multiple notifications being sent out to different recipients, but each contains its own unique information and should be separate from the others. These are individual deliveries.
 
-1. `Notifier` - Classes that define how notifications are delivered and when.
-2. `Noticed::Event` - When a `Notifier` is delivered, a `Noticed::Event` record is created in the database to store params for the delivery.`Notifiers` are ActiveRecord objects inherited from `Noticed::Event` using Single Table Inheritance.
-3. `Noticed::Notification` - Keeps track of each recipient for `Noticed::Event` and the seen & read status for each.
-4. Delivery methods are ActiveJob instances and support the same features like wait, queue, and priority.
+2. Bulk Deliveries - one notification for all recipients. This is useful for sending a notification to your Slack team, for example.
 
-## Delivery Methods
-Individual Delivery methods (one notification to each recipient):
+Let’s continue with the car-sale example here. Consider that your development team created the car-sales application that processed the deal above and sent out the notifications to the three parties. For the sake of team morale and feeling the ‘wins’, you may want to implement a notification that notifies your internal development team whenever a car sells through your platform. In this case, you’ll be notifying many people (your development team, maybe others at your company) but with the same content (“someone just bought a car through our platform!”). This is a bulk delivery. It’s generally a single notification that many people just need to be made aware of.
+
+Bulk deliveries are typically used to push notifications to other platforms where users are managed (Slack, Discord, etc.) instead of your own.
+
+Delivery methods we officially support:
 
 * [ActionCable](docs/delivery_methods/action_cable.md)
 * [Apple Push Notification Service](docs/delivery_methods/ios.md)
@@ -25,7 +32,7 @@ Individual Delivery methods (one notification to each recipient):
 * [Vonage SMS](docs/delivery_methods/vonage_sms.md)
 * [Test](docs/delivery_methods/test.md)
 
-Bulk delivery methods (one notification for all recipients):
+Bulk delivery methods we support:
 
 * [Discord](docs/bulk_delivery_methods/discord.md)
 * [Slack](docs/bulk_delivery_methods/slack.md)
@@ -33,9 +40,9 @@ Bulk delivery methods (one notification for all recipients):
 
 ## 🎬 Screencast
 
-<a href="https://www.youtube.com/watch?v=Scffi4otlFc"><img src="https://i.imgur.com/UvVKWwD.png" title="How to add Notifications to Rails with Noticed" width="50%" /></a>
+<a href="https://www.youtube.com/watch?v=SzX-aBEqnAc"><img src="https://i.imgur.com/UvVKWwD.png" title="How to add Notifications to Rails with Noticed" width="50%" /></a>
 
-[Watch Screencast](https://www.youtube.com/watch?v=Scffi4otlFc)
+[Watch Screencast](https://www.youtube.com/watch?v=SzX-aBEqnAc)
 
 ## 🚀 Installation
 Run the following command to add Noticed to your Gemfile:
@@ -44,7 +51,7 @@ Run the following command to add Noticed to your Gemfile:
 bundle add "noticed"
 ```
 
-Add the migrations:
+Generate then run the migrations:
 
 ```bash
 rails noticed:install:migrations
@@ -53,124 +60,160 @@ rails db:migrate
 
 ## 📝 Usage
 
-To generate a Notifier, simply run:
+Noticed operates with a few constructs: Notifiers, delivery methods, and Notification records.
 
-`rails generate noticed:notifier CommentNotifier`
+To start, generate a Notifier: 
 
-#### Add Delivery Methods
-Then add delivery methods to the Notifier. See [docs/delivery_methods](docs/) for a full list.
+```sh
+rails generate noticed:notifier NewCommentNotifier
+```
+
+#### Notifier Objects
+
+Notifiers are essentially the controllers of the Noticed ecosystem and represent an Event. As such, we recommend naming them with the event they model in mind — be it a `NewSaleNotifier,` `ChargeFailureNotifier`, etc.
+
+Notifiers must inherit from `Noticed::Event`. This provides all of their functionality.
+
+A Notifier exists to declare the various delivery methods that should be used for that event _and_ any notification helper methods necessary in those delivery mechanisms. In this example we’ll deliver by `:action_cable` to provide real-time UI updates to users’ browsers, `:email` if they’ve opted into email notifications, and a bulk notification to `:discord` to tell everyone on the Discord server there’s been a new comment.
 
 ```ruby
-# app/notifiers/comment_notifier.rb
-class CommentNotifier < Noticed::Event
-  bulk_deliver_by :webhook do |config|
-    config.url = "https://example.org..."
-    config.json = ->{ text: "New comment: #{record.body}" }
+# ~/app/notifiers/new_comment_notifier.rb
+
+class NewCommentNotifier < Noticed::Event
+  deliver_by :action_cable do |config|
+    config.channel = "NotificationsChannel"
+    config.stream = :some_stream
   end
 
   deliver_by :email do |config|
-    config.mailer = "UserMailer"
-    config.method = :new_comment
+    config.mailer = "CommentMailer"
+    config.if = ->(recipient) { !!recipient.preferences[:email] }
+  end
+
+  bulk_deliver_by :discord do |config|
+    config.url = "https://discord.com/xyz/xyz/123"
+    config.json = -> {
+      {
+        message: message,
+        channel: :general
+      }
+    }
+  end
+
+  notification_methods do
+    # I18n helpers
+    def message
+      t(".message")
+    end
+
+    # URL helpers are accessible in notifications
+    # Don't forget to set your default_url_options so Rails knows how to generate urls
+    def url
+      user_post_path(recipient, params[:post])
+    end
   end
 end
 ```
 
-#### Sending Notifications
+For deeper specifics on setting up the `:action_cable`, `:email`, and `:discord` (bulk) delivery methods, refer to their docs: [`action_cable`](docs/delivery_methods/action_cable.md), [`email`](docs/delivery_methods/email.md), and [`discord` (bulk)](docs/bulk_delivery_methods/discord.md).
 
-To send a notification to user(s):
+##### Required Params
+
+While explicit / required parameters are completely optional, Notifiers are able to opt in to required parameters via the `required_params` method:
 
 ```ruby
-# Instantiate a new notifier
-CommentNotifier.with(record: @comment, foo: "bar").deliver_later(User.all)
+class CarSaleNotifier < Noticed::Event
+  deliver_by :email { |c| c.mailer = "BranchMailer" }
+
+  # `record` is the Car record, `Branch` is the dealership
+  required_params :record, :branch
+end
 ```
 
-This instantiates a new `CommentNotifier` with params. Similar to ActiveJob, you can pass any params can be serialized.  `record:` is a special param that gets assigned to the `record` polymorphic association in the database.
+Which will validate upon any invocation that the specified parameters are present:
 
-Delivering will create a `Noticed::Event` record and associated `Noticed::Notification` records for each recipient.
+```ruby
+CarSaleNotifier.with(record: Car.last).deliver(Branch.last)
+#=> Noticed::ValidationError("Param `branch` is required for CarSaleNotifier")
 
-After saving, a job will be enqueued for processing this notification and delivering it to all recipients.
+CarSaleNotifier.with(record: Car.last, branch: Branch.last).deliver(Branch.hq)
+#=> OK
+```
 
-Each delivery method also spawns its own job. This allows you to skip email notifications if the user had already opened a push notification, for example.
 
-#### Notifier Objects
 
-Notifiers inherit from `Noticed::Event`. This provides all their functionality and allows them to be delivered.
+##### Helper Methods
 
-```ruby
-class CommentNotifier < Noticed::Event
-  deliver_by :action_cable
-  deliver_by :email do |config|
-    config.mailer = "UserMailer"
-    config.if = ->(recipient) { !!recipient.preferences[:email] }
-    config.wait = 5.minutes
-  end
-end
+Notifiers can implement various helper methods, within a `notification_methods` block, that make it easier to render the resulting notification directly. These helpers can be helpful depending on where and how you choose to render notifications. A common use is rendering a user’s notifications in your web UI as standard ERB. These notification helper methods make that rendering much simpler:
+
+```erb
+<div>
+  <% @user.notifications.each do |notification| %>
+    <%= link_to notification.message, notification.url %>
+  <% end %>
+</div>
 ```
 
-**Shared Options**
+On the other hand, if you’re using email delivery, ActionMailer has its own full stack for setting up objects and rendering. Your notification helper methods will always be available from the notification object, but using ActionMailer’s own paradigms may fit better for that particular delivery method. YMMV.
 
-* `if: :method_name`  - Calls `method_name` and cancels delivery method if `false` is returned. This can also be specified as a Proc / lambda.
-* `unless: :method_name`  - Calls `method_name` and cancels delivery method if `true` is returned
-* `wait:` - Delays the delivery for the given duration of time. Can be an `ActiveSupport::Duration`, Proc / lambda, or Symbol.
+######  URL Helpers
 
-##### Helper Methods
+Rails url helpers are included in Notifiers by default so you have full access to them in your notification helper methods, just like you would in your controllers and views.
 
-You can define helper methods inside your Notifier object to make it easier to render.
+_But don't forget_, you'll need to configure `default_url_options` in order for Rails to know what host and port to use when generating URLs.
 
 ```ruby
-class CommentNotifier < Noticed::Event
-  # I18n helpers
-  def message
-    t(".message")
-  end
+Rails.application.routes.default_url_options[:host] = 'localhost:3000'
+```
 
-  # URL helpers are accessible in notifications
-  # Don't forget to set your default_url_options so Rails knows how to generate urls
-  def url
-    post_path(params[:post])
-  end
+###### Translations
+
+We've also included Rails’ `translate` and `t` helpers for you to use in your notification helper methods. This also provides an easy way of scoping translations. If the key starts with a period, it will automatically scope the key under `notifiers`, the underscored name of the notifier class, and `notification`. For example:
+
+From the above Notifier...
 
-  # Defines methods added to the Noticed::Notification
+```ruby
+class NewCommentNotifier < Noticed::Event
+  # ...
+  
   notification_methods do
-    def personalized_welcome
-      "Hello #{recipient.first_name}."
+    def message
+      t(".message")
     end
   end
+  
+  # ...
 end
 ```
 
-In your views, you can loop through notifications and access
+Calling the `message` helper in an ERB view:
+
 ```erb
-<%= current_user.notifications.includes(:event).each do |notification| %>
-  <%= link_to notification.personalized_welcome, notification.event.url %>
-<% end %>
+<%= @user.notifications.last.message %>
 ```
 
-##### URL Helpers
+Will look for the following translation path:
 
-URL helpers are included in Notifier classes so you have full access to them just like in your controllers and views. Configure `default_url_options` in order for Rails to know what host and port to use when generating URLs.
+```yml
+# ~/config/locales/en.yml
 
-```ruby
-Rails.application.routes.default_url_options[:host] = 'localhost:3000'
+en:
+  notifiers:
+  	new_comment_notifier:
+  	  notification:
+            message: "Someone posted a new comment!"
 ```
 
-##### Translations
-
-`translate` and `t` helpers are available in Notifiers. If the key starts with a period, it will automatically scope the key under `notifiers` and the underscored name of the notification class it is used in.
-
-For example:
+Or, if you have your Notifier within another module, such as `Admin::NewCommentNotifier`, the resulting lookup path will be `en.notifiers.admin.new_comment_notifier.notification.message` (modules become nesting steps).
 
-`t(".message")` looks up `en.notifiers.new_comment.message`
-`t(".message") # in Admin::NewComment` looks up `en.notifiers.admin.new_comment.message`
-
-##### User Preferences
+##### Tip: Capture User Preferences
 
 You can use the `if:` and `unless: ` options on your delivery methods to check the user's preferences and skip processing if they have disabled that type of notification.
 
 For example:
 
 ```ruby
-class CommentNotifier < Noticed::Base
+class CommentNotifier < Noticed::Event
   deliver_by :email do |config|
     config.mailer = 'CommentMailer'
     config.method = :new_comment
@@ -179,182 +222,198 @@ class CommentNotifier < Noticed::Base
 end
 ```
 
-## ✅ Best Practices
-
-### Creating a notification from an Active Record callback
+**Shared Delivery Method Options**
 
-Always use `after_commit` hooks to send notifications from ActiveRecord callbacks. For example, to send a notification automatically after a message is created:
+Each of these options are available for every delivery method (individual or bulk). The value passed may be a lambda, a symbol that represents a callable method, a symbol value, or a string value.
 
-```ruby
-class Message < ApplicationRecord
-  belongs_to :recipient, class_name: "User"
+* `config.if` — Intended for a lambda or method; runs after the `wait` if configured; cancels the delivery method if returns falsey
+* `config.unless`  — Intended for a lambda or method; runs after the `wait` if configured; cancels the delivery method if returns truthy
+* `config.wait` — (Should yield an `ActiveSupport::Duration`) Delays the job that runs this delivery method for the given duration of time
+* `config.wait_until` — (Should yield a specific time object) Delays the job that runs this delivery method until the specific time specified
+* `config.queue` — Sets the ActiveJob queue name to be used for the job that runs this delivery method
 
-  after_create_commit :notify_recipient
+#### Sending Notifications
 
-  private
+Following the `NewCommentNotifier` example above, here’s how we might invoke the Notifier to send notifications to every author in the thread about a new comment being added:
 
-  def notify_recipient
-    NewMessageNotifier.with(message: self).deliver_later(recipient)
-  end
+```ruby
+NewCommentNotifier.with(record: @comment, foo: "bar").deliver(@comment.thread.all_authors)
 ```
 
-Using `after_create` might cause the notification delivery methods to fail. This is because the job was enqueued while inside a database transaction, and the `Message` record might not yet be saved to the database.
+This instantiates a new `NewCommentNotifier` with params (similar to ActiveJob, any serializable params are permitted), then delivers notifications to all authors in the thread.
 
-A common symptom of this problem is undelivered notifications and the following error in your logs.
+✨ The `record:` param is a special param that gets assigned to the `record` polymorphic association in the database. You should try to set the `record:` param where possible. This may be best understood as ‘the record/object this notification is _about_’, and allows for future queries from the record-side: “give me all notifications that were generated from this comment”.
 
-> `Discarded Noticed::DeliveryMethods::Email due to a ActiveJob::DeserializationError.`
+This invocation will create a single `Noticed::Event` record and a `Noticed::Notification` record for each recipient. A background job will then process the Event and fire off a separate background job for each bulk delivery method _and_ each recipient + individual-delivery-method combination. In this case, that’d be the following jobs kicked off from this event:
 
-### Renaming Notifiers
+- A bulk delivery job for `:discord` bulk delivery
+- An individual delivery job for `:action_cable` method to the first thread author
+- An individual delivery job for `:email` method to the first thread author
+- An individual delivery job for `:action_cable` method to the second thread author
+- An individual delivery job for `:email` method to the second thread author
+- Etc...
 
-If you rename the class of a notification object your existing queries can break. This is because ActiveRecord serializes the class name and sets it to the `type` column on the Noticed records.
+## ✅ Best Practices
 
-You can catch these errors at runtime by using `YourNotifierClassName.name` instead of hardcoding the string when performing a query.
+### Renaming Notifiers
 
-```ruby
-Noticed::Event.where(type: YourNotifierClassName.name) # good
-Noticed::Event.where(type: "YourNotifierClassName") # bad
-```
+If you rename a Notifier class your existing data and Noticed setup may break. This is because Noticed serializes the class name and sets it to the `type` column on the `Noticed::Event` record and the `type` column on the `Noticed::Notification` record.
 
-When renaming a notification class you will need to backfill existing notifications to reference the new name.
+When renaming a Notifier class you will need to backfill existing Events and Notifications to reference the new name.
 
 ```ruby
 Noticed::Event.where(type: "OldNotifierClassName").update_all(type: NewNotifierClassName.name)
-Noticed::Notification.where(type: "OldNotifierClassName::Notification").update_all(type: NewNotifierClassName::Notification.name)
+# and
+Noticed::Notification.where(type: "OldNotifierClassName::Notification").update_all(type: "#{NewNotifierClassName.name}::Notification")
 ```
 
 ## 🚛 Delivery Methods
 
-The delivery methods are modular so you can customize the way each type gets delivered.
+The delivery methods are designed to be modular so you can customize the way each type gets delivered.
 
 For example, emails will require a subject, body, and email address while an SMS requires a phone number and simple message. You can define the formats for each of these in your Notifier and the delivery method will handle the processing of it.
 
-### Fallback Notifications
+Individual delivery methods:
+
+* [ActionCable](docs/delivery_methods/action_cable.md)
+* [Apple Push Notification Service](docs/delivery_methods/ios.md)
+* [Email](docs/delivery_methods/email.md)
+* [Firebase Cloud Messaging](docs/delivery_methods/fcm.md) (iOS, Android, and web clients)
+* [Microsoft Teams](docs/delivery_methods/microsoft_teams.md)
+* [Slack](docs/delivery_methods/slack.md)
+* [Twilio Messaging](docs/delivery_methods/twilio_messaging.md) - SMS, Whatsapp
+* [Vonage SMS](docs/delivery_methods/vonage_sms.md)
+* [Test](docs/delivery_methods/test.md)
 
-A common pattern is to deliver a notification via the database and then, after some time has passed, email the user if they have not yet read the notification. You can implement this functionality by combining multiple delivery methods, the `delay` option, and the conditional `if` / `unless` option.
+Bulk delivery methods:
 
-```ruby
-class CommentNotifier< Noticed::Base
-  deliver_by :database
-  deliver_by :email, mailer: 'CommentMailer', delay: 15.minutes, unless: :read?
-end
+* [Discord](docs/bulk_delivery_methods/discord.md)
+* [Slack](docs/bulk_delivery_methods/slack.md)
+* [Webhook](docs/bulk_delivery_methods/webhook.md)
+
+### No Delivery Methods
+
+It’s worth pointing out that you can have a fully-functional and useful Notifier that has _no_ delivery methods. This means that invoking the Notifier and ‘sending’ the notification will only create new database records (no external surfaces like email, sms, etc.). This is still useful as it’s the database records that allow your app to render a user’s (or other object’s) notifications in your web UI.
+
+So even with no delivery methods set, this example is still perfectly available and helpful:
+
+```erb
+<div>
+  <% @user.notifications.each do |notification| %>
+    <%= link_to notification.message, notification.url %>
+  <% end %>
+</div>
 ```
 
-Here a notification will be created immediately in the database (for display directly in your app). If the notification has not been read after 15 minutes, the email notification will be sent. If the notification has already been read in the app, the email will be skipped.
+Sending a notification is entirely an internal-to-your-app function. Delivery methods just get the word out! But many apps may be fully satisfied without that extra layer.
+
+### Fallback Notifications
 
-You can also configure multiple fallback options:
+A common pattern is to deliver a notification via a real (or real-ish)-time service, then, after some time has passed, email the user if they have not yet read the notification. You can implement this functionality by combining multiple delivery methods, the `wait` option, and the conditional `if` / `unless` option.
 
 ```ruby
-class CriticalSystemNotifier < Noticed::Base
-  deliver_by :database
-  deliver_by :slack
-  deliver_by :email, mailer: 'CriticalSystemMailer', delay: 10.minutes, if: :unread?
-  deliver_by :twilio, delay: 20.minutes, if: :unread?
+class NewCommentNotifier< Noticed::Event
+  deliver_by :action_cable
+  deliver_by :email do |config|
+    config.mailer = "CommentMailer"
+    config.wait = 15.minutes
+    config.unless = -> { read? }
+  end
 end
 ```
 
-In this scenario, you have created an escalating notification system that
+Here a notification will be created immediately in the database (for display directly in your app’s web interface) and sent via ActionCable. If the notification has not been marked `read` after 15 minutes, the email notification will be sent. If the notification has already been read in the app, the email will be skipped.
 
--  Immediately creates a record in the database (for display directly in the app)
--  Immediately issues a ping in Slack.
--  If the notification remains unread after 10 minutes, it emails the team.
--  If the notification remains unread after 20 minutes, it sends an SMS to the on-call phone.
+_A note here: notifications expose a `#mark_as_read` method, but your app must choose when and where to call that method._
 
 You can mix and match the options and delivery methods to suit your application specific needs.
 
-Please note that to implement this pattern, it is essential `deliver_by :database` is one among the different delivery methods specified. Without this, a database record of the notification will not be created.
-
 ### 🚚 Custom Delivery Methods
 
-To generate a custom delivery method, simply run
+If you want to build your own delivery method to deliver notifications to a specific service or medium that Noticed doesn’t (or doesn’t _yet_) support, you’re welcome to do so! To generate a custom delivery method, simply run
 
 `rails generate noticed:delivery_method Discord`
 
-This will generate a new `DeliveryMethods::Discord` class inside the `app/notifications/delivery_methods` folder, which can be used to deliver notifications to Discord.
+This will generate a new `DeliveryMethods::Discord` class inside the `app/notifiers/delivery_methods` folder, which can be used to deliver notifications to Discord.
 
 ```ruby
-class DeliveryMethods::Discord < Noticed::DeliveryMethods::Base
+class DeliveryMethods::Discord < Noticed::DeliveryMethod
+  # Specify the config options your delivery method requires in its config block
+  required_options # :foo, :bar
+
   def deliver
-    # Logic for sending a Discord notification
+    # Logic for sending the notification
   end
 end
+
 ```
 
 You can use the custom delivery method thus created by adding a `deliver_by` line with a unique name and `class` option in your notification class.
 
 ```ruby
-class MyNotifier < Noticed::Base
+class MyNotifier < Noticed::Event
   deliver_by :discord, class: "DeliveryMethods::Discord"
 end
 ```
 
 Delivery methods have access to the following methods and attributes:
 
-* `record` - The instance of the Notification. You can call methods on the notification to let the user easily override formatting and other functionality of the delivery method.
-* `options` - Any configuration options on the `deliver_by` line.
-* `recipient` - The object who should receive the notification. This is typically a User, Account, or other ActiveRecord model.
-* `params` - The params passed into the notification. This is details about the event that happened. For example, a user commenting on a post would have params of `{ user: User.first }`
-
-#### Validating options passed to Custom Delivery methods
+* `event` — The `Noticed::Event` record that spawned the notification object currently being delivered
+* `record` — The object originally passed into the Notifier as the `record:` param (see the ✨ note above)
+* `notification` — The `Noticed::Notification` instance being delivered. All notification helper methods are available on this object
+* `recipient` — The individual recipient object being delivered to for this notification (remember that each recipient gets their own instance of the Delivery Method `#deliver`)
+* `config` — The hash of configuration options declared by the Notifier that generated this notification and delivery
+* `params` — The parameters given to the Notifier in the invocation (via `.with()`)
 
-The presence of the delivery method options is automatically validated if using the `option(s)` method.
+#### Validating config options passed to Custom Delivery methods
 
-If you want to validate that the passed options contain valid values, or to add any custom validations, override the `self.validate!(delivery_method_options)` method from the `Noticed::DeliveryMethods::Base` class.
+The presence of delivery method config options are automatically validated when declaring them with the `required_options` method. In the following example, Noticed will ensure that any Notifier using `deliver_by :email` will specify the `mailer` and `method` config keys:
 
 ```ruby
-class DeliveryMethods::Discord < Noticed::DeliveryMethods::Base
-  option :username # Requires the username option to be passed
+class DeliveryMethods::Email < Noticed::DeliveryMethod
+  required_options :mailer, :method
 
   def deliver
-    # Logic for sending a Discord notification
-  end
-
-  def self.validate!(delivery_method_options)
-    super # Don't forget to call super, otherwise option presence won't be validated
-
-    # Custom validations
-    if delivery_method_options[:username].blank?
-      raise Noticed::ValidationError, 'the `username` option must be present'
-    end
+    # ...
+    method = config.method
   end
 end
-
-class CommentNotifier < Noticed::Base
-  deliver_by :discord, class: 'DeliveryMethods::Discord'
-end
 ```
 
-Now it will raise an error because a required argument is missing.
-
-To fix the error, the argument has to be passed correctly. For example:
+If you’d like your config options to support dynamic resolution (set `config.foo` to a lambda or symbol of a method name etc.), you can use `evaluate_option`:
 
 ```ruby
-class CommentNotifier < Noticed::Base
-  deliver_by :discord, class: 'DeliveryMethods::Discord', username: User.admin.username
+class NewSaleNotifier < Noticed::Event
+  deliver_by :whats_app do |config|
+    config.day = -> { is_tuesday? "Tuesday" : "Not Tuesday" }
+  end
 end
-```
 
-#### Callbacks
+class DeliveryMethods::WhatsApp < Noticed::DeliveryMethod
+  required_options :day
 
-Callbacks for delivery methods wrap the *actual* delivery of the notification. You can use `before_deliver`, `around_deliver` and `after_deliver` in your custom delivery methods.
-
-```ruby
-class DeliveryMethods::Discord < Noticed::DeliveryMethods::Base
-  after_deliver do
-    # Do whatever you want
+  def deliver
+    # ...
+		config.day #=> #<Proc:0x000f7c8 (lambda)>
+    evaluate_option(config.day) #=> "Tuesday"
   end
 end
 ```
 
 ### 📦 Database Model
 
-The Notification database model includes several helpful features to make working with database notifications easier.
+The Noticed database models include several helpful features to make working with notifications easier.
 
-#### Class methods
+#### Notification
+
+##### Class methods/scopes
+
+(Assuming your user `has_many :notifications, as: :recipient, class_name: "Noticed::Notification"`)
 
 Sorting notifications by newest first:
 
 ```ruby
-user.notifications.newest_first
+@user.notifications.newest_first
 ```
 
 Query for read or unread notifications:
@@ -383,7 +442,9 @@ Convert back into a Noticed notifier object:
 Mark notification as read / unread:
 
 ```ruby
+@notification.mark_as_read
 @notification.mark_as_read!
+@notification.mark_as_unread
 @notification.mark_as_unread!
 ```
 
@@ -396,41 +457,36 @@ Check if read / unread:
 
 #### Associating Notifications
 
-Adding notification associations to your models makes querying and deleting notifications easy and is a pretty critical feature of most applications.
+Adding notification associations to your models makes querying, rendering, and managing notifications easy (and is a pretty critical feature of most applications).
 
-For example, in most cases, you'll want to delete notifications for records that are destroyed.
+There are two ways to associate your models to notifications:
 
-We'll need two associations for this:
+1. Where your object `has_many` notifications as the recipient (who you sent the notification to)
+2. Where your object `has_many` notifications as the `record` (what the notifications were about)
 
-1. Notifications where the record is the recipient
-2. Notifications where the record is in the notification params
+In the former, we’ll use a `has_many` to `:notifications`. In the latter, we’ll actually `has_many` to `:events`, since `record`s generate notifiable _events_ (and events generate notifications).
 
-For example,  we can query the notifications and delete them on destroy like so:
+We can illustrate that in the following:
 
 ```ruby
-class Post < ApplicationRecord
-  # Standard association for deleting notifications when you're the recipient
-  has_many :notifications, as: :recipient, dependent: :destroy
+class User < ApplicationRecord
+  has_many :notifications, as: :recipient, dependent: :destroy, class_name: "Noticed::Notification"
+end
 
-  # Helper for associating and destroying Notification records where(params: {post: self})
-  has_noticed_notifications
+# All of the notifications the user has been sent
+# @user.notifications.each { |n| render(n) }
 
-  # You can override the param_name, the notification model name, or disable the before_destroy callback
-  has_noticed_notifications param_name: :parent, destroy: false, model_name: "Notification"
+class Post < ApplicationRecord
+  has_many :noticed_events, as: :record, dependent: :destroy, class_name: "Noticed::Event"
 end
 
-# Create a CommentNotification with a post param
-CommentNotifier.with(post: @post).deliver(user)
-# Lookup Notifications where params: {post: @post}
-@post.notifications_as_post
-
-CommentNotifier.with(parent: @post).deliver(user)
-@post.notifications_as_parent
+# All of the notification events this post generated
+# @post.noticed_events.each { |ne| ne.notifications... }
 ```
 
 #### Handling Deleted Records
 
-If you create a notification but delete the associated record and forgot `has_noticed_notifications` on the model, the jobs for sending the notification will not be able to find the record when ActiveJob deserializes. You can discard the job on these errors by adding the following to `ApplicationJob`:
+Generally we recommend using a `dependent: ___` relationship on your models to avoid cases where Noticed Events or Notifications are left lingering when your models are destroyed. In the case that they are or data becomes mis-matched, you’ll likely run into deserialization issues. That may be globally alleviated with the following snippet, but use with caution.
 
 ```ruby
 class ApplicationJob < ActiveJob::Base
@@ -452,3 +508,4 @@ DATABASE_URL=postgres://127.0.0.1/noticed_test rails test
 
 ## 📝 License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+

data/app/channels/noticed/notification_channel.rb

@@ -0,0 +1,19 @@
+module Noticed
+  class NotificationChannel < ApplicationCable::Channel
+    def subscribed
+      stream_for current_user
+    end
+
+    def unsubscribed
+      stop_all_streams
+    end
+
+    def mark_as_seen(data)
+      current_user.notifications.where(id: data["ids"]).mark_as_seen
+    end
+
+    def mark_as_read(data)
+      current_user.notifications.where(id: data["ids"]).mark_as_read
+    end
+  end
+end

data/app/models/concerns/noticed/readable.rb

@@ -31,18 +31,34 @@ module Noticed
       update(read_at: Time.current)
     end
 
+    def mark_as_read!
+      update!(read_at: Time.current)
+    end
+
     def mark_as_unread
       update(read_at: nil)
     end
 
+    def mark_as_unread!
+      update!(read_at: nil)
+    end
+
     def mark_as_seen
       update(seen_at: Time.current)
     end
 
+    def mark_as_seen!
+      update!(seen_at: Time.current)
+    end
+
     def mark_as_unseen
       update(seen_at: nil)
     end
 
+    def mark_as_unseen!
+      update!(seen_at: nil)
+    end
+
     def read?
       read_at?
     end

data/app/models/noticed/notification.rb

@@ -10,7 +10,5 @@ module Noticed
     scope :newest_first, -> { order(created_at: :desc) }
 
     delegate :params, :record, to: :event
-
-    attribute :params, default: {}
   end
 end

data/lib/generators/noticed/templates/delivery_method.rb.tt

@@ -1,12 +1,8 @@
-class DeliveryMethods::<%= class_name %> < Noticed::DeliveryMethods::Base
+class DeliveryMethods::<%= class_name %> < Noticed::DeliveryMethod
+  # Specify the config options your delivery method requires in its config block
+  required_options # :foo, :bar
+
   def deliver
     # Logic for sending the notification
   end
-
-  # You may override this method to validate options for the delivery method
-  # Invalid options should raise a ValidationError
-  #
-  # def self.validate!(options)
-  #   raise ValidationError, "required_option missing" unless options[:required_option]
-  # end
 end

data/lib/noticed/delivery_method.rb

@@ -7,6 +7,7 @@ module Noticed
 
     attr_reader :config, :event, :notification
     delegate :recipient, to: :notification
+    delegate :record, :params, to: :event
 
     def perform(delivery_method_name, notification, overrides: {})
       @notification = notification

data/lib/noticed/delivery_methods/action_cable.rb

@@ -1,11 +1,11 @@
 module Noticed
   module DeliveryMethods
     class ActionCable < DeliveryMethod
-      required_options :channel, :stream, :message
+      required_options :message
 
       def deliver
-        channel = fetch_constant(:channel)
-        stream = evaluate_option(:stream)
+        channel = fetch_constant(:channel) || Noticed::NotificationChannel
+        stream = evaluate_option(:stream) || recipient
         message = evaluate_option(:message)
 
         channel.broadcast_to stream, message

data/lib/noticed/delivery_methods/email.rb

@@ -6,14 +6,18 @@ module Noticed
       def deliver
         mailer = fetch_constant(:mailer)
         email = evaluate_option(:method)
-        params = (evaluate_option(:params) || notification&.params || {}).merge(record: notification&.record)
-        args = evaluate_option(:args)
-
-        mail = mailer.with(params)
-        mail = args.present? ? mail.send(email, *args) : mail.send(email)
-
+        args = evaluate_option(:args) || []
+        mail = mailer.with(params).send(email, *args)
         (!!evaluate_option(:enqueue)) ? mail.deliver_later : mail.deliver_now
       end
+
+      def params
+        (evaluate_option(:params) || notification&.params || {}).merge(
+          notification: notification,
+          record: notification&.record,
+          recipient: notification&.recipient
+        )
+      end
     end
   end
 end

data/lib/noticed/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,6 +35,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/channels/noticed/notification_channel.rb
 - app/jobs/noticed/application_job.rb
 - app/jobs/noticed/event_job.rb
 - app/models/concerns/noticed/deliverable.rb
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Notifications for Ruby on Rails applications