acts_as_notifiable 0.0.6 → 0.0.7

data/lib/acts_as_notifiable/notifiable.rb

@@ -1,5 +1,12 @@
 module ActsAsNotifiable
 	def acts_as_notifiable(options={})
+		if respond_to?(:class_attribute)
+        	class_attribute :readable_options
+		else
+	        class_inheritable_accessor :readable_options
+		end
+		self.readable_options = options
+
 		has_many :notifications, as: :notifiable, dependent: :destroy
 
 		after_create :create_notification
@@ -9,26 +16,27 @@ module ActsAsNotifiable
 		# Find all notifications by type
 		def self.find_all_unnoticed_by(user, type=nil, type_id=nil)
 			@notifications = Notification.where(notifiable_type: self.to_s, user_id: user.id)
-			self.polymorphic_queries(type, type_id)
+			@notifications = self.polymorphic_queries(@notifications, type, type_id)
 			@notifications
 		end
 
 		# Mark all notifications noticed by type
 		def self.mark_all_noticed_by(user, type=nil, type_id=nil)
 			@notifications = Notification.where(user_id: user.id, notifiable_type: self.to_s)
-			self.polymorphic_queries(type, type_id)
+			@notifications = self.polymorphic_queries(@notifications, type, type_id)
 			@notifications.destroy_all
 		end
 
 		private
 
-		def self.polymorphic_queries(type, type_id)
-			if type
-				@notifications = @notifications.where(polymorphic_type: type)
-				@notifications = @notifications.where(polymorphic_id: type_id) if type_id
-			else
-				@notifications = @notifications.where(polymorphic_type: nil)
-			end
+		def self.polymorphic_queries(notifications, type, type_id)
+			notifications = notifications.where(polymorphic_type: type)
+			notifications = notifications.where(polymorphic_id: type_id) if type_id
+			notifications
+		end
+
+		def self.polymorphic?
+			self.readable_options[:polymorphic] == true
 		end
 
 		include NotifiableInstanceMethods
@@ -38,32 +46,34 @@ module ActsAsNotifiable
 		# Check if the notifiable object has been read by the user (no Notification will exist)
 		def unnoticed_by?(user, type=nil, type_id=nil)
 			@notifications = Notification.where(notifiable_id: self.id, notifiable_type: self.class.to_s, user_id: user.id)
-			self.class.polymorphic_queries(type, type_id)
+			@notifications = self.class.polymorphic_queries(@notifications, type, type_id)
 			!@notifications.empty?		
 		end
 
 		# mark the notifiable object as read (remove the Notification)
 		def mark_as_noticed_by(user, type=nil, type_id=nil)
 			@notifications = Notification.where(notifiable_id: self.id, notifiable_type: self.class.to_s, user_id: user.id)
-			self.class.polymorphic_queries(type, type_id)
+			@notifications = self.class.polymorphic_queries(@notifications, type, type_id)
 			@notifications.first.destroy if self.unnoticed_by?(user, type, type_id)
 		end
 
 		# Callback method to create the notification
 		def create_notification
-			# if options[:polymorphic] == true
-			# 	t = create_polymorphic_sender
-			# 	Notification.send(t)
-			# else
+			if self.class.polymorphic?
+				polymorphic_array = polymorphic_sender
+				Notification.find_or_create_by_user_id_and_notifiable_id_and_notifiable_type_and_polymorphic_type_and_polymorphic_id(self.user_id, self.id, self.class.to_s, polymorphic_array[0], polymorphic_array[1])
+			else
 				Notification.find_or_create_by_user_id_and_notifiable_id_and_notifiable_type(self.user_id, self.id, self.class.to_s)
-			# end
+			end
 		end
 
-		def create_polymorphic_sender
-			type = ""
-			self.notifiable.attributes.each{|a| type = a[0] if a[0] =~ /ble_type/ }
-			type = self.notifiable.send(type)
-			"find_or_create_by_user_id_and_notifiable_id_and_notifiable_type_and"
+		# Returns class of polymorphic association and id of the association in a array
+		def polymorphic_sender
+			attribute_type = ""
+			self.attributes.each{|a| attribute_type = a[0] if a[0] =~ /ble_type/ }
+			attribute_type = attribute_type.gsub('_type', '')
+			polymorphic_parent = self.send(attribute_type)
+			[polymorphic_parent.class.to_s, polymorphic_parent.id]
 		end
 	end
 end

data/lib/app/models/notification.rb

@@ -7,7 +7,7 @@ class Notification < ActiveRecord::Base
 
 	# Associations
 	belongs_to :notifiable, polymorphic: true
-	belongs_to :user, counter_cache: true
+	belongs_to :user#, counter_cache: true
 
 	def as_json(options=nil)
 		super(options || {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_notifiable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: