mail_manager 3.0.0 → 3.2.0

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

@@ -1,9 +1,9 @@
-<% title "New Mailing" %>
+<%= title "New Mailing" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
   <div>
-  <%= link_to "Back", mail_manager.mailings_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Back", mail_manager.mailings_path, :class => 'button' %>
   </div>
 <% end %>

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

@@ -1,12 +1,12 @@
-<% title "Send Test for #{@mailing.subject}" %>
+<%= title "Send Test for #{@mailing.subject}" %>
 <%= form_tag mail_manager.send_test_mailing_path(@mailing) do %>
   <table cellpadding="1" cellspacing="0" border="0">
     <tr valign="top">
-      <td width="150"><%= label_tag "Test Email Address" %></td>
+      <td width="150"><%= label_tag :test_email_addresses, "Test Email Address" %></td>
       <td><%= text_field_tag "test_email_addresses", @current_user ? @current_user.email : '' %></td>
     </tr>
     <tr valign="top">
-		  <td colspan="2" align="right"><%= submit_tag "Send Test Email", :class => 'button' %><div class="buttonEnding"></div></td>
+		  <td colspan="2" align="right"><%= submit_tag "Send Test Email", :class => 'button' %></td>
 		</tr>
   </table>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% title "Listing Messages for #{@mailing.subject} " %>
+<%= title "Listing Messages for #{@mailing.subject}" %>
 
 <%= content_for :subnav do %>
 <ul>
@@ -8,7 +8,7 @@
 
     <%= will_paginate @messages %>
     <%= form_tag mail_manager.mailing_messages_path(@mailing), :id => 'search_form', :method => 'GET' do %>
-      Status:<%= select_tag "message[status]", options_for_select(@valid_statuses,params[:message][:status]), :onChange => "$('#search_form').submit()" %>
+      <%= label_tag :message_status, "Status:" %><%= select_tag "message[status]", options_for_select(@valid_statuses,params[:message][:status]), :onChange => "$('#search_form').submit()" %>
     <% end %>
     <% if @messages.length == 0 %>
       <h3>No messages found for your query.</h3>

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

@@ -30,7 +30,7 @@ end
 <%     end
  %>
   <tr>
-     <td colspan="2" align="right"><%= f.submit 'Save', :class => 'button' %><div class="buttonEnding"></div>
+     <td colspan="2" align="right"><%= f.submit 'Save', :class => 'button' %>
      <%= f.hidden_field :mailing_list_id %></td>
   </tr>
 <% end %>

data/app/views/mail_manager/subscriptions/_subscriptions.html.erb

@@ -2,8 +2,8 @@
 <%= contactable_form.fields_for :subscriptions do |subscription_fields| %>
 	<% subscription = subscription_fields.object %>
   <div class="field">
-    <%= subscription_fields.label :status, subscription.mailing_list.try(:name) %><br/>
-    <%= subscription_fields.check_box :status, {}, 'active', subscription.status.eql?('active') ? unsubscribed_status : subscription.status %>
+    <%= subscription_fields.label :status, subscription.mailing_list.try(:name) %>
+    <%= subscription_fields.check_box :status, {}, 'active', subscription.status.eql?('active') ? unsubscribed_status : subscription.status %><br />
     <%= subscription_fields.hidden_field :mailing_list_id %>
   </div>
 <% end %>

data/app/views/mail_manager/subscriptions/edit.html.erb

@@ -1,8 +1,8 @@
-<% title "Editing Subscription for #{@subscription.contact.full_name} " %>
+<%= title "Editing Subscription for #{@subscription.contact.full_name} " %>
 
 <%= content_for :subnav do %>
 <div>
-  <%= link_to 'Back', mail_manager.mailing_list_subscriptions_path(@mailing_list), :class => 'button' %><div class='linkbuttonEnding'></div>
+  <%= link_to 'Back', mail_manager.mailing_list_subscriptions_path(@mailing_list), :class => 'button' %>
 </div>
 <% end %>
 

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

@@ -1,8 +1,8 @@
-<% title "Listing Subsciptions for #{@mailing_list.name} " %>
+<%= title "Listing Subsciptions for #{@mailing_list.name} " %>
 
 <%= content_for :page_navigation do %>
 <div>
-	<%= link_to 'New Subscription', mail_manager.new_mailing_list_subscription_path(@mailing_list), :class => 'button' %><div class='linkbuttonEnding'></div>
+	<%= link_to 'New Subscription', mail_manager.new_mailing_list_subscription_path(@mailing_list), :class => 'button' %>
 <% end %>
 
     <%= form_tag mail_manager.mailing_list_subscriptions_path(@mailing_list), :id => 'search_form', :method => 'GET' do %>
@@ -25,7 +25,7 @@
 
     <td class="item"><%=h subscription.contact.full_name %> <%=h subscription.email_address %></td>
     <td><%=h subscription.contactable.try(:client_company).try(:name) %></td>
-    <td><%= link_to 'Edit', mail_manager.edit_subscription_path(subscription), :class => 'button' %><div class="linkbuttonEnding"></div></td>
+    <td><%= link_to 'Edit', mail_manager.edit_subscription_path(subscription), :class => 'button' %></td>
   </tr>
 <% end %>
 </table>

data/app/views/mail_manager/subscriptions/new.html.erb

@@ -1,4 +1,4 @@
-<% title "New Subscription for #{@mailing_list.name}" %>
+<%= title "New Subscription for #{@mailing_list.name}" %>
 
 <%= content_for :subnav do %>
 <ul>

data/app/views/mail_manager/subscriptions/unsubscribe.html.erb

@@ -1,2 +1,2 @@
 <h1>Unsubscribed</h1>
-<p>You have successfully unsubscribed '<%= @contact.email_address %>' from '<%= @mailing_lists.join("', '") %>' at <%= link_to site_url, site_url%>. You should receive a message shortly confirming your change in subscription.</p>
+<p>You have successfully unsubscribed '<%= @email_address %>' from '<%= @mailing_lists.join("', '") %>' at <%= link_to site_url, site_url%>. You should receive a message shortly confirming your change in subscription.</p>

data/app/views/mail_manager/subscriptions/unsubscribe_by_email_address.html.erb

@@ -1,5 +1,5 @@
-<%= form_tag mail_manager.unsubscribe_by_email_address_path do %>
-<% title "Unsubscribe" %>
+<%= form_tag main_app.unsubscribe_by_email_address_path do %>
+<%= title "Unsubscribe" %>
 <p>Please enter your email address below to unsubscribe from all of our lists.</p>
   <table cellpadding="0" cellspacing="2" border="0">
   <tr>
@@ -7,7 +7,7 @@
     <td><%= text_field_tag :email_address %></td>
   </tr>
   <tr>
-     <td colspan="2" align="right"><%= submit_tag 'Unsubscribe', :class => 'button' %><div class="buttonEnding"></div>
+     <td colspan="2" align="right"><%= submit_tag 'Unsubscribe', :class => 'button' %>
   </tr>
 <% end %>
 </table>

data/config/locales/en.yml

@@ -0,0 +1,13 @@
+# Rails Guides: http://guides.rubyonrails.org/i18n.html
+# see (available from page) for some activemodel/support defaults
+# https://github.com/rails/rails/blob/master/activemodel/lib/active_model/locale/en.yml
+# https://github.com/rails/rails/blob/master/activesupport/lib/active_support/locale/en.yml
+
+en:
+  date:
+    formats:
+      default: "%b %d, %Y"
+  time:
+    formats:
+      default: "%b %d, %Y %I:%M %P"
+

data/config/locales/mailings.en.yml

@@ -0,0 +1,52 @@
+en:
+  activerecord:
+    models:
+      mail_manager/mailing:
+        one: "Mailing"
+        other: "Mailings"
+
+    attributes:
+      mail_manager/mailing:
+        subject: "Email subject"
+        from_email_address: "From email address"
+        scheduled_at: "Send emails at"
+        include_images: "Include images?"
+
+    errors:
+      models:
+        mail_manager/mailing:
+          attributes:
+            subject: "Subject"
+
+  navigation:
+    mail_manager/mailing: "Mailings"
+
+  helpers:
+
+    submit:
+      mail_manager/mailing:
+        create: "Add Mailing"
+        update: "Update Mailing"
+
+    button:
+      campaign:
+
+  messages:
+    mail_manager/mailing:
+      created: "Mailing has been created."
+      updated: "Mailing has been updated."
+      none: "There are no Mailings yet. Click 'New Mailing' to get started."
+
+  mail_manager/mailing:
+
+    links:
+      back_to_index: "Back to Mailing"
+
+    index:
+      title: "Listing Mailings"
+    new:
+      title: "New Mailing"
+    edit:
+      title: "Edit %{subject}"
+    show:
+      title: "Mailing" 

data/config/routes.rb

@@ -3,9 +3,8 @@ MailManager::Engine.routes.draw do
     member do
       post :send_test
       get :test
-      get :schedule
-      get :pause
-      get :cancel
+      put :schedule
+      put :cancel
     end
     resources :messages, only: [:index]
   end
@@ -17,27 +16,30 @@ MailManager::Engine.routes.draw do
     end
   end
 
-  resources :mailing_lists do
-    resources :subscriptions, only: [:index,:new]
-  end
+  resources :mailing_lists
 
   resources :contacts do
     member do
-      get :send_one_off_message
+      delete  :delete
+      put     :undelete
     end
   end
 end
-
 Rails.application.routes.draw do  # NOT MyEngineName::Engine.routes.draw
-  begin
-    unsubscribe_path = "#{MailManager.site_path}#{MailManager.unsubscribe_path}"
-  rescue => e
-    unsubscribe_path = '/listmgr'
-  end
-  unsubscribe_path = '/listmgr' if unsubscribe_path.blank?
+  unsubscribe_path = (MailManager.unsubscribe_path rescue "/listmgr")
+  subscribe_path = (MailManager.subscribe_path rescue "/listmgr/subscribe")
+  double_opt_in_path = (MailManager.double_opt_in_path rescue "/listmgr/confirm")
+  subscribe_thank_you_path = (MailManager.subscribe_thank_you_path rescue "/listmgr/subscribe_thank_you")
 
-  match "#{unsubscribe_path}/:guid", :controller => 'mail_manager/subscriptions', 
-    :action => 'unsubscribe'
-  match '/unsubscribe_by_email_address' => 'mail_manager/subscriptions#unsubscribe_by_email_address', as: 'unsubscribe_by_email_address'
-
-end
+  post subscribe_path, to: 'mail_manager/contacts#subscribe', 
+    as: :subscribe
+  get subscribe_thank_you_path, to: 'mail_manager/contacts#thank_you', 
+    as: :subscribe_thank_you
+  get "#{double_opt_in_path}/:login_token", to: 'mail_manager/contacts#double_opt_in', 
+    as: :double_opt_in
+  get "#{unsubscribe_path}/:guid", to: 'mail_manager/subscriptions#unsubscribe', 
+    as: :unsubscribe
+  match '/unsubscribe_by_email_address', 
+    to: 'mail_manager/subscriptions#unsubscribe_by_email_address', 
+    as: 'unsubscribe_by_email_address'
+end

data/db/migrate/008_add_bounces_count_to_mailings.rb

@@ -0,0 +1,14 @@
+class AddBouncesCountToMailings < ActiveRecord::Migration
+  def table_prefix
+    MailManager.table_prefix
+  rescue
+    'mail_manager_'
+  end
+  def change
+    add_column :"#{table_prefix}mailings", :bounces_count, :integer, default: 0
+    MailManager::Mailing.reset_column_information
+    MailManager::Mailing.find_each do |m|
+      MailManager::Mailing.reset_counters m.id, :bounces
+    end
+  end
+end

data/db/migrate/009_add_messages_count_to_mailings.rb

@@ -0,0 +1,14 @@
+class AddMessagesCountToMailings < ActiveRecord::Migration
+  def table_prefix
+    MailManager.table_prefix
+  rescue
+    'mail_manager_'
+  end
+  def change
+    add_column :"#{table_prefix}mailings", :messages_count, :integer, default: 0
+    MailManager::Mailing.reset_column_information
+    MailManager::Mailing.find_each do |m|
+      MailManager::Mailing.reset_counters m.id, :messages
+    end
+  end
+end

data/db/migrate/010_add_login_token_to_contact.rb

@@ -0,0 +1,11 @@
+class AddLoginTokenToContact < ActiveRecord::Migration
+  def table_prefix
+    MailManager.table_prefix
+  rescue
+    'mail_manager_'
+  end
+  def change
+    add_column :"#{table_prefix}contacts", :login_token, :string
+    add_column :"#{table_prefix}contacts", :login_token_created_at, :datetime
+  end
+end

data/db/migrate/011_add_deleted_at_to_mailing.rb

@@ -0,0 +1,11 @@
+class AddDeletedAtToMailing < ActiveRecord::Migration
+  def table_prefix
+    MailManager.table_prefix
+  rescue
+    'mail_manager_'
+  end
+
+  def change
+    add_column :"#{table_prefix}mailings", :deleted_at, :datetime
+  end
+end

data/lib/delayed/mailer.rb

@@ -1,8 +1,12 @@
 class Delayed::Mailer < ActionMailer::Base
-  def exception_notification(job,error,emails)
-    recipients emails
-    from Conf.exception_notification['sender_address'] 
-    subject  "* [JOB] #{job.name}(#{job.id}) failed on #{`hostname`} in #{Rails.root}"
-    body "* [JOB] #{job.name}(#{job.id}) failed with #{error.class.name}: #{error.message} - #{job.attempts} failed attempts\n  #{error.backtrace.join("\n  ")}"
+  def exception_notification(job)
+    return if MailManager.exception_notification[:to_addresses].blank? || 
+     MailManager.exception_notification[:from_address].blank?
+    mail(to: MailManager.exception_notification[:to_addresses],
+      from: MailManager.exception_notification[:from_address],
+      subject: "* [JOB] #{job.name}(#{job.id}) failed on #{`hostname`} in #{Rails.root}",
+      body: "* [JOB] #{job.name}(#{job.id}) failed with #{job.last_error} - #{
+        job.attempts} failed attempts"
+    )
   end
 end

data/lib/delayed/status.rb

@@ -4,9 +4,13 @@ module ::Delayed
   class Status
     def self.ok?(overdue=15.minutes)
       job = ::Delayed::StatusJob.first || ::Delayed::StatusJob.enqueue(::Delayed::StatusJob.new)
+      failed_count = Delayed::Job.where('failed_at is not null').count
+      raise(::Delayed::StatusException, "There are #{failed_count} failed jobs!"
+        ) if failed_count > 0
       elapsed_time = (Time.now - job.updated_at).to_i
-      raise(::Delayed::StatusException, "Rails3 Status job has failed at #{job.failed_at} with message: #{job.last_error}") if job.failed?
-      raise(::Delayed::StatusException, "Rails3 Status job hasn't run for #{elapsed_time} seconds") if elapsed_time > overdue
+      raise(::Delayed::StatusException, 
+        "Rails3 Status job hasn't run for #{elapsed_time} seconds"
+      ) if elapsed_time > overdue
       true
     end
   end

data/lib/delayed_overrides/worker.rb

@@ -0,0 +1,21 @@
+require 'delayed_job'
+require 'delayed/worker'
+if defined?(Delayed::Worker)
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','mailer')
+  
+  class Delayed::Worker
+    def failed(job)
+      self.class.lifecycle.run_callbacks(:failure, self, job) do
+        begin
+          job.hook(:failure) 
+        rescue => error
+          say "Error when running failure callback: #{error}", 'error'
+          say error.backtrace.join("\n"), 'error'
+        ensure     
+          self.class.destroy_failed_jobs ? job.destroy : job.fail!
+          Delayed::Mailer.exception_notification(job).deliver
+        end
+      end
+    end
+  end
+end

data/lib/deleteable.rb

@@ -2,6 +2,9 @@ module Deleteable
 
   def self.included(receiver)
     receiver.extend ClassMethods
+    receiver.class_eval do
+      default_scope where("deleted_at IS NULL")
+    end
   end
 
   def is_deleted?
@@ -17,15 +20,8 @@ module Deleteable
   end
 
   module ClassMethods
-    def find(*args)
-      if args[0] == (:exclusive_scope)
-        args.shift
-        super
-      else
-        with_scope(:find => {:conditions => ["#{table_name}.deleted_at is null"]}) do
-          super
-        end
-      end
+    def deleted
+      unscoped.where("deleted_at IS NOT NULL")
     end
   end
 
@@ -37,14 +33,17 @@ module DeleteableActions
   end
 
   def destroy
-    thing = controller_name.singularize.split('_').collect{|string| string.capitalize}.join.constantize.find(params[:id])
+    thing = self.class.name.gsub(/s?Controller$/,'').constantize.find(params[:id])
     thing.delete
-    redirect_to(eval("#{controller_name}_path(derailed_params)"))
+    flash[:info] = "#{thing.class.name.gsub(/^.*::/,'').humanize} successfully deleted."
+    redirect_to(action: :index)
   end
 
+  # :nocov: - not currently supported
   def undelete
-    thing = controller_name.singularize.split('_').collect{|string| string.capitalize}.join.constantize.find(:exclusive_scope,params[:id])
+    thing = self.class.name.gsub(/s?Controller$/,'').constantize.find(params[:id])
     thing.undelete
-    redirect_to(eval("#{controller_name}_path(derailed_params)"))
+    redirect_to(action: :index)
   end
-end
+  # :nocov:
+end

data/lib/mail_manager/config.rb

@@ -41,10 +41,10 @@ class MailManager::Config
       $stderr.puts "Missing Configuration: either define ::Conf with proper values or create a config/mail_manager.yml with rake mail_manager:default_app_config"
     end
     c = ::MailManager::Config.new
-    c.use_file!("#{Rails.root}/config/mail_manager.yml")
-    c.use_file!("#{Rails.root}/config/mail_manager.local.yml")
+    c.use_file!(standard_file)
+    c.use_file!(local_file)
     c.use_section!(Rails.env)
     c
   end
   
-end
+end

data/lib/mail_manager/engine.rb

@@ -1,9 +1,63 @@
 module MailManager
-  mattr_accessor :secret, :site_url, :dont_include_images_domains, :sleep_time_between_messages, :table_prefix,
-    :default_from_email_address, :bounce, :unsubscribe_path, :site_path, :layout, :use_show_for_resources
+  # set up accessors for configuration options from config/mail_manager.yml
+  # table_prefix: prefix for database table names to avoid collisions within another app
+  mattr_accessor :table_prefix
+  # secret: a secret for encrypting tokens and guids
+  mattr_accessor :secret
+  # site_url: used in various places to get the url of the site (such as in mailings templates)
+  mattr_accessor :site_url
+  # dont_include_images_domains: a list of domains that won't include images in the email, whether or not the mailing is set to include them
+  mattr_accessor :dont_include_images_domains
+  # sleep_time_between_messages: a timeout between messages to slow the output of emails to your email server; you should probably limit with your mail server itself if possible
+  mattr_accessor :sleep_time_between_messages
+  # default_from_email_address: where any public messages from the app default to for the "FROM:" header
+  mattr_accessor :default_from_email_address 
+  # bounce: (a grouping for 'POP' settings for bounce messages and the RETURN_PATH: header)
+  #   email_address: the account for POPing bounces and RETURN_PATH
+  #   login: login for account for POPing
+  #   password: password for account for POPing
+  #   pop_server: POP server
+  #   port: PORT of pop server
+  #   ssl: true/false whether you want to enable ssl for pop
+  mattr_accessor :bounce
+  # unsubscribe_path: public url for unsubscribing ... this is a prefix and is followed by a message 'guid', defaults to '/listmgr' and routes as '/listmgr/:guid'
+  mattr_accessor :unsubscribe_path
+  # site_path: used in case your rails site is at a sub-path of your domain
+  mattr_accessor :site_path
+  # layout: layout used for mail manager administratin pages
+  mattr_accessor :layout
+  # public_layout: layout used for public facing pages like unsubscribing and opt-in pages
+  mattr_accessor :public_layout
+  # subscribe_path: public path for double-opt-in 'subscribe' step which sends the email
+  mattr_accessor :subscribe_path
+  # subscribe_thank_you_path: public path for double-opt-in 'thank you' default path
+  mattr_accessor :subscribe_thank_you_path
+  # honey_pot_field: used to set a field name which will ignore submissions to the subscribe action if filled
+  mattr_accessor :honey_pot_field
+  # double_opt_in_path: path to route the double-opt-in confirmation action to
+  mattr_accessor :double_opt_in_path
+  # signup_email_address: email address for the FROM: of a double opt in/subscribe email
+  mattr_accessor :signup_email_address
+  # exception_notification: (grouping for who gets notified of exceptions)
+  #   to_addresses: an array of recipients for exceptions
+  #   from_address: who the exception appears to be from
+  mattr_accessor :exception_notification
+  # requires_authentication: whether the mail manager app requires login
+  mattr_accessor :requires_authentication
+  # authorized_roles: array of role names that can administer the mail manager
+  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
+  
+  # The following 2 might be deprecated soon
+  # show_title: can be used in templates/layouts to see whether you should show a title
+  # use_show_for_resources: whether to have links to "show" actions - we don't use them really in this app..
+  # and the 'show' actions aren't really currently supported
+  mattr_accessor :show_title
+  mattr_accessor :use_show_for_resources
   class Engine < ::Rails::Engine
-    isolate_namespace MailManager
-    initializer "MailManager.config" do |app|
+    isolate_namespace MailManager 
+    initializer "MailManager.config" do |app| 
       if File.exist?(File.join(Rails.root,'config','mail_manager.yml'))
         require 'mail_manager/config'
         MailManager.initialize_with_config(MailManager::Config.initialize!)
@@ -17,13 +71,69 @@ module MailManager
       g.fixture_replacement :factory_girl, :dir => 'spec/factories'
     end
   end
+
+  # used to easily know where the mail manager gem files are
   PLUGIN_ROOT = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
+
+  # checks if the given 'user' has a role
+  def self.authorized_for_roles?(user,roles=[])
+    return true unless roles.present?
+    user_roles = if ::MailManager.roles_method.present?
+      if user.respond_to? ::MailManager.roles_method
+        user.send(::MailManager.roles_method)
+      else
+        false
+      end
+    elsif user.respond_to?(:roles)
+      user.roles 
+    elsif user.respond_to?(:role)
+      [user.role]
+    else
+      []
+    end
+    return false unless user_roles.present?
+    user_roles = [user_roles] unless user_roles.is_a?(Array)
+    roles.detect{|role| user_roles.map(&:to_sym).map(&:to_s).include?(role.to_s)}.present?
+  end
+
+  # logic for authorization mail manager
+  def self.authorized?(user)
+    return true unless ::MailManager.requires_authentication
+    return false if user.blank?
+    return true unless ::MailManager.authorized_roles.present?
+    authorized_for_roles?(user, ::MailManager.authorized_roles)
+  end
+
+  # can be used to inject cancan abilities into your application
+  def self.abilities
+    <<-EOT
+      if MailManager.authorized?(user)
+        can :manage, [
+          MailManager::Mailing,
+          MailManager::MailingList,
+          MailManager::Contact,
+          MailManager::Subscription,
+          MailManager::Bounce,
+          MailManager::Message
+        ]
+      end
+    EOT
+  end
+
+  # gives the url for a contactable object (such as users or members or whatever 
+  # you set up for mapping to your contacts
   def self.edit_route_for(contactable)
     ContactableRegistry.edit_route_for(contactable.is_a?(String) ? contactable : contactable.class.name)
   end
+
+  # easily get a path to the gem's assets
   def self.assets_path
     File.join(PLUGIN_ROOT,'assets')
   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
   def self.initialize_with_config(conf)
     MailManager.secret ||= conf.secret rescue nil
     default_url_options = ActionController::Base.default_url_options
@@ -33,16 +143,33 @@ module MailManager
     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_'
     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 {}
     MailManager.unsubscribe_path ||= conf.unsubscribe_path || "/listmgr" rescue "/listmgr"
+    MailManager.subscribe_path ||= conf.subscribe_path || "/listmgr/subscribe" rescue "/listmgr/subscribe"
+    MailManager.double_opt_in_path ||= conf.double_opt_in_path || "/listmgr/confirm" rescue "/listmgr/confirm"
+    MailManager.honey_pot_field ||= conf.honey_pot_field || "company_name" rescue "company_name"
+    MailManager.subscribe_thank_you_path ||= conf.subscribe_thank_you_path || "/listmgr/subscribe_thank_you" rescue "/listmgr/subscribe_thank_you"
     MailManager.site_path ||= conf.site_path || "/" rescue "/"
-    MailMatager.layout ||= conf.layout || "application" rescue "application"
-    MailMatager.use_show_for_resources ||= conf.use_show_for_resources || false rescue false
+    MailManager.layout ||= conf.layout || "mail_manager/application" rescue "mail_manager/application"
+    MailManager.public_layout ||= conf.public_layout || "mail_manager/application" rescue "mail_manager/application"
+    MailManager.use_show_for_resources ||= conf.use_show_for_resources || false rescue false
+    MailManager.show_title ||= conf.show_title || true rescue true
+    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.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
   end
 end
+
+# load needed libraries for locking and delaying work
 MailManager::Engine.config.to_prepare do
   ApplicationController.helper(MailManager::SubscriptionsHelper)
-  load File.join(MailManager::PLUGIN_ROOT,'lib','mail_manager','lock.rb')
+  unless defined? MailManager::Lock
+    load File.join(MailManager::PLUGIN_ROOT,'lib','mail_manager','lock.rb')
+  end
   begin
     require 'delayed_job'
     defined?(::Delayed::Job) or die "Cannot load Delayed::Job object!"
@@ -50,5 +177,7 @@ MailManager::Engine.config.to_prepare do
   rescue NameError => e
   rescue LoadError => le
   end
+  load File.join(MailManager::PLUGIN_ROOT,'lib','delayed_overrides','worker.rb')
 end
+
 require 'will_paginate'