mail_manager 3.2.5 → 3.2.6

data/lib/delayed/status_job.rb

@@ -1,23 +1,7 @@
-# module Delayed
-#   class StatusJob < RepeatingJob
-#     def perform
-#       true
-#     end
-
-#     def repeats_every
-#       1.minutes
-#     end
-
-#     # This is a good hook if you need to report job processing errors in additional or different ways
-#     def log_exception(error)
-#       #don't send mail for this currently.. we'll do something smart laters
-#       #Delayed::Mailer.deliver_exception_notification(self,error,notify_email) unless notify_email.blank?
-#       logger.error "* [JOB] #{name}(#{id}) failed with #{error.class.name}: #{error.message} - #{attempts} failed attempts"
-#     end
-#   end
-# end
-class ::Delayed::StatusJob < ::Delayed::Job
-  def perform
-    ::Delayed::StatusJob.enqueue ::Delayed::StatusJob.new, run_at: 1.minute.from_now
+module Delayed
+  class StatusJob < Struct.new(:next_run)
+    def perform
+      Job.enqueue StatusJob.new, run_at: (next_run || 1.minute.from_now)
+    end
   end
 end

data/lib/delayed_overrides/job.rb

@@ -0,0 +1,6 @@
+require 'delayed_job'
+if defined?(Delayed::Job)
+  class Delayed::Job
+    scope :failed, where("failed_at is not null")
+  end
+end

data/lib/mail_manager/engine.rb

@@ -48,6 +48,8 @@ module MailManager
   mattr_accessor :authorized_roles
   # roles_method: the method that your "current_user" object defines its role names(returns a list of strings)
   mattr_accessor :roles_method
+  # sets whether the generic mailable is registered as available
+  mattr_accessor :register_generic_mailable
   
   # The following 2 might be deprecated soon
   # show_title: can be used in templates/layouts to see whether you should show a title
@@ -116,7 +118,12 @@ module MailManager
           MailManager::Bounce,
           MailManager::Message
         ]
+        can [:send_test, :test, :schedule, :cancel], MailManager::Mailing
+        can [:dismiss, :fail_address], MailManager::Bounce
+        can [:delete, :undelete], MailManager::Contact
       end
+      can [:subscribe, :double_opt_in, :thank_you], MailManager::Contact 
+      can [:unsubscribe, :unsubscribe_by_email_address], MailManager::Subscription
     EOT
   end
 
@@ -131,6 +138,15 @@ module MailManager
     File.join(PLUGIN_ROOT,'assets')
   end
 
+  def self.public_path?(path)
+    [
+      MailManager.subscribe_path,
+      MailManager.unsubscribe_path,
+      MailManager.double_opt_in_path,
+      MailManager.subscribe_thank_you_path
+    ].detect{|public_path| public_path =~ /#{path}/i}.present?
+  end
+
   # sets up your MailManager.blah configuration options from 
   # config/mail_manager.yml and can override those with 
   # config/mail_manager.local.yml for development environments
@@ -141,7 +157,11 @@ module MailManager
     MailManager.site_url ||= conf.site_url || default_site_url rescue default_site_url
     MailManager.dont_include_images_domains ||= conf.dont_include_images_domains || [] rescue []
     MailManager.sleep_time_between_messages ||= conf.sleep_time_between_messages || 0.3 rescue 0.3
-    MailManager.table_prefix ||= conf.table_prefix || 'mail_manager_' rescue 'mail_manager_'
+    if conf.params.has_key?('table_prefix')
+      MailManager.table_prefix ||= conf.table_prefix.to_s # allow empty
+    else
+      MailManager.table_prefix ||= 'mail_manager_'
+    end
     MailManager.default_from_email_address ||= conf.default_from_email_address rescue nil
     MailManager.signup_email_address ||= conf.signup_email_address rescue nil
     MailManager.bounce ||= conf.bounce || {} rescue {}
@@ -158,6 +178,7 @@ module MailManager
     MailManager.requires_authentication ||= conf.requires_authentication || false rescue false
     MailManager.authorized_roles ||= conf.authorized_roles || [] rescue []
     MailManager.roles_method ||= conf.roles_method || nil rescue nil
+    MailManager.register_generic_mailable ||= conf.register_generic_mailable || false rescue false
     MailManager.exception_notification = {}
     MailManager.exception_notification[:to_addresses] ||= conf.exception_notification['to_addresses'] || [] rescue []
     MailManager.exception_notification[:from_address] ||= conf.exception_notification['from_address'] || nil rescue nil
@@ -178,6 +199,7 @@ MailManager::Engine.config.to_prepare do
   rescue LoadError => le
   end
   load File.join(MailManager::PLUGIN_ROOT,'lib','delayed_overrides','worker.rb')
+  load File.join(MailManager::PLUGIN_ROOT,'lib','delayed_overrides','job.rb')
 end
 
 require 'will_paginate'

data/lib/mail_manager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = "3.2.5"
+  VERSION = "3.2.6"
 end

data/mail_manager.gemspec

@@ -6,12 +6,19 @@ require 'mail_manager/version'
 Gem::Specification.new do |gem|
   gem.name          = "mail_manager"
   gem.version       = MailManager::VERSION
-  gem.authors       = ["Lone Star Internet"]
+  gem.authors       = ["Lone Star Internet", "Christopher Hauboldt"]
   gem.email         = ["biz@lone-star.net", 'chauboldt@lone-star.net']
   gem.licenses      = ["MIT"]
   gem.description   = %q{Manages the delivery of mailable items. Handles contacts, mailing lists, bounces, unsubscribe, opt-in, etc. Also available with a newsletter manager (including newsletter designs and elements management, wysiwyg newsletter editor, and newsletter archive) as well as user access control as part of the iReach gem.}
   gem.summary       = %q{Mailing list management tool}
   gem.homepage      = "http://ireachnews.com"
+  gem.post_install_message = <<-EOT
+    #** Mail Manager 3.2.6 messages **********************
+    #** Required Actions for every upgrade **
+      rake mail_manager:upgrade # this adds any new migrations and migrates your DB ...
+      #** NOTE! you should try this in development before pushing to your production site
+    #*END Mail Manager messages ********************
+  EOT
 
   gem.add_dependency "rails", "~>3.2"
   gem.add_dependency 'jquery-rails', "~>3.1"
@@ -22,8 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mini_magick", "~>4.1"
   gem.add_dependency "will_paginate", "~>3.0"
   gem.add_dependency 'unix_utils', "~>0.0"
-  gem.add_dependency "delayed_job", "~>4"
-  gem.add_dependency 'delayed_job_active_record', "~>4"
+  gem.add_dependency "delayed_job", '~>4'
+  gem.add_dependency 'delayed_job_active_record', '~>4'
   gem.add_dependency "dynamic_form", "~>1.1"
   gem.add_dependency 'cancancan', "~>1.9"
 

data/spec/test_app/Procfile

@@ -1,3 +1,5 @@
-post_office: bundle exec script/post_office run
-delayed_job: bundle exec script/delayed_job run
-web:         spring rails s WEBrick
+post_office:      bundle exec script/post_office run
+post_office_test: RAILS_ENV=test bundle exec script/post_office run
+with_lock:        script/with_lock run
+delayed_job:      bundle exec script/delayed_job run
+web:              spring rails s WEBrick

data/spec/test_app/config/mail_manager.yml

@@ -64,6 +64,7 @@ common:
   sleep_time_between_messages: 0.3
   path_prefix: /admin
   table_prefix: mail_manager_
+  register_generic_mailable: false
   default_from_email_address: chrisboy <chrisboy@lvh.me>
   secret: 7a3906324erwr6254e85e4bdb80592001a
   bounce:
@@ -79,7 +80,9 @@ development:
   site_url: http://example.dev
   secret: !binary |-
     ZDgxNDViNzJhOWExMDI1NmU1OTkwZDEzYTgyODcy
+  register_generic_mailable: true
 test:
   site_url: http://mail-manager.lvh.me:4460
   secret: !binary |-
     ZjU0MDU2YWU4M2Q0MjU4MTM2ZWIwYzM2ZTNjMDRj
+  register_generic_mailable: true

data/spec/test_app/features/contact_management.feature

@@ -74,6 +74,13 @@ Feature: Manage Contacts
      And I press "Submit"
     Then contact "Bobo Clown" should exist with email_address "bobo@example.com"
      And contact "Bobo Clown" should be subscribed to "Peeps" with the "active" status
+    When I follow "Edit"
+     And I check "Others"
+     And I uncheck "Peeps"
+     And I press "Submit"
+    Then contact "Bobo Clown" should exist with email_address "bobo@example.com"
+     And contact "Bobo Clown" should be subscribed to "Others" with the "active" status
+     And contact "Bobo Clown" should be subscribed to "Peeps" with the "admin_unsubscribed" status
   
   Scenario: Many contacts existing will show pagination
    Given 50 contacts exist

data/spec/test_app/features/message_management.feature

@@ -17,6 +17,13 @@ Feature: view messages for mailings
   Scenario:
     When I go to the mailings page
      And I follow "Messages"
-     And I select "Any Status" from "Status"
+    Then I should see "bobo@example.com"
+    When I select "Pending" from "Status"
+    Then I should not see "bobo@example.com"
+    When I select "Sent" from "Status"
+    Then I should see "bobo@example.com"
+    When I select "Failed" from "Status"
+    Then I should not see "bobo@example.com"
+    When I select "Any Status" from "Status"
     Then I should see "bobo@example.com"
      

data/spec/test_app/features/step_definitions/webrat_steps.rb

@@ -95,11 +95,15 @@ When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
 end
 
 Then /^I should see "([^\"]*)"$/ do |text|
-  expect(page.body).to have_content(text)
+  Debugging::wait_until_success(5) do
+    expect(page.body).to have_content(text)
+  end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |text|
-  expect(page.body).not_to have_content(text)
+  Debugging::wait_until_success(5) do
+    expect(page.body).not_to have_content(text)
+  end
 end
 
 Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|

data/spec/test_app/lib/debugging.rb

@@ -11,7 +11,7 @@ module ::Debugging
         end
       rescue Exception, StandardError, RuntimeError => te
         Rails.logger.warn "Uncaught/Unpried exception: #{te.message} #{te.backtrace.join("\n")}"
-        raise e
+        raise te
       end
     end
   end
@@ -52,7 +52,7 @@ module ::Debugging
         Rails.logger.warn "Waiting for something.. trying: #{Kernel.caller[0..5].join("\n")}" if log
         yield
         true
-      rescue => e
+      rescue Exception, StandardError, RuntimeError => e
         Rails.logger.warn "Waiting for something.. failure: #{e.message} #{e.backtrace.join}"
         false
       end

data/spec/test_app/script/full_suite

@@ -13,14 +13,14 @@ export CUC_SQLITE_SUCCESS=0
 DBADAPTER=sqlite bundle exec rspec spec && export SQLITE_SUCCESS=1
 DBADAPTER=sqlite bundle exec cucumber features && export CUC_SQLITE_SUCCESS=1
 
-if [ $POSTGRES -eq 1 ]; then
+if [ "$POSTGRES" = "1" ]; then
   #RUN FOR Postgresql
   cp config/database.postgres.local.yml config/database.yml
 
   bundle exec rake db:schema:load
   
   export PGSQL_SUCCESS=0
-  export CUCPGSQL_SUCCESS=0
+  export CUC_PGSQL_SUCCESS=0
 
   DBADAPTER=pg bundle exec rspec spec && export PGSQL_SUCCESS=1
   DBADAPTER=pg bundle exec cucumber features && export CUC_PGSQL_SUCCESS=1
@@ -32,7 +32,7 @@ cp config/database.mysql.local.yml config/database.yml
 bundle exec rake db:schema:load
 
 export MYSQL_SUCCESS=0
-export CUCMYSQL_SUCCESS=0
+export CUC_MYSQL_SUCCESS=0
 
 DBADAPTER=mysql bundle exec rspec spec && export MYSQL_SUCCESS=1
 DBADAPTER=mysql bundle exec cucumber features && export CUC_MYSQL_SUCCESS=1
@@ -43,8 +43,10 @@ DBADAPTER=mysql bundle exec cucumber features && export CUC_MYSQL_SUCCESS=1
 unset RAILS_ENV
 
 if [ $MYSQL_SUCCESS -eq 0 ] ; then echo "Rspec Mysql Failed" && exit 1; fi
-if [ $PGSQL_SUCCESS -eq 0 ] ; then echo "Rspec Pgsql Failed" && exit 1; fi
 if [ $SQLITE_SUCCESS -eq 0 ] ; then  echo "Rspec SQLite Failed" && exit 1; fi
 if [ $CUC_MYSQL_SUCCESS -eq 0 ] ; then  echo "Cucumber Mysql Failed" && exit 1; fi
-if [ $CUC_PGSQL_SUCCESS -eq 0 ] ; then  echo "Cucumber Pgsql Failed" && exit 1; fi
 if [ $CUC_SQLITE_SUCCESS -eq 0 ] ; then  echo "Cucumber SQLite Failed" && exit 1; fi
+if [ "$POSTGRES" = "1" ] ; then 
+  if [ $PGSQL_SUCCESS -eq 0 ] ; then echo "Rspec Pgsql Failed" && exit 1; fi
+  if [ $CUC_PGSQL_SUCCESS -eq 0 ] ; then  echo "Cucumber Pgsql Failed" && exit 1; fi
+fi

data/spec/test_app/spec/controllers/mail_manager/bounces_controller_spec.rb

@@ -45,6 +45,15 @@ RSpec.describe MailManager::BouncesController, :type => :controller do
       expect(assigns(:bounces)).to eq([bounce])
       expect(response.body).to match /Listing Bounces/
     end
+    it "orders bounces create date desc" do
+      Timecop.travel 2.hours.ago
+      bounce = MailManager::Bounce.create! valid_attributes
+      Timecop.return
+      bounce_new = MailManager::Bounce.create! valid_attributes
+      get :index, {}, valid_session
+      expect(assigns(:bounces)).to eq([bounce_new,bounce])
+      expect(response.body).to match /Listing Bounces/
+    end
   end
 
   describe "GET #show" do
@@ -56,4 +65,34 @@ RSpec.describe MailManager::BouncesController, :type => :controller do
     end
   end
 
+  describe "PUT #dismiss" do
+    it "dismisses a bounce from needing attention" do
+      bounce = FactoryGirl.create(:bounce, status: 'needs_manual_intervention')
+      put :dismiss, {id: bounce.id}, valid_session
+      expect(assigns(:bounce)).to eq(bounce)
+      bounce.reload
+      expect(bounce.status).to eq 'dismissed'
+    end
+  end
+
+  describe "PUT #dismiss" do
+    it "fails a bounce setting it to 'removed' and failing its email addresses from active subscriptions" do
+      contact = FactoryGirl.create(:contact)
+      list1 = FactoryGirl.create(:mailing_list)
+      list2 = FactoryGirl.create(:mailing_list)
+      sub1 = contact.subscribe(list1)
+      message = FactoryGirl.create(:message, contact_id: contact.id) 
+      bounce = FactoryGirl.create(:bounce, status: 'needs_manual_intervention',
+        message_id: message.id
+      )
+      put :fail_address, {id: bounce.id}, valid_session
+      expect(assigns(:bounce)).to eq(bounce)
+      bounce.reload
+      sub1.reload
+      expect(bounce.message.status).to eq('failed')
+      expect(sub1.status).to eq('failed_address')
+      expect(MailManager::Subscription.count).to eq 1
+      expect(bounce.status).to eq 'removed'
+    end
+  end
 end

data/spec/test_app/spec/controllers/mail_manager/mailings_controller_spec.rb

@@ -81,6 +81,18 @@ RSpec.describe MailManager::MailingsController, :type => :controller do
       expect(assigns(:mailing)).to be_a_new(MailManager::Mailing)
       expect(response.body).to have_content("New Mailing")
     end
+    it "assigns mailables in created_at desc order" do
+      Timecop.travel 2.hours.ago
+      mailable = FactoryGirl.create(:mailable)
+      Timecop.return
+      mailable_new = FactoryGirl.create(:mailable)
+      get :new, {}, valid_session
+      expect(assigns(:mailing)).to be_a_new(MailManager::Mailing)
+      expect(assigns(:mailables_for_select)).to eq([mailable_new,mailable].map{|m|
+        [m.name, "#{m.class.name}_#{m.id}"]
+      })
+      expect(response.body).to have_content("New Mailing")
+    end
   end
 
   describe "GET #edit" do

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

@@ -30,6 +30,37 @@ RSpec.describe MailManager::Bounce do
       )
       Delayed::Worker.delay_jobs = false
     end
+
+    it "deferred's 400's" do
+      bounce = MailManager::Bounce.create(
+        bounce_message: File.read('spec/support/files/bounce-400.txt')
+      )
+      bounce.process
+      expect(bounce.status).to eq 'deferred'
+    end
+
+    it "removed's 500's and 'failed_address's associated active subscriptions" do
+      contact = FactoryGirl.create(:contact)
+      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_guid = '30-28-11376-fa351cf35e4012d37d8c13df8735fd13edfed563'
+
+      bounce = MailManager::Bounce.create(
+        bounce_message: File.read('spec/support/files/bounce-500.txt').gsub(
+        /#{bounce_guid}/,message.guid)
+      )
+      bounce.process
+      sub1.reload
+      expect(bounce.status).to eq 'removed'
+      expect(sub1.status).to eq 'failed_address'
+      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)))

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

@@ -76,4 +76,29 @@ RSpec.describe MailManager::Engine do
       end
     end
   end
+  it "can set table prefix to empty" do
+    prefix = MailManager.table_prefix
+    MailManager.table_prefix = nil
+    conf = MailManager::Config.new(
+      'spec/support/files/mail_manager_empty_table_prefix.yml')
+    MailManager.initialize_with_config(conf)
+    expect(MailManager.table_prefix).to eq ''
+    MailManager.table_prefix = prefix
+  end
+  context "with respect to the mailables object" do
+    it "can turn on its registration" do
+      MailManager.register_generic_mailable = nil
+      conf = MailManager::Config.new(
+        'spec/support/files/mail_manager_use_generic_mailables.yml')
+      MailManager.initialize_with_config(conf)
+      expect(MailManager.register_generic_mailable).to be true
+    end
+    it "can turn off its registration(default behaviour in mail_manager.yml)" do
+      MailManager.register_generic_mailable = nil
+      conf = MailManager::Config.new('config/mail_manager.yml')
+      MailManager.initialize_with_config(conf)
+      expect(MailManager.register_generic_mailable).to be false
+      MailManager.register_generic_mailable = true
+    end
+  end
 end

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

@@ -12,4 +12,43 @@ RSpec.describe MailManager::MailingList do
       expect(@mailing_list.valid?).to eq false
     end
   end
+  describe "self::active_email_addresses_contact_ids_subscription_ids_for_mailing_list_ids" do
+    it "returns all active email addresses, contact_ids, subscription_ids for given mailing list ids" do
+      contact1 = FactoryGirl.create(:contact)
+      contact2 = FactoryGirl.create(:contact)
+      contact3 = FactoryGirl.create(:contact)
+      contact4 = FactoryGirl.create(:contact)
+      list1 = FactoryGirl.create(:mailing_list)
+      sub1 = contact1.subscribe(list1)
+      sub2 = contact2.subscribe(list1)
+      list2 = FactoryGirl.create(:mailing_list)
+      sub3 = contact2.subscribe(list2)
+      sub4 = contact3.subscribe(list2)
+      list3 = FactoryGirl.create(:mailing_list)
+      sub5 = contact3.subscribe(list3)
+      sub6 = contact4.subscribe(list3)
+      expect(MailManager::MailingList.
+        active_email_addresses_contact_ids_subscription_ids_for_mailing_list_ids(
+        [list1.id, list2.id]).sort).to eq (
+        {
+          contact1.email_address => {
+            contact_id: contact1.id,
+            subscription_id: sub1.id
+          },
+          contact2.email_address => {
+            contact_id: contact2.id,
+            subscription_id: sub2.id
+          },
+          contact2.email_address => {
+            contact_id: contact2.id,
+            subscription_id: sub3.id
+          },
+          contact3.email_address => {
+            contact_id: contact3.id,
+            subscription_id: sub4.id
+          }
+        }.sort
+      ) 
+    end
+  end
 end