noticed 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c02b0c74747522809dcb6d841016c48b91d8b5c6f637efb3fbd68729babb59
-  data.tar.gz: 01f8b8a9c4f185c48729a7c073915194c4e872f8f412ed1a3c94b763f7134ec9
+  metadata.gz: cf12a81661e3c6fa7e6240e54f6cb802420b13e2cfd35feabdc713a415986b5a
+  data.tar.gz: '08074571747ce14478e7f45de5917700fa997caefd0bb93b3bd154287f3b7830'
 SHA512:
-  metadata.gz: 2a5e8023362194fbdb682faa7f608101e54c67df6916e7a5faac7252852196618518d405f233720d7fb843b6a67e4757a29da189b9dd7c084cca135b3caf1226
-  data.tar.gz: e475367cb48916b2fa796076b057c3eb215a9046cf286f958b11b8c99f294feec5b646b21ce5def9c0208c3293a34cbc434ecc831d4f7e1b7fc51659fc9f3512
+  metadata.gz: c5ed4a60a134a094a9837127d2ac5aaab7ab2bae500222861ebb99e3053ef8450a439093543f03f58fefe5d1df04b47e519bfcfb3193b2aa82262bb5d725fe7a
+  data.tar.gz: 4cfcb122083862b7400459b99695619fabafb8676ea44e5185a06f85eaa693cc12a4eca0fb3094a0c502017fe0b67767d5853ec72e5928b4b560209189e95c4e

data/README.md

@@ -87,7 +87,7 @@ class NewCommentNotifier < Noticed::Event
 
   deliver_by :email do |config|
     config.mailer = "CommentMailer"
-		config.if = ->(recipient) { !!recipient.preferences[:email] }
+    config.if = ->(recipient) { !!recipient.preferences[:email] }
   end
 
   bulk_deliver_by :discord do |config|
@@ -201,7 +201,7 @@ en:
   notifiers:
   	new_comment_notifier:
   	  notification:
-        message: "Someone posted a new comment!"
+            message: "Someone posted a new comment!"
 ```
 
 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).

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/lib/generators/noticed/notifier_generator.rb

@@ -7,12 +7,20 @@ module Noticed
     class NotifierGenerator < Rails::Generators::NamedBase
       include Rails::Generators::ResourceHelpers
 
+      check_class_collision suffix: "Notifier"
+
       source_root File.expand_path("../templates", __FILE__)
 
       desc "Generates a notification with the given NAME."
 
       def generate_notification
-        template "notifier.rb", "app/notifiers/#{file_path}.rb"
+        template "notifier.rb", "app/notifiers/#{file_path}_notifier.rb"
+      end
+
+      private
+
+      def file_name # :doc:
+        @_file_name ||= super.sub(/_notifier\z/i, "")
       end
     end
   end

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

@@ -2,7 +2,7 @@
 #
 # <%= class_name %>.with(record: @post, message: "New post").deliver(User.all)
 
-class <%= class_name %> < Noticed::Event
+class <%= class_name %>Notifier < Noticed::Event
   # Add your delivery methods
   #
   # deliver_by :email do |config|

data/lib/noticed/delivery_method.rb

@@ -40,7 +40,7 @@ module Noticed
 
       # Call method if symbol and matching method on Notifier
       elsif option.is_a?(Symbol) && event.respond_to?(option)
-        event.send(option, self)
+        event.send(option, notification)
 
       # Return the value
       else

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/version.rb

@@ -1,3 +1,3 @@
 module Noticed
-  VERSION = "2.0.1"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noticed
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-20 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