notification-handler 2.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2cdb58ba8f4da880b60d9443747199aac809a9fc881c52ea6d6521b02ebb1c6
-  data.tar.gz: 2b22c562259da40608261bd742224fc6302ba678e2536ece9c01a01a01c51d82
+  metadata.gz: 1dc02802065493c5e297334667b3331b8b0c8757e80989b052d6426b154d450b
+  data.tar.gz: 4c3f0782b4a05e9df8960cfcfcd18cbb27bc14d25855fa0f63ce0b973324b55b
 SHA512:
-  metadata.gz: a6eb0d2c4cc82ca45ca54d08bc4bf75aaa531d793a31109c0644345e2e00d392f84bf145b414863b835225e52a2249d64ff12df872b2698657ba6ce0b7401693
-  data.tar.gz: cac446fcf48614af0346f947a181be5bfbb5a2fe9f54dd3aebd7e0b231d2550d73f851fad439cf3a07565e8daa9f7278ccc9c5ddd59395b8ee82a1d8e9d50aea
+  metadata.gz: 9a49f5df7d39be5495797718c4909b35c831bcd59dfcde06b14ad7b63a8866d4d9e666cb9de868b30fc18008db0fc9090f8a36bcce98e8fe339625c7b4775ccd
+  data.tar.gz: fc6f3e388e7cb39e44fcda525b4b6adde35dd7d1adb05733010d4aa1a7c8d4006efbcd04f23f0b15ae24d2257aa05b12bf7ea1891d9d513c7e54f4aa2c86cb5d

data/README.md

@@ -99,7 +99,7 @@ Notification.read
 Notification.unread
 
 # Number of unread notifications
-Notification.unread.count
+Notification.unread.size
 ```
 
 ### `notification_target`
@@ -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.
@@ -176,10 +172,12 @@ The only requirement is that the result of evaluating the proc be Enumerable.
 Bulk-creation of notifications for a certain group is fairly simple:
 
 ```ruby
-notification = Notification.create(object: Recipe.first, group: :subscribers)
-notification = Notification.create(object: Recipe.first, group: :company_members, group_args: 4)
+notifications = Notification.for_group(:subscribers, attrs: { object: Recipe.first })
+notifications = Notification.for_group(:company_members, args: [4], attrs: { object: Recipe.first })
 ```
 
+`Notification.for_group` returns an array of `Notification` objects.
+
 **Note:** You are not able to set the `target` attribute when a `group` has been specified.
 
 ### Caching

data/lib/generators/notification_handler/install_generator.rb

@@ -14,7 +14,8 @@ module NotificationHandler
       if ActiveRecord::Base.timestamped_migrations
         Time.now.utc.strftime('%Y%m%d%H%M%S')
       else
-        format('%.3d', current_migration_number(dirname) + 1)
+        format('%<migration_number>.3d',
+               migration_number: current_migration_number(dirname) + 1)
       end
     end
 

data/lib/notification_handler/notification_lib.rb

@@ -9,12 +9,9 @@ module NotificationHandler
     included do
       self.inheritance_column = :_type_disabled
 
-      before_validation :create_for_group
       after_commit :cache
 
       serialize :metadata, Hash
-      attr_accessor :group
-      attr_accessor :group_args
 
       belongs_to :target, polymorphic: true
       belongs_to :object, polymorphic: true, optional: true
@@ -32,6 +29,18 @@ module NotificationHandler
       end
     end
 
+    module ClassMethods
+      def for_group(group, args: [], attrs: {})
+        return if group.nil?
+
+        target_scope = NotificationHandler::Group.find_by_name!(group)
+                                                 .target_scope
+        target_scope.call(*args)&.map do |target|
+          Notification.create(attrs.merge(target: target))
+        end
+      end
+    end
+
     module InstanceMethods
       def read?
         read
@@ -43,24 +52,11 @@ module NotificationHandler
 
       private
 
-      def create_for_group
-        return if group.nil?
-
-        target_scope = NotificationHandler::Group.find_by_name!(group)
-                                                 .target_scope
-        target_scope.call(*group_args)&.each_with_index do |target, index|
-          notification = index.zero? ? self : dup
-          notification.target = target
-          notification.group = nil
-          notification.save!
-        end
-      end
-
       def cache
         return unless read_changed?
 
-        target.read_notification_count = target.notifications.read.count
-        target.unread_notification_count = target.notifications.unread.count
+        target.read_notification_count = target.notifications.read.size
+        target.unread_notification_count = target.notifications.unread.size
         target.save!
       end
     end

data/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

data/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notification-handler
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,7 +174,8 @@ files:
 homepage: https://github.com/jonhue/notifications-rails/tree/master/notification-handler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  github_repo: ssh://github.com/jonhue/notifications-rails
 post_install_message: 
 rdoc_options: []
 require_paths: