mail_manager 3.2.7 → 3.2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7086dba0cddea0712c21f6c60b68081d53aa2d5d
-  data.tar.gz: ff73fe7f60296ab4368baa6ac7b91268be0528ef
+  metadata.gz: 9e30049959f31c782b245392fadd2f276bd28360
+  data.tar.gz: 3af3e1fc8addf6210f31492e59b7d294c596f1f8
 SHA512:
-  metadata.gz: c0119d6ab3f1bc2f1f64680a1178eaf84ee25b61f809c452276178e471f9b0799fffb4442a1b35c2b4fa03f211ed90b3b622dcd6d1ee592a7d396d7e0473e8a1
-  data.tar.gz: 8d41ad9933f4f6b610ded97d39e31c76006d427e82da9f7ac38f0c6c78860b0b0e592572c4458d8725fe61c930a2f1784e95a0d2c32def26402c7155bc5d76dd
+  metadata.gz: f40f462c5dba56692d4d6f51d71ffb0f9dad57f27b689d1059c1ddb58dfff6e42654f70240d078d0c76fd40ab1460691f7fcdcff14cebba896214307bedfd2bc
+  data.tar.gz: 7acb1437d9253247e6eb00e2471a261ea8e7b53d3be37bb8fcea385c42958e9b99bdcc743526e7cf3a9c7738003ae7efd3688c17dd3f6be88a3f34ed0f2d8125

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gem 'dotenv-rails', :require => 'dotenv/rails-now'
 gemspec
 
+gem 'xpath', '~>2.1'
 # jquery-rails is used by the dummy application
 gem "devise"
 gem "jquery-rails"
@@ -15,7 +16,7 @@ gem 'spring-commands-cucumber'
 gem 'thor', '0.19.1'
 gem 'delayed_job_active_record'
 gem 'sqlite3'
-gem 'mysql2'
+gem 'mysql2', '~>0.3.21'
 if ENV['POSTGRES']
   gem 'pg'
 end
@@ -26,6 +27,8 @@ group :test, :development do
   gem "factory_girl_rails", "~>4.3"
   gem "faker"
   gem 'post_office'
+  gem 'brakeman'
+  gem 'bundler-audit'
 end
 
 #group :test, :development, :post_office do
@@ -42,5 +45,6 @@ group :test do
   gem 'capybara'
   gem 'poltergeist'
   gem 'database_cleaner'
+  gem 'cucumber', '~>2.1'
   gem 'cucumber-rails', require: false
 end

data/app/controllers/mail_manager/mailing_lists_controller.rb

@@ -1,5 +1,6 @@
 module MailManager
   class MailingListsController < MailManager::ApplicationController
+    include DeleteableActions
     def index
       @mailing_lists = MailingList.active.order("name asc").paginate(:page => params[:page])
     end

data/app/models/mail_manager/bounce.rb

@@ -22,7 +22,7 @@ module MailManager
     belongs_to :message, :class_name => 'MailManager::Message'
     belongs_to :mailing, :class_name => 'MailManager::Mailing', counter_cache: true
     include StatusHistory
-    override_statuses(['needs_manual_intervention','unprocessed','dismissed','resolved','invalid','removed','deferred'],'unprocessed')
+    override_statuses(['needs_manual_intervention','unprocessed','dismissed','resolved','invalid','removed','deferred','unsubscribed'],'unprocessed')
     before_create :set_default_status
     #default_scope :order => "#{MailManager.table_prefix}contacts.last_name, #{MailManager.table_prefix}contacts.first_name, #{MailManager.table_prefix}contacts.email_address",
     #    :joins => 
@@ -43,7 +43,19 @@ module MailManager
       if status.eql?('unprocessed') || force
         self.message = Message.find_by_guid(bounce_message_guid)
         self.mailing = message.mailing unless message.nil?
-        if !from_mailer_daemon?
+        if email.subject.to_s =~ /unsubscribe/i
+          guid = email.subject.to_s.gsub(/unsubscribe from (.*)/,'\1')
+          self.message = Message.find_by_guid(guid)
+          self.mailing = message.mailing unless message.nil?
+          change_status(:unsubscribed)
+          if(message.present?) 
+            MailManager::Subscription.unsubscribe_by_email_address(contact_email_address)
+          else
+            email.from.each do |email_address|
+              MailManager::Subscription.unsubscribe_by_email_address(email_address)
+            end
+          end
+        elsif !from_mailer_daemon?
           change_status(:invalid)
         elsif delivery_error_code =~ /4\.\d\.\d/ || delivery_error_message.to_s =~ /quota/i
           update_attribute(:comments, delivery_error_message)
@@ -52,8 +64,10 @@ module MailManager
           transaction do 
             update_attribute(:comments, delivery_error_message)
             change_status(:removed)
-            message.change_status(:failed)
-            message.update_attribute(:result,"Failure Message from Bounce: #{delivery_error_message}")
+            if message.present?
+              message.change_status(:failed)
+              message.update_attribute(:result,"Failure Message from Bounce: #{delivery_error_message}")
+            end
             Subscription.fail_by_email_address(contact_email_address)
           end
         else
@@ -70,6 +84,9 @@ module MailManager
 
     def from_mailer_daemon?
       ['postmaster','mailer-daemon'].include?(email.from.first.gsub(/\@.*$/,'').downcase)
+    rescue => e
+      # they don't have a proper from email address
+      delivery_error_code.present?
     end
   
     def dismiss

data/app/models/mail_manager/contact.rb

@@ -10,7 +10,9 @@ module MailManager
     validates_presence_of :email_address
     #validates_format_of :email_address, :with => Authentication.email_regex, 
     #  :message => Authentication.bad_email_message, :allow_nil => true
-    validates_format_of :email_address, :with => /\w{1,}[@][\w\-]{1,}([.]([\w\-]{1,})){1,3}$/, :allow_nil => true
+    validates_format_of :email_address, :with => /\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i, :allow_nil => true
+
+    before_validation :trim_fields
 
     include MailManager::ContactableRegistry::Contactable
     include Deleteable
@@ -20,6 +22,12 @@ module MailManager
     def contact
       self
     end
+
+    def trim_fields
+      [:first_name, :last_name, :email_address].each do |field|
+        self[field].gsub!(/\A\s*|\s*\Z/,'') if self[field].present?
+      end
+    end
     
     scope :search, lambda{|params| 
       conditions = ["deleted_at IS NULL"]

data/app/models/mail_manager/mailer.rb

@@ -53,7 +53,7 @@ module MailManager
       def deliver_message(message, cached_parts=nil)
         cached_parts ||= message.parts
         self.send_mail(message.subject,message.email_address_with_name,message.from_email_address,
-          cached_parts,message.guid,message.mailing.include_images?)
+          cached_parts,message.guid,message.mailing.include_images?,message.unsubscribe_url)
       end
 
       # create mailing; parsing html sources for images to attach/include
@@ -108,7 +108,7 @@ module MailManager
       end
     
       # send the mailing with the given subject, addresses, and parts
-      def send_mail(subject,to_email_address,from_email_address,the_parts,message_id=nil,include_images=true)
+      def send_mail(subject,to_email_address,from_email_address,the_parts,message_id=nil,include_images=true,unsubscribe_url=nil)
         include_images = (include_images and !MailManager.dont_include_images_domains.detect{|domain| 
           to_email_address.strip =~ /#{domain}>?$/})
         mail = if include_images
@@ -118,6 +118,9 @@ module MailManager
         end
         mail.header['Return-Path'] = MailManager.bounce['email_address']
         mail.header['X-Bounce-Guid'] = message_id if message_id
+        unsubscribe_header = "<mailto:#{MailManager.bounce['email_address']}?subject=unsubscribe%20from%20#{message_id}>"
+        unsubscribe_header += ",<#{unsubscribe_url}>" if unsubscribe_url.present? 
+        mail.header['List-Unsubscribe'] = unsubscribe_header
         set_mail_settings(mail)
         mail.deliver!
         Rails.logger.info "Sent mail to: #{to_email_address}"

data/app/models/mail_manager/mailing.rb

@@ -155,7 +155,8 @@ module MailManager
     # creates all of the Messages that will be sent for this mailing
     def initialize_messages
       emails_hash = MailManager::Message.email_address_hash_for_mailing_id(self.id)
-      emails_hash.merge!(MailManager::Subscription.unsubscribed_emails_hash)
+      # NOTE: the following over-protective line has been removed as per Ken's request 2017-12-21
+      # emails_hash.merge!(MailManager::Subscription.unsubscribed_emails_hash)
       ids = self.mailing_lists.select('id').map(&:id)
       active_subscriptions_hash = MailManager::MailingList.
         active_email_addresses_contact_ids_subscription_ids_for_mailing_list_ids(ids)
@@ -168,6 +169,13 @@ module MailManager
         })
       end 
     end
+
+    def delete
+      transaction do
+        super
+        job.try(:destroy)
+      end
+    end
   
     # clean up an email address for sending FIXME - maybe do a bit more
     def self.clean_email_address(email_address)

data/app/models/mail_manager/mailing_list.rb

@@ -20,6 +20,7 @@ module MailManager
     validates :name, presence: true
   
     include StatusHistory
+    include Deleteable if (column_names.include?('deleted_at') rescue false)
     before_create :set_default_status
 
     attr_protected :id
@@ -32,7 +33,7 @@ module MailManager
         s.id as subscription_id from #{MailManager.table_prefix}contacts c 
         inner join #{MailManager.table_prefix}subscriptions s on c.id=s.contact_id 
         where s.status in ('active') and c.deleted_at is NULL and mailing_list_id in (#{
-        mailing_list_ids.join(',')})|
+        mailing_list_ids.map(&:to_i).uniq.join(',')})|
       )
       results = results.map(&:values) if results.first.is_a?(Hash)
       results.inject(Hash.new){ |h,r|

data/app/models/mail_manager/message.rb

@@ -39,7 +39,7 @@ module MailManager
         %Q|select distinct c.email_address 
         from #{MailManager.table_prefix}contacts c 
         inner join #{MailManager.table_prefix}messages m 
-        on c.id=m.contact_id where m.mailing_id=#{mailing_id}|
+        on c.id=m.contact_id where m.mailing_id=#{mailing_id.to_i}|
       )
       results = results.map(&:values) if results.first.is_a?(Hash) 
       results.inject(Hash.new){|h,r|h.merge!(r[0].to_s.strip.downcase => true)}

data/app/views/mail_manager/bounces/show.html.erb

@@ -16,7 +16,7 @@
 
 <p>
   <b>Status changed at:</b>
-  <%=h @bounce.status_changed_at %>
+  <%=l @bounce.status_changed_at %>
 </p>
 <p>
   <b>Comments:</b>

data/app/views/mail_manager/mailings/_form.html.erb

@@ -37,7 +37,8 @@
            <p>
   		<% @all_mailing_lists.each do |mailing_list| %>
   				<%= check_box_tag 'mailing[mailing_list_ids][]', mailing_list.id, @mailing.mailing_lists.include?(mailing_list) %>
-  				<%= label_tag :mailing_mailing_list_ids_, "#{mailing_list.name}" %><br/>
+  				<%= label_tag :mailing_mailing_list_ids_, "#{mailing_list.name}" %>
+				<div style="clear: left;"></div>
   		<% end %>
   		    </p>
   		  </div>

data/app/views/mail_manager/mailings/show.html.erb

@@ -10,12 +10,12 @@
 
 <p>
   <b>Status changed at:</b>
-  <%=h @mailing.status_changed_at %>
+  <%=l @mailing.status_changed_at %>
 </p>
 
 <p>
   <b>Scheduled at:</b>
-  <%=h @mailing.scheduled_at %>
+  <%=l @mailing.scheduled_at %>
 </p>
 
 <p>
@@ -25,4 +25,4 @@
 
 
 <%= link_to 'Edit', mail_manager.edit_mailing_path(@mailing) %> |
-<%= link_to 'Back', mail_manager.mailings_path %>
+<%= link_to 'Back', mail_manager.mailings_path %>

data/app/views/mail_manager/messages/index.html.erb

@@ -28,7 +28,7 @@
     <td><%=h message.full_name %> <%=h message.email_address %></td>
     <!--
     <td><%=h message.status %></td>
-    <td><%=h message.status_changed_at %></td>
+    <td><%=l message.status_changed_at %></td>
     -->
     <td><%=h message.result %></td>
   </tr>

data/config/locales/mailings.en.yml

@@ -1,4 +1,8 @@
 en:
+  will_paginate:
+    previous_label: "Previous"
+    next_label: "Next"
+    page_gap: "…"
   activerecord:
     models:
       mail_manager/mailing:

data/lib/mail_manager/config.rb

@@ -12,10 +12,20 @@ class MailManager::Config
   
   def use_file!(file)
     begin
-      hash = YAML::load(ERB.new(IO.read(file)).result)       
-      @sections.merge!(hash) {|key, old_val, new_val| (old_val || new_val).merge new_val }
+      hash = YAML::load(ERB.new(IO.read(file)).result).with_indifferent_access
+      key = old_val = new_val = nil
+      @sections.merge!(hash) do |key, old_val, new_val| 
+        old_val ||= Hash.new.with_indifferent_access
+        new_val ||= Hash.new.with_indifferent_access
+        if old_val.is_a?(Hash) && new_val.is_a?(Hash)
+          old_val.merge(new_val)
+        else
+          new_val
+        end
+      end
       @params.merge!(@sections['common'])
     rescue => e
+      Rails.logger.error "Couldn't load config file #{file} #{e.message}"
       nil
     end    
   end

data/lib/mail_manager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = "3.2.7"
+  VERSION = "3.2.22.0"
 end

data/lib/workers/mail_manager/bounce_job.rb

@@ -31,13 +31,18 @@ module MailManager
             found_messages = true
             Rails.logger.info "You have #{pop.mails.length} new bounced messages."
             Rails.logger.info "Downloading..."
-
+            max_messages = 50
+            num_messages = 0
             pop.mails.each_with_index do|m,i|
               bounce = ::MailManager::Bounce.create({
-                :bounce_message => m.pop
+                # ensure encoding will work; we don't really care about invalid characters
+                # PG will explode if utf-8 has invalid chars
+                :bounce_message => m.pop.encode("utf-8", invalid: :replace, undef: :replace)
               })
               bounce.process
               m.delete
+              num_messages += 1
+              break if num_messages > max_messages
             end
           end
         end

data/mail_manager.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://ireachnews.com"
 
   gem.add_dependency "rails", "~>3.2"
+  gem.add_dependency 'rack-protection', '=2.0.1'
   gem.add_dependency 'jquery-rails', "~>3.1"
   gem.add_dependency 'jquery-ui-rails', "~>5.0"
   gem.add_dependency 'jquery-ui-themes', "~>0.0"

data/spec/test_app/features/contact_management.feature

@@ -45,7 +45,7 @@ Feature: Manage Contacts
     When I go to the new contact page
      And I fill in "First name" with "Bobo"
      And I fill in "Last name" with "Clown"
-     And I fill in "Email address" with "bobo@example.com" 
+     And I fill in "Email address" with "bobo@example.com " 
      And I check "Peeps"
      And I press "Submit"
     Then contact "Bobo Clown" should exist with email_address "bobo@example.com"
@@ -69,7 +69,7 @@ Feature: Manage Contacts
      And I follow "Edit"
      And I fill in "First name" with "Bobo"
      And I fill in "Last name" with "Clown"
-     And I fill in "Email address" with "bobo@example.com" 
+     And I fill in "Email address" with " bobo@example.com" 
      And I check "Peeps"
      And I press "Submit"
     Then contact "Bobo Clown" should exist with email_address "bobo@example.com"

data/spec/test_app/spec/models/mail_manager/bounce_spec.rb

@@ -3,6 +3,13 @@ require 'rails_helper'
 
 RSpec.describe MailManager::Bounce do
   context "when checking pop account" do
+    it "should not blow up when mail has no from address" do
+      bounce = create_bounce_from_file('bounce-500-no-from-address.eml')
+      expect{bounce.process}.not_to  raise_exception
+      expect(bounce.message.status).to eq 'failed'
+      expect(bounce.status).to eq 'removed'
+      Delayed::Worker.delay_jobs = false
+    end
     it "should not blow up when mail contains a bad extended char" do
       Delayed::Worker.delay_jobs = true
       send_bounce('bad_utf8_chars.eml')
