gossiper 0.3.8 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d578f1c535eaaeb002558c0bc74a6592a8e22a
-  data.tar.gz: e995e9d05e66af43cb77b139800cdb6beeca455d
+  metadata.gz: 7b1840e880a934d5e464bbfb8a29f8f322242ff6
+  data.tar.gz: 3b4ad03f0c2dcd0de1f3977b7c22e4e6747d4192
 SHA512:
-  metadata.gz: 61111ed23a1ecc731148d0b843a539b98b1df9252f97f464bcc960daaf0e6361b9e3c7087db2e1a4ed86b3dde6489a69444ad745b1962127a16ad1564dace9c2
-  data.tar.gz: f1352ee94b7709766a79c986888e6d1d97faca01c30fd40da80a7045f416b412b9162b71f12a4e69fc3c1848ca55eacdf591ae9867e4a55d83f36b61ee15ac36
+  metadata.gz: 54904a932f3d326ef56a4882a7c296b867e1131b9a5a9d29b02b02afcf14a21e150c11a52a35751a7b5827dcd763f2580e9abacdc2ac0db9bf5c1a426dc5fed4
+  data.tar.gz: 02a77e375098867dfee87355f3d8ff9c683983264f2fdc5f49ff93b839a1ec744de3884993591b3318f9ef44a77a18f4099248287958b2c0ea721acee9bfafa2

data/app/controllers/gossiper/notifications_controller.rb

@@ -10,7 +10,7 @@ module Gossiper
     end
 
     def show
-      respond_with(notification)
+      respond_with(notification, location: :notifications)
     end
 
     def deliver

data/app/views/gossiper/notifications/index.html.erb

@@ -17,7 +17,7 @@
     <% decorator = Gossiper::NotificationDecorator.new(notification) %>
     <tr>
       <td><%= decorator.kind %></td>
-      <td><%= decorator.user.email %></td>
+      <td><%= decorator.to %></td>
       <td><%= decorator.delivered_at %></td>
       <td><%= decorator.status %></td>
       <td><%= decorator.read? %></td>
@@ -31,7 +31,7 @@
           },
           class: 'btn pull-right'
         ) %>
-        <%= link_to(t('.show', default: t('gossiper.notifications.show')), notification, class: 'btn pull-right') %>
+        <%= link_to(t('.show', default: t('gossiper.notifications.show')), notification_path(notification), class: 'btn pull-right') %>
       </td>
     </tr>
   <% end %>

data/app/views/gossiper/notifications/show.html.erb

@@ -12,7 +12,7 @@
 
     <tr>
       <th class="title"><%= Gossiper::Notification.human_attribute_name('email_body') rescue t("email_body") %></th>
-      <td><pre><%= decorator.email_object %></pre></td>
+      <td><%= decorator.email_object.encoded.html_safe %></td>
     </tr>
 
 </table>

data/db/migrate/20140304100755_add_type_to_notifications.rb

@@ -0,0 +1,5 @@
+class AddTypeToNotifications < ActiveRecord::Migration
+  def change
+    add_column :notifications, :type, :string
+  end
+end

data/db/migrate/20140304111323_add_to_to_gossiper_notifications.rb

@@ -0,0 +1,5 @@
+class AddToToGossiperNotifications < ActiveRecord::Migration
+  def change
+    add_column :gossiper_notifications, :to, :text
+  end
+end

data/db/migrate/20140304131816_remove_kind_from_gossiper_notifications.rb

@@ -0,0 +1,10 @@
+class RemoveKindFromGossiperNotifications < ActiveRecord::Migration
+  def up
+    remove_column :gossiper_notifications, :kind
+  end
+
+  def down
+    add_column :notifications, :type, :string
+  end
+
+end

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

@@ -1,8 +1,7 @@
 module Notifications
-  class <%= class_name %>Notification < Gossiper::EmailConfig
-
-    # def initialize(notification)
-    # end
+  class <%= class_name %>Notification < Gossiper::Notification
+    # uncomment the below line to require user and enable user notifications
+    # require_user
 
     # def from
     # end

data/lib/gossiper/concerns/decorators/notification.rb

@@ -21,15 +21,15 @@ module Gossiper
         end
 
         def kind
-          t("gossiper.notifications.#{notification.kind}.title",
-            default: notification.kind.titleize
-           )
+          t("gossiper.notifications.#{notification.type.underscore}.title",
+            default: notification.type.titleize
+          )
         end
 
         def subject
-          t("gossiper.notifications.#{notification.kind}.subject",
+          t("gossiper.notifications.#{notification.type.underscore}.subject",
             default: kind
-           )
+          )
         end
 
         def status
@@ -41,9 +41,8 @@ module Gossiper
         end
 
         def email
-          notification.user.email
+          notification.to
         end
-        alias_method :to, :email
 
         def delivered_at
           decorate_date(notification.delivered_at)

data/lib/gossiper/concerns/models/email_settings.rb

@@ -0,0 +1,64 @@
+module Gossiper
+  module Concerns
+    module Models
+      module EmailSettings
+        extend ActiveSupport::Concern
+
+        def from
+          config.default_from
+        end
+
+        def reply_to
+          config.default_reply_to.presence || config.default_from
+        end
+
+        def bcc
+          config.default_bcc
+        end
+
+        def cc
+          config.default_cc
+        end
+
+        def template_name
+          type.underscore
+        end
+
+        def template_path
+          ''
+        end
+
+        def subject
+          I18n.t("gossiper.notifications.#{type.underscore}.subject", subject_variables)
+        end
+
+        def attachments
+          {}
+        end
+
+        def instance_variables
+          {}
+        end
+
+        def subject_variables
+          {}
+        end
+
+        def deliver
+          mail.deliver
+          update_delivered_at!
+        end
+
+        def deliver!
+          mail.deliver!
+          update_delivered_at!
+        end
+
+        def config
+          Gossiper.configuration
+        end
+
+      end
+    end
+  end
+end

