noticed 1.2.2 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534fd7403e6eb6ad98672132d5c2b3ebf6de0eff7ada3a40ad9acc2bea2b7f2b
-  data.tar.gz: 18973d1ff94fee48cc3daadd7a1e5df9bc104153dcd6ee10d9b5cfe98df832be
+  metadata.gz: fcd5afdca1ab2862bca9259b3015f86d93ab323eb64b6f8de666f9067216b202
+  data.tar.gz: 8c6a53d533eb2667c44804b4a7a5e518b4ab7938b345c6105490145bb4fdb75a
 SHA512:
-  metadata.gz: 67cc5fe29f00612c81b64f70fd0b72d264d7f9d3486b14d0892a6482ac1ca75f06303d2bfd8aebfa349d145a269295b06e9530105ca2578d85d148ac5665eefb
-  data.tar.gz: b66fa2922599a8edb40bdddf3a9a2a05debdfde299877140909fcb339895a0c94b2fa30c2a9d693026a4c040fcbd0c2cb1fdacaefcb328c845783694b04c4100
+  metadata.gz: 21ea1e549dcbd0857fea6538a0fc2d17ba5f0d249b7f39d1e1d33a56cbece35a3413605d8c1a6e71a381a424b6db93c82bfe7de19d87e3e669c569926fa4a42b
+  data.tar.gz: 1e85eb2edfbbac61fa9bcacf91a4fe041adc945c54ad029a6e8ab75e3d4fc64d52fbcf8527e43da9d0fd3c30e267c2c1e13bafbdf10662f6f826758a1a4f3f41

data/README.md

@@ -4,18 +4,27 @@
 
 ### 🎉  Notifications for your Ruby on Rails app.
 