@@ -61,6 +68,45 @@ RSpec.describe MailManager::Bounce do
       expect(sub1.status).to eq 'failed_address'
       expect(MailManager::Subscription.count).to eq 1
     end
+    it "unsubscribes an address when a bounce has 'unsubscribe' in its subject" do
+      contact = FactoryGirl.create(:contact, email_address: 'bobo@example.net')
+      mailing_list = FactoryGirl.create(:mailing_list)
+      mailing_list2 = FactoryGirl.create(:mailing_list)
+      sub1=contact.subscribe(mailing_list)
+
+      bounce = MailManager::Bounce.create(
+        bounce_message: File.read('spec/support/files/unsubscribe.txt')
+      )
+      bounce.process
+      
+      sub1.reload
+      expect(bounce.status).to eq 'unsubscribed'
+      expect(sub1.status).to eq 'unsubscribed'
+      expect(MailManager::Subscription.count).to eq 1
+    end
+    it "unsubscribes from a messages's contact when it's guid is in the subject" do
+      contact = FactoryGirl.create(:contact, email_address: 'bobo_other@example.net')
+      mailing_list = FactoryGirl.create(:mailing_list)
+      mailing_list2 = FactoryGirl.create(:mailing_list)
+      sub1=contact.subscribe(mailing_list)
+      mailing = FactoryGirl.create(:mailing)
+      message = FactoryGirl.create(:message, 
+        mailing_id: mailing.id,
+        contact_id: contact.id
+      )
+
+      bounce = MailManager::Bounce.create(
+        bounce_message: File.read('spec/support/files/unsubscribe.txt').gsub(
+          /Subject: unsubscribe/,"Subject: unsubscribe from #{message.guid}"
+        )
+      )
+      bounce.process
+      
+      sub1.reload
+      expect(bounce.status).to eq 'unsubscribed'
+      expect(sub1.status).to eq 'unsubscribed'
+      expect(MailManager::Subscription.count).to eq 1
+    end
   end
   def send_bounce(filename)
     mail = Mail.new(File.read(File.join(Rails.root,'spec','support','files',filename)))
@@ -68,4 +114,12 @@ RSpec.describe MailManager::Bounce do
     mail.delivery_method.settings.merge!(ActionMailer::Base.smtp_settings)
     mail.deliver
   end
+  def create_bounce_from_file(filename)
+    mail_message = File.read(File.join(Rails.root,'spec','support','files',filename))
+    bounce = MailManager::Bounce.create(bounce_message: mail_message)
+    message = FactoryGirl.create(:message)
+    message.guid = bounce.bounce_message_guid
+    message.save
+    bounce
+  end
 end

data/spec/test_app/spec/models/mail_manager/mailing_spec.rb

@@ -42,6 +42,21 @@ RSpec.describe MailManager::Mailing do
     expect(MailManager::Mailing.count).to eq 0
     expect(MailManager::Mailing.deleted.count).to eq 1
   end
+  it "will remove the scheduled job on deletion" do
+    Delayed::Job.delete_all
+    expect(Delayed::Job.count).to eq 0
+    Delayed::Worker.delay_jobs = true
+    mailing = MailManager::Mailing.create(valid_attributes.merge({
+      scheduled_at: 4.hours.from_now
+    }))
+    mailing.schedule
+    expect(Delayed::Job.count).to eq 1
+    expect(mailing.job).to eq Delayed::Job.first
+    mailing.delete
+    expect(MailManager::Mailing.deleted.count).to eq 1
+    expect(Delayed::Job.count).to eq 0
+    Delayed::Worker.delay_jobs = false
+  end
   it "doesn't include images when configured to not do so for a domain" do
     # should be in config
     image_url = "http://www.lone-star.net/graphics/lst_header_logo.png"
@@ -147,6 +162,15 @@ RSpec.describe MailManager::Mailing do
       expect(MyMailable.mailable_parts_call_count).to eq 1
     end
 
+    it "creates its 'List-Unsubscribe' headers correctly" do
+      @mailing.initialize_messages
+      message = @mailing.messages.first
+      message.deliver
+      sent_message = ActionMailer::Base.deliveries.last.to_s
+      unsubscribe_header = "<mailto:#{MailManager.bounce['email_address']}?subject=unsubscribe%20from%20#{message.guid}>,<#{message.unsubscribe_url}>"
+      expect(sent_message.include?(unsubscribe_header)).to be true
+    end
+
     it "sends a specified number of messages per job" do
       expect(Delayed::Job.count).to eq 1
       expect(MailManager.deliveries_per_run).to be > 0

data/spec/test_app/spec/support/files/bounce-500-no-from-address.eml

@@ -0,0 +1,74 @@
+Return-Path: <MAILER-DAEMON>
+Received: from zapp.lnstar.com (zapp.lnstar.com [66.45.121.18])
+	by farnsworth.lnstar.com (8.13.8/8.13.8) with ESMTP id t1A0H8kt030070
+	for <bounce@austinflowers.com>; Mon, 9 Feb 2015 18:17:08 -0600
+Received: by zapp.lnstar.com (Postfix)
+	id EBE6A10E6E2; Mon,  9 Feb 2015 18:17:08 -0600 (CST)
+Date: Mon,  9 Feb 2015 18:17:08 -0600 (CST)
+Subject: Undelivered Mail Returned to Sender
+To: bounce@austinflowers.com
+Auto-Submitted: auto-replied
+MIME-Version: 1.0
+Content-Type: multipart/report; report-type=delivery-status;
+	boundary="6800110E6EE.1423527428/zapp.lnstar.com"
+Message-Id: <20150210001708.EBE6A10E6E2@zapp.lnstar.com>
+X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00,
+	URIBL_DBL_ABUSE_REDIR autolearn=ham version=3.3.2
+X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on
+	farnsworth.lnstar.com
+
+This is a MIME-encapsulated message.
+
+--6800110E6EE.1423527428/zapp.lnstar.com
+Content-Description: Notification
+Content-Type: text/plain; charset=us-ascii
+
+This is the mail system at host zapp.lnstar.com.
+
+I'm sorry to have to inform you that your message could not
+be delivered to one or more recipients. It's attached below.
+
+For further assistance, please send mail to postmaster.
+
+If you do so, please include this problem report. You can
+delete your own text from the attached returned message.
+
+                   The mail system
+
+<roz@gocseevents.com>: host presmtp.ex4.secureserver.net[72.167.238.29] said:
+    550 5.1.1 <roz@gocseevents.com> Recipient not found.
+    <http://x.co/irbounce> (in reply to RCPT TO command)
+
+--6800110E6EE.1423527428/zapp.lnstar.com
+Content-Description: Delivery report
+Content-Type: message/delivery-status
+
+Reporting-MTA: dns; zapp.lnstar.com
+X-Postfix-Queue-ID: 6800110E6EE
+X-Postfix-Sender: rfc822; bounce@austinflowers.com
+Arrival-Date: Mon,  9 Feb 2015 18:17:07 -0600 (CST)
+
+Final-Recipient: rfc822; roz@gocseevents.com
+Action: failed
+Status: 5.1.1
+Remote-MTA: dns; presmtp.ex4.secureserver.net
+Diagnostic-Code: smtp; 550 5.1.1 <roz@gocseevents.com> Recipient not found.
+    <http://x.co/irbounce>
+
+--6800110E6EE.1423527428/zapp.lnstar.com
+Content-Description: Undelivered Message Headers
+Content-Type: text/rfc822-headers
+
+Return-Path: <bounce@austinflowers.com>
+Received: by zapp.lnstar.com (Postfix, from userid 65534)
+	id 6800110E6EE; Mon,  9 Feb 2015 18:17:07 -0600 (CST)
+Date: Mon, 9 Feb 2015 18:17:07 -0600
+From: "SanAntonioFlowerCo." <news@sanantonioflowers.com>
+To: roz@gocseevents.com
+Subject: Valentines Day 2015!
+Mime-Version: 1.0
+Content-Type: multipart/alternative; boundary=mimepart_54d94e034d23e_50d9..fdbe370dc1560
+X-Bounce-Guid: 30-28-11376-fa351cf35e4012d37d8c13df8735fd13edfed563
+Message-Id: <20150210001707.6800110E6EE@zapp.lnstar.com>
+
+--6800110E6EE.1423527428/zapp.lnstar.com--