data/lib/gossiper/concerns/models/notification.rb

@@ -7,8 +7,8 @@ module Gossiper
         STATUSES = %w(pending delivered)
 
         included do
+          include Gossiper::Concerns::Models::EmailSettings
           serialize :data, JSON
-          validates :kind, presence: true
           belongs_to :user, polymorphic: true
         end
 
@@ -20,25 +20,6 @@ module Gossiper
           read_attribute(:data).presence || {}
         end
 
-        def deliver
-          mail.deliver
-          update_delivered_at!
-        end
-
-        def deliver!
-          mail.deliver!
-          update_delivered_at!
-        end
-
-        def kind=(value)
-          value = value.present? ? value.parameterize.underscore : nil
-          write_attribute(:kind, value)
-        end
-
-        def config
-          ClassResolver.new.resolve(kind).constantize.new(self)
-        end
-
         def method_missing(method, *args, &block)
           STATUSES.each do |status|
             if method.to_s == "#{status}?"
@@ -48,10 +29,17 @@ module Gossiper
           super(method, *args, &block)
         end
 
-        protected
-          def mail
-            Gossiper::Mailer.mail_for(self)
+        module ClassMethods
+          def require_user
+            include Gossiper::Concerns::Models::UserNotification
           end
+        end
+
+        def mail
+          Gossiper::Mailer.mail_for(self)
+        end
+
+        private
 
           def update_delivered_at!
             self.delivered_at = Time.now

data/lib/gossiper/concerns/models/user_notification.rb

@@ -0,0 +1,24 @@
+module Gossiper
+  module Concerns
+    module Models
+      module UserNotification
+        extend ActiveSupport::Concern
+
+        included do
+          validates :user, presence: true
+        end
+
+        def to
+          if user.present?
+            if user.respond_to?(:name) && user.name.present?
+              "#{user.name} <#{user.email}>"
+            else
+              user.email
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/gossiper/mailer.rb

@@ -2,14 +2,14 @@ module Gossiper
   class Mailer < ActionMailer::Base
 
     def mail_for(notification)
-      config = notification.config
+      @notification = NotificationDecorator.new(notification)
+
+      config = notification
 
       config.attachments.each do |filename, file|
         attachments[filename] = file
       end
 
-      @notification = NotificationDecorator.new(notification)
-
       config.instance_variables.each do |name, value|
         instance_variable_set("@#{name}", value)
       end

data/lib/gossiper/version.rb

@@ -1,3 +1,3 @@
 module Gossiper
-  VERSION = "0.3.8"
+  VERSION = "0.5.0"
 end

data/lib/gossiper.rb

@@ -1,7 +1,8 @@
 require "gossiper/engine"
 require "gossiper/concerns/models/notification"
+require "gossiper/concerns/models/user_notification"
+require "gossiper/concerns/models/email_settings"
 require "gossiper/concerns/decorators/notification"
-require "gossiper/email_config"
 require "gossiper/mailer"
 require "gossiper/configuration"
 require "gossiper/notification_decorator"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gossiper
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.5.0
 platform: ruby
 authors:
 - Marcelo Jacobus
@@ -203,8 +203,11 @@ files:
 - app/controllers/gossiper/application_controller.rb
 - config/routes.rb
 - config/locales/en.bootstrap.yml
+- db/migrate/20140304131816_remove_kind_from_gossiper_notifications.rb
+- db/migrate/20140304111323_add_to_to_gossiper_notifications.rb
 - db/migrate/20131206162038_create_gossiper_notifications.rb
 - db/migrate/20131214081503_add_data_to_notifications.rb
+- db/migrate/20140304100755_add_type_to_notifications.rb
 - lib/generators/gossiper/notification_type/USAGE
 - lib/generators/gossiper/notification_type/notification_type_generator.rb
 - lib/generators/gossiper/notification_type/templates/notification_type_spec.rb
@@ -217,10 +220,11 @@ files:
 - lib/generators/gossiper/install/templates/locale.en.yml
 - lib/gossiper.rb
 - lib/tasks/gossiper_tasks.rake
-- lib/gossiper/email_config.rb
 - lib/gossiper/engine.rb
 - lib/gossiper/concerns/decorators/notification.rb
+- lib/gossiper/concerns/models/email_settings.rb
 - lib/gossiper/concerns/models/notification.rb
+- lib/gossiper/concerns/models/user_notification.rb
 - lib/gossiper/mailer.rb
 - lib/gossiper/class_resolver.rb
 - lib/gossiper/notification_decorator.rb

data/lib/gossiper/email_config.rb

@@ -1,63 +0,0 @@
-module Gossiper
-  class EmailConfig
-    attr_reader :notification, :user
-
-    def initialize(notification)
-      @notification = notification
-      @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}>"]
-      else
-        [user.email]
-      end
-    end
-
-    def bcc
-      config.default_bcc
-    end
-
-    def cc
-      config.default_cc
-    end
-
-    def template_name
-      "#{notification.kind}_notification"
-    end
-
-    def template_path
-      'notifications'
-    end
-
-    def subject
-      I18n.t("gossiper.notifications.#{notification.kind}.subject", subject_variables)
-    end
-
-    def attachments
-      {}
-    end
-
-    def instance_variables
-      {}
-    end
-
-    def subject_variables
-      {}
-    end
-
-    private
-      def config
-        Gossiper.configuration
-      end
-  end
-end