georgia_mailer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4faad27e6208514d3e840eb69e4ff5d5044a2d4f
-  data.tar.gz: 169e7f7f479f689915d0ceea5ecf2c38f0823182
+  metadata.gz: 6aafa57ea78d8babbab38651552c658541092a45
+  data.tar.gz: f7d0608941ff2db9476c12ec484d19358126ce19
 SHA512:
-  metadata.gz: ec6f19b865de5c131c082a848cca03d95fc1b1a30c19dd5e0849b20c3cdbe415e7006a272fff3d422bc32ece89513e3f1e85a0955322ba9e8ed3f332d265e4b4
-  data.tar.gz: 3826207368f8fd607caf5c8b2d6165968083143dbbcb5a64a9bf4b79f99e94e33ed4590c85448f095c0baaab5bfd79f2c1aac2797f5563506487eaa2f0da1019
+  metadata.gz: 0fe796c554d3f1c6e1113cc46786141f2cf58c37d56d0d7c2cd3c56d6aec271900044d91d5d64b587745eab5f22d5482ac247ce538ff46dd35b6dc3ccb5db5a5
+  data.tar.gz: 970f5f117b2f7c3350888beb19b78ce2979964b08156b19b62cf4d049e136ac9e58b2eb16b0ec6bb9f70cd6b51c0cea433f5a899156c7b7142bad63aa41601c0

data/app/controllers/georgia/messages_controller.rb

@@ -67,8 +67,8 @@ module Georgia
     private
 
     def prepare_search
-      @results = ::Georgia::Indexer.search(GeorgiaMailer::Message, params)
-      @messages = GeorgiaMailer::MessageDecorator.decorate_collection(@results)
+      @search = ::Georgia::Indexer.search(GeorgiaMailer::Message, params)
+      @messages = GeorgiaMailer::MessageDecorator.decorate_collection(@search.results)
     end
 
   end

data/app/controllers/georgia_mailer/messages_controller.rb

@@ -1,11 +1,11 @@
 module GeorgiaMailer
   class MessagesController < ::ApplicationController
 
-    # Convenient method to create and check for spam
     def create
-      @message = GeorgiaMailer::Message.new(message_params)
+      @message = Message.new(message_params)
       if @message.save
-        SpamWorker.perform_async(@message.id)
+        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 }
@@ -23,7 +23,7 @@ module GeorgiaMailer
     def message_params
       @message_params = {}
       params[:message].each do |key, value|
-        @message_params[key] = value.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+        @message_params[key] = value.force_encoding('UTF-8')
       end
       @message_params[:referrer] = request.referrer
       @message_params[:user_ip] = request.remote_ip

data/app/mailers/georgia_mailer/notifier.rb

@@ -6,8 +6,8 @@ module GeorgiaMailer
       emails_to = Georgia::User.admins.map(&:email)
       unless emails_to.empty?
         mail(
-          from: "georgia@motioneleven.com",
-          to: "noreply@motioneleven.com",
+          from: "noreply@georgiacms.com",
+          to: "noreply@georgiacms.com",
           bcc: emails_to,
           subject: "New message from #{Georgia.title}"
           )

data/app/models/georgia_mailer/message.rb

@@ -12,7 +12,7 @@ module GeorgiaMailer
     validates :email, format: /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
     validates :message, presence: true
 
-    mount_uploader :attachment, Georgia::AttachmentUploader
+    mount_uploader :attachment, Ckeditor::AttachmentFileUploader
 
     # Anti Spam: check https://github.com/joshfrench/rakismet for more details
     include Rakismet::Model

data/app/services/georgia_mailer/spam_check.rb

@@ -0,0 +1,17 @@
+module GeorgiaMailer
+  class SpamCheck
+
+    def initialize message
+      @message = message
+    end
+
+    # The .spam? method comes from Rakismet. It gathers the necessary information and
+    #   and calls Akismet for a spam check. It returns true or false based on the status
+    #
+    # https://github.com/joshfrench/rakismet/blob/master/lib/rakismet/model.rb
+    def call
+      @message.spam?
+    end
+
+  end
+end

data/app/views/georgia/messages/show.html.erb

@@ -25,9 +25,7 @@
         <%= message_actions_list(@message) %>
       </ul>
     </div>
-    <strong>
-      <%= @message.name_or_anonymous %>
-    </strong>
+    <strong><%= @message.name_or_anonymous %></strong>
     <span>&lt;<%= @message.email %>&gt;</span>
     <span>on <%= @message.created_at.strftime('%F %H:%M') %></span>
     <span>sent from <%= link_to @message.referrer, @message.referrer %></span>
@@ -42,9 +40,9 @@
     <p>
       <b>Attachment</b>:
       <% if @message.attachment.try(:file) and @message.attachment.file.exists? %>
-      <%= link_to @message.attachment.file.filename, @message.attachment.url %>
+        <%= link_to @message.attachment.file.filename, @message.attachment.url %>
       <% else -%>
-      <span class='muted'>There were no attachment.</span>
+        <span class='muted'>There were no attachments.</span>
       <% end -%>
     </p>
   </div>

data/app/views/georgia_mailer/notifier/new_message_notification.html.erb

@@ -40,29 +40,14 @@ a {
   color: #FFF;
   background-color: #348eda;
   border:solid #348eda;
-  border-width:10px 20px;
+  border-width: 5px 20px;
   line-height:2;
   font-weight:bold;
   margin-right:10px;
   text-align:center;
   cursor:pointer;
   display: inline-block;
-  border-radius: 25px;
-}
-
-.btn-secondary {
-  text-decoration:none;
-  color: #FFF;
-  background-color: #aaa;
-  border:solid #aaa;
-  border-width:10px 20px;
-  line-height:2;
-  font-weight:bold;
-  margin-right:10px;
-  text-align:center;
-  cursor:pointer;
-  display: inline-block;
-  border-radius: 25px;
+  border-radius: 5px;
 }
 
 .last {
@@ -189,11 +174,10 @@ ul li, ol li {
           <td>
             <p>Hi there,</p>
             <p>You've received a new message on Georgia CMS from <%= @message.name_or_anonymous %></p>
-            <h1><%= @message.subject %></h1>
+            <% if @message.subject.present? %><h1><%= @message.subject %></h1><% end %>
             <p><%= @message.message %></p>
-            <% if @message.phone.present? %>
-              <p><%= @message.phone %></p>
-            <% end -%>
+            <% if @message.phone.present? %><p><%= @message.phone %></p><% end -%>
+            <p><a href="<%= georgia.message_path(@message, only_path: false) %>" class='btn-primary'>Have a closer look</a></p>
             <p>Thanks, have a lovely day.</p>
           </td>
         </tr>

data/app/workers/georgia_mailer/email_delivery_worker.rb

@@ -0,0 +1,19 @@
+module GeorgiaMailer
+  class EmailDeliveryWorker
+    include SuckerPunch::Job
+
+    def perform(message_id)
+      ActiveRecord::Base.connection_pool.with_connection do
+        message = Message.find(message_id)
+        unless message.spam or !GeorgiaMailer.turn_on_email_notifications
+          Notifier.new_message_notification(message).deliver
+        end
+      end
+    end
+
+    def later(sec, message_id)
+      after(sec) { perform(message_id) }
+    end
+
+  end
+end

data/app/workers/georgia_mailer/spam_worker.rb

@@ -1,17 +1,16 @@
 module GeorgiaMailer
   class SpamWorker
-    include Sidekiq::Worker
+    include SuckerPunch::Job
 
     def perform(message_id)
-      begin
-        @message = GeorgiaMailer::Message.find(message_id)
-        is_spam = @message.spam?
-        @message.update_attributes(spam: is_spam, verified_at: Time.zone.now)
-        unless @message.spam or !GeorgiaMailer.turn_on_email_notifications
-          GeorgiaMailer::Notifier.new_message_notification(@message).deliver
+      ActiveRecord::Base.connection_pool.with_connection do
+        begin
+          message = Message.find(message_id)
+          is_spam = SpamCheck.new(message).call
+          message.update_attributes(spam: is_spam, verified_at: Time.zone.now)
+        rescue ActiveRecord::RecordNotFound
+          Rails.logger.info "Message with ID #{message_id} was destroy before it could be processed"
         end
-      rescue ActiveRecord::RecordNotFound
-        Rails.logger.info "Message with ID #{message_id} was destroy before it could be processed"
       end
     end
 

data/lib/georgia/indexer/extensions/solr_adapter/georgia_mailer/message.rb

@@ -34,7 +34,7 @@ module Georgia
               with(:spam, (params[:s] || 'clean'))
               order_by (params[:o] || :created_at), (params[:dir] || :desc)
               paginate(page: params[:page], per_page: (params[:per] || 25))
-            end.results
+            end
           end
 
         end

data/lib/georgia/indexer/extensions/tire_adapter/georgia_mailer/message.rb

@@ -36,7 +36,7 @@ module Georgia
                 end
               end
               sort { by (params[:o] || :created_at), (params[:dir] || :desc) } if params[:query].blank?
-            end.results
+            end
           end
 
         end

data/lib/georgia_mailer/engine.rb

@@ -4,7 +4,7 @@ module GeorgiaMailer
 
     require 'georgia'
     require 'rakismet'
-    require 'sidekiq'
+    require 'sucker_punch'
 
   end
 end

data/lib/georgia_mailer/version.rb

@@ -1,3 +1,3 @@
 module GeorgiaMailer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia_mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georgia
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: sucker_punch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -60,37 +60,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/georgia_mailer/components/message_table.js.coffee
-- app/assets/javascripts/georgia_mailer/application.js
-- app/assets/stylesheets/georgia_mailer/settings/_color.scss
-- app/assets/stylesheets/georgia_mailer/modules/_message.scss
-- app/assets/stylesheets/georgia_mailer/mixins/_ellipsis.scss
-- app/assets/stylesheets/georgia_mailer/application.css.scss
-- app/decorators/georgia_mailer/message_decorator.rb
-- app/models/georgia_mailer/message.rb
-- app/controllers/georgia/messages_controller.rb
 - app/controllers/georgia_mailer/messages_controller.rb
-- app/views/georgia/header/_messages.html.erb
-- app/views/georgia/messages/destroy.js.erb
-- app/views/georgia/messages/show.html.erb
-- app/views/georgia/messages/search.html.erb
-- app/views/georgia/georgia_mailer/messages/_message.html.erb
+- app/controllers/georgia/messages_controller.rb
 - app/views/georgia_mailer/messages/create.js.erb
 - app/views/georgia_mailer/notifier/new_message_notification.html.erb
+- app/views/georgia/georgia_mailer/messages/_message.html.erb
+- app/views/georgia/messages/destroy.js.erb
+- app/views/georgia/messages/search.html.erb
+- app/views/georgia/messages/show.html.erb
+- app/views/georgia/header/_messages.html.erb
+- app/workers/georgia_mailer/email_delivery_worker.rb
 - app/workers/georgia_mailer/spam_worker.rb
+- app/helpers/georgia/messages_helper.rb
+- app/assets/stylesheets/georgia_mailer/modules/_message.scss
+- app/assets/stylesheets/georgia_mailer/settings/_color.scss
+- app/assets/stylesheets/georgia_mailer/mixins/_ellipsis.scss
+- app/assets/stylesheets/georgia_mailer/application.css.scss
+- app/assets/javascripts/georgia_mailer/application.js
+- app/assets/javascripts/georgia_mailer/components/message_table.js.coffee
 - app/mailers/georgia_mailer/notifier.rb
+- app/models/georgia_mailer/message.rb
+- app/decorators/georgia_mailer/message_decorator.rb
 - app/presenters/georgia_mailer/message_actions_presenter.rb
-- app/helpers/georgia/messages_helper.rb
-- app/uploaders/georgia_mailer/attachment_uploader.rb
+- app/services/georgia_mailer/spam_check.rb
 - config/routes.rb
 - db/migrate/001_create_georgia_mailer_messages.rb
-- lib/tasks/georgia_mailer_tasks.rake
-- lib/generators/georgia_mailer/install/install_generator.rb
+- lib/georgia_mailer/version.rb
+- lib/georgia_mailer/engine.rb
 - lib/georgia_mailer.rb
+- lib/tasks/georgia_mailer_tasks.rake
 - lib/georgia/indexer/extensions/solr_adapter/georgia_mailer/message.rb
 - lib/georgia/indexer/extensions/tire_adapter/georgia_mailer/message.rb
-- lib/georgia_mailer/engine.rb
-- lib/georgia_mailer/version.rb
+- lib/generators/georgia_mailer/install/install_generator.rb
 - MIT-LICENSE
 - Rakefile
 - README.md

data/app/uploaders/georgia_mailer/attachment_uploader.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-module GeorgiaMailer
-  class AttachmentUploader < CarrierWave::Uploader::Base
-
-    storage :fog
-
-    def store_dir
-      "/attachments/#{model.id}"
-    end
-
-    def extension_white_list
-      ["doc", "docx", "xls", "odt", "ods", "pdf", "rar", "zip", "tar", "tar.gz"]
-    end
-
-  end
-end