notification-handler 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4c180ed64ec555efdd26415ce61364a09ac48e81d3d78dfa7d387a2c0f2ad0
-  data.tar.gz: 89c348007a44edc1e34864973f33e50709fd0b49a3366cb4367221bb7b79d8fc
+  metadata.gz: 3fe2fe2c91eabaaec753df7ba65e183a7050eea1270f45c5a3066e535e0ae1b3
+  data.tar.gz: dd8f5a2801afa7cc2b8e9d2f372398151c94f6c4139210bf846a63beea89944e
 SHA512:
-  metadata.gz: f085d5ef3833c88e265517146e28b92ac8a696a1902dbecb788aab3817751d95232e45e2dc623cad93d29d2d1817ec9962d65058f37214b1f01457a3569ba2af
-  data.tar.gz: af4e1b23a0843363710ea8937bd6cf69fa9d8e28a63f136d94b38ab3094aaaac184af97185ba0a0f21a99e92b1fe4bc29c1e8c641ba60507a3207be4a40f53e8
+  metadata.gz: ed9de05b283ff004cd5b3dda16287cfc4e516a44d65457146025b93c92b4d1993791a45c92f138133e77f4c436e19d5f73eb52af23c948b3b140726998f9679d
+  data.tar.gz: 69cbc0114a5b412ef7eec404829080deb34999eda805ac0ea8fab5a8450aad31145e167ae6aa0a5dfa1396ec297ef898e459704cbb663ea184a9b523475d3611

data/lib/generators/templates/install/notification_model.rb

@@ -1,2 +1,6 @@
-class Notification < NotificationHandler::Notification
+class Notification < ApplicationRecord
+
+    include NotificationHandler::NotificationLibrary
+    include NotificationHandler::NotificationScopes
+
 end

data/lib/notification-handler.rb

@@ -2,8 +2,6 @@ module NotificationHandler
 
     require 'notification_handler/configuration'
 
-    require 'notification_handler/engine'
-
     autoload :Group, 'notification_handler/group'
 
     autoload :Target, 'notification_handler/target'

data/lib/notification_handler/configuration.rb

@@ -18,7 +18,7 @@ module NotificationHandler
         end
 
         def define_group name, target_scope
-            ::NotificationHandler::Group.new name: name.to_sym, target_scope: target_scope
+            ::NotificationHandler::Group.new name.to_sym, target_scope
         end
 
     end

data/lib/notification_handler/notification_library.rb

@@ -1,39 +1,57 @@
 module NotificationHandler
     module NotificationLibrary
 
-        attr_accessor :group
+        extend ActiveSupport::Concern
 
-        before_validation :create_for_group
-        after_commit :cache
+        included do
+            before_validation :create_for_group
+            after_commit :cache
 
-        def read?
-            self.read
-        end
-        def unread?
-            !self.read
+            serialize :metadata, Hash
+            attr_accessor :group
+
+            belongs_to :target, polymorphic: true
+            belongs_to :object, polymorphic: true, optional: true
+
+            include NotificationHandler::NotificationLibrary::InstanceMethods
+
+            include NotificationRenderer::NotificationLibrary if defined?(NotificationRenderer)
+            include NotificationPusher::NotificationLibrary if defined?(NotificationPusher)
+            include NotificationSettings::NotificationLibrary if defined?(NotificationSettings)
         end
 
-        private
+        module InstanceMethods
 
-        def create_for_group
-            unless self.group.nil?
-                target_scope = NotificationHandler::Group.find_by_name(self.group).last.target_scope
-                target_scope&.each do |target|
-                    notification = self.dup
-                    notification.target = target
-                    notification.group = nil
-                    notification.save
+            def read?
+                self.read
+            end
+            def unread?
+                !self.read
+            end
+
+            private
+
+            def create_for_group
+                unless self.group.nil?
+                    target_scope = NotificationHandler::Group.find_by_name(self.group).last.target_scope
+                    target_scope&.each do |target|
+                        notification = self.dup
+                        notification.target = target
+                        notification.group = nil
+                        notification.save
+                    end
+                    return false
                 end
-                return false
             end
-        end
 
-        def cache
-            if self.read_changed?
-                self.target.read_notification_count = self.target.notifications.read.count
-                self.target.unread_notification_count = self.target.notifications.unread.count
-                self.target.save!
+            def cache
+                if self.read_changed?
+                    self.target.read_notification_count = self.target.notifications.read.count
+                    self.target.unread_notification_count = self.target.notifications.unread.count
+                    self.target.save!
+                end
             end
+
         end
 
     end

data/lib/notification_handler/notification_scopes.rb

@@ -1,8 +1,15 @@
 module NotificationHandler
     module NotificationScopes
 
-        scope :read, -> { where(read: true) }
-        scope :unread, -> { where(read: false) }
+        extend ActiveSupport::Concern
+
+        included do
+            scope :read, -> { where(read: true) }
+            scope :unread, -> { where(read: false) }
+
+            include NotificationRenderer::NotificationScopes if defined?(NotificationRenderer)
+            include NotificationSettings::NotificationScopes if defined?(NotificationSettings)
+        end
 
     end
 end

data/lib/notification_handler/target.rb

@@ -18,8 +18,7 @@ module NotificationHandler
         module InstanceMethods
 
             def notify options = {}
-                options[:target] = self
-                Notification.create options
+                self.notifications.create options
             end
 
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notification-handler
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Jonas Hübotter
@@ -82,7 +82,6 @@ files:
 - lib/generators/templates/install/notifications_migration.rb.erb
 - lib/notification-handler.rb
 - lib/notification_handler/configuration.rb
-- lib/notification_handler/engine.rb
 - lib/notification_handler/group.rb
 - lib/notification_handler/notification_library.rb
 - lib/notification_handler/notification_scopes.rb

data/lib/notification_handler/engine.rb

@@ -1,6 +0,0 @@
-require 'rails/railtie'
-
-module NotificationHandler
-    class Engine < ::Rails::Engine
-    end
-end