georgia_mailer 0.1.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aafa57ea78d8babbab38651552c658541092a45
-  data.tar.gz: f7d0608941ff2db9476c12ec484d19358126ce19
+  metadata.gz: 7f893d6dbc6b8bac397826c8a7dbf28b15423b8e
+  data.tar.gz: a76f6eb928d97f65df463684027791dcee62bfe4
 SHA512:
-  metadata.gz: 0fe796c554d3f1c6e1113cc46786141f2cf58c37d56d0d7c2cd3c56d6aec271900044d91d5d64b587745eab5f22d5482ac247ce538ff46dd35b6dc3ccb5db5a5
-  data.tar.gz: 970f5f117b2f7c3350888beb19b78ce2979964b08156b19b62cf4d049e136ac9e58b2eb16b0ec6bb9f70cd6b51c0cea433f5a899156c7b7142bad63aa41601c0
+  metadata.gz: 594e8787b0b2350a5390020e488716beb50bb140afeff5ab4364ebae6a49026c512c4ed33209bc65bb6f6b8df5674903bace4f4ed89cbfb768edc492ce31328d
+  data.tar.gz: 9e64674780aeaf658e8576ff4bcb71b5eb07dba10bc2bb840bcb1fa7cab964f5968032e13a5fc1fde9ce384ef429bdc61009996f84af96b30401df49fe42771d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Motion Eleven
+Copyright (c) 2012-2014
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -10,21 +10,13 @@ The install generator will add missing migrations and automatically migrate your
 If you selected ElasticSearch as your indexer with Tire, your index will be created.
 Finally, it will mount the engine in your routes.rb file under '/mailer'
 
-    rails generate georgia_mailer:install
+    rails generate georgia:mailer:install
 
 ### Heroku
 
-Add Redis addon for Sidekiq
+Generate Georgia::Mailer::Message index:
 
-    heroku addons:add redistogo
-
-Generate GeorgiaMailer::Message index:
-
-    heroku run rake environment tire:import CLASS=GeorgiaMailer::Message FORCE=true
-
-Add sidekiq to your Procfile:
-
-    worker: bundle exec sidekiq
+    heroku run rake environment georgia:mailer:create_indices
 
 ### Spam filtering
 

data/app/assets/javascripts/georgia_mailer/components/message_table.js.coffee

@@ -1,36 +1,49 @@
-class @MessagesTable
-
-  constructor: (element) ->
-    @element          = $(element)
-    @checkboxes       = @element.find("input:checkbox")
-    @deleteBtn        = @element.find('.js-delete')
-    @spamBtn          = @element.find('.js-spam')
-    @hamBtn           = @element.find('.js-ham')
+class @MessagesTable extends @Table
+
+  constructor: (element, checkboxable) ->
+    super(element, checkboxable)
+    @deleteBtn  = @element.find('.js-delete')
+    @spamBtn    = @element.find('.js-spam')
+    @hamBtn     = @element.find('.js-ham')
     @setBindings()
 
   setBindings: () =>
-    @checkboxes.on('change', @update)
     @deleteBtn.on('click', @delete)
     @spamBtn.on('click', @spam)
     @hamBtn.on('click', @ham)
 
-  update: () =>
-    if @getChecked().length then @enableActions() else @disableActions()
-
   delete: (event) =>
     @stopEvent(event)
     $.ajax(
       url: "/admin/messages/#{@getIds()}"
       type: 'DELETE'
-    )
+      dataType: "JSON"
+      success: @removeMessages
+    ).always(@notify)
 
-  spam: (event) ->
+  spam: (event) =>
     @stopEvent(event)
-    # TODO: send event to controller
+    $.ajax(
+      type: "POST"
+      dataType: "JSON"
+      url: "/admin/messages/#{@getIds()}/spam"
+      success: @removeMessages
+    ).always(@notify)
 
-  ham: (event) ->
+  ham: (event) =>
     @stopEvent(event)
