ses-proxy 0.1.1 → 0.2.0

data/app/views/_search_form.haml

@@ -1,9 +1,10 @@
 %form.form-horizontal(data-ajax-url="#{@chart_url}" data-chart="chartdiv")
   %fieldset(style="text-align: left")
     %legend Search:
-  %div(style="display: inline-block;vertical-align: middle;")
-    %label Text
-    %input.span4(type="text" name="q" value="#{@q}" placeholder="Type something…")
+  -if @menu_item.eql? "mails" or @menu_item.eql? "bounced_mails"
+    %div(style="display: inline-block;vertical-align: middle;")
+      %label Text
+      %input.span4(type="text" name="q" value="#{@q}" placeholder="Type something…")
   %div.input-append.date(data-date="#{@s||Time.now.strftime('%d/%m/%Y')}" data-date-format="dd-mm-yyyy")
     %label From
     %input.span2(size="16" type="text" name="s" value="#{@s}" placeholder="dd-mm-yyyy")

data/app/views/layout.haml

@@ -15,6 +15,8 @@
           %ul.nav.nav-pills
             %li{:class => ('active' if @menu_item.eql? "mails")}
               %a(href="/") Sent Emails
+            %li{:class => ('active' if @menu_item.eql? "bounced_mails")}
+              %a(href="/bounced_mails") Bounced Emails
             %li{:class => ('active' if @menu_item.eql? "bounces")}
               %a(href="/bounces") Bounced Addresses
       = yield

data/app/views/mails.haml

@@ -1,4 +1,5 @@
-%h1.page-title(style="text-align: center; margin-bottom:20px;") Sent Emails
+%h1.page-title(style="text-align: center; margin-bottom:20px;")
+  = @page_title
 = haml :_search_form
 = haml :_chart
 %table.table.table-striped(style="table-layout:fixed")

data/app/web_panel.rb

@@ -39,6 +39,7 @@ get '/' do
   protected!
   @menu_item = "mails"
   @chart_url = "/mails.json"
+  @page_title = "Sent Emails"
   @per = params[:per] || 20
   mails = mails_query
   @mails = mails.page(params[:page]).per(@per)
@@ -49,7 +50,55 @@ get '/mails.json' do
   protected!
   mails = mails_query
   d_array = (string_to_date(@s)..string_to_date(@e)).to_a
-  data = get_data_json "Mails", mails, "created_at", d_array
+  recipients_number = SesProxy::RecipientsNumber.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
+  data = {}
+  grouped_collection = {}
+  filtered_rate_collection = {}
+  key_format = get_key_format d_array
+  data[:x] = make_formatted_array d_array, key_format
+  data[:y] ||= []
+  data[:x].each do |d|
+    grouped_collection[d] = mails.collect{|b| b if b.created_at.strftime(key_format).eql? d}.compact.size
+    filtered_rate_collection[d] = recipients_number.collect{|b| b.filtered if b.created_at.strftime(key_format).eql? d}.compact.sum.to_f
+  end
+  data[:y] << {:name=>"Mails",:data=>grouped_collection.values}
+  data[:y] << {:name=>"Sents",:data=>filtered_rate_collection.values}
+
+  content_type :json
+  data.to_json
+end
+
+get '/bounced_mails' do
+  protected!
+  @menu_item = "bounced_mails"
+  @chart_url = "/bounced_mails.json"
+  @page_title = "Bounced Emails"
+  @per = params[:per] || 20
+  mails = bounced_mails_query
+  @mails = mails.page(params[:page]).per(@per)
+  haml :mails
+end
+
+get '/bounced_mails.json' do
+  protected!
+  mails = bounced_mails_query
+  d_array = (string_to_date(@s)..string_to_date(@e)).to_a
+  recipients_number = SesProxy::RecipientsNumber.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
+  data = {}
+  grouped_collection = {}
+  bounced_rate_collection = {}
+  key_format = get_key_format d_array
+  data[:x] = make_formatted_array d_array, key_format
+  data[:y] ||= []
+  data[:x].each do |d|
+    grouped_collection[d] = mails.collect{|b| b if b.created_at.strftime(key_format).eql? d}.compact.size
+    original_size = recipients_number.collect{|b| b.original if b.created_at.strftime(key_format).eql? d}.compact.sum.to_f
+    filtered_size = recipients_number.collect{|b| b.filtered if b.created_at.strftime(key_format).eql? d}.compact.sum.to_f
+    bounced_rate_collection[d] = original_size - filtered_size
+  end
+  data[:y] << {:name=>"Mails",:data=>grouped_collection.values}
+  data[:y] << {:name=>"Bounced Sents",:data=>bounced_rate_collection.values}
+
   content_type :json
   data.to_json
 end
