mail_manager 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccad22ae4d5ef09bb078ef6918c254a617d4d9aa
-  data.tar.gz: ce3cf0ed13df2688280109f5405d9087e57e9c53
+  metadata.gz: d5b18070eb704e09c4abee8c914aaa548deb43e6
+  data.tar.gz: 9b29f0f717833d1a4c3b8fa0d2858592b4823195
 SHA512:
-  metadata.gz: f446fef7c05a8c08a88d0f3130c9f3350119ec00318a08b67ed4deeeed3a2f149e54b67b86b6265d5ec3c308f8871e204804d64390722be1c89f9689069e008a
-  data.tar.gz: b6335b6e69e8092181034cbf16a227260aa43eadac08a9c827f8d8d2b87fd99b4aca2538c7ec6bb528ccd9f9552e3bee1acdb7da4c2de0444f7af07f7337f22f
+  metadata.gz: 18a71c74071f945dcfd0cf5590395f72648e82a13222abb83205702c32446de593dbe9a69d9d310dc8b2ae8e021aee3d6a61d850f050d2c4c6efb7829f16926e
+  data.tar.gz: 751c9ef49582c67528776bf9e0e573316e539a38382df09fd59e7a0ac272b98d661aded4c3bbab1ccfb4e4e1dbd5bd550bf1ed105ef0aca10a4ea9cdee4ac8e3

data/README.md

@@ -5,7 +5,10 @@ The gem provides an interface to manage mailing lists, scheduling of email maili
 
 Also available as a stand alone application called [iReach](https://github.com/LoneStarInternet/iReach/releases) including the newsletter manager (newsletter template and elements manager, simple wysiwyg interface to create newsletters, and newsletter archive) and user access management. There is also the i_reach gem that ties mail_manager and newsletter together into one gem.
 
-See the latest docs at the [Homepage](http://ireachnews.com/mail_manager_documentation.html)
+Online Documentation
+--------------------
+* [Homepage](http://ireachnews.com/mail_manager_documentation.html)
+* [Changelog](http://www.ireachnews.com/index.html#changelog)
 
 Requirements
 ------------

data/app/controllers/mail_manager/bounces_controller.rb

@@ -9,11 +9,23 @@ module MailManager
       @bounces = Bounce.scoped
       @bounces = @bounces.by_mailing_id(@mailing.id) if @mailing.present?
       @bounces = @bounces.by_status(status) if status.present?
-      @bounces = @bounces.paginate(:page => params[:page])
+      @bounces = @bounces.order("created_at desc").paginate(
+        :page => (params[:page] || 1)
+      )
     end
 
     def show
     end
+
+    def dismiss
+      @bounce.dismiss
+      redirect_to @bounce
+    end
+
+    def fail_address
+      @bounce.fail_address
+      redirect_to @bounce
+    end
   
     protected 
   

data/app/controllers/mail_manager/contacts_controller.rb

@@ -1,8 +1,6 @@
 module MailManager
   class ContactsController < ::MailManager::ApplicationController
 
-    skip_before_filter :authorize, only: [:subscribe,:double_opt_in,:thank_you]
-
     include DeleteableActions
 
     def subscribe
@@ -19,6 +17,7 @@ module MailManager
     end
 
     def thank_you
+      render layout: MailManager.public_layout
     end
 
     def double_opt_in

data/app/controllers/mail_manager/mailings_controller.rb

@@ -92,10 +92,8 @@ module MailManager
     end
   
     def get_mailables_for_select
-      #@mailables_for_select = [['Choose Mailable', @mailable.is_a?(Mailable)  ? 
-      #  'Mailable_new' : '']]+@mailables.collect{|mailable| 
-      #  [mailable.name,"#{mailable.class.name}_#{mailable.id}"]}
-      @mailables_for_select = @mailables.collect{|mailable| 
+      @mailables_for_select = @mailables.sort{|a,b| b.created_at <=> a.created_at}.
+        collect{|mailable| 
         [mailable.name,"#{mailable.class.name}_#{mailable.id}"]}
     end
   end

data/app/controllers/mail_manager/subscriptions_controller.rb

@@ -1,7 +1,5 @@
 module MailManager
   class SubscriptionsController < ::MailManager::ApplicationController
-    skip_before_filter :authorize_resource
-    skip_before_filter :load_resource
 
     # unsubscribes an email adress by a message's guid(sent in the link)
     def unsubscribe

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'],'unprocessed')
+    override_statuses(['needs_manual_intervention','unprocessed','dismissed','resolved','invalid','removed','deferred'],'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 => 
@@ -47,11 +47,11 @@ module MailManager
           change_status(:invalid)
         elsif delivery_error_code =~ /4\.\d\.\d/ || delivery_error_message.to_s =~ /quota/i
           update_attribute(:comments, delivery_error_message)
-          change_status(:resolved)
+          change_status(:deferred)
         elsif delivery_error_code =~ /5\.\d\.\d/ && delivery_error_message.present?
           transaction do 
             update_attribute(:comments, delivery_error_message)
-            change_status(:resolved)
+            change_status(:removed)
             message.change_status(:failed)
             message.update_attribute(:result,"Failure Message from Bounce: #{delivery_error_message}")
             Subscription.fail_by_email_address(contact_email_address)
@@ -82,10 +82,12 @@ module MailManager
       raise "Status cannot be manually changed unless it needs manual intervention!"  unless
         status.eql?('needs_manual_intervention')
       transaction do 
-        Subscription.fail_by_email_address(contact_email_address)
-        message.result = message.result.to_s + "Failed by Administrator: (bounced, not auto resolved) "
-        message.change_status(:failed)
-        change_status(:resolved)
+        Subscription.fail_by_email_address(contact_email_address) if contact.present?
+        if message.present?
+          message.result = message.result.to_s + "Failed by Administrator: (bounced, not auto resolved) "
+          message.change_status(:failed)
+        end
+        change_status(:removed)
       end
     end
 

data/app/models/mail_manager/contactable_registry.rb

@@ -96,7 +96,8 @@ module MailManager
       end
 
       def subscribe(mailing_list, status='active')
-        set_contactable_data && MailManager::Subscription.subscribe(contact,mailing_list, status)
+        set_contactable_data
+        MailManager::Subscription.subscribe(contact,mailing_list, status)
       end
 
       def unsubscribe(mailing_list)

data/app/models/mail_manager/mailable.rb

@@ -1,14 +1,16 @@
 class MailManager::Mailable < ActiveRecord::Base
+  self.table_name = "#{MailManager.table_prefix}mailables"
   attr_accessible :name, :email_text, :email_html
   default_scope where(reusable: true)
   include MailManager::MailableRegistry::Mailable
 end
-
-MailManager::MailableRegistry.register('MailManager::Mailable',{
-  :find_mailables => :all,
-  :name => :name,
-  :parts => [
-    ['text/plain', :email_text],
-    ['text/html', :email_html]
-  ]
-})
+if MailManager.register_generic_mailable
+  MailManager::MailableRegistry.register('MailManager::Mailable',{
+    :find_mailables => :all,
+    :name => :name,
+    :parts => [
+      ['text/plain', :email_text],
+      ['text/html', :email_html]
+    ]
+  })
+end

data/app/models/mail_manager/mailer.rb

@@ -202,26 +202,34 @@ module MailManager
           if(index % 4 == 2)
             image = Hash.new()
             image[:cid] = Base64.encode64(data).gsub(/\s*/,'').reverse[0..59]
-            final_html << "cid:#{image[:cid]}"
+            if images.detect{|this_image| this_image[:cid].eql?(image[:cid])}
+              final_html << "cid:#{image[:cid]}"
+              next
+            end
             #only attach new images!
-            next if images.detect{|this_image| this_image[:cid].eql?(image[:cid])}
             begin
               image[:content] = fetch(data)
             rescue => e
-              image_errors += "Couldn't fetch url '#{data}'<!--, #{e.message} - #{e.backtrace.join("\n")}-->\n"
+              image_errors += "\n  Couldn't fetch url '#{data}'<!--, #{e.message} - #{e.backtrace.join("\n")}-->\n"
+            end
+            if image[:content].blank?
+              final_html << data
+              next
             end
             image[:filename] = filename = File.basename(data)
             extension = filename.gsub(/^.*\./,'').downcase
             Rails.logger.debug "Fetching Image for: #{filename} #{image[:content].to_s[0..30]}"
             extension = get_extension_from_data(image[:content]) if image_mime_types(extension).blank?
-            image_errors += "Couldn't find mime type for #{extension} on #{data}" if image_mime_types(extension).blank?
+            image_errors += "\n  Couldn't find mime type for #{extension} on #{data}" if image_mime_types(extension).blank?
             image[:content_type] = image_mime_types(extension)
+            final_html << "cid:#{image[:cid]}"
             images << image
           else
             final_html << data
           end
         end
-        raise image_errors unless image_errors.eql?('')
+        # FIXME: add warnings for missing images email or on the newsletter/mailing page
+        # raise image_errors unless image_errors.eql?('')
         [final_html,images]
       end
 

data/app/models/mail_manager/mailing.rb

@@ -149,31 +149,19 @@ module MailManager
   
     # creates all of the Messages that will be sent for this mailing
     def initialize_messages
-      unless messages.length > 0
-        Rails.logger.info "Building mailing messages for mailing(#{id})"
-        transaction do 
-          emails_hash = messages.select{|m| m.type.eql?('MailManager::Message')}.inject(Hash.new){|emails_hash,message| emails_hash.merge(Mailing.clean_email_address(message.email_address)=>1)}
-          mailing_lists.each do |mailing_list|
-            mailing_list.subscriptions.active.each do |subscription|
-              contact = subscription.contact
-              next if contact.nil? or contact.deleted?
-              email_address = Mailing.clean_email_address(contact.email_address)
-              if emails_hash.has_key?(email_address)
-                Rails.logger.info "Skipping duplicate address: #{email_address}"
-              else
-                Rails.logger.info "Adding #{email_address} to mailing #{subject}"
-                emails_hash[email_address] = 1
-                message = Message.new
-                message.subscription = subscription
-                message.contact = contact
-                message.mailing = self
-                message.save
-              end
-            end
-          end
-        end
-        save
-      end
+      emails_hash = MailManager::Message.email_address_hash_for_mailing_id(self.id)
+      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)
+      active_subscriptions_hash.each_pair do | email, data |
+        next if emails_hash[email.to_s.strip.downcase].present?
+        message = MailManager::Message.create({
+          :subscription_id => data[:subscription_id],
+          :contact_id => data[:contact_id],
+          :mailing_id => self.id
+        })
+      end 
     end
   
     # clean up an email address for sending FIXME - maybe do a bit more

data/app/models/mail_manager/mailing_list.rb

@@ -23,6 +23,23 @@ module MailManager
     before_create :set_default_status
 
     attr_protected :id
+
+    def self.active_email_addresses_contact_ids_subscription_ids_for_mailing_list_ids(mailing_list_ids)
+      results = MailManager::MailingList.connection.execute(
+        %Q|select c.email_address as email_address, c.id as contact_id, 
+        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 mailing_list_id in (#{
+        mailing_list_ids.join(',')})|
+      )
+      results = results.map(&:values) if results.first.is_a?(Hash)
+      results.inject(Hash.new){ |h,r|
+        h.merge!(r[0].to_s.strip.downcase => {
+          contact_id: r[1].to_i, subscription_id: r[2].to_i
+        })
+      }
+    end
+
     
     def active?
       deleted_at.nil?

data/app/models/mail_manager/message.rb

@@ -34,6 +34,17 @@ module MailManager
 
     attr_protected :id
 
+    def self.email_address_hash_for_mailing_id(mailing_id)
+      results = MailManager::Message.connection.execute(
+        %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}|
+      )
+      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)}
+    end
+
     def initialize(*args)
       super
       set_type
@@ -45,7 +56,7 @@ module MailManager
         conditions[0] += " AND #{MailManager.table_prefix}messages.mailing_id=?"
         conditions << params[:mailing_id]
       end
-      if params[:status]
+      if params[:status].present?
         conditions[0] += " AND #{MailManager.table_prefix}messages.status=?"
         conditions << params[:status]
       end

data/app/models/mail_manager/subscription.rb

@@ -50,6 +50,17 @@ module MailManager
     attr_protected :id
     
     #acts_as_audited rescue Rails.logger.warn "Audit Table not defined!"
+    #
+
+    def self.unsubscribed_emails_hash
+      results = self.connection.execute(%Q|select distinct c.email_address 
+        from #{MailManager.table_prefix}contacts c 
+        inner join #{MailManager.table_prefix}subscriptions s on c.id=s.contact_id 
+        where s.status in ('unsubscribed')|
+      )
+      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)}
+    end
   
     def contact_full_name
        contact.full_name
@@ -63,6 +74,7 @@ module MailManager
       subscription.contact = contact
       subscription.mailing_list = mailing_list
       subscription.change_status(status)
+      subscription
     end
 
     # subscribes the contact to the list

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

@@ -14,7 +14,9 @@
     <hr/>
   <h3>Headers</h3>
     <pre>
-      <%= this_part.header.inspect %>
+      <% this_part.header.each_entry do |header| %>
+        <%= header.name %>: <%= header.value %>
+      <% end %>
     </pre>
   <% if this_part.header['content-type'].to_s =~ /text\/html/i %>
   <h3>Body Part</h3>

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

@@ -1,4 +1,4 @@
-<%= title "Listing Bounces#{"for #{@mailing.subject}" if @mailing.present?}" %>
+<%= title "Listing Bounces#{" for #{@mailing.subject}" if @mailing.present?}" %>
 
 
 <%= form_tag mail_manager.bounces_path, :id => 'search_form', :method => 'GET' do %>

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

@@ -3,9 +3,9 @@
 
 <% if @bounce.status.eql?('needs_manual_intervention') %>
 <div>
-  <%= link_to "Unsubscribe", mail_manager.fail_address_bounce_path(@bounce), :class => 'button' %>
+  <%= link_to "Remove Related Email/Subscriptions", mail_manager.fail_address_bounce_path(@bounce), :class => 'button', method: :put %>
     &nbsp;
-  <%= link_to "Dismiss", mail_manager.dismiss_bounce_path(@bounce), :class => 'button' %>
+  <%= link_to "Dismiss", mail_manager.dismiss_bounce_path(@bounce), :class => 'button', method: :put %>
 </div>
 <% end %>
 

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

@@ -6,6 +6,6 @@
        <%= f.text_field :last_name, :style => 'width: 300px;' %><br />
        <%= f.label :email_address %>
        <%= f.text_field :email_address, :style => 'width: 300px;' %><br />
-    <%= contactable_subscriptions_selector(f) %>
+    <%= contactable_subscriptions_selector(f, 'admin_unsubscribed') %>
       <div class="submit_button"><%= f.submit "Submit", :class => 'button' %></div>
 <% end %>

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

@@ -16,7 +16,7 @@
 			<td><%=l(mailing.scheduled_at) rescue '' %></td>
 			<td><b><%=h mailing.status %></b></td>
 			<td align="center"><nobr><%= link_to 'Send Test', mail_manager.test_mailing_path(mailing), :id => 'Send_Test', :class => 'button' %></nobr></td>
-      <td>
+      <td><div class="mailing_buttons">
       <% if mailing.can_edit? %>
 			<%= link_to 'Edit', mail_manager.edit_mailing_path(mailing), :class => 'button' %>
 			<% if mailing.can_schedule? %>
@@ -33,7 +33,7 @@
 			<%= link_to 'Bounces', mail_manager.bounces_path(:mailing_id => mailing.id), :class => 'button' %>
       <% end %>
 			<%= link_to 'Delete', mail_manager.mailing_path(mailing), :method => :delete, :confirm => "Are you sure?", :class => 'button' %>
-      </td>
+      </div></td>
 		</tr>
 		<% end %>
 	</table>
@@ -43,7 +43,7 @@ No mailings exist.<br /><br />
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= will_paginate @mailings %>
+  <%= will_paginate @mailings %><br /><br />
   <%= link_to "New Mailing", mail_manager.new_mailing_path, :class => 'button' %>
 </div>
 <% end %>

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

@@ -20,7 +20,7 @@
     <td>Status</td>
     <td>Status changed at</td>
     -->
-    <td>Result</td>
+    <td>Errors</td>
   </tr>
 
 <% @messages.each do |message| %>

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

@@ -1,9 +1,12 @@
 <% unsubscribed_status ||= 'unsubscribed' %>
 <%= contactable_form.fields_for :subscriptions do |subscription_fields| %>
 	<% subscription = subscription_fields.object %>
-  <div class="field">
+  <div class="field subscription_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 %>
+    <%= subscription_fields.check_box :status, {}, 'active', subscription.status.eql?('active') ? unsubscribed_status : subscription.status %>
+    <%= subscription_fields.hidden_field :mailing_list_id %> 
+    <% unless ['pending','active'].include?(subscription.status) %>
+      <%= subscription.status.humanize %>
+    <% end %><br />
   </div>
 <% end %>

data/config/routes.rb

@@ -11,8 +11,8 @@ MailManager::Engine.routes.draw do
 
   resources :bounces, only: [:index, :show] do
     member do
-      get :dismiss
-      get :fail_address
+      put :dismiss
+      put :fail_address
     end
   end
 

data/lib/delayed/status.rb

@@ -3,15 +3,18 @@ module ::Delayed
   end
   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
+      elapsed_time = (Time.now - status_job.updated_at).to_i
       raise(::Delayed::StatusException, 
         "Rails3 Status job hasn't run for #{elapsed_time} seconds"
       ) if elapsed_time > overdue
       true
     end
+    def self.status_job
+      status_job = Job.where("handler like '%StatusJob%'").first
+      status_job ||= Job.enqueue StatusJob.new(1.minute.from_now)
+    end
   end
 end