lib/voltron/notify.rb in voltron-notify-0.2.0 vs lib/voltron/notify.rb in voltron-notify-0.2.1

@@ -7,45 +7,12 @@
   module Notify
 
     LOG_COLOR = :light_yellow
 
     def notifyable(defaults={})
-      include InstanceMethods
-
       @_notification_defaults = defaults.with_indifferent_access
 
-      before_validation :validate_notifications
-
-      after_validation :clean_notification_validation
-
-      has_many :notifications, as: :notifyable, class_name: '::Voltron::Notification'
-    end
-
-    module InstanceMethods
-
-      private
-
-        def validate_notifications
-          # Find all notification records that haven't been saved yet
-          self.notifications.select(&:new_record?).each do |notification|
-
-            # Set the to value for both the email and phone, if any on this model
-            notification.to self.try(:email), self.try(:phone)
-
-            # If not valid, populate the childs error messages in this models errors object
-            unless notification.valid?
-              notification.errors.messages.each do |k, errors|
-                errors.each { |error| self.errors.add k, error }
-              end
-            end
-          end
-        end
-
-        def clean_notification_validation
-          # Cleanup, remove the notifications key from the error messages,
-          # All of the actual errors are populated into "notifications.<type>" keys above
-          self.errors.delete :notifications
-        end
+      has_many :notifications, as: :notifyable, inverse_of: :notifyable, validate: true, autosave: true, class_name: '::Voltron::Notification'
     end
   end
 end
 
 require 'voltron/notify/engine' if defined?(Rails)