@@ -67,17 +116,39 @@ end
 get '/bounces.json' do
   protected!
   bounces = bounces_query
+  recipients_number = SesProxy::RecipientsNumber.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
   d_array = (string_to_date(@s)..string_to_date(@e)).to_a
-  data = get_data_json "Bounced", bounces, "created_at", d_array
+  data = {}
+  original_rate_collection = {}
+  filtered_rate_collection = {}
+  key_format = get_key_format d_array
+  data[:x] = make_formatted_array d_array, key_format
+  data[:y] ||= []
+  data[:x].each do |d|
+    bounces_size = bounces.collect{|b| b if b.created_at.strftime(key_format).eql? d}.compact.size.to_f
+    original_size = recipients_number.collect{|b| b.original if b.created_at.strftime(key_format).eql? d}.compact.sum.to_f
+    filtered_size = recipients_number.collect{|b| b.filtered if b.created_at.strftime(key_format).eql? d}.compact.sum.to_f
+    if original_size > 0
+      original_rate_collection[d] = (((bounces_size.to_f + original_size - filtered_size) / original_size) * 100).round(2)
+    else
+      original_rate_collection[d] = 0
+    end
+    if filtered_size > 0
+      filtered_rate_collection[d] = ((bounces_size.to_f / filtered_size) * 100).round(2)
+    else
+      filtered_rate_collection[d] = 0
+    end
+  end
+  data[:y] << {:name=>"Original Rate (%)",:data=>original_rate_collection.values}
+  data[:y] << {:name=>"Filtered Rate (%)",:data=>filtered_rate_collection.values}
+
   content_type :json
   data.to_json
 end
 
 private
 
-def get_data_json(name, collection, method, d_array)
-  data = {}
-  grouped_collection = {}
+def get_key_format(d_array)
   if d_array.size <= 30
     #days
     key_format = "%d/%m/%Y"
@@ -88,13 +159,11 @@ def get_data_json(name, collection, method, d_array)
     #months
     key_format = "%B/%Y"
   end
-  data[:x] = d_array.map{|d| d.to_date.strftime(key_format)}.uniq
-  data[:y] ||= []
-  data[:x].each do |d|
-    grouped_collection[d] = collection.collect{|b| b if b.send(method).strftime(key_format).eql? d}.compact.size
-  end
-  data[:y] << {:name=>name,:data=>grouped_collection.values}
-  data
+  key_format
+end
+
+def make_formatted_array(d_array, key_format)
+  return d_array.map{|d| d.to_date.strftime(key_format)}.uniq
 end
 
 def mails_query
@@ -103,36 +172,46 @@ def mails_query
   @e = params[:e]||Date.today.strftime("%d-%m-%Y")
   if @q.nil? or @q.eql?""
     if valid_date(@s) and valid_date(@e)
-      mails = SesProxy::Email.where(:created_at=>{'$gte' => string_to_date(@s),'$lt' => string_to_date(@e)})
+      mails = SesProxy::Email.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
     else
       mails = SesProxy::Email.all
     end
   else
     if valid_date(@s) and valid_date(@e)
-      mails = SesProxy::Email.where(:created_at=>{'$gte' => string_to_date(@s),'$lt' => string_to_date(@e)}).any_of({:recipients => /.*#{@q}.*/i },{:sender => /.*#{@q}.*/i },{:system => /.*#{@q}.*/i },{:subject => /.*#{@q}.*/i })
+      mails = SesProxy::Email.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day}).any_of({:recipients => /.*#{@q}.*/i },{:sender => /.*#{@q}.*/i },{:system => /.*#{@q}.*/i },{:subject => /.*#{@q}.*/i })
     else
       mails = SesProxy::Email.any_of({:recipients => /.*#{@q}.*/i },{:sender => /.*#{@q}.*/i },{:system => /.*#{@q}.*/i },{:subject => /.*#{@q}.*/i }).page(params[:page]).per(20)
     end
   end
 end
 
-def bounces_query
+def bounced_mails_query
   @q = params[:q]
   @s = params[:s]||(Date.today-1.month).strftime("%d-%m-%Y")
   @e = params[:e]||Date.today.strftime("%d-%m-%Y")
   if @q.nil? or @q.eql?""
     if valid_date(@s) and valid_date(@e)
-      bounces = SesProxy::Bounce.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)})
+      mails = SesProxy::BouncedEmail.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
     else
-      bounces = SesProxy::Bounce.all
+      mails = SesProxy::BouncedEmail.all
     end
   else
     if valid_date(@s) and valid_date(@e)
-      bounces = SesProxy::Bounce.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)}).any_of({:email => /.*#{@q}.*/i },{ :type => /.*#{@q}.*/i },{ :desc => /.*#{@q}.*/i })
+      mails = SesProxy::BouncedEmail.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day}).any_of({:recipients => /.*#{@q}.*/i },{:sender => /.*#{@q}.*/i },{:system => /.*#{@q}.*/i },{:subject => /.*#{@q}.*/i })
     else
-      bounces = SesProxy::Bounce.any_of({:email => /.*#{@q}.*/i },{ :type => /.*#{@q}.*/i },{ :desc => /.*#{@q}.*/i })
+      mails = SesProxy::BouncedEmail.any_of({:recipients => /.*#{@q}.*/i },{:sender => /.*#{@q}.*/i },{:system => /.*#{@q}.*/i },{:subject => /.*#{@q}.*/i }).page(params[:page]).per(20)
     end
   end
+end
+
+def bounces_query
+  @s = params[:s]||(Date.today-1.month).strftime("%d-%m-%Y")
+  @e = params[:e]||Date.today.strftime("%d-%m-%Y")
+  if valid_date(@s) and valid_date(@e)
+    bounces = SesProxy::Bounce.where(:created_at=>{'$gte' => string_to_date(@s),'$lte' => string_to_date(@e)+1.day})
+  else
+    bounces = SesProxy::Bounce.all
+  end
   bounces
 end
 

data/lib/ses_proxy/models/bounced_email.rb

@@ -0,0 +1,15 @@
+require 'mongoid'
+
+module SesProxy
+  class BouncedEmail
+    include Mongoid::Document
+
+    field :sender, type: String
+    field :recipients, type: String
+    field :subject, type: String
+    field :body, type: String
+    field :system, type: String
+    field :created_at, type: DateTime
+    field :updated_at, type: DateTime
+  end
+end

data/lib/ses_proxy/models/recipients_number.rb

@@ -0,0 +1,12 @@
+require 'mongoid'
+
+module SesProxy
+  class RecipientsNumber
+    include Mongoid::Document
+
+    field :original, type: Integer
+    field :filtered, type: Integer
+    field :created_at, type: DateTime
+    field :updated_at, type: DateTime
+  end
+end

data/lib/ses_proxy/smtp_server.rb

@@ -69,6 +69,15 @@ module SesProxy
       actual_recipients = recipients - bounced
       actual_cc_addrs = mail.cc_addrs - bounced
       actual_bcc_addrs = mail.bcc_addrs - bounced
+      original_number = recipients.size+mail.cc_addrs.size+mail.bcc_addrs.size
+      filtered_number = actual_recipients.size+actual_cc_addrs.size+actual_bcc_addrs.size
+      record = RecipientsNumber.new({
+        :original=>original_number,
+        :filtered=>filtered_number,
+        :created_at => Time.now,
+        :updated_at => Time.now
+      })
+      record.save!
       if actual_recipients.any?
         mail.to = actual_recipients.uniq.join(",")
         mail.cc = actual_cc_addrs.uniq.join(",")
@@ -85,15 +94,28 @@ module SesProxy
         record.save!
         begin
           ses.send_raw_email(mail.to_s)
-          true
         rescue Exception => e
           print "Error! "
           puts e.message
-          false
+          return false
         end
       else
         puts "No valid recipients!"
-        true
+      end
+      if not original_number.eql? filtered_number
+        mail.to = (recipients&bounced).uniq.join(",")
+        mail.cc = (mail.cc_addrs&bounced).uniq.join(",")
+        mail.bcc = (mail.bcc_addrs&bounced).uniq.join(",")
+        record = BouncedEmail.new({
+          :sender => sender,
+          :recipients => (recipients&bounced).uniq.join(","),
+          :subject => mail.subject,
+          :body => mail.body.decoded,
+          :system => mail['X-Sender-System']||"Unknown",
+          :created_at => Time.now,
+          :updated_at => Time.now
+        })
+        record.save!
       end
     end
 

data/ses_proxy.rb

@@ -7,4 +7,6 @@ module SesProxy
   autoload :Bounce, 'ses_proxy/models/bounce'
   autoload :Complaint, 'ses_proxy/models/complaint'
   autoload :Email, 'ses_proxy/models/email'
+  autoload :BouncedEmail, 'ses_proxy/models/bounced_email'
+  autoload :RecipientsNumber, 'ses_proxy/models/recipients_number'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ses-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -212,6 +212,8 @@ extra_rdoc_files: []
 files:
 - ses_proxy.rb
 - lib/ses_proxy/sns_endpoint.rb
+- lib/ses_proxy/models/recipients_number.rb
+- lib/ses_proxy/models/bounced_email.rb
 - lib/ses_proxy/models/email.rb
 - lib/ses_proxy/models/complaint.rb
 - lib/ses_proxy/models/bounce.rb