data/spec/test_app/spec/support/files/unsubscribe.txt

@@ -0,0 +1,29 @@
+Return-Path: <chauboldt@lone-star.net>
+X-Original-To: chris@hauboldt.us
+Delivered-To: chrisboy@ophanim.hauboldt.us
+Received: from enoch.hauboldt.us (enoch.hauboldt.us [45.56.75.249])
+  by ophanim.hauboldt.us (Postfix) with ESMTP id 451539CD2C
+  for <chris@hauboldt.us>; Mon, 13 Mar 2017 10:00:11 -0500 (CDT)
+Received: from mail.lnstar.com (mail.lnstar.com [96.126.122.158])
+  by enoch.hauboldt.us (Postfix) with ESMTPS id B90B22E0A2
+  for <chris@gylo.us>; Mon, 13 Mar 2017 15:00:10 +0000 (UTC)
+Received: from [20.10.10.11] (r74-193-50-146.gldwcmta01.glwttx.tl.dh.suddenlink.net [74.193.50.146])
+  (authenticated bits=0)
+  by mail.lnstar.com (8.14.4/8.13.8) with ESMTP id v2DF09Ne006687
+  (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
+  for <chris@gylo.us>; Mon, 13 Mar 2017 10:00:09 -0500
+To: bounce@example.net
+From: Bobo Clown<bobo@example.net>
+Subject: unsubscribe
+Message-ID: <e1b39be4-254d-7486-3d36-cf8b583fb0cd@lone-star.net>
+Date: Mon, 13 Mar 2017 10:00:04 -0500
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
+ Thunderbird/45.7.1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 7bit
+X-Spam-Status: No, score=-1.5 required=5.0 tests=ALL_TRUSTED,BAYES_05,
+  TVD_SPACE_RATIO autolearn=ham version=3.3.2
+X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on Mail
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_manager
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.22.0
 platform: ruby
 authors:
 - Lone Star Internet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +223,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - MIT-LICENSE
@@ -485,6 +500,7 @@ files:
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/bad_utf8_chars.eml
 - spec/test_app/spec/support/files/bounce-400.txt
+- spec/test_app/spec/support/files/bounce-500-no-from-address.eml
 - spec/test_app/spec/support/files/bounce-500.txt
 - spec/test_app/spec/support/files/bounce-invalid-address.txt
 - spec/test_app/spec/support/files/bounce-invalid.txt
@@ -496,6 +512,7 @@ files:
 - spec/test_app/spec/support/files/bounce-unknown_domain.txt
 - spec/test_app/spec/support/files/mail_manager_empty_table_prefix.yml
 - spec/test_app/spec/support/files/mail_manager_use_generic_mailables.yml
+- spec/test_app/spec/support/files/unsubscribe.txt
 - spec/test_app/spec/views/mail_manager/bounces/index.html.erb_spec.rb
 - spec/test_app/spec/views/mail_manager/bounces/show.html.erb_spec.rb
 - spec/test_app/spec/views/users/edit.html.erb_spec.rb
@@ -671,6 +688,7 @@ test_files:
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/bad_utf8_chars.eml
 - spec/test_app/spec/support/files/bounce-400.txt
+- spec/test_app/spec/support/files/bounce-500-no-from-address.eml
 - spec/test_app/spec/support/files/bounce-500.txt
 - spec/test_app/spec/support/files/bounce-invalid-address.txt
 - spec/test_app/spec/support/files/bounce-invalid.txt
@@ -682,6 +700,7 @@ test_files:
 - spec/test_app/spec/support/files/bounce-unknown_domain.txt
 - spec/test_app/spec/support/files/mail_manager_empty_table_prefix.yml
 - spec/test_app/spec/support/files/mail_manager_use_generic_mailables.yml
+- spec/test_app/spec/support/files/unsubscribe.txt
 - spec/test_app/spec/views/mail_manager/bounces/index.html.erb_spec.rb
 - spec/test_app/spec/views/mail_manager/bounces/show.html.erb_spec.rb
 - spec/test_app/spec/views/users/edit.html.erb_spec.rb