-    # TODO: send event to controller
+    $.ajax(
+      type: "POST"
+      dataType: "JSON"
+      url: "/admin/messages/#{@getIds()}/ham"
+      success: @removeMessages
+    ).always(@notify)
+
+  removeMessages: () =>
+    $.each @getIds(), (i, message_id) => @removeMessage(message_id)
+
+  removeMessage: (message_id) ->
+    $("tr#message_#{message_id}").remove();
 
   enableActions: () =>
     @spamBtn.removeClass('disabled').addClass('btn-warning')
@@ -42,17 +55,10 @@ class @MessagesTable
     @hamBtn.addClass('disabled').removeClass('btn-warning')
     @deleteBtn.addClass('disabled').removeClass('btn-danger')
 
-  stopEvent: (event) ->
-    event.stopPropagation()
-    event.preventDefault()
-
-  getChecked: () => @element.find("input:checkbox:checked[data-checkbox='child']")
-  getId:      (c) => $(c).data('id')
-  getIds:     () => $.map(@getChecked(), (c) => @getId(c))
-
 $.fn.actsAsMessagesTable = () ->
   @each ->
-    new MessagesTable($(this))
+    checkboxable = new Checkboxable($(this))
+    new MessagesTable($(this), checkboxable)
 
 jQuery ->
   $("table.messages.js-checkboxable").each ->

data/app/assets/stylesheets/georgia_mailer/application.css.scss

@@ -1,3 +1,4 @@
 @import "settings/*";
 @import "mixins/*";
+@import "components/*";
 @import "modules/*";

data/app/assets/stylesheets/georgia_mailer/components/_button.scss

@@ -0,0 +1,4 @@
+#messages.georgia .btn-sm {
+  padding: 6px 9px;
+  margin-right: 10px;
+}

data/app/assets/stylesheets/georgia_mailer/{modules → components}/_message.scss

@@ -25,13 +25,10 @@
   border-top: 1px solid #cbcbcb;
   border-bottom: 1px solid #cbcbcb;
 }
-.message-status {
-  width: 1px;
-  border-right: 3px solid;
-  padding: 0 !important;
-  margin: 0;
-  &.spam { border-color: $red; }
-  &.clean { border-color: $green; }
+
+td.status {
+  &.spam { border-right: 3px solid $red; }
+  &.clean { border-right: 3px solid $green; }
 }
 
 .message-name span {

data/app/assets/stylesheets/georgia_mailer/modules/_categories.scss

@@ -0,0 +1,17 @@
+.inbox-categories {
+  border-top: 1px solid #ddd;
+  margin-top: 52px;
+  padding-top: 5px;
+}
+
+.inbox-category-link {
+  display: block;
+  padding: 5px 5px 5px 10px;
+  margin-top: 5px;
+  &.active {
+    font-weight: bold;
+    color: #FFF;
+    background-color: #2c3e50;
+    &:hover { text-decoration: none; }
+  }
+}

data/app/assets/stylesheets/georgia_mailer/modules/_messages.scss

@@ -0,0 +1,7 @@
+th.messages-destroy-spam {
+  text-align: center;
+  a {
+    font-weight: normal;
+    font-size: 0.9em;
+  }
+}

data/app/controllers/georgia/mailer/messages_controller.rb

@@ -0,0 +1,38 @@
+module Georgia
+  module Mailer
+    class MessagesController < ::ApplicationController
+
+      def create
+        @message = Message.new(message_params)
+        if @message.save
+          Georgia::CreateActivity.new(@message, :create).call
+          EmailDeliveryWorker.new.async.later(60, @message.id)
+          SpamWorker.new.async.perform(@message.id)
+          respond_to do |format|
+            format.html { redirect_to :back, notice: 'Message delivered successfully' }
+            format.js   { render layout: false }
+          end
+        else
+          respond_to do |format|
+            format.html { redirect_to :back, alert: 'Oups. Something went wrong.' }
+            format.js   { render layout: false }
+          end
+        end
+      end
+
+      private
+
+      def message_params
+        @message_params = {}
+        params[:message].each do |key, value|
+          @message_params[key] = value.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+        end
+        @message_params[:referrer] = request.referrer
+        @message_params[:user_ip] = request.remote_ip
+        @message_params[:user_agent] = request.user_agent
+        @message_params
+      end
+
+    end
+  end
+end

data/app/controllers/georgia/messages_controller.rb

@@ -1,63 +1,78 @@
 module Georgia
-  class MessagesController < ::Georgia::ApplicationController
+  class MessagesController < Georgia::ApplicationController
 
-    load_and_authorize_resource class: GeorgiaMailer::Message
-
-    before_filter :prepare_search, only: [:search, :show, :spam, :ham]
 
+    def show
+      begin
+        @message = Georgia::Mailer::Message.find(params[:id]).decorate
+        authorize @message
+      rescue ActiveRecord::RecordNotFound
+        authorize Georgia::Mailer::Message
+        redirect_to search_messages_path, alert: 'This message could not be found.'
+      end
+    end
 
     def index
+      authorize Georgia::Mailer::Message
       redirect_to georgia.search_messages_path
     end
 
     def search
+      authorize Georgia::Mailer::Message
+      search_definition = Georgia::Mailer::MessageSearch.new(params).definition
+      @search = Georgia::Mailer::Message.search(search_definition).page(params[:page])
+      @messages = Georgia::Mailer::MessageDecorator.decorate_collection(@search.records)
     end
 
-    # Destroy multiple assets
     def destroy
-      ids = params[:id].split(',')
-      if @messages = GeorgiaMailer::Message.destroy(ids)
-        respond_to do |format|
-          format.html {
-            redirect_to georgia.search_messages_path, notice: 'Messages successfully deleted.'
-          }
-          format.js { render layout: false }
-        end
+      set_messages
+      authorize @messages
+      messages_count = @messages.length
+      if @messages.destroy_all
+        render_success("#{'Message'.pluralize(messages_count)} successfully deleted.")
       else
-        respond_to do |format|
-          format.html {redirect_to georgia.search_messages_path, alert: 'Oups. Something went wrong.'}
-          format.js {head :internal_server_error}
-        end
+        render_error('Oups. Something went wrong.')
       end
     end
 
-    def show
-      @message = GeorgiaMailer::Message.find(params[:id]).decorate
+    def destroy_all_spam
+      authorize Georgia::Mailer::Message
+      Georgia::Mailer::DestroyAllSpamWorker.new.async.perform
+      redirect_to search_messages_path(s: true), notice: 'Busy purging all spam messages.'
     end
 
     def spam
-      @message = GeorgiaMailer::Message.find(params[:id])
-      if @message.spam!
-        @message.update_attribute(:spam, true)
-        redirect_to :back, notice: 'Message successfully marked as spam.'
-      else
-        redirect_to :back, alert: 'Oups. Something went wrong.'
+      set_messages
+      authorize @messages
+      begin
+        if !@messages.map(&:report_spam).include?(false)
+          render_success("#{'Message'.pluralize(@messages.length)} successfully reported as spam.")
+        else
+          render_error('Oups. Something went wrong.')
+        end
+      rescue Rakismet::Undefined => ex
+        render_error(ex.message)
       end
     end
 
     def ham
-      @message = GeorgiaMailer::Message.find(params[:id])
-      if @message.ham! == false
-        @message.update_attribute(:spam, false)
-        redirect_to :back, notice: 'Message successfully marked as ham.'
-      else
-        redirect_to :back, alert: 'Oups. Something went wrong.'
+      set_messages
+      authorize @messages
+      begin
+        if !@messages.map(&:move_to_inbox).include?(false)
+          render_success("#{'Message'.pluralize(@messages.length)} successfully moved to your inbox.")
+        else
+          render_error('Oups. Something went wrong.')
+        end
+      rescue => ex
+        render_error(ex.message)
       end
     end
 
     def resend_notification
-      @message = GeorgiaMailer::Message.find(params[:id])
-      if GeorgiaMailer::Notifier.new_message_notification(@message, message_path(@message, only_path: false)).deliver
+      @message = Georgia::Mailer::Message.find(params[:id])
+      authorize @message
+      if Georgia::Mailer::Notifier.new_message_notification(@message).deliver
         redirect_to :back, notice: 'Notification successfully sent.'
       else
         redirect_to :back, alert: 'Oups. Something went wrong. Message could not be delivered.'
@@ -66,9 +81,29 @@ module Georgia
 
     private
 
-    def prepare_search
-      @search = ::Georgia::Indexer.search(GeorgiaMailer::Message, params)
-      @messages = GeorgiaMailer::MessageDecorator.decorate_collection(@search.results)
+    def set_messages
+      ids = params[:id].split(',')
+      @messages = Georgia::Mailer::Message.where(id: ids)
+    end
+
+    def render_success success_message
+      @status_message = success_message
+      @status = :notice
+      respond_to do |format|
+        format.html { redirect_to :back, notice: @status_message }
+        format.js   { render layout: false }
+        format.json { render json: { ids: @messages.map(&:id), message: @status_message, status: @status } }
+      end
+    end
+
+    def render_error error_message
+      @status_message = error_message
+      @status = :alert
+      respond_to do |format|
+        format.html { redirect_to :back, alert: @status_message }
+        format.js   { render layout: false }
+        format.json { render json: { message: @status_message, status: @status } }
+      end
     end
 
   end

data/app/decorators/georgia/mailer/message_decorator.rb

@@ -0,0 +1,23 @@
+module Georgia
+  module Mailer
+    class MessageDecorator < ::Georgia::ApplicationDecorator
+
+      def phone_or_none
+        phone.present? ? phone : h.content_tag(:span, 'no phone', class: 'muted')
+      end
+
+      def subject_truncated
+        h.truncate(h.strip_tags(subject), length: 60, separator: ' ').html_safe if subject.present?
+      end
+
+      def message_truncated
+        h.truncate(h.strip_tags(message), length: 200, separator: ' ').html_safe if message.present?
+      end
+
+      def name_or_anonymous
+        name || 'Anonymous'
+      end
+
+    end
+  end
+end

data/app/helpers/georgia/messages_helper.rb

@@ -2,7 +2,7 @@ module Georgia
   module MessagesHelper
 
     def message_actions_list(message)
-      GeorgiaMailer::MessageActionsPresenter.new(self, message)
+      Mailer::MessageActionsPresenter.new(self, message)
     end
 
   end

data/app/mailers/georgia/mailer/notifier.rb

@@ -0,0 +1,20 @@
+module Georgia
+  module Mailer
+    class Notifier < ActionMailer::Base
+
+      def new_message_notification(message)
+        @message = MessageDecorator.decorate(message)
+        emails_to = Georgia::User.where(receives_notifications: true).map(&:email)
+        unless emails_to.empty?
+          mail(
+            from: "noreply@georgiacms.org",
+            to: "noreply@georgiacms.org",
+            bcc: emails_to,
+            subject: "New message from #{Georgia.title}"
+            )
+        end
+      end
+
+    end
+  end
+end

data/app/models/georgia/mailer/message.rb

@@ -0,0 +1,54 @@
+module Georgia
+  module Mailer
+    class Message < ActiveRecord::Base
+
+      include Elasticsearch::Model
+      include Elasticsearch::Model::Callbacks
+
+      include PublicActivity::Common
+
+      delegate :url, :current_path, :size, :content_type, :filename, to: :attachment
+
+      validates :name, presence: true
+      validates :email, format: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
+      validates :message, presence: true
+
+      mount_uploader :attachment, Ckeditor::AttachmentFileUploader
+
+      # Anti Spam: check https://github.com/joshfrench/rakismet for more details
+      include Rakismet::Model
+      rakismet_attrs author: :name, author_email: :email, content: :message, comment_type: 'message'
+      # attr_accessible :user_ip, :user_agent, :referrer, :spam, :verified_at
+      attr_accessor :permalink, :author_url
+
+      scope :spam, -> { where(spam: true) }
+      scope :ham, -> { where(spam: false) }
+      scope :latest, -> { order("created_at DESC") }
+
+      def status
+        @status ||= spam ? 'spam' : 'clean'
+      end
+
+      def report_spam
+        if self.spam!
+          self.update_attribute(:spam, true)
+        else
+          false
+        end
+      end
+
+      def move_to_inbox
+        if !self.ham!
+          self.update_attribute(:spam, false)
+        else
+          false
+        end
+      end
+
+      def self.policy_class
+        Georgia::Mailer::MailerPolicy
+      end
+
+    end
+  end
+end