gossiper 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cdc61bdd2db605d54aea6be7862aaa8b50a7f26
-  data.tar.gz: 8fd27aadb81931eece3a78e724ede6b5d5650a5b
+  metadata.gz: bc1480aab310d0621df06090ef44c953c3422cc6
+  data.tar.gz: f0bf08f5a7c011c1110435016dde51829bb1d53b
 SHA512:
-  metadata.gz: 6345c4c5611f258aebd3386d62584e6edcfe37c5a925541fffc1d57b4880e076da6123a28e6c42754bdc0ba5475e2b75f3993c1a6af116f4ccbba60356e77c17
-  data.tar.gz: fa3aa48780490cf68b38bab6757f5e816edbc7d87f0641e8a91acf2221e49079616e76aab2294fc4fb8bf802cdf64e2161fe1e74ade902e816019d5505173aea
+  metadata.gz: f033f5024be39161393719659a7408a3c4b4cea217a1457f2dcbfb1193f7ae95cc78cd51ab8f1d334a2fb9e83868bdaa8af3a18537d1a2d72fb617236a1a8e33
+  data.tar.gz: b3cc4b64668113a7fe3f7c7caad4010a550d02b51fca04a5fcbd3217ca6a3b526f4fa4b58b3a6211d89d1689c7e2d65a2c44e02f1b257fa6dfa5415e95de78c7

data/app/models/gossiper/notification.rb

@@ -6,20 +6,7 @@ module Gossiper
     serialize :data, JSON
 
     validates :kind, presence: true
-
-    def user=(user)
-      @user           = user
-      self.user_class = user.class.to_s
-      self.user_id    = user.id
-    end
-
-    def user
-      @user ||= user_class.constantize.find(user_id)
-    end
-
-    def user_class
-      read_attribute(:user_class).presence || Gossiper.configuration.default_notification_user_class
-    end
+    belongs_to :user, polymorphic: true
 
     def status
       read_attribute(:status).presence || STATUSES.first
@@ -44,6 +31,16 @@ module Gossiper
       write_attribute(:kind, value)
     end
 
+    def config
+      begin
+        klass = "Notifications::#{kind.classify}Notification"
+        klass.constantize.new(self)
+      rescue NameError
+        klass = Gossiper.configuration.default_notification_config_class
+        klass.constantize.new(self)
+      end
+    end
+
     def method_missing(method, *args, &block)
       STATUSES.each do |status|
         if method.to_s == "#{status}?"

data/db/migrate/20131206162038_create_gossiper_notifications.rb

@@ -2,7 +2,7 @@ class CreateGossiperNotifications < ActiveRecord::Migration
   def change
     create_table :gossiper_notifications do |t|
       t.integer :user_id
-      t.string :user_class
+      t.string :user_type
       t.string :kind
       t.string :status
       t.datetime :delivered_at

data/lib/generators/gossiper/install/templates/initializer.rb

@@ -1,14 +1,16 @@
 <%- test_folder = defined?(RSpec) ? 'spec' : 'test' -%>
 Gossiper.configure do |config|
-  # Change the default user class
-  config.default_notification_user_class = 'User'
 
   # change the default class of the configurations
   config.default_notification_config_class = 'Gossiper::EmailConfig'
 
-  # email the email sender
+  # the email sender
   config.default_from = 'from@example.com'
 
+  # the default reply to
+  # when not present, it defaults to the same email addres ass the default_from
+  # config.default_reply_to = 'reply@example.com'
+
   # The list of emails to send copies to
   # config.default_cc   = ['user@example.com']
 

data/lib/generators/gossiper/notification_type/templates/notification_type.rb

@@ -1,13 +1,19 @@
 module Notifications
   class <%= class_name %>Notification < Gossiper::EmailConfig
 
-    # def to
+    # def initialize(notification)
     # end
 
-    # def bcc
+    # def from
     # end
 
-    # def from
+    # def reply_to
+    # end
+
+    # def to
+    # end
+
+    # def bcc
     # end
 
     # def cc
@@ -21,12 +27,17 @@ module Notifications
 
     # def subject
     # end
+    #
+    # def subject_variables
+    # {}
+    # end
 
     # def attachments
+    #   {}
     # end
 
     # def instance_variables
+    #   {}
     # end
-
   end
 end

data/lib/gossiper/configuration.rb

@@ -19,6 +19,7 @@ module Gossiper
     attribute :default_notification_user_class
     attribute :default_notification_config_class
     attribute :default_from
+    attribute :default_reply_to
     attribute :default_cc
     attribute :default_bcc
 

data/lib/gossiper/email_config.rb

@@ -4,13 +4,17 @@ module Gossiper
 
     def initialize(notification)
       @notification = notification
-      @user         = notification.user
+      @user = notification.user rescue nil
     end
 
     def from
       config.default_from
     end
 
+    def reply_to
+      config.default_reply_to.presence || config.default_from
+    end
+
     def to
       if user.respond_to?(:name)
         ["#{user.name} <#{user.email}>"]
@@ -36,7 +40,7 @@ module Gossiper
     end
 
     def subject
-      I18n.t("gossiper.notifications.#{notification.kind}.subject")
+      I18n.t("gossiper.notifications.#{notification.kind}.subject", subject_variables)
     end
 
     def attachments
@@ -47,6 +51,10 @@ module Gossiper
       {}
     end
 
+    def subject_variables
+      {}
+    end
+
     private
       def config
         Gossiper.configuration

data/lib/gossiper/mailer.rb

@@ -2,7 +2,7 @@ module Gossiper
   class Mailer < ActionMailer::Base
 
     def mail_for(notification)
-      config = config_for(notification)
+      config = notification.config
 
       config.attachments.each do |filename, file|
         attachments[filename] = file
@@ -15,25 +15,16 @@ module Gossiper
       end
 
       mail(
-        from:    config.from,
-        to:      config.to,
-        cc:      config.cc,
-        bcc:     config.bcc,
+        from:     config.from,
+        reply_to: config.reply_to,
+        to:       config.to,
+        cc:       config.cc,
+        bcc:      config.bcc,
         subject: config.subject,
         template_name: config.template_name,
         template_path: config.template_path
       )
     end
 
-    def config_for(notification)
-      begin
-        klass = "Notifications::#{notification.kind.classify}Notification"
-        klass.constantize.new(notification)
-      rescue NameError
-        klass = Gossiper.configuration.default_notification_config_class
-        klass.constantize.new(notification)
-      end
-
-    end
   end
 end

data/lib/gossiper/version.rb

@@ -1,3 +1,3 @@
 module Gossiper
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gossiper
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Marcelo Jacobus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -124,7 +124,6 @@ files:
 - app/assets/stylesheets/gossiper/application.css
 - app/assets/stylesheets/gossiper/notifications.css
 - app/helpers/gossiper/notifications_helper.rb
-- app/helpers/gossiper/application_helper.rb
 - app/models/gossiper/notification.rb
 - app/views/layouts/gossiper/application.html.erb
 - app/views/kaminari/_gap.html.erb

data/app/helpers/gossiper/application_helper.rb

@@ -1,4 +0,0 @@
-module Gossiper
-  module ApplicationHelper
-  end
-end