-[![Build Status](https://github.com/excid3/noticed/workflows/Tests/badge.svg)](https://github.com/excid3/noticed/actions)
+[![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)
 
 Currently, we support these notification delivery methods out of the box:
 
 * Database
 * Email
 * ActionCable channels
+* Slack
 * Twilio (SMS)
 * Vonage / Nexmo (SMS)
 
 And you can easily add new notification types for any other delivery methods.
 
+## 🎬 Screencast
+
+<div style="width:50%">
+  <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" /></a>
+</div>
+
+[Watch Screencast](https://www.youtube.com/watch?v=Scffi4otlFc)
+
 ## 🚀 Installation
 Run the following command to add Noticed to your Gemfile
 
@@ -37,6 +46,28 @@ To generate a notification object, simply run:
 
 `rails generate noticed:notification CommentNotification`
 
+#### Sending Notifications
+
+To send a notification to a user:
+
+```ruby
+# Instantiate a new notification
+notification = CommentNotification.with(comment: @comment)
+
+# Deliver notification in background job
+notification.deliver_later(@comment.post.author)
+
+# Deliver notification immediately
+notification.deliver(@comment.post.author)
+
+# Deliver notification to multiple recipients
+notification.deliver_later(User.all)
+```
+
+This will instantiate a new notification with the `comment` stored in the notification's params.
+
+Each delivery method is able to transform this metadata that's best for the format. For example, the database may simply store the comment so it can be linked when rendering in the navbar. The websocket mechanism may transform this into a browser notification or insert it into the navbar.
+
 #### Notification Objects
 
 Notifications inherit from `Noticed::Base`. This provides all their functionality and allows them to be delivered.
@@ -49,10 +80,6 @@ class CommentNotification < Noticed::Base
   deliver_by :action_cable
   deliver_by :email, if: :email_notifications?
 
-  def email_notifications?
-    !!recipient.preferences[:email]
-  end
-
   # I18n helpers
   def message
     t(".message")
@@ -63,33 +90,16 @@ class CommentNotification < Noticed::Base
     post_path(params[:post])
   end
 
+  def email_notifications?
+    !!recipient.preferences[:email]
+  end
+
   after_deliver do
     # Anything you want
   end
 end
 ```
 
-#### Sending Notifications
-
-To send a notification to a user:
-
-```ruby
-notification = CommentNotification.with(comment: @comment.to_gid)
-
-# Deliver notification in background job
-notification.deliver_later(@comment.post.author)
-
-# Deliver notification immediately
-notification.deliver(@comment.post.author)
-
-# Deliver notification to multiple recipients
-notification.deliver_later(User.all)
-```
-
-This will instantiate a new notification with the `comment` stored in the notification's params.
-
-Each delivery method is able to transform this metadata that's best for the format. For example, the database may simply store the comment so it can be linked when rendering in the navbar. The websocket mechanism may transform this into a browser notification or insert it into the navbar.
-
 **Shared Options**
 
 * `if: :method_name`  - Calls `method_name`and cancels delivery method if `false` is returned
@@ -134,7 +144,7 @@ Defining custom delivery methods allows you to add callbacks that run inside the
 
 ##### Translations
 
-We've added `translate` and  `t` helpers like Rails has to provide an easy way of scoping translations. If the key starts with a period, it will automatically scope the key under `notifications` and the underscored name of the notification class it is used in.
+We've added `translate` and `t` helpers like Rails has to provide an easy way of scoping translations. If the key starts with a period, it will automatically scope the key under `notifications` and the underscored name of the notification class it is used in.
 
 For example:
 
@@ -176,6 +186,10 @@ Writes notification to the database.
 
   The name of the database association to use. Defaults to `:notifications`
 
+* `format: :format_for_database` - *Optional*
+
+  Use a custom method to define the attributes saved to the database
+
 ### Email
 
 Sends an email notification. Emails will always be sent with `deliver_later`
@@ -192,6 +206,10 @@ Sends an email notification. Emails will always be sent with `deliver_later`
 
   Used to customize the method on the mailer that is called
 
+* `format: :format_for_email` - *Optional*
+
+  Use a custom method to define the params sent to the mailer. `recipient` will be merged into the params.
+
 ### ActionCable
 
 Sends a notification to the browser via websockets (ActionCable channel by default).
@@ -264,7 +282,7 @@ Sends an SMS notification via Twilio.
 
 ### Vonage SMS
 
-Sends an SMS notification vai Vonage / Nexmo.
+Sends an SMS notification via Vonage / Nexmo.
 
 `deliver_by :vonage`
 
@@ -344,6 +362,45 @@ For Rails 6.0 and earlier, you must pass strings of the class names in the `deli
 
 We recommend the Rails 6.0 compatible options to prevent confusion.
 
+### 📦 Database Model
+
+The Notification database model includes several helpful features to make working with database notifications easier.
+
+#### Class methods
+
+Sorting notifications by newest first:
+
+```ruby
+user.notifications.newest_first
+```
+
+Marking all notifications as read:
+
+```ruby
+user.notifications.mark_as_read!
+```
+
+#### Instance methods
+
+Convert back into a Noticed notification object:
+
+```ruby
+@notification.to_notification
+```
+
+Mark notification as read:
+
+```ruby
+@notification.mark_as_read!
+```
+
+Check if read / unread:
+
+```ruby
+@notification.read?
+@notification.unread?
+```
+
 ## 🙏 Contributing
 
 This project uses [Standard](https://github.com/testdouble/standard) for formatting Ruby code. Please make sure to run `standardrb` before submitting pull requests.

data/Rakefile

@@ -18,6 +18,10 @@ require "bundler/gem_tasks"
 
 require "rake/testtask"
 
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+load "rails/tasks/statistics.rake"
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"

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

@@ -22,6 +22,6 @@ class <%= class_name %> < Noticed::Base
   # end
   #
   # def url
-  #   posts_path(params[:post])
+  #   post_path(params[:post])
   # end
 end

data/lib/noticed.rb

@@ -1,3 +1,4 @@
+require "active_job/arguments"
 require "http"
 require "noticed/engine"
 

data/lib/noticed/base.rb

@@ -9,7 +9,8 @@ module Noticed
     class_attribute :delivery_methods, instance_writer: false, default: []
     class_attribute :param_names, instance_writer: false, default: []
 
-    attr_accessor :record
+    # Gives notifications access to the record and recipient when formatting for delivery
+    attr_accessor :record, :recipient
 
     class << self
       def deliver_by(name, options = {})
@@ -28,9 +29,10 @@ module Noticed
         new(params)
       end
 
-      def param(name)
-        param_names.push(name)
+      def params(*names)
+        param_names.concat Array.wrap(names)
       end
+      alias param params
     end
 
     def initialize(params = {})

data/lib/noticed/coder.rb

@@ -1,11 +1,19 @@
 module Noticed
   class Coder
     def self.load(data)
+      return if data.nil?
+
+      # Text columns need JSON parsing
+      if data.is_a?(String)
+        data = JSON.parse(data)
+      end
+
       ActiveJob::Arguments.send(:deserialize_argument, data)
     end
 
     def self.dump(data)
-      ActiveJob::Arguments.send(:serialize_argument, data)
+      return if data.nil?
+      ActiveJob::Arguments.send(:serialize_argument, data).to_json
     end
   end
 end

data/lib/noticed/delivery_methods/action_cable.rb

@@ -16,11 +16,19 @@ module Noticed
       end
 
       def channel
-        if (method = options[:channel])
-          notification.send(method)
-        else
-          Noticed::NotificationChannel
-        end
+        @channel ||= begin
+          value = options[:channel]
+          case value
+          when String
+            value.constantize
+          when Symbol
+            notification.send(value)
+          when Class
+            value
+          else
+            Noticed::NotificationChannel
+           end
+         end
       end
     end
   end

data/lib/noticed/delivery_methods/base.rb

@@ -4,15 +4,17 @@ module Noticed
       extend ActiveModel::Callbacks
       define_model_callbacks :deliver
 
-      attr_reader :notification, :options, :recipient
+      attr_reader :notification, :options, :recipient, :record
 
       def perform(notification_class:, options:, params:, recipient:, record:)
         @notification = notification_class.constantize.new(params)
         @options = options
         @recipient = recipient
+        @record = record
 
-        # Keep track of the database record for rendering
+        # Make notification aware of database record and recipient during delivery
         @notification.record = record
+        @notification.recipient = recipient
 
         run_callbacks :deliver do
           deliver

data/lib/noticed/delivery_methods/email.rb

@@ -2,7 +2,7 @@ module Noticed
   module DeliveryMethods
     class Email < Base
       def deliver
-        mailer.with(notification.params).send(method.to_sym).deliver_later
+        mailer.with(format).send(method.to_sym).deliver_later
       end
 
       private
@@ -14,6 +14,17 @@ module Noticed
       def method
         options[:method] || notification.class.name.underscore
       end
+
+      def format
+        if (method = options[:format])
+          notification.send(method)
+        else
+          notification.params.merge(
+            recipient: recipient,
+            record: record
+          )
+        end
+      end
     end
   end
 end

data/lib/noticed/delivery_methods/slack.rb

@@ -11,7 +11,7 @@ module Noticed
         if (method = options[:format])
           notification.send(method)
         else
-          params
+          notification.params
         end
       end
 

data/lib/noticed/translation.rb

@@ -13,7 +13,7 @@ module Translation
 
   def scope_translation_key(key)
     if key.to_s.start_with?(".")
-      "notifications.#{self.class.name.underscore}#{key}"
+      "#{i18n_scope}.#{self.class.name.underscore}#{key}"
     else
       key
     end

data/lib/noticed/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "1.2.2"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.7
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails